spitball 0.2.5 → 0.3.0

data/Rakefile

@@ -22,10 +22,10 @@ begin
     gem.description = "Use bundler to generate gem tarball packages."
     gem.email = "freels@twitter.com"
     gem.homepage = "http://github.com/freels/spitball"
-    gem.authors = ["Matt Freels", "Brandon Mitchell"]
+    gem.authors = ["Matt Freels", "Brandon Mitchell", "Joshua Hull"]
 
-    gem.add_dependency 'bundler', '>= 0.9.5'
-    gem.add_dependency 'sinatra', '>= 1.0'
+    gem.add_dependency 'bundler', '~> 1.0.0'
+    gem.add_dependency 'sinatra', '~> 1.0'
 
     gem.add_development_dependency 'rspec'
     gem.add_development_dependency 'rr'

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.3.0

data/bin/spitball

@@ -37,7 +37,6 @@ end
 
 opts.permute!(ARGV)
 
-
 args[:gemfile] = ARGV[0]
 args[:destination] = ARGV[1]
 
@@ -47,9 +46,10 @@ unless args[:gemfile] and args[:destination]
 end
 
 gemfile = File.read(args[:gemfile])
+gemfile_lock = File.read("#{args[:gemfile]}.lock")
 
 ball = args[:host] ?
-  Spitball::Remote.new(gemfile, args[:host], (args[:port] || 8080).to_i) :
-  Spitball.new(gemfile, :without => args[:without])
+  Spitball::Remote.new(gemfile, gemfile_lock, :host => args[:host], :port => (args[:port] || 8080).to_i) :
+  Spitball.new(gemfile, gemfile_lock, :without => args[:without])
 
 ball.copy_to args[:destination]

data/bin/spitball-server

@@ -20,6 +20,7 @@ OptionParser.new { |op|
 set :run, true
 
 mime_type :gemfile, 'text/plain'
+mime_type :lock, 'text/plain'
 mime_type :tgz, 'application/x-compressed'
 
 # return json array of cached SHAs
@@ -33,7 +34,7 @@ get '/:digest.:format' do |digest, format|
   error 400 unless ['tgz', 'gemfile'].include? format
 
   # this returns 404 on Errno::ENOENT
-  send_file Spitball::Repo.path(digest, format), :type => format
+  send_file Spitball::Repo.bundle_path(digest, format), :type => format
 end
 
 class Streamer
@@ -45,7 +46,7 @@ end
 # 202 Accepted if it does not. The body of the response is the URI for
 # the tarball.
 post '/create' do
-  ball = Spitball.new(request.body.read)
+  ball = Spitball.new(params['gemfile'], params['gemfile_lock'])
   url = "#{request.url.split("/create").first}/#{ball.digest}.tgz"
   response['Location'] = url
 
@@ -55,18 +56,30 @@ post '/create' do
   else
     status 202
 
-    pid = open("|-")
+    i,o = IO.pipe
 
-    if pid == nil # child
-      begin
-        ball.cache!
-      rescue Object => e
-        puts "#{e.class}: #{e}", e.backtrace.map{|l| "\t#{l}" }
-        exit! 1
+    # fork twice. once so we can have a pid to detach from in order to clean up,
+    #             twice in order to properly redirect stdout for underlying shell commands.
+    pid = fork do
+      baller = open("|-")
+      if baller == nil # child
+        begin
+          ball.cache!
+        rescue Object => e
+          puts "#{e.class}: #{e}", e.backtrace.map{|l| "\t#{l}" }
+        end
+      else
+        while buf = baller.read(200)
+          $stdout.print buf
+          o.print buf
+        end
       end
       exit!
     end
 
-    Streamer.new(pid)
+    o.close
+    Process.detach(pid)
+
+    Streamer.new(i)
   end
 end

data/lib/ext/bundler_fake_dsl.rb

@@ -0,0 +1,27 @@
+module Bundler
+  class FakeDsl
+    
+    def initialize(file)
+      @groups = Hash.new{|h, k| h[k] = []}
+      instance_eval(file)
+    end
+
+    def __groups
+      @groups
+    end
+
+    def group(name, &blk)
+      @current_group = name.to_sym
+      instance_eval(&blk)
+      @current_group = nil
+    end
+    alias_method :groups, :group
+
+    def gem(*args)
+      @groups[@current_group] << args.first
+    end
+    
+    def method_missing(*args)
+    end
+  end
+end

data/lib/ext/bundler_lockfile_parser.rb

@@ -0,0 +1,108 @@
+require "strscan"
+
+module Bundler
+  class FakeLockfileParser
+    attr_reader :sources, :dependencies, :specs, :platforms
+
+    def initialize(lockfile)
+      @platforms    = []
+      @sources      = []
+      @dependencies = []
+      @specs        = []
+      @state        = :source
+
+      lockfile.split(/(\r?\n)+/).each do |line|
+        if line == "DEPENDENCIES"
+          @state = :dependency
+        elsif line == "PLATFORMS"
+          @state = :platform
+        else
+          send("parse_#{@state}", line)
+        end
+      end
+    end
+
+  private
+
+    TYPES = {
+      "GIT"  => Bundler::Source::Git,
+      "GEM"  => Bundler::Source::Rubygems,
+      "PATH" => Bundler::Source::Path
+    }
+
+    def parse_source(line)
+      case line
+      when "GIT", "GEM", "PATH"
+        @current_source = nil
+        @opts, @type = {}, line
+      when "  specs:"
+        @current_source = TYPES[@type].from_lock(@opts)
+        @sources << @current_source
+      when /^  ([a-z]+): (.*)$/i
+        value = $2
+        value = true if value == "true"
+        value = false if value == "false"
+
+        key = $1
+
+        if @opts[key]
+          @opts[key] = Array(@opts[key])
+          @opts[key] << value
+        else
+          @opts[key] = value
+        end
+      else
+        parse_spec(line)
+      end
+    end
+
+    NAME_VERSION = '(?! )(.*?)(?: \(([^-]*)(?:-(.*))?\))?'
+
+    def parse_dependency(line)
+      if line =~ %r{^ {2}#{NAME_VERSION}(!)?$}
+        name, version, pinned = $1, $2, $4
+        version = version.split(",").map { |d| d.strip } if version
+
+        dep = Bundler::Dependency.new(name, version)
+
+        if pinned && dep.name != 'bundler'
+          spec = @specs.find { |s| s.name == dep.name }
+          dep.source = spec.source if spec
+
+          # Path sources need to know what the default name / version
+          # to use in the case that there are no gemspecs present. A fake
+          # gemspec is created based on the version set on the dependency
+          # TODO: Use the version from the spec instead of from the dependency
+          if version && version.size == 1 && version.first =~ /^\s*= (.+)\s*$/ && dep.source.is_a?(Bundler::Source::Path)
+            dep.source.name    = name
+            dep.source.version = $1
+          end
+        end
+
+        @dependencies << dep
+      end
+    end
+
+    def parse_spec(line)
+      if line =~ %r{^ {4}#{NAME_VERSION}$}
+        name, version = $1, Gem::Version.new($2)
+        platform = $3 ? Gem::Platform.new($3) : Gem::Platform::RUBY
+        @current_spec = LazySpecification.new(name, version, platform)
+        @current_spec.source = @current_source
+        @specs << @current_spec
+      elsif line =~ %r{^ {6}#{NAME_VERSION}$}
+        name, version = $1, $2
+        version = version.split(',').map { |d| d.strip } if version
+        dep = Gem::Dependency.new(name, version)
+        @current_spec.dependencies << dep
+      end
+    end
+
+    def parse_platform(line)
+      if line =~ /^  (.*)$/
+        @platforms << Gem::Platform.new($1)
+      end
+    end
+
+  end
+end

data/lib/spitball/digest.rb

@@ -2,7 +2,7 @@ require 'digest/sha1'
 
 module Spitball::Digest
   def digest
-    @digest ||= ::Digest::SHA1.hexdigest "#{options.to_a.sort}:#{gemfile}"
+    @digest ||= ::Digest::SHA1.hexdigest "#{options.to_a.sort}:#{gemfile_lock}"
   end
 
   def hash

data/lib/spitball/remote.rb

@@ -3,10 +3,11 @@ require 'uri'
 
 class Spitball::Remote
 
-  def initialize(gemfile, host, port)
+  def initialize(gemfile, gemfile_lock, opts = {})
     @gemfile = gemfile
-    @host = host
-    @port = port
+    @gemfile_lock = gemfile_lock
+    @host = opts[:host]
+    @port = opts[:port]
   end
 
   def copy_to(path)
@@ -18,10 +19,11 @@ class Spitball::Remote
 
   def generate_remote_tarball
     url = URI.parse("http://#{@host}:#{@port}/create")
-    res = Net::HTTP.start(url.host, url.port) do |http|
-      http.post(url.path, @gemfile) do |body|
-        print body
-      end
+    req = Net::HTTP::Post.new(url.path)
+    req.form_data = {'gemfile' => @gemfile, 'gemfile_lock' => @gemfile_lock}
+
+    res = Net::HTTP.new(url.host, url.port).start do |http|
+      http.request(req) {|r| puts r.read_body }
     end
 
     print "\nDownloading tarball..."; $stdout.flush

data/lib/spitball/repo.rb

@@ -3,21 +3,25 @@ module Spitball::Repo
 
   WORKING_DIR = ENV['SPITBALL_CACHE'] || '/tmp/spitball'
 
-  def path(digest, extension = nil)
+  def bundle_path(digest, extension = nil)
     extension = ".#{extension}" unless extension.nil? or extension.empty?
     File.join WORKING_DIR, "bundle_#{digest}#{extension}"
   end
 
+  def gemcache_path
+    File.join(WORKING_DIR, "gemcache")
+  end
+
+  def gemfile(digest)
+    bundle_path digest, 'gemfile'
+  end
+
   def exist?(digest)
     File.exist? tarball(digest)
   end
 
   def tarball(digest)
-    path(digest, 'tgz')
-  end
-
-  def gemfile(digest)
-    path(digest, 'gemfile')
+    bundle_path(digest, 'tgz')
   end
 
   def cached_digests
@@ -26,8 +30,8 @@ module Spitball::Repo
     end.compact.uniq.sort
   end
 
-  def make_cache_dir
-    FileUtils.mkdir_p WORKING_DIR
+  def make_cache_dirs
+    FileUtils.mkdir_p File.join(WORKING_DIR, "gemcache")
   end
 
   def clean_up_unused(access_window)

data/lib/spitball.rb

@@ -1,4 +1,8 @@
 require 'fileutils'
+require 'digest/md5'
+require 'bundler'
+require 'ext/bundler_lockfile_parser'
+require 'ext/bundler_fake_dsl'
 
 class Spitball
   require 'spitball/digest'
@@ -14,11 +18,13 @@ class Spitball
 
   include Spitball::Digest
 
-  attr_reader :gemfile, :options
+  attr_reader :gemfile, :gemfile_lock, :without, :options
 
-  def initialize(gemfile, options = {})
-    @gemfile = gemfile
-    @options = options
+  def initialize(gemfile, gemfile_lock, options = {})
+    @gemfile      = gemfile
+    @gemfile_lock = gemfile_lock
+    @options      = options
+    @without      = (options[:without] || []).map{|w| w.to_sym}
   end
 
   def copy_to(dest)
@@ -31,14 +37,12 @@ class Spitball
   end
 
   def cache!(sync = true)
-    Spitball::Repo.make_cache_dir
-
+    Spitball::Repo.make_cache_dirs
     unless cached?
       lock = Spitball::FileLock.new(bundle_path('lock'))
-
       if lock.acquire_lock
         begin
-          create_bundle
+         create_bundle
         ensure
           lock.release_lock
         end
@@ -49,43 +53,66 @@ 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
 
+    # save gemfile and lock file for future reference.
     File.open(gemfile_path, 'w') {|f| f.write gemfile }
+    File.open(gemfile_lock_path, 'w') {|f| f.write gemfile_lock }
 
-    if system "cd #{bundle_path} && bundle install #{bundle_path} --disable-shared-gems #{without_clause} 2>&1"
+    parsed_lockfile, dsl = Bundler::FakeLockfileParser.new(gemfile_lock), Bundler::FakeDsl.new(gemfile)
 
-      # rewrite bang lines to #!/usr/bin/env ruby
-      # in serious lameness, OS X sed (more posix compliant?) requires
-      # a slightly different sed incantation for in place editing
-      if Dir["#{bundle_path}/bin/*"].length > 0
-        if RUBY_PLATFORM =~ /linux/
-          system "cd #{bundle_path} && find bin/* -exec sed -i'' '1,1 s|^#!/.*/ruby[ ]*|#!/usr/bin/env ruby|' {} \\;"
-        else
-          system "cd #{bundle_path} && find bin/* -exec sed -i '' '1,1 s|^#!/.*/ruby[ ]*|#!/usr/bin/env ruby|' {} \\;"
-        end
+    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)}
       end
+    end
 
-      system "tar czf #{tarball_path}.#{Process.pid} -C #{bundle_path} ."
-      system "mv #{tarball_path}.#{Process.pid} #{tarball_path}"
-    else
-      raise BundleCreationFailure, "Bundle build failure."
+    Dir.chdir(bundle_path) do
+      Dir["#{bundle_path}/bin/**"].each do |file|
+        contents = File.read(file)
+        contents.gsub!(/^#!.*?\n/, "#!/usr/bin/env ruby\n")
+        File.open(file, 'w') {|f| f << contents}
+      end
     end
 
+    system "rm -rf #{bundle_path}/cache"
+    system "tar czf #{tarball_path}.#{Process.pid} -C #{bundle_path} ."
+    system "mv #{tarball_path}.#{Process.pid} #{tarball_path}"
     FileUtils.rm_rf bundle_path
   end
 
-  def without_clause
-    without = Array(options[:without] || [])
-    return '' if without.empty?
+  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('/'))}")
+    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)
+    else
+      puts "Using cached version of #{spec.name} (#{spec.version})"
+    end
+    `cp -R #{cache_dir}/* #{bundle_path}`
+  end
 
-    "--without=#{without.join(',')}"
+  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(' ')
   end
 
   # Paths
 
   def bundle_path(extension = nil)
-    Repo.path(digest, extension)
+    Repo.bundle_path(digest, extension)
+  end
+
+  def gemfile_lock_path
+    File.expand_path('Gemfile.lock', bundle_path)
   end
 
   def gemfile_path
@@ -93,6 +120,6 @@ class Spitball
   end
 
   def tarball_path
-    Repo.path(digest, 'tgz')
+    Repo.bundle_path(digest, 'tgz')
   end
 end

data/spec/spec_helper.rb

@@ -30,6 +30,14 @@ end
 
 # helper methods
 
+def capture_stdout
+  $stdout = StringIO.new
+  yield
+  $stdout.string
+ensure
+  $stdout = STDOUT
+end
+
 def purge_test_cache
   FileUtils.rm_rf SPITBALL_CACHE
 end
@@ -49,12 +57,6 @@ def use_success_bundler
   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

@@ -6,16 +6,30 @@ describe Spitball do
 
     @gemfile = <<-end_gemfile
         source :rubygems
-        gem "activerecord"
+        gem "json_pure"
       end_gemfile
 
-    @spitball = Spitball.new(@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
+
+    @spitball = Spitball.new(@gemfile, @lockfile)
   end
 
   describe "cached?" do
     it "returns true if the tarball has already been cached" do
       @spitball.should_not be_cached
-      @spitball.cache!
+      mock(@spitball).install_gem(anything, anything).times(any_times)
+      capture_stdout { @spitball.cache! }
       @spitball.should be_cached
     end
   end
@@ -34,7 +48,6 @@ describe Spitball do
       mock.instance_of(Spitball::FileLock).acquire_lock { true }
       mock(@spitball).create_bundle
       mock.instance_of(Spitball::FileLock).release_lock
-
       @spitball.cache!
     end
 
@@ -69,30 +82,56 @@ describe Spitball do
 
   describe "create_bundle" do
     it "generates a bundle at the bundle_path" do
-      @spitball.create_bundle
-
+      mock(@spitball).install_gem(anything, anything).times(any_times)
+      capture_stdout { @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 == ''
+    before do
+      @gemfile = <<-end_gemfile
+          source :rubygems
+          group 'development' do
+            gem "activerecord"
+          end
+        end_gemfile
+
+      @lockfile = <<-end_lockfile.strip.gsub(/\n[ ]{6}/m, "\n")
+        GEM
+          remote: http://rubygems.org/
+          specs:
+            activemodel (3.0.1)
+              activesupport (= 3.0.1)
+              builder (~> 2.1.2)
+              i18n (~> 0.4.1)
+            activerecord (3.0.1)
+              activemodel (= 3.0.1)
+              activesupport (= 3.0.1)
+              arel (~> 1.0.0)
+              tzinfo (~> 0.3.23)
+            activesupport (3.0.1)
+            arel (1.0.1)
+              activesupport (~> 3.0.0)
+            builder (2.1.2)
+            i18n (0.4.2)
+            tzinfo (0.3.23)
+
+        PLATFORMS
+          ruby
+
+        DEPENDENCIES
+          activerecord
+      end_lockfile
     end
-
-    it "allows multiple groups" do
-      Spitball.new('gemfile', :without => ["system", "test"]).without_clause.should == '--without=system,test'
+    
+    it "should use without" do
+      @spitball = Spitball.new(@gemfile, @lockfile)
+      mock(@spitball).install_gem(anything, anything).times(3)
+      @spitball.create_bundle
+      @spitball = Spitball.new(@gemfile, @lockfile, :without => 'development')
+      mock(@spitball).install_gem(anything, anything).times(1)
+      @spitball.create_bundle
     end
   end
 end
@@ -100,7 +139,7 @@ end
 describe Spitball::FileLock do
   describe "acquire_lock" do
     before do
-      Spitball::Repo.make_cache_dir
+      Spitball::Repo.make_cache_dirs
       @lock_path = File.expand_path('test.lock', SPITBALL_CACHE)
       @lock = Spitball::FileLock.new(@lock_path)
     end
@@ -120,50 +159,56 @@ end
 
 describe Spitball::Repo do
   before do
-    Spitball::Repo.make_cache_dir
+    Spitball::Repo.make_cache_dirs
   end
 
-  describe "make_cache_dir" do
+  describe "make_cache_dirs" 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
+      Spitball::Repo.make_cache_dirs
       File.exist?(SPITBALL_CACHE).should == true
     end
   end
 
-  describe "path" do
+  describe "bundle_path" do
     it "generates paths with the correct cache" do
-      Spitball::Repo.path('digest').should =~ %r[^#{SPITBALL_CACHE}]
+      Spitball::Repo.bundle_path('digest').should =~ %r[^#{SPITBALL_CACHE}]
     end
 
     it "generates paths with extensions" do
-      Spitball::Repo.path('digest', 'tgz').should =~ %r[\.tgz$]
+      Spitball::Repo.bundle_path('digest', 'tgz').should =~ %r[\.tgz$]
     end
 
     it "generates paths prefixed with bundle_" do
-      Spitball::Repo.path('digest', 'tgz').should =~ %r[bundle_digest\.tgz$]
+      Spitball::Repo.bundle_path('digest', 'tgz').should =~ %r[bundle_digest\.tgz$]
+    end
+  end
+
+  describe "gemcache_path" do
+    it "returns the correct path in the cache dir" do
+      Spitball::Repo.gemcache_path.should == File.join(SPITBALL_CACHE, "gemcache")
     end
   end
 
   describe "exist?" do
     it "returns true if tarball for a digest exists" do
       Spitball::Repo.exist?('digest').should_not == true
-      File.open(Spitball::Repo.path('digest', 'tgz'), 'w') {|f| f.write 'tarball!' }
+      File.open(Spitball::Repo.bundle_path('digest', 'tgz'), 'w') {|f| f.write 'tarball!' }
       Spitball::Repo.exist?('digest').should == true
     end
   end
 
   describe "tarball" do
     it "returns the path of the cached tarball for a digest" do
-      Spitball::Repo.tarball('digest').should == Spitball::Repo.path('digest', 'tgz')
+      Spitball::Repo.tarball('digest').should == Spitball::Repo.bundle_path('digest', 'tgz')
     end
   end
 
   describe "gemfile" do
     it "returns the path of the cached gemfile for a digest" do
-      Spitball::Repo.gemfile('digest').should == Spitball::Repo.path('digest', 'gemfile')
+      Spitball::Repo.gemfile('digest').should == Spitball::Repo.bundle_path('digest', 'gemfile')
     end
   end
 
@@ -197,15 +242,16 @@ 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
+    [Spitball.new('gemfile contents', 'gemlock', :without => "system").digest,
+     Spitball.new('gemfile contents 2', 'gemlock', :without => "system").digest,
+     Spitball.new('gemfile', 'gemlock', :without => "other_group").digest,
+     Spitball.new('gemfile', 'gemlock').digest,
+     Spitball.new('gemfile', 'gemlock2').digest
     ].uniq.length.should == 4
   end
 
   it "provides a hash equal to the digest's hash"do
-    spitball = Spitball.new('gemfile contents')
+    spitball = Spitball.new('gemfile contents', 'gemlock 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.2.5"
+  s.version = "0.3.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-09-08}
+  s.authors = ["Matt Freels", "Brandon Mitchell", "Joshua Hull"]
+  s.date = %q{2010-10-27}
   s.description = %q{Use bundler to generate gem tarball packages.}
   s.email = %q{freels@twitter.com}
   s.executables = ["spitball", "spitball-cache-cleanup", "spitball-server"]
@@ -18,13 +18,14 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
-     "Gemfile.sample",
      "README.md",
      "Rakefile",
      "VERSION",
      "bin/spitball",
      "bin/spitball-cache-cleanup",
      "bin/spitball-server",
+     "lib/ext/bundler_fake_dsl.rb",
+     "lib/ext/bundler_lockfile_parser.rb",
      "lib/spitball.rb",
      "lib/spitball/digest.rb",
      "lib/spitball/file_lock.rb",
@@ -50,19 +51,19 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<bundler>, [">= 0.9.5"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 1.0"])
+      s.add_runtime_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<sinatra>, ["~> 1.0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rr>, [">= 0"])
     else
-      s.add_dependency(%q<bundler>, [">= 0.9.5"])
-      s.add_dependency(%q<sinatra>, [">= 1.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<sinatra>, ["~> 1.0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rr>, [">= 0"])
     end
   else
-    s.add_dependency(%q<bundler>, [">= 0.9.5"])
-    s.add_dependency(%q<sinatra>, [">= 1.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<sinatra>, ["~> 1.0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rr>, [">= 0"])
   end

metadata

@@ -1,22 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: spitball
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 5
-  version: 0.2.5
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Matt Freels
 - Brandon Mitchell
+- Joshua Hull
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 -07:00
+date: 2010-10-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,14 +26,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 23
         segments: 
+        - 1
         - 0
-        - 9
-        - 5
-        version: 0.9.5
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,7 +42,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 15
         segments: 
@@ -90,13 +91,14 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
-- Gemfile.sample
 - README.md
 - Rakefile
 - VERSION
 - bin/spitball
 - bin/spitball-cache-cleanup
 - bin/spitball-server
+- lib/ext/bundler_fake_dsl.rb
+- lib/ext/bundler_lockfile_parser.rb
 - lib/spitball.rb
 - lib/spitball/digest.rb
 - lib/spitball/file_lock.rb

data/Gemfile.sample

@@ -1,8 +0,0 @@
-source :rubygems
-
-group "native" do
-  gem 'mysql'
-  gem 'json'
-end
-
-gem 'activesupport'