auser-suitcase 0.0.6 → 0.0.7

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 6
-:major: 0
+:patch: 7
+:major: 0

data/lib/suitcase/zipper.rb

@@ -61,37 +61,37 @@ module Suitcase
         end
       end
     end
-
-    def self.gems(gem_list, gem_location)
+    
+    # TODO: MOVE
+    def self.gems(gem_list, o={})
       require 'rubygems/dependency_installer'
       gem_list = [gem_list] unless gem_list.is_a?(Array)
-      ensure_location_exists gem_location
-
-      cache_dir = "#{gem_location}/cache"
-      ::FileUtils.mkdir_p cache_dir rescue nil unless File.exist? cache_dir
+      
+      gem_list.each do |g|
+        add find_gem(g, o), "gems"
+      end
+    end
+    
+    # Find the gem named named
+    # First, search in the :search_paths passed in via the options
+    # If it's not found there, then search in the locally installed gems
+    # and finally search online if the gem isn't available
+    def self.find_gem(named, o={})
+      require 'rubygems/dependency_installer'
 
-      locally_installed_gems = Gem::SourceIndex.from_installed_gems.map {|n,s| s.name }
+      # Look for the gem in a path passed
+      found_path = search_path_for_gem_in_paths(named, o[:search_paths]) if o[:search_paths]
+      return found_path if found_path
       
-      locally_installable_gems = gem_list & locally_installed_gems
-      remotely_installable = gem_list - locally_installable_gems
+      found_path = find_gem_in_locally_installed_gems(named)
+      return found_path if found_path
       
-      # First, add the locally installed gems
-      locally_installable_gems.each do |spec|
-        spec = Gem::SourceIndex.from_installed_gems.find_name(spec).last#.sort_by {|a,b| a.version <=> b.version }.last                
-        f = Dir[File.join(Gem.dir, 'cache', "#{spec.full_name}.gem")].first
-        add(f, "gems")
-      end
+      gem_location = o[:temp_path] || "/tmp/gems"
+      ensure_location_exists(gem_location)
       
-      remotely_installable.each do |g|
-        di = Gem::DependencyInstaller.new
-        spec, url = di.find_spec_by_name_and_version(g).first
-        f = begin
-          Gem::RemoteFetcher.fetcher.download spec, "http://gems.github.com", gem_location
-        rescue Exception => e
-          Gem::RemoteFetcher.fetcher.download spec, url, gem_location
-        end
-        add(f, "gems")
-      end
+      found_path = find_gem_remotely_by_name_and_download_to(named, gem_location)
+      return found_path if found_path        
+      nil
     end
 
     def self.packages(package_list, package_location="#{Dir.pwd}/packages")
@@ -114,6 +114,54 @@ module Suitcase
     def self.add_content_as(content="", filename="", namespace="files")
       items.merge!({"__p__string#{filename}_#{namespace}".to_sym => {:name => ::File.basename(filename), :content => content, :namespace => namespace}})
     end
+    
+    def self.reset!
+      @items = nil
+    end
+    
+    private
+    # Search for the gem in a given path
+    def self.search_path_for_gem_in_paths(named, dirs)
+      fi = dirs.map do |d|
+        q = Dir["#{d}/*"].entries.detect {|fi|fi =~ /#{named}/}
+        q ? q : nil
+      end.compact.first
+    end
+    
+    # Search in the locally installed gems
+    def self.find_gem_in_locally_installed_gems(named)
+      locally_installed_gems_list = locally_installed_gems.map {|n,s| s.name }
+      
+      locally_installed_gems_list.detect do |g|
+        if g == named
+          spec = locally_installed_gems.find_name(g).last
+          if f = Dir[File.join(Gem.dir, 'cache', "#{spec.full_name}.gem")].first
+            return f
+          end
+        end
+      end
+      nil
+    end
+    
+    def self.locally_installed_gems
+      @locally_installed_gems ||= Gem::SourceIndex.from_installed_gems
+    end
+    
+    # Find the gem from online, first trying gems.github.com
+    # and then from rubyforge
+    def self.find_gem_remotely_by_name_and_download_to(named, to, o={})
+      # Look for the gems from remote
+      di = Gem::DependencyInstaller.new
+      spec, url = di.find_spec_by_name_and_version(named).first
+      f = begin
+        Gem::RemoteFetcher.fetcher.download spec, "http://gems.github.com", to
+      rescue Exception => e
+        Gem::RemoteFetcher.fetcher.download spec, url, to
+      end        
+      return f if f
+      nil
+    end
+    
 
   end
 end

data/test/suitcase_test.rb

@@ -23,15 +23,16 @@ class DependenciesTest < Test::Unit::TestCase
     end
     should "be able to add directories to the suitcase" do
       Suitcase::Zipper.add("#{::File.dirname(__FILE__)}/test_dir")
-      assert_equal Suitcase::Zipper.items.size, 2
+      assert_equal Suitcase::Zipper.items.size, 3
       assert Suitcase::Zipper.items["test_dir/box.rb"] =~ /test_dir\/box\.rb/
     end
     should "be able to add_content_as" do
       Suitcase::Zipper.add_content_as("hello world", "hello.txt", "files")
       assert_equal Suitcase::Zipper.items.size, 1
-      assert Suitcase::Zipper.items[:string][:name] == "hello.txt"
-      assert Suitcase::Zipper.items[:string][:content] == "hello world"
-      assert Suitcase::Zipper.items[:string][:namespace] == "files"
+      fitem = Suitcase::Zipper.items[:"__p__stringhello.txt_files"]
+      assert fitem[:name] == "hello.txt"
+      assert fitem[:content] == "hello world"
+      assert fitem[:namespace] == "files"
     end
     should "add the content as a file when build_dir!" do
       Suitcase::Zipper.add_content_as("hello world", "hello.txt", "files")
@@ -45,12 +46,17 @@ class DependenciesTest < Test::Unit::TestCase
     end
     # UNCOMMENT THESE TO LIVE-TEST THE USAGE
     should "be able to add gems to the suitcase" do
-      Suitcase::Zipper.gems("rake", Dir.pwd)
+      Suitcase::Zipper.gems("rake", :temp_path => Dir.pwd)
       Suitcase::Zipper.build_dir! "#{Dir.pwd}/cache"
       assert ::File.file?(::File.expand_path("#{Dir.pwd}/cache/gems/rake-0.8.4.gem"))
     end
+    should "be able to add gems to the suitcase with a direct search path" do
+      Suitcase::Zipper.gems("carrot", :temp_path => Dir.pwd, :search_paths => ["#{File.dirname(__FILE__)}/test_dir/gems"])
+      Suitcase::Zipper.build_dir! "#{Dir.pwd}/cache"
+      assert ::File.file?(::File.expand_path("#{Dir.pwd}/cache/gems/famoseagle-carrot-0.6.0.gem"))
+    end
     should "find the gem online if it is not locally installed" do
-      Suitcase::Zipper.gems("aaronp-meow", Dir.pwd)
+      Suitcase::Zipper.gems("aaronp-meow", :temp_path => Dir.pwd)
       assert ::File.file?(::File.expand_path("#{Dir.pwd}/cache/aaronp-meow-1.1.0.gem"))
     end
     # should "be able to add packages to the suitcase" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-suitcase
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-27 00:00:00 -07:00
+date: 2009-06-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,6 +41,8 @@ files:
 - test/suitcase_test.rb
 - test/test_dir
 - test/test_dir/box.rb
+- test/test_dir/gems
+- test/test_dir/gems/famoseagle-carrot-0.6.0.gem
 - test/test_dir/test.txt
 - test/test_helper.rb
 - LICENSE
@@ -69,7 +71,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: TODO
 test_files: []