spitball 0.4.5 → 0.5.0

data/.gitignore

@@ -1 +1,2 @@
 /pkg
+/Gemfile.lock

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/bin/spitball-server

@@ -29,6 +29,11 @@ get '/list' do
   JSON.dump Spitball::Repo.cached_digests
 end
 
+get '/env' do
+  content_type :text
+  `#{$:.inspect}\n#{Spitball.gem_cmd} env`
+end
+
 # return tgz or gemfile of cached SHA or 404
 get '/:digest.:format' do |digest, format|
   error 400 unless ['tgz', 'gemfile'].include? format

data/lib/ext/bundler_fake_dsl.rb

@@ -3,7 +3,7 @@ module Bundler
     
     def initialize(file)
       @groups = Hash.new{|h, k| h[k] = []}
-      @gem_names = []
+      @gems = []
       instance_eval(file)
     end
 
@@ -11,8 +11,12 @@ module Bundler
       @groups
     end
 
+    def __gems
+      @gems
+    end
+
     def __gem_names
-      @gem_names
+      __gems.map(&:first)
     end
 
     def group(name, &blk)
@@ -23,7 +27,7 @@ module Bundler
     alias_method :groups, :group
 
     def gem(*args)
-      @gem_names << args.first
+      @gems << args
       @groups[@current_group] << args.first
     end
     

data/lib/spitball/remote.rb

@@ -11,7 +11,7 @@ class Spitball::Remote
     @host      = opts[:host]
     @port      = opts[:port]
     @without   = (opts[:without] || []).map{|w| w.to_sym}
-    @cache_dir = File.join(ENV['SPITBALL_CACHE'] || '/tmp/spitball', 'client')
+    @cache_dir = File.join(ENV['SPITBALL_CACHE'] || File.join(ENV['HOME'], '.spitball'), 'client')
     FileUtils.mkdir_p(@cache_dir)
     use_cache_file
   end

data/lib/spitball/version.rb

@@ -1,3 +1,3 @@
 class Spitball
-  VERSION = '0.4.5'
+  VERSION = '0.5.0'
 end

data/lib/spitball.rb

@@ -15,6 +15,10 @@ class Spitball
   class ClientError < StandardError; end
   class BundleCreationFailure < StandardError; end
 
+  def self.gem_cmd
+    ENV['GEM_CMD'] || 'gem'
+  end
+
   PROTOCOL_VERSION = '1'
   PROTOCOL_HEADER = "X-Spitball-Protocol"
   WITHOUT_HEADER = "X-Spitball-Without"
@@ -69,9 +73,16 @@ class Spitball
     File.open(gemfile_lock_path, 'w') {|f| f.write gemfile_lock }
 
     Dir.chdir(Repo.gemcache_path) do
-      @dsl.__gem_names.each do |spec_name|
+      @dsl.__gem_names.each do |spec|
+        spec_name = spec.first
         if @groups_to_install.any?{|group| @dsl.__groups[group].include?(spec_name)}
-          install_gem(@parsed_lockfile.specs.find {|spec| spec.name == spec_name})
+          if found_spec = @parsed_lockfile.specs.find {|spec| spec.name == spec_name}
+            install_gem(found_spec)
+          elsif spec_name == 'bundler'
+            install_and_copy_spec(spec_name, '>= 0')
+          else
+            raise "Cannot install #{spec * ' '}"
+          end
         end
       end
     end
@@ -91,17 +102,24 @@ class Spitball
   end
 
   def install_gem(spec)
-    install_and_copy_spec(spec)
+    install_and_copy_spec(spec.name, spec.version)
     spec.dependencies.each do |dep|
-      install_gem(@parsed_lockfile.specs.find {|spec| spec.name == dep.name})
+      spec_name = dep.name
+      if found_spec = @parsed_lockfile.specs.find {|spec| spec.name == spec_name}
+        install_gem(found_spec)
+      elsif spec_name == 'bundler'
+        install_and_copy_spec(dep.name, dep.requirements_list.first || '> 0')
+      else
+        raise "Cannot install #{dep.inspect}"
+      end
     end
   end
 
-  def install_and_copy_spec(spec)
-    cache_dir = File.join(Repo.gemcache_path, "#{spec.name}-#{::Digest::MD5.hexdigest([spec.name, spec.version, sources_opt(@parsed_lockfile.sources)].join('/'))}")
+  def install_and_copy_spec(name, version)
+    cache_dir = File.join(Repo.gemcache_path, "#{name}-#{::Digest::MD5.hexdigest([name, version, sources_opt(@parsed_lockfile.sources)].join('/'))}")
     unless File.exist?(cache_dir)
       FileUtils.mkdir_p(cache_dir)
-      out = `gem install #{spec.name} -v'#{spec.version}' --no-rdoc --no-ri --ignore-dependencies -i#{cache_dir} #{sources_opt(@parsed_lockfile.sources)} 2>&1`
+      out = `#{Spitball.gem_cmd} install #{name} -v'#{version}' --no-rdoc --no-ri --ignore-dependencies -i#{cache_dir} #{sources_opt(@parsed_lockfile.sources)} 2>&1`
       if $? == 0
         puts out
       else
@@ -109,19 +127,20 @@ class Spitball
         raise BundleCreationFailure, out
       end
     else
-      puts "Using cached version of #{spec.name} (#{spec.version})"
+      puts "Using cached version of #{name} (#{version})"
     end
     `cp -R #{cache_dir}/* #{bundle_path}`
   end
 
   def sources_opt(sources)
-    sources.
-      map{|s| s.remotes}.flatten.
-      map{|s| s.to_s}.
-      sort.
-      map{|s| %w{gemcutter rubygems rubyforge}.include?(s) ? "http://rubygems.org" : s}.
-      map{|s| "--source #{s}"}.
-      join(' ')
+    Array(ENV['SOURCE_OVERRIDE'] || 
+      sources.
+        map{|s| s.remotes}.flatten.
+        map{|s| s.to_s}.
+        sort.
+        map{|s| %w{gemcutter rubygems rubyforge}.include?(s) ? "http://rubygems.org" : s}).
+        map{|s| "--source #{s}"}.
+        join(' ')
   end
 
   # Paths

data/spec/spitball_spec.rb

@@ -127,7 +127,7 @@ describe Spitball do
     
     it "should use without" do
       @spitball = Spitball.new(@gemfile, @lockfile)
-      mock(@spitball).install_and_copy_spec(anything).times(9)
+      mock(@spitball).install_and_copy_spec(anything, anything).times(9)
       @spitball.send :create_bundle
       @spitball = Spitball.new(@gemfile, @lockfile, :without => 'development')
       mock(@spitball).install_and_copy_spec(anything).times(0)

data/spitball.gemspec

@@ -9,13 +9,13 @@ Gem::Specification.new do |s|
   s.authors     = ["Matt Freels", "Brandon Mitchell", "Joshua Hull"]
   s.email       = "freels@twitter.com"
   s.homepage    = "http://rubygems.org/gems/spitball"
-  s.summary     = %q{Use bundler to generate gem tarball packages.}
+  s.summary     = %q{Use bundler to generate gem tarball packages}
   s.description = %q{Use bundler to generate gem tarball packages.}
 
   s.rubyforge_project = "spitball"
 
-  s.add_dependency 'sinatra', '>= 1.0'
   s.add_development_dependency 'rspec', "~> 1.3.0"
+  s.add_development_dependency 'diff-lcs'
   s.add_development_dependency 'rr'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'phocus'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spitball
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
-  - 4
   - 5
-  version: 0.4.5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Matt Freels
@@ -17,38 +17,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 -08:00
+date: 2011-04-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 27
         segments: 
         - 1
+        - 3
         - 0
-        version: "1.0"
-  type: :runtime
+        version: 1.3.0
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: diff-lcs
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 1
-        - 3
         - 0
-        version: 1.3.0
+        version: "0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -105,6 +104,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
+- Gemfile
 - README.md
 - Rakefile
 - bin/spitball
@@ -153,10 +153,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: spitball
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Use bundler to generate gem tarball packages.
+summary: Use bundler to generate gem tarball packages
 test_files: 
 - spec/spec.opts
 - spec/spec_helper.rb