spitball 0.4.3 → 0.4.4

data/bin/spitball

@@ -30,6 +30,10 @@ opts = OptionParser.new do |opts|
     args[:without] = without
   end
 
+  opts.on('-g', '--generate-only', "Only generate, don't download") do
+    args[:generate] = true
+  end
+
   opts.separator ""
   opts.separator "environment variables:"
   opts.separator "\tSPITBALL_CACHE\t\t     Specifies the cache dir. Defaults to /tmp/spitball"
@@ -53,4 +57,5 @@ ball = args[:host] ?
   Spitball::Remote.new(gemfile, gemfile_lock, :host => args[:host], :port => (args[:port] || 8080).to_i, :without => args[:without]) :
   Spitball.new(gemfile, gemfile_lock, :without => args[:without])
 
-ball.copy_to args[:destination]
+args[:generate] ? ball.cache! : ball.copy_to(args[:destination])
+

data/lib/ext/bundler_fake_dsl.rb

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

data/lib/spitball.rb

@@ -25,10 +25,14 @@ class Spitball
   attr_reader :gemfile, :gemfile_lock, :without, :options
 
   def initialize(gemfile, gemfile_lock, options = {})
+    Spitball::Repo.make_cache_dirs
     @gemfile      = gemfile
     @gemfile_lock = gemfile_lock
     @options      = options
     @without      = (options[:without] || []).map{|w| w.to_sym}
+    @parsed_lockfile, @dsl = Bundler::FakeLockfileParser.new(gemfile_lock), Bundler::FakeDsl.new(gemfile)
+    raise "You need to run bundle install before you can use spitball" unless (@parsed_lockfile.dependencies.map{|d| d.name}.uniq.sort == @dsl.__gem_names.uniq.sort)
+    @groups_to_install = @dsl.__groups.keys - @without
   end
 
   def cached?
@@ -36,18 +40,16 @@ class Spitball
   end
 
   def cache!(sync = true)
-    Spitball::Repo.make_cache_dirs
-    unless cached?
-      lock = Spitball::FileLock.new(bundle_path('lock'))
-      if lock.acquire_lock
-        begin
-         create_bundle
-        ensure
-          lock.release_lock
-        end
-      elsif sync
-        sleep 0.1 until cached?
+    return if cached?
+    lock = Spitball::FileLock.new(bundle_path('lock'))
+    if lock.acquire_lock
+      begin
+       create_bundle
+      ensure
+        lock.release_lock
       end
+    elsif sync
+      sleep 0.1 until cached?
     end
   end
 
@@ -59,7 +61,6 @@ class Spitball
   end
 
   def create_bundle
-    ENV['BUNDLE_GEMFILE'] = gemfile_path # make bundler happy! :) *cry*
     Spitball::Repo.make_cache_dirs
     FileUtils.mkdir_p bundle_path
 
@@ -67,11 +68,9 @@ class Spitball
     File.open(gemfile_path, 'w') {|f| f.write gemfile }
     File.open(gemfile_lock_path, 'w') {|f| f.write gemfile_lock }
 
-    parsed_lockfile, dsl = Bundler::FakeLockfileParser.new(gemfile_lock), Bundler::FakeDsl.new(gemfile)
-
     Dir.chdir(Repo.gemcache_path) do
-      parsed_lockfile.specs.each do |spec|
-        install_gem(spec, parsed_lockfile.sources) unless without.any?{|w| dsl.__groups[w].include?(spec.name)}
+      @dsl.__gem_names.each do |spec_name|
+        install_gem(@parsed_lockfile.specs.find {|spec| spec.name == spec_name})
       end
     end
 
@@ -89,12 +88,27 @@ class Spitball
     FileUtils.rm_rf bundle_path
   end
 
-  def install_gem(spec, sources)
-    cache_dir = File.join(Repo.gemcache_path, "#{spec.name}-#{::Digest::MD5.hexdigest([spec.name, spec.version, sources_opt(sources)].join('/'))}")
+  def install_gem(spec)
+    if @groups_to_install.any?{|group| @dsl.__groups[group].include?(spec.name)}
+      install_and_copy_spec(spec)
+      spec.dependencies.each do |dep|
+        install_gem(@parsed_lockfile.specs.find {|spec| spec.name == dep.name})
+      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('/'))}")
     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(sources)} 2>&1`
-      $? == 0 ? (puts out) : (raise BundleCreationFailure, out)
+      out = `gem install #{spec.name} -v'#{spec.version}' --no-rdoc --no-ri --ignore-dependencies -i#{cache_dir} #{sources_opt(@parsed_lockfile.sources)} 2>&1`
+      if $? == 0
+        puts out
+      else
+        FileUtils.rm_rf(cache_dir)
+        raise BundleCreationFailure, out
+      end
     else
       puts "Using cached version of #{spec.name} (#{spec.version})"
     end
@@ -128,4 +142,4 @@ class Spitball
   def tarball_path
     Repo.bundle_path(digest, 'tgz')
   end
-end
+end

data/lib/spitball/file_lock.rb

@@ -9,9 +9,7 @@ class Spitball::FileLock
   end
 
   def acquire_lock
-
     File.open(pre_lock_path, 'w') {|f| f.write Process.pid }
-
     system "ln #{pre_lock_path} #{path} > /dev/null 2>&1"
     File.read(path).to_i == Process.pid
   ensure

data/lib/spitball/remote.rb

@@ -7,12 +7,11 @@ class Spitball::Remote
   include Spitball::ClientCommon
 
   def initialize(gemfile, gemfile_lock, opts = {})
-    @gemfile = gemfile
-    @gemfile_lock = gemfile_lock
-    @host = opts[:host]
-    @port = opts[:port]
-    @without = (opts[:without] || []).map{|w| w.to_sym}
-    @cache_dir = '/tmp/spitball/client'
+    @gemfile, @gemfile_lock = gemfile, gemfile_lock
+    @host      = opts[:host]
+    @port      = opts[:port]
+    @without   = (opts[:without] || []).map{|w| w.to_sym}
+    @cache_dir = File.join(ENV['SPITBALL_CACHE'] || '/tmp/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.3'
+  VERSION = '0.4.4'
 end

data/spec/spec_helper.rb

@@ -12,7 +12,7 @@ require 'rubygems'
 require 'fileutils'
 require 'spec'
 require 'spitball'
-
+require 'phocus'
 
 Spec::Runner.configure do |config|
   config.mock_with :rr

data/spec/spitball_spec.rb

@@ -28,7 +28,7 @@ describe Spitball do
   describe "cached?" do
     it "returns true if the tarball has already been cached" do
       @spitball.should_not be_cached
-      mock(@spitball).install_gem(anything, anything).times(any_times)
+      mock(@spitball).install_gem(anything).times(any_times)
       @spitball.cache!
       @spitball.should be_cached
     end
@@ -82,7 +82,7 @@ describe Spitball do
 
   describe "create_bundle" do
     it "generates a bundle at the bundle_path" do
-      mock(@spitball).install_gem(anything, anything).times(any_times)
+      mock(@spitball).install_gem(anything).times(any_times)
       capture_stdout { @spitball.send :create_bundle }
       File.exist?(@spitball.send(:tarball_path)).should == true
     end
@@ -127,10 +127,10 @@ describe Spitball do
     
     it "should use without" do
       @spitball = Spitball.new(@gemfile, @lockfile)
-      mock(@spitball).install_gem(anything, anything).times(7)
+      mock(@spitball).install_and_copy_spec(anything).times(1)
       @spitball.send :create_bundle
       @spitball = Spitball.new(@gemfile, @lockfile, :without => 'development')
-      mock(@spitball).install_gem(anything, anything).times(6)
+      mock(@spitball).install_and_copy_spec(anything).times(0)
       @spitball.send :create_bundle
     end
   end
@@ -255,3 +255,37 @@ describe Spitball::Digest do
     spitball.hash.should == spitball.digest.hash
   end
 end
+
+describe Spitball do
+  context "mismatched" do
+    before do
+      use_success_bundler
+
+      @gemfile = <<-end_gemfile
+          source :rubygems
+          gem "json_pure"
+          gem "somethingelse"
+        end_gemfile
+
+      @lockfile = <<-end_lockfile.strip.gsub(/\n[ ]{6}/m, "\n")
+        GEM
+          remote: http://rubygems.org/
+          specs:
+            json_pure (1.4.6)
+
+        PLATFORMS
+          ruby
+
+        DEPENDENCIES
+          json_pure
+      end_lockfile
+
+    end
+
+    describe "create_bundle failure" do
+      it "should raise on create_bundle" do
+        proc { Spitball.new(@gemfile, @lockfile) }.should raise_error
+      end
+    end
+  end
+end

data/spitball.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', "~> 1.3.0"
   s.add_development_dependency 'rr'
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'phocus'
 
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- spec/*`.split("\n")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spitball
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Matt Freels
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -08:00
+date: 2011-01-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: phocus
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Use bundler to generate gem tarball packages.
 email: freels@twitter.com
 executables: