Merge branch 'master' of https://github.com/segment-integrations/analytics.js-integration-appcues

Author: rayd

.eslintrc

@@ -1,17 +1,3 @@
 {
-  "extends": "segment/browser",
-
-  "rules": {
-    "global-strict": 0,
-    "max-len": 0,
-    // FIXME: Remove this when linting error has been fixed
-    "no-use-before-define": 0,
-    "strict": 1
-  },
-
-  "globals": {
-    "exports": true,
-    "module": true,
-    "require": true
-  }
+  "extends": "@segment/eslint-config/browser/legacy"
 }

.gitignore

@@ -1,5 +1,2 @@
-*.log
-.DS_Store
-build.js
-components
+coverage
 node_modules

Contributing.md CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing
 
-We're huge fans of open-source, and we absolutely love getting good contributions to **analytics.js**! Integrations are available to thousands of Segment customers and we have hundreds of integrations in already in our queue, so it's important that you do the following _before writing a pull request_. 
+We're huge fans of open-source, and we absolutely love getting good contributions to **analytics.js**! Integrations are available to thousands of Segment customers and we have hundreds of integrations in already in our queue, so it's important that you do the following _before writing a pull request_.
 
 1. Read about our integration options and apply to be a partner: https://segment.com/partners/
 1. Hear from the Segment team before submitting your pull request.
@@ -21,9 +21,8 @@ That will install all of our [npm](http://npmjs.org) and [component](http://comp
 The commands you'll want to know for development are:
 
 ```bash
-$ make               # re-compiles the development build of analytics.js for testing
-$ make test          # runs all of the tests in your terminal
-$ make test-browser  # runs all of the tests in your browser, for nicer debugging
+$ make test                          # runs all of the tests in your terminal
+$ make test-browser BROWSERS=Chrome  # runs all of the tests in Chrome for nicer debugging
 ```
 
 ## Writing Tests

HISTORY.md

@@ -0,0 +1,52 @@
+2.0.0 / 2016-06-21
+==================
+
+  * Remove Duo compatibility
+  * Add CI setup (coverage, linting, cross-browser compatibility, etc.)
+  * Update eslint configuration
+
+
+1.0.8 / 2016-06-07
+==================
+
+  * Merge pull request #7 from segment-integrations/revert/apikey
+
+1.0.7 / 2016-05-13
+==================
+
+  * Switch appcuesId to apiKey
+
+1.0.6 / 2016-05-07
+==================
+
+  * Bump Analytics.js core, tester, integration to use Facade 2.x
+
+1.0.5 / 2015-10-08
+==================
+
+  * analytics.page() should call Appcues.start().
+
+1.0.4 / 2015-06-30
+==================
+
+  * Replace analytics.js dependency with analytics.js-core
+
+1.0.3 / 2015-06-30
+==================
+
+  * Replace analytics.js dependency with analytics.js-core
+
+1.0.2 / 2015-06-24
+==================
+
+  * Bump analytics.js-integration version
+
+1.0.1 / 2015-06-24
+==================
+
+  * Bump analytics.js-integration version
+
+1.0.0 / 2015-06-09
+==================
+
+  * Initial commit :sparkles:

History.md

@@ -1,93 +1,80 @@
-#
-# Binaries.
-#
-
-DUO = node_modules/.bin/duo
-DUOT = node_modules/.bin/duo-test
-ESLINT = node_modules/.bin/eslint
-
-#
-# Files.
-#
-
-SRCS_DIR = lib
-SRCS = $(shell find $(SRCS_DIR) -type f -name "*.js")
-TESTS_DIR = test
-TESTS = $(shell find $(TESTS_DIR) -type f -name '*.test.js')
-
-#
-# Task config.
-#
-
-BROWSER ?= chrome
-
-PORT ?= 0
-
-DUOT_ARGS = \
-	--reporter spec \
-	--port $(PORT) \
-	--commands "make build"
-
-#
-# Chore tasks.
-#
-
-# Install node dependencies.
+##
+# Binaries
+##
+
+ESLINT := node_modules/.bin/eslint
+KARMA := node_modules/.bin/karma
+
+##
+# Files
+##
+
+LIBS = $(shell find lib -type f -name "*.js")
+TESTS = $(shell find test -type f -name "*.test.js")
+SUPPORT = $(wildcard karma.conf*.js)
+ALL_FILES = $(LIBS) $(TESTS) $(SUPPORT)
+
+##
+# Program options/flags
+##
+
+# A list of options to pass to Karma
+# Overriding this overwrites all options specified in this file (e.g. BROWSERS)
+KARMA_FLAGS ?=
+
+# A list of Karma browser launchers to run
+# http://karma-runner.github.io/0.13/config/browsers.html
+BROWSERS ?=
+ifdef BROWSERS
+KARMA_FLAGS += --browsers $(BROWSERS)
+endif
+
+ifdef CI
+KARMA_CONF ?= karma.conf.ci.js
+else
+KARMA_CONF ?= karma.conf.js
+endif
+
+# Mocha flags.
+GREP ?= .
+
+##
+# Tasks
+##
+
+# Install node modules.
 node_modules: package.json $(wildcard node_modules/*/package.json)
 	@npm install
+	@touch $@
+
+# Install dependencies.
+install: node_modules
 
 # Remove temporary files and build artifacts.
 clean:
-	rm -rf build.js
+	rm -rf *.log coverage
 .PHONY: clean
 
 # Remove temporary files, build artifacts, and vendor dependencies.
 distclean: clean
-	rm -rf components node_modules
+	rm -rf node_modules
 .PHONY: distclean
 
-#
-# Build tasks.
-#
-
-# Build all integrations, tests, and dependencies together for testing.
-build.js: node_modules component.json $(SRCS) $(TESTS)
-	@$(DUO) --stdout --development $(TESTS) > $@
-
-# Build shortcut.
-build: build.js
-.DEFAULT_GOAL = build
-
-#
-# Test tasks.
-#
-
-# Lint JavaScript source.
-lint: node_modules
-	@$(ESLINT) $(SRCS) $(TESTS)
+# Lint JavaScript source files.
+lint: install
+	@$(ESLINT) $(ALL_FILES)
 .PHONY: lint
 
-# Test locally in PhantomJS.
-test-phantomjs: node_modules build.js
-	@$(DUOT) phantomjs $(TESTS_DIR) args: \
-		--path node_modules/.bin/phantomjs
-.PHONY: test
+# Attempt to fix linting errors.
+fmt: install
+	@$(ESLINT) --fix $(ALL_FILES)
+.PHONY: fmt
+
+# Run browser unit tests in a browser.
+test-browser: install
+	@$(KARMA) start $(KARMA_FLAGS) $(KARMA_CONF)
 
-# Test locally in the browser.
-test-browser: node_modules build.js
-	@$(DUOT) browser --commands "make build" $(TESTS_DIR)
-.PHONY: test-browser
-
-# Test in Sauce Labs. Note that you must set the SAUCE_USERNAME and
-# SAUCE_ACCESS_KEY environment variables using your Sauce Labs credentials.
-test-sauce: node_modules build.js
-	@$(DUOT) saucelabs $(TESTS_DIR) \
-		--name analytics.js-integrations \
-		--browsers $(BROWSER) \
-		--user $(SAUCE_USERNAME) \
-		--key $(SAUCE_ACCESS_KEY)
-.PHONY: test-sauce
-
-# Test shortcut.
-test: lint test-phantomjs
+# Default test target.
+test: lint test-browser
 .PHONY: test
+.DEFAULT_GOAL = test

License.md LICENSE

@@ -4,7 +4,7 @@ Appcues integration for [Analytics.js][].
 
 ## License
 
-Released under the [MIT license](License.md).
+Released under the [MIT license](LICENSE).
 
 
 [Analytics.js]: https://segment.com/docs/libraries/analytics.js/

Makefile

@@ -1,11 +1,31 @@
 machine:
   node:
-    version: 0.12
+    version: 4
+  environment:
+    NPM_CONFIG_PROGRESS: false
+    NPM_CONFIG_SPIN: false
+    SAUCE_ACCESS_KEY: 80dcffc2-c9a2-45e2-9fb7-87b29a6cd986
+    SAUCE_USERNAME: segment-oss
+    TEST_REPORTS_DIR: $CIRCLE_TEST_REPORTS
+
 dependencies:
   pre:
-    - echo "github.com,192.30.252.*,192.30.253.*,192.30.254.*,192.30.255.* ssh-rsa $(ssh-keyscan -t rsa github.com | cut -d ' ' -f 3-)" >> ~/.ssh/known_hosts
-    - npm install -g npm@'>=2.7.0'
-    - make
+    - npm config set "//registry.npmjs.org/:_authToken" $NPM_AUTH
+    - npm -g install codecov
+  override:
+    - make install
+
 test:
   override:
     - make test
+  post:
+    - cp -R coverage $CIRCLE_ARTIFACTS/
+    - codecov
+
+deployment:
+  publish:
+    owner: segment-integrations
+    # Works on e.g. `1.0.0-alpha.1`
+    tag: /[0-9]+(\.[0-9]+)*(-.+)?/
+    commands:
+      - npm publish .