spitball 0.1.5 → 0.2.0

data/README.md

@@ -8,3 +8,22 @@ deployment.
 Also comes with `spitball-server`, a small sinatra app that you can run
 on a dedicated build server. The `spitball` command line client can then
 pull packages down from said server.
+
+### Usage
+
+    Usage: spitball [options] GEMFILE ARCHIVE
+
+    options:
+        -h, --host HOST                  Get the tarball from a remote spitball server
+        -p, --port PORT                  Specify the remote server port. Default 8080
+            --without a,b,c              Excluded groups in the tarball. Does not apply to remote spitballs
+            --version
+
+    environment variables:
+            SPITBALL_CACHE		     Specifies the cache dir. Defaults to /tmp/spitball
+
+### TODO
+
+Lots of things are changing in bundler 1.0. We're stuck on 0.9.5 for
+now, but once we get to 1.0, this tool will probably work with lock
+files instead of gem files, for more predictable builds.

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data/lib/spitball/file_lock.rb

@@ -1,19 +1,31 @@
 require 'fileutils'
 
-module Spitball::FileLock
-  def acquire_lock(lock_path)
-    pre_lock_path = "#{lock_path}_pre_#{Process.pid}"
+class Spitball::FileLock
+
+  attr_reader :path
+
+  def initialize(path)
+    @path = path
+  end
+
+  def acquire_lock
 
     File.open(pre_lock_path, 'w') {|f| f.write Process.pid }
 
-    system "ln #{pre_lock_path} #{lock_path} > /dev/null 2>&1"
-    File.read(lock_path).to_i == Process.pid
+    system "ln #{pre_lock_path} #{path} > /dev/null 2>&1"
+    File.read(path).to_i == Process.pid
   ensure
     FileUtils.rm_f pre_lock_path
   end
 
   # seems silly to lock to release lock
-  def release_lock(lock_path)
-    FileUtils.rm_f lock_path if acquire_lock lock_path
+  def release_lock
+    FileUtils.rm_f path if acquire_lock
+  end
+
+  private
+
+  def pre_lock_path
+    "#{path}_pre_#{Process.pid}"
   end
 end

data/lib/spitball/remote.rb

@@ -3,6 +3,8 @@ require 'uri'
 
 class Spitball::Remote
 
+  WAIT_SECONDS = 30
+
   def initialize(gemfile, host, port)
     @gemfile = gemfile
     @host = host
@@ -25,12 +27,14 @@ class Spitball::Remote
     when '201' # Created
       Net::HTTP.get(URI.parse(res['Location']))
     when '202' # Accepted
-      loop do
+      (WAIT_SECONDS / 2).times do
         sleep 2
         try = Net::HTTP.get_response(URI.parse(res['Location']))
         next if try.code != '200'
         return try.body
       end
+
+      raise SpitballServerFailure, "Spitball build timed out. The build failed or it's just taking a while..."
     else
       raise SpitballServerFailure, "Expected 2xx response code. Got #{res.code}."
     end

data/lib/spitball.rb

@@ -13,7 +13,6 @@ class Spitball
   VERSION = '1.0'
 
   include Spitball::Digest
-  include Spitball::FileLock
 
   attr_reader :gemfile, :options
 
@@ -35,11 +34,13 @@ class Spitball
     Spitball::Repo.make_cache_dir
 
     unless cached?
-      if acquire_lock bundle_path('lock')
+      lock = Spitball::FileLock.new(bundle_path('lock'))
+
+      if lock.acquire_lock
         begin
           create_bundle
         ensure
-          release_lock bundle_path('lock')
+          lock.release_lock
         end
       elsif sync
         sleep 0.1 until cached?
@@ -52,14 +53,10 @@ class Spitball
 
     File.open(gemfile_path, 'w') {|f| f.write gemfile }
 
-    if system "cd #{bundle_path} && bundle install #{bundle_path} --disable-shared-gems #{without_clause} > /dev/null"
-      FileUtils.rm_rf File.join(bundle_path, "cache")
-
+    if system "cd #{bundle_path} && bundle install #{bundle_path} --disable-shared-gems #{without_clause}"
       system "tar czf #{tarball_path}.#{Process.pid} -C #{bundle_path} ."
       system "mv #{tarball_path}.#{Process.pid} #{tarball_path}"
-
     else
-      #FileUtils.rm_rf gemfile_path
       raise BundleCreationFailure, "Bundle build failure."
     end
 
@@ -67,7 +64,7 @@ class Spitball
   end
 
   def without_clause
-    without = options[:without] || []
+    without = Array(options[:without] || [])
     return '' if without.empty?
 
     "--without=#{without.join(',')}"

data/spec/spec_helper.rb

@@ -1,7 +1,11 @@
 SPEC_DIR = File.dirname(__FILE__)
 
+SPEC_BIN_PATH = File.expand_path('bin', SPEC_DIR)
+
 SPITBALL_CACHE = ENV['SPITBALL_CACHE'] = File.expand_path('cache', SPEC_DIR)
 
+ENV['PATH'] = [SPEC_BIN_PATH, ENV['PATH']].join(':') unless ENV['PATH'].include? SPEC_BIN_PATH
+
 $: << File.expand_path("../lib", SPEC_DIR)
 
 require 'rubygems'
@@ -14,10 +18,12 @@ Spec::Runner.configure do |config|
   config.mock_with :rr
   config.before do
     purge_test_cache
+    purge_bin
   end
 
   config.after :all do
     purge_test_cache
+    purge_bin
   end
 end
 
@@ -27,3 +33,28 @@ end
 def purge_test_cache
   FileUtils.rm_rf SPITBALL_CACHE
 end
+
+def make_bundler
+  bundle_path = File.expand_path('bundle', SPEC_BIN_PATH)
+  FileUtils.mkdir_p SPEC_BIN_PATH
+  File.open(bundle_path, 'w') { |f| yield f }
+  FileUtils.chmod(0755, bundle_path)
+end
+
+def use_success_bundler
+  make_bundler do |f|
+    f.puts "#!/bin/sh"
+    f.puts "mkdir -p $2/gems"
+    f.puts "echo WIN > $2/gems/gem"
+  end
+end
+
+def use_fail_bundler
+  make_bundler do |f|
+    f.puts "exit 1"
+  end
+end
+
+def purge_bin
+  FileUtils.rm_rf File.expand_path('bin', SPEC_DIR)
+end

data/spec/spitball_spec.rb

@@ -1,35 +1,132 @@
 require 'spec/spec_helper'
 
 describe Spitball do
-  it "works" do
+  before do
+    use_success_bundler
+
+    @gemfile = <<-end_gemfile
+        source :rubygems
+        gem "activerecord"
+      end_gemfile
+
+    @spitball = Spitball.new(@gemfile)
+  end
+
+  describe "cached?" do
+    it "returns true if the tarball has already been cached" do
+      @spitball.should_not be_cached
+      @spitball.cache!
+      @spitball.should be_cached
+    end
+  end
+
+  describe "cache!" do
+    it "returns if the spitball is cached" do
+      mock(@spitball).cached? { true }
+      mock.instance_of(Spitball::FileLock).acquire_lock.never
+      mock.instance_of(Spitball::FileLock).release_lock.never
+      mock(@spitball).create_bundle(anything).never
+
+      @spitball.cache!
+    end
+
+    it "creates the bundle if it acquires the lock" do
+      mock.instance_of(Spitball::FileLock).acquire_lock { true }
+      mock(@spitball).create_bundle
+      mock.instance_of(Spitball::FileLock).release_lock
+
+      @spitball.cache!
+    end
+
+    it "does not create the bundle if it does not acquire the lock" do
+      mock.instance_of(Spitball::FileLock).release_lock.never
+      mock.instance_of(Spitball::FileLock).acquire_lock { false }
+      mock(@spitball).create_bundle.never
+
+      @spitball.cache!(false)
+    end
+
+    it "blocks if it does not acquire the lock and sync is true (default)" do
+      cached = false
+      done_caching = false
+
+      mock.instance_of(Spitball::FileLock).acquire_lock { false }
+      stub(@spitball).cached? { cached }
+
+      t = Thread.new do
+        @spitball.cache!
+        done_caching = true
+      end
+
+      sleep 0.5
+      done_caching.should_not == true
+
+      cached = true
+      t.join
+      done_caching.should == true
+    end
+  end
+
+  describe "create_bundle" do
+    it "generates a bundle at the bundle_path" do
+      @spitball.create_bundle
+
+      File.exist?(@spitball.tarball_path).should == true
+    end
+
+    it "raises an exception if bundle creation fails" do
+      use_fail_bundler
+
+      lambda { @spitball.create_bundle }.should raise_error(Spitball::BundleCreationFailure)
+      File.exist?(@spitball.tarball_path).should_not == true
+    end
+  end
+
+  describe "without_clause" do
+    it "returns a --without bundler option if :without is set" do
+      Spitball.new('gemfile', :without => "system").without_clause.should == '--without=system'
+    end
+
+    it "returns an empty string if without is not set" do
+      Spitball.new('gemfile').without_clause.should == ''
+    end
+
+    it "allows multiple groups" do
+      Spitball.new('gemfile', :without => ["system", "test"]).without_clause.should == '--without=system,test'
+    end
   end
 end
 
 describe Spitball::FileLock do
-  include Spitball::FileLock
-
   describe "acquire_lock" do
     before do
       Spitball::Repo.make_cache_dir
       @lock_path = File.expand_path('test.lock', SPITBALL_CACHE)
+      @lock = Spitball::FileLock.new(@lock_path)
     end
 
     it "returns true if the lock is acquired" do
-      acquire_lock(@lock_path).should == true
+      @lock.acquire_lock.should == true
     end
 
     it "returns false if the lock is not acquired" do
-      fork { acquire_lock(@lock_path); exit! }
+      fork { @lock.acquire_lock; exit! }
       Process.wait
 
-      acquire_lock(@lock_path).should == false
+      @lock.acquire_lock.should == false
     end
   end
 end
 
 describe Spitball::Repo do
+  before do
+    Spitball::Repo.make_cache_dir
+  end
+
   describe "make_cache_dir" do
     it "creates the correct cache dir" do
+      FileUtils.rm_rf(SPITBALL_CACHE)
+
       File.exist?(SPITBALL_CACHE).should_not == true
       Spitball::Repo.make_cache_dir
       File.exist?(SPITBALL_CACHE).should == true
@@ -49,4 +146,44 @@ describe Spitball::Repo do
       Spitball::Repo.path('digest', 'tgz').should =~ %r[bundle_digest\.tgz$]
     end
   end
+
+  describe "exist?" do
+    it "returns true if tarball for a digest has been exists" do
+      Spitball::Repo.exist?('digest').should_not == true
+      File.open(Spitball::Repo.path('digest', 'tgz'), 'w') {|f| f.write 'tarball!' }
+      Spitball::Repo.exist?('digest').should == true
+    end
+  end
+
+  describe "gemfile" do
+    it "returns the contents of the cached gemfile for a digest" do
+      gemfile = 'gem :memcached'
+      File.open(Spitball::Repo.path('digest', 'gemfile'), 'w') {|f| f.write gemfile }
+      Spitball::Repo.gemfile('digest').should == gemfile
+    end
+  end
+
+  describe "list_cached" do
+    it "returns a list of cached bundles" do
+      File.open(Spitball::Repo.path('digest', 'tgz'), 'w') {|f| f.write 'tarball!' }
+      File.open(Spitball::Repo.path('digest2', 'tgz'), 'w') {|f| f.write 'tarball2!' }
+
+      Spitball::Repo.list_cached.should == ['digest', 'digest2']
+    end
+  end
+end
+
+describe Spitball::Digest do
+  it "generates a digest based on the spitball's options and gemfile" do
+    [Spitball.new('gemfile contents', :without => "system").digest,
+     Spitball.new('gemfile contents 2', :without => "system").digest,
+     Spitball.new('gemfile', :without => "other_group").digest,
+     Spitball.new('gemfile').digest
+    ].uniq.length.should == 4
+  end
+
+  it "provides a hash equal to the digest's hash"do
+    spitball = Spitball.new('gemfile contents')
+    spitball.hash.should == spitball.digest.hash
+  end
 end

data/spitball.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{spitball}
-  s.version = "0.1.5"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Freels", "Brandon Mitchell"]
-  s.date = %q{2010-07-21}
+  s.date = %q{2010-07-29}
   s.description = %q{Use bundler to generate gem tarball packages.}
   s.email = %q{freels@twitter.com}
   s.executables = ["spitball", "spitball-server"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spitball
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Matt Freels
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 -07:00
+date: 2010-07-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency