jim 0.1.1 → 0.1.2

data/Rakefile

@@ -15,8 +15,10 @@ begin
     gem.email = "aaron@quirkey.com"
     gem.homepage = "http://github.com/quirkey/jim"
     gem.authors = ["Aaron Quint"]
-    gem.add_dependency "downlow", ">= 0.1.1"
+    
+    gem.add_dependency "downlow", ">= 0.1.2"
     gem.add_dependency "yajl-ruby"
+    
     gem.add_development_dependency "shoulda", ">= 0"
     gem.add_development_dependency "fakeweb", ">= 1.2.8"
     gem.add_development_dependency "mocha"

data/jim.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jim}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]
-  s.date = %q{2010-02-20}
+  s.date = %q{2010-02-21}
   s.default_executable = %q{jim}
   s.description = %q{jim is your friendly javascript library manager. He downloads, stores, bundles, vendors and compresses.}
   s.email = %q{aaron@quirkey.com}
@@ -69,20 +69,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<downlow>, [">= 0.1.1"])
+      s.add_runtime_dependency(%q<downlow>, [">= 0.1.2"])
       s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<fakeweb>, [">= 1.2.8"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
     else
-      s.add_dependency(%q<downlow>, [">= 0.1.1"])
+      s.add_dependency(%q<downlow>, [">= 0.1.2"])
       s.add_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<fakeweb>, [">= 1.2.8"])
       s.add_dependency(%q<mocha>, [">= 0"])
     end
   else
-    s.add_dependency(%q<downlow>, [">= 0.1.1"])
+    s.add_dependency(%q<downlow>, [">= 0.1.2"])
     s.add_dependency(%q<yajl-ruby>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<fakeweb>, [">= 1.2.8"])

data/lib/jim/bundler.rb

@@ -68,7 +68,7 @@ module Jim
       to = options[:compressed_path] if to.nil? && options[:compressed_path]
       io = io_for_path(to)
       logger.info "compressing to #{to}"
-      io << js_compress(bundle!(false))
+      io << compress_js(bundle!(false))
       io
     end
 
@@ -84,6 +84,27 @@ module Jim
       end
     end
 
+    # Run the uncompressed test through a JS compressor (closure-compiler) by
+    # default. Setting options[:compressor] == 'yui' will force the YUI JS Compressor
+    def compress_js(uncompressed)
+      if options[:compressor] == 'yui'
+        begin
+          require "yui/compressor"
+        rescue LoadError
+          raise "You must install the yui compressor gem to use the compressor\ngem install yui-compressor"
+        end
+        compressor = ::YUI::JavaScriptCompressor.new
+      else 
+        begin
+          require 'closure-compiler'
+        rescue LoadError
+          raise "You must install the closure compiler gem to use the compressor\ngem install closure-compiler"
+        end
+        compressor = ::Closure::Compiler.new
+      end
+      compressor.compress(uncompressed)
+    end
+
     private
     def io_for_path(to)
       case to
@@ -109,26 +130,7 @@ module Jim
         end
       end
     end
-
-    def js_compress(uncompressed)
-      if options[:compressor] == 'yui'
-        begin
-          require "yui/compressor"
-        rescue LoadError
-          raise "You must install the yui compressor gem to use the compressor\ngem install yui-compressor"
-        end
-        compressor = ::YUI::JavaScriptCompressor.new
-      else 
-        begin
-          require 'closure-compiler'
-        rescue LoadError
-          raise "You must install the closure compiler gem to use the compressor\ngem install closure-compiler"
-        end
-        compressor = ::Closure::Compiler.new
-      end
-      compressor.compress(uncompressed)
-    end
-
+    
     def logger
       Jim.logger
     end

data/lib/jim/cli.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'readline'
 
 module Jim
   
@@ -93,6 +94,29 @@ module Jim
       logger.info "Installed:\n#{list.collect {|i| "#{i[0]} (#{i[1].join(', ')})"}.join("\n")}"
     end
     
+    # Iterates over matching files and prompts for removal
+    def remove(name, version = nil)
+      logger.info "Looking for files matching #{name} #{version}"
+      files = installed_index.find_all(name, version)
+      if files.length > 0
+        logger.info "Found #{files.length} matching files"
+        removed = 0
+        files.each do |filename|
+          response = Readline.readline("Remove #{filename}? (y/n)\n")
+          if response.strip =~ /y/i
+            logger.info "Removing #{filename}"
+            filename.delete
+            removed += 1
+          else 
+            logger.info "Skipping #{filename}"
+          end
+        end
+        logger.info "Removed #{removed} files."
+      else 
+        logger.info "No installed files matched."
+      end
+    end
+    
     # list the files and their resolved paths specified in the Jimfile
     def resolve
       resolved = bundler.resolve!
@@ -141,13 +165,21 @@ module Jim
     end
     
     def index
-      @index ||= Jim::Index.new(jimhome + 'lib', Dir.pwd)
+      @index ||= Jim::Index.new(install_dir, Dir.pwd)
+    end
+    
+    def installed_index 
+      @installed_index ||= Jim::Index.new(install_dir)
     end
     
     def bundler
       @bundler ||= Jim::Bundler.new(jimfile, index)
     end
     
+    def install_dir
+      jimhome + 'lib'
+    end
+    
     def template(path)
       (Pathname.new(__FILE__).dirname + 'templates' + path).read
     end

data/lib/jim/index.rb

@@ -14,18 +14,15 @@ module Jim
     def list
       list = {}
       each_file_in_index('.js') do |filename|
-        if version = filename.version
-          name = filename.stem.gsub(/(\-[^\-]+)$/, '')
-        elsif /lib\/([^\/]+)-([\d\w\.\-]+)\/.+/.match filename
+        if /lib\/([^\/]+)-([\d\w\.\-]+)\/.+/.match filename
           name    = $1
           version = $2
         else
-          name = filename.stem
-          version = '0'
+          name, version = Jim::VersionParser.parse_filename(filename)
         end
         if name && version
           list[name] ||= []
-          list[name] << version unless list[name].include?(version)
+          list[name] << [version, filename]
         end
       end
       list.sort
@@ -51,14 +48,20 @@ module Jim
         possible_paths.each do |p|
           if File.file?(filename) && p.match(filename)
             final = Pathname.new(filename).expand_path
-            break
+            block_given? ? yield(final) : break
           end
         end
-        break if final
+        break if final && !block_given?
       end
       final
     end
     
+    def find_all(name, version = nil)
+      matched = []
+      find(name, version) {|p| matched << p }
+      matched
+    end
+    
     def each_file_in_index(ext, &block)
       @directories.each do |dir|
         Dir.glob(Pathname.new(dir) + '**' + "*#{ext}") do |filename|

data/lib/jim/version_parser.rb

@@ -4,7 +4,7 @@ module Jim
     NOT_EXTENSIONS = %w{.min .pre .beta}
 
     def self.parse_filename(filename)
-      f = filename.dup
+      f = Pathname.new(filename).basename.to_s
       extension = f.scan(/\.[^\.\d\s\-\_][^\.]*$/)[0]
       if NOT_EXTENSIONS.include?(extension)
         extension = nil

data/lib/jim.rb

@@ -4,7 +4,7 @@ require 'yajl'
 
 
 module Jim
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
   
   class Error < RuntimeError; end
   class FileExists < Error; end

data/test/helper.rb

@@ -3,6 +3,7 @@ require 'test/unit'
 require 'shoulda'
 require 'fakeweb'
 require 'mocha'
+# require 'test_benchmark'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_jim_bundler.rb

@@ -114,7 +114,7 @@ class TestJimBundler < Test::Unit::TestCase
     
     context "compress!" do
       setup do
-        @bundler.expects(:js_compress).returns(@bundler.bundle!(false))
+        @bundler.stubs(:compress_js).returns(@bundler.bundle!(false))
       end
       
       should "run through google compressor" do

data/test/test_jim_cli.rb

@@ -31,6 +31,10 @@ class TestJimCLI < Test::Unit::TestCase
     end
     
     context "compress" do
+      setup do
+        Jim::Bundler.any_instance.stubs(:compress_js).returns("compressed.js")
+      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'

data/test/test_jim_index.rb

@@ -24,8 +24,8 @@ class TestJimIndex < Test::Unit::TestCase
         @list = @index.list
       end
       
-      should "return list of files and directories" do
-        names = @list.collect {|l| l[0] } 
+      should "return list of files" do
+        names = @list.collect {|l| l[0] }
         assert names.include?('jquery'), "should include jquery"
         assert names.include?('infoincomments')
       end
@@ -33,9 +33,11 @@ class TestJimIndex < Test::Unit::TestCase
       should "only return one of each name" do
         jquery = @list.find {|l| l[0] == 'jquery' }
         assert jquery, "should include jquery"
-        assert jquery[1].is_a?(Array), "should have array of versions"
+        assert jquery[1].is_a?(Array), "should have array of versions and filenames"
         assert_equal jquery[1].length, jquery[1].uniq.length
-        assert jquery[1].include?('1.5pre')
+        assert jquery[1][0].is_a?(Array)
+        assert jquery[1][0][0].is_a?(String), "should have version"
+        assert jquery[1][0][1].is_a?(Pathname), "should include pathname"
       end
       
     end
@@ -92,6 +94,23 @@ class TestJimIndex < Test::Unit::TestCase
       end
 
     end
+    
+    context "find_all" do
+      setup do
+        Jim::Installer.new(fixture_path('jquery-1.4.1.js'), tmp_path, :version => '1.5pre').install
+        @all = @index.find_all("jquery")
+      end
+      
+      should "return array" do
+        assert @all.is_a?(Array)
+      end
+      
+      should "find all files that match the search" do
+        assert @all[0].is_a?(Pathname)
+        assert @all.all? {|p| p.to_s.match /jquery/ }
+      end
+      
+    end
         
   end
 end

data/test/test_jim_version_parser.rb

@@ -9,6 +9,7 @@ class TestJimVersionParser < Test::Unit::TestCase
         [
           ["sammy-0.1.0", ["sammy", "0.1.0"]],
           ["sammy_0.1.0", ["sammy", "0.1.0"]],
+          ["/test/fixtures/sammy-0.1.0", ["sammy", "0.1.0"]],
           ["sammy-1", ["sammy", "1"]],
           ["sammy_1", ["sammy", "1"]],
           ["sammy.1.0", ["sammy", "1.0"]],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jim
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Aaron Quint
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-20 00:00:00 -05:00
+date: 2010-02-21 00:00:00 -05:00
 default_executable: jim
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: 0.1.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby