konacha-chai-matchers 0.1.7 → 0.1.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7846ed3732b6b9ce3c5d0d37b4cdfeece59545c1
+  data.tar.gz: 27b0b95a6be691ad3b3d1a454dc2f65980ce2416
+SHA512:
+  metadata.gz: 28873ea28cdbe4b63c5f7c14c0dcf055df0592de429738c92b2bc0a1bdb34e455242f94c4e9e190a0148d5c3d2ff08e92416ff65156dac1b97a58c478ef53d28
+  data.tar.gz: 0ade1f615cf3e634355d9ec2a00f24f745288f8e85c8560471a1d73d12a0aa07ed92d0bb43e266d58a880f9bd24643e96f0a036373695281302cba6bbd530b1a

data/VERSIONS

@@ -1,7 +1,7 @@
 chai-spies: 0.5.1
-sinon-chai: 2.4.0
+sinon-chai: 2.5.0
 chai-as-promised: 4.1.0
-chai-jquery: 1.1.2
+chai-jquery: 1.2.1
 chai-timers: 0.2.0
 chai-stats: 0.3.0
 chai-null: 0.1.0
@@ -9,7 +9,7 @@ chai-factories: 0.1.0
 chai-changes: 1.3.4
 chai-backbone: 0.9.2
 js-factories: 1.0.1
-mocha-as-promised: 1.4.1
+mocha-as-promised: 2.0.0
 chai-things: 0.2.0
 chai-fuzzy: 1.4.0
 sinon: 1.7.3

data/VERSIONS.lock

@@ -0,0 +1 @@
+sinon: v1.7.3

data/lib/konacha-chai-matchers/collector.rb

@@ -1,10 +1,14 @@
+require 'yaml'
 
 module Konacha
   module Chai
     module Matchers
       class Collector
 
+
         def update_libraries
+          `git submodule init`
+          `git submodule update`
           modules = collect_libraries
 
           modules.each(&:update)
@@ -18,20 +22,22 @@ module Konacha
         end
 
         private
-
         def collect_libraries
-          libs = []
-          File.open('.gitmodules') do |f|
-            contents = f.read
-            contents.each_line do |line|
-              if matches = /\[submodule "(.*)"\]/.match(line)
-                libs << Library.new(matches[1])
-              end
-            end
+          locked_versions = YAML.load_file 'VERSIONS.lock'
+
+          urls = `cat .gitmodules | grep 'url =' | awk '{print $3}'`.split("\n")
+          paths = `cat .gitmodules | grep 'path =' | awk '{print $3}'`.split("\n")
+          @libs ||= urls.each_with_index.map do |url, i|
+            name = paths[i]
+            `cd ./#{name} && git fetch && cd ..`
+            latest_tag = `cd ./#{name} && git describe --tags --abbrev=0 && cd ..`.split.first
+            library_tag = locked_versions[name] || latest_tag
+
+            latest_commit = `cd ./#{name} && git rev-parse #{library_tag || 'HEAD'} && cd ..`.split.first
+
+            Library.new url: url, name: name, tag: library_tag, commit: latest_commit
           end
-          libs
         end
-
       end
     end
   end

data/lib/konacha-chai-matchers/library.rb

@@ -4,15 +4,25 @@ module Konacha
     module Matchers
       class Library
 
-        attr_reader :name
+        attr_reader :data, :name
 
-        def initialize(name)
-          @name = name
+        def initialize(data)
+          @data = data
+          @name = data[:name]
+        end
+
+        def to_s
+          "#{@data[:name]} => #{@data[:tag]}"
+        end
+
+        def latest_version
+          `cd ./#@name && git fetch`
+          @data[:tag]
         end
 
         def update
-          `cd ./#@name && git pull origin master`
-          `cd ./#@name && ./build` if File.exist? "./#@name/build"
+          puts "Updating #{@data[:name]} to #{latest_version}"
+          `cd ./#{@data[:name]} && git checkout #{@data[:commit]}`
         end
 
         def vendor

data/lib/konacha-chai-matchers/version.rb

@@ -1,7 +1,7 @@
 module Konacha
   module Chai
     module Matchers
-      VERSION = "0.1.7"
+      VERSION = "0.1.8"
     end
   end
 end

data/vendor/assets/javascripts/chai-jquery.js

@@ -52,7 +52,7 @@
     return el.html();
   };
 
-  var props = {attr: 'attribute', css: 'CSS property'};
+  var props = {attr: 'attribute', css: 'CSS property', prop: 'property'};
   for (var prop in props) {
     (function (prop, description) {
       chai.Assertion.addMethod(prop, function (name, val) {
@@ -139,7 +139,7 @@
     );
   });
 
-  $.each(['visible', 'hidden', 'selected', 'checked', 'disabled'], function (i, attr) {
+  $.each(['visible', 'hidden', 'selected', 'checked', 'enabled', 'disabled'], function (i, attr) {
     chai.Assertion.addProperty(attr, function () {
       this.assert(
           flag(this, 'object').is(':' + attr)
@@ -225,7 +225,7 @@
             , text
           );
         } else {
-          Function.prototype.apply.call(_super.call(this), this, arguments);
+          return Function.prototype.apply.call(_super.call(this), this, arguments);
         }
       };
       setPrototypeOf(contain, this);

data/vendor/assets/javascripts/chai-timers.js

@@ -1,16 +1,9 @@
-!function (context, definition) {
-  if (typeof require === "function" && typeof exports === "object" && typeof module === "object") {
-    module.exports = definition();
-  } else if (typeof define === 'function' && typeof define.amd  === 'object') {
-    define(definition);
-  } else {
-    if (!context.chai) throw new Error('Chai cannot be found in current scope.');
-    context.chai.use(definition());
-  }
-}(this, function () {
-
-
-  function require(p) {
+!function (name, definition) {
+  if (typeof define == 'function' && typeof define.amd  == 'object') define(definition);
+  else this[name] = definition();
+}('chai_timers', function () {
+  // CommonJS require()
+  function require(p){
     var path = require.resolve(p)
       , mod = require.modules[path];
     if (!mod) throw new Error('failed to require "' + p + '"');
@@ -23,7 +16,7 @@
 
   require.modules = {};
 
-  require.resolve = function (path) {
+  require.resolve = function (path){
     var orig = path
       , reg = path + '.js'
       , index = path + '/index.js';
@@ -32,7 +25,7 @@
       || orig;
   };
 
-  require.register = function (path, fn) {
+  require.register = function (path, fn){
     require.modules[path] = fn;
   };
 
@@ -54,121 +47,110 @@
     };
   };
 
-  require.alias = function (from, to) {
-    var fn = require.modules[from];
-    require.modules[to] = fn;
-  };
 
+require.register("timers", function (module, exports, require) {
 
-  require.register("chai-timers.js", function(module, exports, require){
-    var Timer = require('./timer');
-
-    module.exports = function (chai, _) {
-      var Assertion = chai.Assertion;
-
-      chai.Timer = Timer;
-
-      chai.timer = function (name) {
-        return new Timer(name);
-      };
-
-      Assertion.addProperty('timer', function () {
-        this.assert(
-            this._obj instanceof Timer
-          , 'expected #{this} to be a chai timer'
-          , 'expected #{this} to not be a chai timer' );
-      });
-
-      [ 'started', 'stopped', 'created' ].forEach(function (when) {
-        Assertion.overwriteProperty(when, function (_super) {
-          return function () {
-            if (this._obj instanceof Timer) {
-              _.flag(this, 'timer_when', when);
-            } else {
-              _super.call(this);
-            }
-          }
-        });
-      });
-
-      Assertion.overwriteMethod('before', function (_super) {
-        return function assertBefore (timer2, when2) {
-          var timer1 = this._obj;
-          new Assertion(timer1).to.be.a.timer;
-          new Assertion(timer2).to.be.a.timer;
-
-          var when1 = _.flag(this, 'timer_when') || 'started';
-          when2 = when2 || when1;
-          var time1 = timer1[when1].getTime()
-            , time2 = timer2[when2].getTime();
-
-          this.assert(
-              time1 < time2
-            , 'expected timer {' + timer1.name + '} to have been ' + when1 + ' before timer {' + timer2.name + '} was ' + when2
-            , 'expected timer {' + timer1.name + '} to not have been ' + when1 + ' before timer {' + timer2.name + '} was ' + when2
-          );
-        };
-      });
-
-      Assertion.overwriteMethod('after', function (_super) {
-        return function assertBefore (timer2, when2) {
-          var timer1 = this._obj;
-          new Assertion(timer1).to.be.a.timer;
-          new Assertion(timer2).to.be.a.timer;
-
-          var when1 = _.flag(this, 'timer_when') || 'started';
-          when2 = when2 || when1;
-          var time1 = timer1[when1].getTime()
-            , time2 = timer2[when2].getTime();
-
-          this.assert(
-              time1 > time2
-            , 'expected timer {' + timer1.name + '} to have been ' + when1 + ' after timer {' + timer2.name + '} was ' + when2
-            , 'expected timer {' + timer1.name + '} to not have been ' + when1 + ' after timer {' + timer2.name + '} was' + when2
-          );
-        };
-      });
+module.exports = function (chai, _) {
 
-    };
+  chai.Timer = function (name) {
+    this.name = name || 'timer';
+    this.created = new Date();
+    this.marks = [];
+    this.started = null;
+    this.stopped = null;
+  };
 
-  }); // module: chai-timers.js
+  chai.Timer.prototype.start = function (date) {
+    this.started = date || new Date();
+    return this;
+  };
 
-  require.register("timer.js", function(module, exports, require){
+  chai.Timer.prototype.stop = function (date) {
+    this.stopped = date || new Date();
+  };
 
-    module.exports = Timer;
+  chai.Timer.prototype.mark = function (date) {
+    this.marks.push(date || new Date());
+  };
 
-    function Timer (name) {
-      this.name = name || 'timer';
-      this.created = new Date();
-      this.marks = [];
-      this.started = null;
-      this.stopped = null;
-    };
+  Object.defineProperty(chai.Timer.prototype, 'elapsed',
+    { get: function () {
+        var start = this.started.getTime()
+          , stop = this.stopped.getTime();
+        return stop - start;
+      }
+    , configurable: true
+  });
 
-    Object.defineProperty(Timer.prototype, 'elapsed',
-      { get: function () {
-          var start = this.started.getTime()
-            , stop = this.stopped.getTime();
-          return stop - start;
+  Object.defineProperty(chai.Timer.prototype, 'marks',
+    { get: function () {
+        var marks = _.flag(this, 'marks');
+        return marks;
+      }
+    , configurable: true
+  });
+
+  chai.Assertion.addProperty('timer', function () {
+    this.assert(
+        this._obj instanceof chai.Timer
+      , 'expected #{this} to be a chai timer'
+      , 'expected #{this} to not be a chai timer' );
+  });
+
+  [ 'started', 'stopped', 'created' ].forEach(function (when) {
+    chai.Assertion.overwriteProperty(when, function (_super) {
+      return function () {
+        if (this._obj instanceof chai.Timer) {
+          _.flag(this, 'timer_when', when);
+        } else {
+          _super.call(this);
         }
+      }
     });
-
-    Timer.prototype.start = function (date) {
-      this.started = date || new Date();
-      return this;
+  });
+
+  chai.Assertion.overwriteMethod('before', function (_super) {
+    return function assertBefore (timer2, when2) {
+      var timer1 = this._obj;
+      new chai.Assertion(timer1).to.be.a.timer;
+      new chai.Assertion(timer2).to.be.a.timer;
+
+      var when1 = _.flag(this, 'timer_when') || 'started';
+      when2 = when2 || when1;
+      var time1 = timer1[when1].getTime()
+        , time2 = timer2[when2].getTime();
+
+      this.assert(
+          time1 < time2
+        , 'expected timer {' + timer1.name + '} to have been ' + when1 + ' before timer {' + timer2.name + '} was ' + when2
+        , 'expected timer {' + timer1.name + '} to not have been ' + when1 + ' before timer {' + timer2.name + '} was ' + when2
+      );
     };
-
-    Timer.prototype.stop = function (date) {
-      this.stopped = date || new Date();
+  });
+
+  chai.Assertion.overwriteMethod('after', function (_super) {
+    return function assertBefore (timer2, when2) {
+      var timer1 = this._obj;
+      new chai.Assertion(timer1).to.be.a.timer;
+      new chai.Assertion(timer2).to.be.a.timer;
+
+      var when1 = _.flag(this, 'timer_when') || 'started';
+      when2 = when2 || when1;
+      var time1 = timer1[when1].getTime()
+        , time2 = timer2[when2].getTime();
+
+      this.assert(
+          time1 > time2
+        , 'expected timer {' + timer1.name + '} to have been ' + when1 + ' after timer {' + timer2.name + '} was ' + when2
+        , 'expected timer {' + timer1.name + '} to not have been ' + when1 + ' after timer {' + timer2.name + '} was' + when2
+      );
     };
+  });
 
-    Timer.prototype.mark = function (date) {
-      this.marks.push(date || new Date());
-    };
-
-  }); // module: timer.js
+};
 
-  require.alias("./chai-timers.js", "chai-timers");
-
-  return require('chai-timers');
+}); // module timers
+  return require('timers');
 });
+
+chai.use(chai_timers);

data/vendor/assets/javascripts/memo-is.js

@@ -108,7 +108,7 @@ var Memoizer = function() {
   memoizer.is = this.is;
 };
 
-if (typeof(module) != 'undefined' && module.exports) { // Node.js
+if (module && module.exports) { // Node.js
   /**
    * Return a new Memoizer object.
    *

data/vendor/assets/javascripts/mocha-as-promised.js

@@ -1,18 +1,20 @@
 (function (mochaAsPromised) {
     "use strict";
 
-    function findNodeJSMocha(moduleToTest, suffix) {
+    function findNodeJSMocha(moduleToTest, suffix, accumulator) {
+        if (accumulator === undefined) {
+            accumulator = [];
+        }
+
         if (moduleToTest.id.indexOf(suffix, moduleToTest.id.length - suffix.length) !== -1 && moduleToTest.exports) {
-            return moduleToTest.exports;
+            accumulator.push(moduleToTest.exports);
         }
 
-        for (var i = 0; i < moduleToTest.children.length; ++i) {
-            var found = findNodeJSMocha(moduleToTest.children[i], suffix);
+        moduleToTest.children.forEach(function (child) {
+            findNodeJSMocha(child, suffix, accumulator);
+        });
 
-            if (found) {
-                return found;
-            }
-        }
+        return accumulator;
     }
 
     // Module systems magic dance.
@@ -22,31 +24,32 @@
         // using the Mocha test runner from either a locally-installed package, or from a globally-installed one.
         // In the latter case, naively plugging in `require("mocha")` would end up duck-punching the wrong instance,
         // so we provide this shortcut to auto-detect which Mocha package needs to be duck-punched.
-        module.exports = function (mocha) {
-            if (!mocha) {
+        module.exports = function (mochaModules) {
+            if (mochaModules === undefined) {
                 if (typeof process === "object" && Object.prototype.toString.call(process) === "[object process]") {
                     // We're in *real* Node.js, not in a browserify-like environment. Do automatic detection logic.
 
-                    // Funky syntax prevents Browserify from detecting the require, since it's needed for Node.js-only stuff.
+                    // Funky syntax prevents Browserify from detecting the require, since it's needed for Node.js-only
+                    // stuff.
                     var path = (require)("path");
                     var suffix = path.join("mocha", "lib", "mocha.js");
-                    mocha = findNodeJSMocha(require.main, suffix);
+                    mochaModules = findNodeJSMocha(require.main, suffix);
 
-                    if (mocha === undefined) {
+                    if (mochaModules === undefined) {
                         throw new Error("Attempted to automatically plug in to Mocha, but could not detect a " +
                                         "running Mocha module.");
                     }
 
                 } else if (typeof Mocha !== "undefined") {
                     // We're in a browserify-like emulation environment. Try the `Mocha` global.
-                    mocha = Mocha;
+                    mochaModules = [Mocha];
                 } else {
                     throw new Error("Attempted to automatically plug in to Mocha, but could not detect the " +
                                     "environment. Plug in manually by passing the running Mocha module.");
                 }
             }
 
-            mochaAsPromised(mocha);
+            mochaModules.forEach(mochaAsPromised);
         };
     } else if (typeof define === "function" && define.amd) {
         // AMD
@@ -69,13 +72,11 @@
         }
     }
 
-    var duckPunchedAlready = false;
-
     return function mochaAsPromised(mocha) {
-        if (duckPunchedAlready) {
+        if (mocha._mochaAsPromisedLoadedAlready) {
             return;
         }
-        duckPunchedAlready = true;
+        mocha._mochaAsPromisedLoadedAlready = true;
 
         // Soooo this is an awesome hack.