jim 0.1.2 → 0.2.0

data/test/fixtures/sammy-0.5.0/vendor/qunit-spec.js

@@ -0,0 +1,127 @@
+(function($) {
+
+  QUnit.Spec = function(name) {
+    this.before = false;
+    this.after = false;
+    QUnit.module(name);
+  };
+
+
+  // RSpec style describe
+  // takes an arbitrary number of arguments that are contactenated as strings
+  // the last argument is the configuration object
+  // which can have before: after: callbacks
+  function describe() {
+    var args = $.makeArray(arguments),
+    // configuration function
+      config = (args.length > 0 && args[args.length - 1]['before']) ? args.pop() : {},
+      spec = new QUnit.Spec(args.join(' '));
+    spec['before'] = config['before'] || config['setup'];
+    spec['after']  = config['after'] || config['teardown'];
+    return spec;
+  }
+
+
+  $.extend(QUnit.Spec.prototype, {
+    
+    // RSpec style test definition
+    it: function(name, callback, nowait) {
+      var spec = this;
+      var spec_context = {};
+      QUnit.test(name, function() { 
+        if (spec.before) spec.before.apply(spec_context);
+        callback.apply(spec_context, [this]); 
+        if (spec.after) spec.after.apply(spec_context);
+      });
+      return spec;
+    },
+
+    // Shoulda style test definition
+    should: function(name, callback, nowait) {
+      name = 'should ' + name;
+      return this.it.apply(this, [name, callback, nowait]);
+    },
+    
+    pending: function(name, callback, nowait) {
+      name = '<span style="color: #EB8531;" class="pending">DEFERRED: ' + name + '</span>';
+      QUnit.test(name, function () { QUnit.ok(true) }, nowait);
+      return this;
+    },
+    
+    should_eventually: function(name, callback, nowait) {
+      return this.pending(name, callback, nowait);
+    }
+    
+  });
+
+
+  $.extend(QUnit, {
+    // aliases for describe
+    describe: describe,
+    context: describe,
+
+    // asserts that the method is defined (like respond_to?)
+    defined: function(object, method) {
+      return QUnit.ok(QUnit.is('Function', object[method]), method + ' is not defined on ' + object);
+    },
+
+    // asserts that the object is of a certain type
+    isType: function(object, type) {
+      return ok(QUnit.is(type, object), "expected " + object + " to be a " + type);
+    },
+    
+    // assert a string matches a regex
+    matches: function(matcher, string, message) {
+      return QUnit.ok(!!matcher.test(string), "expected: " + string + "match(" + matcher.toString() + ")");
+    },
+    
+    // assert that a matching error is raised
+    // expected can be a regex, a string, or an object
+    raised: function(expected_error, callback) {
+      var error = '';
+      try {
+        callback.apply(this);
+      } catch(e) {
+        error = e;
+      }
+      message = "expected error: " + expected_error.toString() + ", actual error:" + error.toString();
+      if (expected_error.constructor == RegExp) {
+        return QUnit.matches(expected_error, error.toString(), message);
+      } else if (expected_error.constructor == String) {
+        return QUnit.equals(expected_error, error.toString(), message);
+      } else {
+        return QUnit.equals(expected_error, error, message);
+      }
+    },
+    
+    notRaised: function(callback) {
+      var error = '';
+      try {
+        callback.apply(this);
+      } catch(e) {
+        error = e;
+      }
+      message = "expected: no errors, actual error: " + error.toString();
+      QUnit.equals('', error, message);
+    },
+    
+    soon: function(callback, context, secs, many_expects) {
+      if (typeof context == 'undefined') context = this;
+      if (typeof secs == 'undefined') secs = 1;
+      if (typeof many_expects == 'undefined') many_expects = 1;
+      QUnit.expect(many_expects);
+      QUnit.stop();
+      setTimeout(function() {
+        callback.apply(context);
+        QUnit.start();
+      }, secs * 500);
+    },
+    
+    flunk: function() {
+      QUnit.ok(false, 'FLUNK');
+    }
+
+  });
+
+
+})(jQuery);

data/test/helper.rb

@@ -9,8 +9,17 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'jim'
 
-Jim.logger = Logger.new('/dev/null')
-Jim::Installer.tmp_root = File.join(File.dirname(__FILE__), 'tmp', 'jimtmproot')
+unless !!ENV['PRINT']
+  Jim.logger = Logger.new('/dev/null') 
+else 
+  logger           = Logger.new(STDOUT)
+  logger.level     = Logger::DEBUG
+  logger.formatter = Proc.new {|s, t, n, msg| "\n* #{s}: #{msg}\n"}
+  Jim.logger = logger
+end
+
+JIM_TMP_ROOT = File.join(File.dirname(__FILE__), 'tmp', 'jimtmproot')
+Jim::Installer.tmp_root = JIM_TMP_ROOT
 
 class Test::Unit::TestCase
   
@@ -23,7 +32,7 @@ class Test::Unit::TestCase
   end
   
   def tmp_path
-    File.join(File.dirname(__FILE__), 'tmp')
+    Pathname.new(File.join(File.dirname(__FILE__), 'tmp')).expand_path
   end
   
   def assert_readable(*args)
@@ -31,9 +40,20 @@ class Test::Unit::TestCase
     assert File.readable?(full_path), "Expected #{full_path} to be a readable file"
   end
   
+  def assert_file_contents(match, *args)
+    full_path = File.join(*args)
+    file_contents = File.read(full_path)
+    assert_match(match, file_contents, "Expected file at #{full_path} with content #{file_contents} to match #{match.inspect}")
+  end
+  
   def assert_dir(*args)
     full_path = File.join(*args)
     assert File.directory?(full_path), "Expected #{full_path} to be a directory"
   end
   
+  def assert_not_readable(*args)
+    full_path = File.join(*args)
+    assert !File.readable?(full_path), "Expected #{full_path} to not be a readable file"
+  end
+  
 end

data/test/test_jim_bundler.rb

@@ -26,13 +26,13 @@ class TestJimBundler < Test::Unit::TestCase
       end
       
       should "parse options out of jimfile" do
-        assert_equal 'tmp/public/javascripts/bundled.js', @bundler.options[:bundled_path]
-        assert_equal 'tmp/public/javascripts/vendor', @bundler.options[:vendor_dir]
+        assert_equal 'test/tmp/public/javascripts/bundled.js', @bundler.options[:bundled_path]
+        assert_equal 'test/tmp/public/javascripts/vendor', @bundler.options[:vendor_dir]
       end
       
-      should "set index" do
+      should "set index and include vendor dir" do
         assert @bundler.index.is_a?(Jim::Index)
-        assert_equal @directories, @bundler.index.directories
+        assert_equal [@bundler.options[:vendor_dir]] + @directories, @bundler.index.directories
       end      
     end        
     
@@ -43,14 +43,15 @@ class TestJimBundler < Test::Unit::TestCase
         @bundler.resolve!
         assert @bundler.paths
         assert_equal 2, @bundler.paths.length
-        @bundler.paths.each do |path|
+        @bundler.paths.each do |path, name, version|
           assert path.is_a?(Pathname)
+          assert name.is_a?(String)
         end
       end
       
       should "set paths in same order as in jimfile" do
         @bundler.resolve!
-        assert_equal Pathname.new(fixture_path('jquery-1.4.1.js')), @bundler.paths.first
+        assert_equal Pathname.new(fixture_path('jquery-1.4.1.js')), @bundler.paths[0][0]
       end
       
       should "raise error if file can not be found" do
@@ -67,8 +68,8 @@ class TestJimBundler < Test::Unit::TestCase
       should "copy files in jemfile to path specified" do
         vendor_dir = Pathname.new(tmp_path) + 'vendor'
         @bundler.vendor!(vendor_dir)
-        assert_readable vendor_dir + 'jquery.js'
-        assert_readable vendor_dir + 'myproject.js'
+        assert_readable vendor_dir + 'jquery-1.4.1.js'
+        assert_readable vendor_dir + 'myproject-1.2.2.js'
       end
       
     end

data/test/test_jim_cli.rb

@@ -5,7 +5,7 @@ class TestJimCLI < Test::Unit::TestCase
   context "Jim::CLI" do
     setup do
       FileUtils.rm_rf(tmp_path) if File.directory?(tmp_path)
-      other_tmp_path = File.join(File.dirname(__FILE__), '..', 'tmp')
+      other_tmp_path = File.join(File.dirname(__FILE__), '..', '..' 'tmp')
       FileUtils.rm_rf(other_tmp_path) if File.directory?(other_tmp_path)
       Jim::Installer.new(fixture_path('infoincomments.js'), tmp_path).install
       Jim::Installer.new(fixture_path('jquery-1.4.1.js'), tmp_path).install
@@ -18,15 +18,26 @@ class TestJimCLI < Test::Unit::TestCase
       end
     end
     
+    context "pack" do
+      should "run vendor, bundle, compress" do
+        Jim::Bundler.any_instance.stubs(:compress_js).returns("compressed.js")
+        run_cli("pack", "-j", fixture_path('Jimfile'), "--jimhome", tmp_path)
+        assert_readable tmp_path, 'public', 'javascripts', 'vendor', 'jquery-1.4.1.js'
+        assert_readable tmp_path, 'public', 'javascripts', 'vendor', 'myproject-1.2.2.js'
+        assert_readable tmp_path, 'public', 'javascripts', 'bundled.js'
+        assert_readable tmp_path, 'public', 'javascripts', 'compressed.js'
+      end
+    end
+    
     context "bundle" do
       should "write bundled Jimfile to path" do
-        run_cli("bundle", tmp_path + '/bundle.js', "-j", fixture_path('Jimfile'), "--jimhome", tmp_path)
-        assert_readable tmp_path + '/bundle.js'
+        run_cli("bundle", tmp_path + 'bundle.js', "-j", fixture_path('Jimfile'), "--jimhome", tmp_path)
+        assert_readable tmp_path + 'bundle.js'
       end
       
       should "write to bundled_path if no path provided" do
         run_cli("bundle", "-j", fixture_path('Jimfile'), "--jimhome", tmp_path)
-        assert_readable tmp_path, '..', '..', 'tmp', 'public', 'javascripts', 'bundled.js'
+        assert_readable tmp_path, 'public', 'javascripts', 'bundled.js'
       end
     end
     
@@ -36,23 +47,21 @@ class TestJimCLI < Test::Unit::TestCase
       end
       
       should "compress Jimfile to path" do
-        run_cli("compress", tmp_path + '/compressed.js', "-j", fixture_path('Jimfile'), "--jimhome", tmp_path)
-        assert_readable tmp_path + '/compressed.js'
+        run_cli("compress", tmp_path + 'compressed.js', "-j", fixture_path('Jimfile'), "--jimhome", tmp_path)
+        assert_readable tmp_path + 'compressed.js'
       end
       
       should "compress to compressed_path if no path provided" do
         run_cli("compress", "-j", fixture_path('Jimfile'), "--jimhome", tmp_path)
-        assert_readable tmp_path, '..', '..', 'tmp', 'public', 'javascripts', 'compressed.js'
+        assert_readable tmp_path, 'public', 'javascripts', 'compressed.js'
       end
     end
     
     context "vendor" do
-      should "vendor Jimfile to dir" do
-        
-      end
-      
       should "vendor Jimfile to vendor dir" do
-        
+        run_cli("vendor", "-j", fixture_path('Jimfile'), "--jimhome", tmp_path)
+        assert_readable tmp_path, 'public', 'javascripts', 'vendor', 'jquery-1.4.1.js'
+        assert_readable tmp_path, 'public', 'javascripts', 'vendor', 'myproject-1.2.2.js'
       end
     end
         

data/test/test_jim_installer.rb

@@ -5,50 +5,51 @@ class TestJimInstaller < Test::Unit::TestCase
   context "Jim::Installer" do
     setup do
       # clear the tmp dir
-      FileUtils.rm_rf(tmp_path) if File.directory?(tmp_path)
+      FileUtils.rm_rf(tmp_path) if File.exist?(tmp_path)
+      FileUtils.rm_rf(JIM_TMP_ROOT) if File.exist?(JIM_TMP_ROOT)
     end
-    
+
     context "initializing" do
       setup do
         @installer = Jim::Installer.new('fetchpath', 'installpath', {:version => '1.1'})
       end
-      
+
       should "set fetch path" do
         assert_equal Pathname.new('fetchpath'), @installer.fetch_path
       end
-      
+
       should "set install path" do
         assert_equal Pathname.new('installpath'), @installer.install_path
       end
-      
+
       should "set options" do
         assert_equal({:version => '1.1'}, @installer.options)
       end
-      
+
     end
-    
+
     context "fetch" do
       setup do
         @url = "http://jquery.com/download/jquery-1.4.1.js"
         FakeWeb.register_uri(:get, @url, :body => fixture('jquery-1.4.1.js'))
       end
-      
+
       should "fetch remote file" do
         installer = Jim::Installer.new(@url, tmp_path)
         assert installer.fetch
       end
-            
+
       should "fetch local file" do
         installer = Jim::Installer.new(fixture_path('jquery-1.4.1.js'), tmp_path)
         fetched_path = installer.fetch
         assert_dir fetched_path.dirname
         assert_equal 'jquery-1.4.1.js', fetched_path.basename.to_s
       end
-      
+
     end
-    
+
     context "determine_name_and_version" do
-      
+
       should "determine from filename" do
         installer = Jim::Installer.new(fixture_path('jquery-1.4.1.js'), tmp_path)
         assert installer.fetch
@@ -56,7 +57,7 @@ class TestJimInstaller < Test::Unit::TestCase
         assert_equal '1.4.1', installer.version
         assert_equal 'jquery', installer.name
       end
-      
+
       should "determine from package.json" do
         installer = Jim::Installer.new(fixture_path('mustache.js'), tmp_path)
         assert installer.fetch
@@ -64,7 +65,7 @@ class TestJimInstaller < Test::Unit::TestCase
         assert_equal "0.2.2", installer.version
         assert_equal "mustache", installer.name
       end
-      
+
       should "determine from file comments" do
         installer = Jim::Installer.new(fixture_path('infoincomments.js'), tmp_path)
         assert installer.fetch
@@ -72,7 +73,7 @@ class TestJimInstaller < Test::Unit::TestCase
         assert_equal 'myproject', installer.name
         assert_equal '1.2.2', installer.version
       end
-      
+
       should "determine from options" do
         installer = Jim::Installer.new(fixture_path('jquery-1.4.1.js'), tmp_path, :name => 'myproject', :version => '1.1.1')
         assert installer.fetch
@@ -80,7 +81,7 @@ class TestJimInstaller < Test::Unit::TestCase
         assert_equal 'myproject', installer.name
         assert_equal '1.1.1', installer.version
       end      
-      
+
       should "have default version if version can not be determined" do
         installer = Jim::Installer.new(fixture_path('noversion.js'), tmp_path)
         assert installer.fetch
@@ -88,32 +89,148 @@ class TestJimInstaller < Test::Unit::TestCase
         assert_equal 'noversion', installer.name
         assert_equal '0', installer.version
       end
-      
+
     end
-    
+
     context "install" do
+
+      context "with a single file" do
+        setup do 
+          @installer = Jim::Installer.new(fixture_path('jquery-1.4.1.js'), tmp_path)
+          assert @installer.install
+          @install_path = File.join(tmp_path, 'lib', 'jquery-1.4.1')
+        end
+        
+        should "install a package.json" do
+          assert_readable @install_path,  'package.json'
+          assert_file_contents(/\"name\"\:\s*\"jquery\"/, @install_path,  'package.json')
+        end
+        
+        should "move file into install path at name/version" do
+          assert_dir @install_path
+          assert_readable @install_path, 'jquery.js'
+          assert_equal fixture('jquery-1.4.1.js'), File.read(File.join(@install_path, 'jquery.js'))
+        end
+      end
       
-      should "move file into install path at name/version" do
-        installer = Jim::Installer.new(fixture_path('jquery-1.4.1.js'), tmp_path)
-        assert installer.install
-        install_path = File.join(tmp_path, 'lib', 'jquery-1.4.1')
-        assert_dir install_path
-        assert_readable install_path, 'jquery.js'
-        assert_equal fixture('jquery-1.4.1.js'), File.read(File.join(install_path, 'jquery.js'))
+      context "with a file that seems to be installed already" do
+        should "raise error" do
+          @installer = Jim::Installer.new(fixture_path('jquery-1.4.1.js'), tmp_path)
+          assert @installer.install
+          @install_path = File.join(tmp_path, 'lib', 'jquery-1.4.1')
+          assert_readable @install_path, 'jquery.js'
+          @installer = Jim::Installer.new(fixture_path('jquery.color.js'), tmp_path, :name => 'jquery', :version => '1.4.1')
+          assert_raise(Jim::FileExists) {
+            @installer.install
+          }
+        end
       end
       
-      should "install zips" do
-        @url = "http://jquery.com/download/jquery.metadata-2.0.zip"
-        FakeWeb.register_uri(:get, @url, :body => fixture('jquery.metadata-2.0.zip'))
-        installer = Jim::Installer.new(@url, tmp_path)
-        path = installer.install
-        # puts Dir.glob(path + '**/**').inspect 
-        assert_dir path
-        assert_dir path + 'jquery.metadata-2.0.zip'
-        assert_readable path + 'jquery.metadata-2.0.zip' + 'jquery.metadata.2.0' +'jquery.metadata.js'
+      context "with a duplicate file" do
+        should "skip install but not raise error" do
+          @installer = Jim::Installer.new(fixture_path('jquery-1.4.1.js'), tmp_path)
+          assert @installer.install
+          @install_path = File.join(tmp_path, 'lib', 'jquery-1.4.1')
+          assert_readable @install_path, 'jquery.js'
+          @installer = Jim::Installer.new(fixture_path('jquery-1.4.1.js'), tmp_path)
+          assert @installer.install
+          assert_readable @install_path, 'jquery.js'
+        end
+      end
+
+      context "with a zip" do
+        setup do
+          @url = "http://jquery.com/download/jquery.metadata-2.0.zip"
+          FakeWeb.register_uri(:get, @url, :body => fixture('jquery.metadata-2.0.zip'))
+          @installer = Jim::Installer.new(@url, tmp_path)
+          @paths = @installer.install
+          @install_path = tmp_path + 'lib'
+        end
+
+        should "return an array of paths" do
+          assert @paths.is_a?(Array)
+          assert @paths.all? {|p| p.is_a?(Pathname) }
+        end
+
+        should "install each js file found separately" do
+          assert_dir tmp_path, 'lib', 'jquery.metadata-2.0'
+          assert_readable tmp_path, 'lib', 'jquery.metadata-2.0', 'jquery.metadata.js'
+          assert_readable tmp_path, 'lib', 'jquery.metadata.min-2.0', 'jquery.metadata.min.js'
+          assert_readable tmp_path, 'lib', 'jquery.metadata.pack-2.0', 'jquery.metadata.pack.js'
+        end
+
+        should "not install files found in ignored directories" do
+          assert_not_readable tmp_path, 'lib', 'test-2.0', 'test.js'
+          assert_not_readable tmp_path, 'lib', 'test-0', 'test.js'
+        end
+        
+        should "install a package.json" do
+          json_path = @install_path + 'jquery.metadata-2.0' + 'package.json'
+          assert_readable json_path
+          assert_file_contents(/\"name\"\:\s*\"jquery\.metadata\"/, json_path)
+        end
+
+      end
+
+      context "with a dir" do
+        setup do
+          @installer = Jim::Installer.new(fixture_path('sammy-0.5.0'), tmp_path)
+          @paths = @installer.install
+          @install_path = tmp_path + 'lib'
+        end
+
+        should "return an array of paths" do
+          assert @paths.is_a?(Array)
+          assert @paths.all? {|p| p.is_a?(Pathname) }
+        end
+
+        should "install each js file found separately" do
+          assert_dir tmp_path, 'lib', 'sammy-0.5.0'
+          assert_readable tmp_path, 'lib', 'sammy-0.5.0', 'sammy.js'
+          assert_readable tmp_path, 'lib', 'sammy.template-0.5.0', 'sammy.template.js'
+          assert_readable tmp_path, 'lib', 'sammy.haml-0.5.0', 'sammy.haml.js'
+        end
+
+        should "not install files found in ignored directories" do
+          assert_not_readable tmp_path, 'lib', 'qunit-spec-0.5.0', 'qunit-spec.js'
+          assert_not_readable tmp_path, 'lib', 'qunit-spec-0', 'qunit-spec.js'
+          assert_not_readable tmp_path, 'lib', 'test_sammy_application-0.5.0', 'test_sammy_application.js'
+          assert_not_readable tmp_path, 'lib', 'test_sammy_application-0', 'test_sammy_application.js'
+        end
+        
+        should "install a package.json" do
+          json_path = @install_path + 'sammy-0.5.0' + 'package.json'
+          assert_readable json_path
+          assert_file_contents(/\"name\"\:\s*\"sammy\"/, json_path)
+        end        
       end
       
-    end
+      context "with an existing package.json" do
+        setup do
+          @installer = Jim::Installer.new(fixture_path('mustache.js'), tmp_path)
+          @paths = @installer.install
+          @install_path = tmp_path + 'lib'
+        end
+        
+        should "return an array of paths" do
+          assert @paths.is_a?(Array)
+          assert @paths.all? {|p| p.is_a?(Pathname) }
+        end
+
+        should "install each js file found separately" do
+          assert_dir tmp_path, 'lib', 'mustache-0.2.2'
+          assert_readable tmp_path, 'lib', 'mustache-0.2.2', 'mustache.js'
+        end
+        
+        should "merge initial package.json values" do
+          json_path = @install_path + 'mustache-0.2.2' + 'package.json'
+          assert_readable json_path
+          assert_file_contents(/\"name\"\:\s*\"mustache\"/, json_path)
+          assert_file_contents(/\"author\"\:\s*\"Jan Lehnardt\"/, json_path)
+        end
+      end
     
+    end
+
   end
 end

data/test/test_jim_version_parser.rb

@@ -23,10 +23,14 @@ class TestJimVersionParser < Test::Unit::TestCase
           ["sammy.plugin-1.0.1beta", ["sammy.plugin", "1.0.1beta"]],
           ["sammy.plugin.1.0.1.pre", ["sammy.plugin", "1.0.1.pre"]],
           ["sammy.plugin-1.0.1.beta", ["sammy.plugin", "1.0.1.beta"]],
+          ["sammy.plugin-1.0.1.min", ["sammy.plugin", "1.0.1.min"]],
           ["sammy 1.0.1", ["sammy", "1.0.1"]],
           ["sammy.plugin.1.0.1.js", ["sammy.plugin", "1.0.1"]],
           ["sammy.plugin.1.0.1.zip", ["sammy.plugin", "1.0.1"]],
           ["sammy.plugin.1.0.1", ["sammy.plugin", "1.0.1"]],
+          ["sammy.nested_params-0.5.0.js", ["sammy.nested_params", "0.5.0"]],
+          ["sammy.plugin-v0.5.0.js", ["sammy.plugin", "0.5.0"]],
+          ["sammy.plugin-a050.js", ["sammy.plugin-a050", "0"]],
           # ["sammy.plugin-a9asb02", ["sammy.plugin", "a9asb02"]],
           ["sammy-9asb02", ["sammy", "9asb02"]],
           ["noversion.js", ["noversion", "0"]]