jim 0.2.0 → 0.2.1

data/.gitignore

@@ -20,3 +20,4 @@ pkg
 tmp
 
 ## PROJECT::SPECIFIC
+*.rbc

data/HISTORY

@@ -1,3 +1,8 @@
+== 0.2.1 [07-06-10]
+
+* Local (non JIMHOME) files specified in the Jimfiles are not copied into vendor
+* jim list and available now take an option search param
+
 == 0.2.0 [03-16-10]
 
 * Major rewrite of the installer and version parser

data/jim.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jim}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]
-  s.date = %q{2010-03-16}
+  s.date = %q{2010-07-06}
   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}
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
      "test/fixtures/jquery-1.4.1.js",
      "test/fixtures/jquery.color.js",
      "test/fixtures/jquery.metadata-2.0.zip",
+     "test/fixtures/localfile.js",
      "test/fixtures/mustache.js/mustache.js",
      "test/fixtures/mustache.js/package.json",
      "test/fixtures/noversion.js",

data/lib/jim/bundler.rb

@@ -83,7 +83,9 @@ module Jim
       dir ||= 'vendor' # default
       logger.info "Vendoring to #{dir}"
       paths.each do |path, name, version|
-        Jim::Installer.new(path, dir, :shallow => true, :force => force).install
+        if index.in_jimhome?(path)
+          Jim::Installer.new(path, dir, :shallow => true, :force => force).install
+        end
       end
     end
 

data/lib/jim/cli.rb

@@ -94,20 +94,24 @@ module Jim
       bundler.vendor!(dir, force)
     end
     
-    # list the only the _installed_ projects and versions
-    def list
+    # list the only the _installed_ projects and versions.
+    # Match names against `search` if supplied.
+    def list(search = nil)
       logger.info "Getting list of installed files in\n#{installed_index.directories.join(':')}"
-      list = installed_index.list
+      logger.info "Searching for '#{search}'" if search
+      list = installed_index.list(search)
       logger.info "Installed:"
       print_version_list(list)
     end
     alias :installed :list
     
     # list all available projects and versions including those in the local path, or 
-    # paths specified in a jimfile
-    def available
+    # paths specified in a Jimfile. 
+    # Match names against `search` if supplied.
+    def available(search = nil)
       logger.info "Getting list of all available files in\n#{index.directories.join("\n")}"
-      list = index.list
+      logger.info "Searching for '#{search}'" if search
+      list = index.list(search)
       logger.info "Available:"
       print_version_list(list)
     end
@@ -226,7 +230,7 @@ module Jim
     
     def print_version_list(list)
       list.each do |file, versions|
-        logger.info "#{file} (#{VersionSorter.rsort(versions.collect {|v| v[0] }).join(',')})"
+        logger.info "#{file} (#{VersionSorter.rsort(versions.collect {|v| v[0] }).join(', ')})"
       end
     end
     

data/lib/jim/index.rb

@@ -4,14 +4,15 @@ module Jim
     attr_reader :directories
     
     def initialize(*directories)
-      @directories = directories.flatten.compact
+      @directories = [directories].flatten.compact
+      @jimhome_re  = /#{Pathname.new(@directories.first).expand_path.to_s}/
     end
 
     def add(directory)
       @directories.unshift directory
     end
     
-    def list
+    def list(search = nil)
       list = {}
       each_file_in_index('.js') do |filename|
         if /lib\/([^\/\-]+)-([\d\w\.\-]+)\/.+/.match filename
@@ -25,6 +26,10 @@ module Jim
           list[name] << [version, filename]
         end
       end
+      if search
+        search = /#{search}/i
+        list = list.find_all {|lib| lib[0] =~ search }
+      end
       list.sort
     end
 
@@ -56,6 +61,10 @@ module Jim
       final
     end
     
+    def in_jimhome?(path)
+      !!(path.to_s =~ @jimhome_re)
+    end
+    
     def find_all(name, version = nil)
       matched = []
       find(name, version) {|p| matched << p }

data/lib/jim/templates/commands

@@ -13,16 +13,16 @@ install <url> [name] [version]
 
 remove <name> [version]
 uninstall <name> [version]
-  Iterate through the install files and prompt for the removal of those matching
-  the supplied name and version 
+  Iterate through the install files and prompt for the removal of those 
+  matching the supplied name and version 
 
-list
-installed
+list [search]
+installed [search]
   List all the installed packages and their versions
   
-available
-  List all available projects and versions including those in the local path, or 
-  paths specified in a Jimfile
+available [search]
+  List all available projects and versions including those in the local path, 
+  or paths specified in a Jimfile
   
 resolve
   Resolve all the paths listed in a Jimfile and print them to STDOUT. 

data/lib/jim.rb

@@ -5,7 +5,7 @@ require 'version_sorter'
 require 'digest/md5'
 
 module Jim
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
   
   class Error < RuntimeError; end
   class InstallError < Error; end

data/test/fixtures/jimfile

@@ -4,4 +4,4 @@
 
 jquery 1.4.1
 myproject
-
+localfile

data/test/fixtures/localfile.js

@@ -0,0 +1 @@
+// local file

data/test/test_jim_bundler.rb

@@ -7,8 +7,8 @@ class TestJimBundler < Test::Unit::TestCase
       # clear the tmp dir
       FileUtils.rm_rf(tmp_path) if File.directory?(tmp_path)
       root = File.dirname(__FILE__)
-      @directories = [File.join(root, 'fixtures'), File.join(root, 'tmp', 'lib')]
-      Jim::Installer.new(fixture_path('infoincomments.js'), tmp_path).install
+      @directories = [File.join(root, 'tmp', 'lib'), File.join(root, 'fixtures')]
+      Jim::Installer.new(fixture_path('infoincomments.js'), File.join(root, 'tmp', 'lib')).install
       @bundler = Jim::Bundler.new(fixture('jimfile'), Jim::Index.new(@directories))
     end
     
@@ -42,7 +42,7 @@ class TestJimBundler < Test::Unit::TestCase
         assert @bundler.paths.empty?
         @bundler.resolve!
         assert @bundler.paths
-        assert_equal 2, @bundler.paths.length
+        assert_equal 3, @bundler.paths.length
         @bundler.paths.each do |path, name, version|
           assert path.is_a?(Pathname)
           assert name.is_a?(String)
@@ -65,11 +65,11 @@ class TestJimBundler < Test::Unit::TestCase
     
     context "vendor!" do
       
-      should "copy files in jemfile to path specified" do
+      should "copy files in jimfile to path specified" do
         vendor_dir = Pathname.new(tmp_path) + 'vendor'
         @bundler.vendor!(vendor_dir)
-        assert_readable vendor_dir + 'jquery-1.4.1.js'
         assert_readable vendor_dir + 'myproject-1.2.2.js'
+        assert !File.readable?(vendor_dir + 'localfile.js'), "shouldnt vendor local files"
       end
       
     end

data/test/test_jim_index.rb

@@ -40,6 +40,12 @@ class TestJimIndex < Test::Unit::TestCase
         assert jquery[1][0][1].is_a?(Pathname), "should include pathname"
       end
       
+      should "only return files matching search" do
+        @list = @index.list('jquery')
+        names = @list.collect {|l| l[0] }
+        assert names.include?('jquery'), "should include jquery"
+        assert !names.include?('infoincomments')
+      end
     end
     
     context "find" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Aaron Quint
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 -04:00
+date: 2010-07-06 00:00:00 -07:00
 default_executable: jim
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -126,6 +126,7 @@ files:
 - test/fixtures/jquery-1.4.1.js
 - test/fixtures/jquery.color.js
 - test/fixtures/jquery.metadata-2.0.zip
+- test/fixtures/localfile.js
 - test/fixtures/mustache.js/mustache.js
 - test/fixtures/mustache.js/package.json
 - test/fixtures/noversion.js