testdouble · searls · Dec 4, 2015 · Dec 4, 2015 · Dec 4, 2015 · Dec 4, 2015
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ npm-debug.log*
 /node_modules
 
 /generated
+/lib
diff --git a/.npmignore b/.npmignore
@@ -1,2 +1,3 @@
 # this file is necessary so that npm doesn't use .gitignore;
-# gitignore ignores generated/ which *must* be included in the package.
+# gitignore ignores lib/ which *must* be included in the package.
+
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,4 @@ language: node_js
 node_js:
   - "4.1"
   - "0.12"
-script:
-  - npm run test:ci
-  - npm run test:examples
+script: npm run test:ci
diff --git a/docs/6-verifying-invocations.md b/docs/6-verifying-invocations.md
@@ -55,7 +55,7 @@ Error: Unsatisfied verification on test double `quack`.
 
   But was actually called:
     - called with `("QUACK")`.
-  at Object.module.exports [as verify] (/Users/justin/code/testdouble/testdouble.js/generated/verify.js:22:15)
+  at Object.module.exports [as verify] (/Users/justin/code/testdouble/testdouble.js/lib/verify.js:22:15)
 ```
 
 As you can see, the expected arguments of the failed verification are pritned

diff --git a/package.json b/package.json
@@ -8,30 +8,29 @@
     "email": "justin@testdouble.com",
     "url": "http://testdouble.com"
   },
-  "main": "generated/testdouble.js",
+  "main": "lib/testdouble.js",
   "config": {
     "build_file": "dist/testdouble.js",
     "mocha_reporter": "spec"
   },
   "scripts": {
-    "clean": "rm -rf generated dist && git checkout -- dist",
+    "clean": "rm -rf generated dist lib && git checkout -- dist",
     "start": "testem",
-    "compile": "coffee --output generated --compile lib",
-    "compile:tests": "coffee --output generated/test --compile test",
+    "compile:node": "coffee --output lib --compile src",
+    "compile:test": "coffee --output generated/test --compile test",
+    "compile:browser": "browserify . --standalone testdouble --outfile $npm_package_config_build_file --ignore 'quibble'",
+    "compile": "npm run compile:node && npm run compile:test && npm run compile:browser",
     "test": "mocha --ui mocha-given --reporter $npm_package_config_mocha_reporter --compilers coffee:coffee-script --recursive test/node-helper.coffee test/lib",
-    "test:ci": "npm run test --testdouble:mocha_reporter=tap && testem ci",
-    "test:examples": "cd examples/node && npm i && npm test && cd ../..",
+    "test:example": "cd examples/node && npm i && npm test && cd ../..",
+    "test:ci": "npm run test --testdouble:mocha_reporter=tap && testem ci && npm run test:example",
     "test:debug": "npm test -- --debug-brk",
-    "prebuild": "npm run compile",
-    "build": "browserify . --standalone testdouble --outfile $npm_package_config_build_file --ignore 'quibble'",
-    "audit:disc": "npm run build -- --full-paths && discify $npm_package_config_build_file --open",
     "preversion": "git pull --rebase && npm run test:ci",
-    "version": "npm run build && git add dist",
+    "version": "npm run compile && git add dist",
     "postversion": "git push && git push --tags && npm publish",
     "prepublish": "npm run compile"
   },
   "browser": {
-    "./generated/replace.js": "./generated/replace.browser.js"
+    "./lib/replace.js": "./lib/replace.browser.js"
   },
   "browserify": {
     "transform": [

diff --git a/lib/args-match.coffee → src/args-match.coffee b/lib/args-match.coffee → src/args-match.coffee
diff --git a/lib/explain.coffee → src/explain.coffee b/lib/explain.coffee → src/explain.coffee
diff --git a/lib/function.coffee → src/function.coffee b/lib/function.coffee → src/function.coffee
diff --git a/lib/matchers/captor.coffee → src/matchers/captor.coffee b/lib/matchers/captor.coffee → src/matchers/captor.coffee
diff --git a/lib/matchers/index.coffee → src/matchers/index.coffee b/lib/matchers/index.coffee → src/matchers/index.coffee
diff --git a/lib/object.coffee → src/object.coffee b/lib/object.coffee → src/object.coffee
diff --git a/lib/replace.browser.coffee → src/replace.browser.coffee b/lib/replace.browser.coffee → src/replace.browser.coffee
diff --git a/lib/replace.coffee → src/replace.coffee b/lib/replace.coffee → src/replace.coffee
diff --git a/lib/reset.coffee → src/reset.coffee b/lib/reset.coffee → src/reset.coffee
diff --git a/lib/store/calls.coffee → src/store/calls.coffee b/lib/store/calls.coffee → src/store/calls.coffee
diff --git a/lib/store/index.coffee → src/store/index.coffee b/lib/store/index.coffee → src/store/index.coffee
diff --git a/lib/store/stubbings.coffee → src/store/stubbings.coffee b/lib/store/stubbings.coffee → src/store/stubbings.coffee
diff --git a/lib/stringify-args.coffee → src/stringify-args.coffee b/lib/stringify-args.coffee → src/stringify-args.coffee
diff --git a/lib/testdouble.coffee → src/testdouble.coffee b/lib/testdouble.coffee → src/testdouble.coffee
diff --git a/lib/verify.coffee → src/verify.coffee b/lib/verify.coffee → src/verify.coffee
diff --git a/lib/when.coffee → src/when.coffee b/lib/when.coffee → src/when.coffee
diff --git a/testem.js b/testem.js
@@ -14,7 +14,7 @@ module.exports = {
 
   framework: 'mocha+chai',
 
-  before_tests: "npm run compile:tests && npm run build",
+  before_tests: "npm run compile",
   //might want to add this if you do a lot of file-delete/add churn; faster w/o.
   //after_tests: "npm run clean",
 
@@ -35,7 +35,7 @@ module.exports = {
   ],
 
   watch_files: [
-    "lib/**/*",
+    "src/**/*",
     "test/**/*"
   ]
 };