spitball 0.7.4 → 0.8.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2345cee5f5ecd06c78fe5be3a6e3a36cabeb9137
+  data.tar.gz: 2541b8df75e52d080e74148dc9427f8f3d52feac
+SHA512:
+  metadata.gz: 17f5b06496261b19dc266f3361a47b9352b4ec41d6876e0cdeb8247472c29fc986ebe5a3aad470085d6cae88d1a4dc1f7164840e5832d2166373ac6fd97d576f
+  data.tar.gz: c90f8aca684bf93f39b9c094c92dd1c94d3afbecabac99cb1ae64aaa5cfd66caf8bada7aacadd4981b6d5ccfd684665daa7c3896ae9dfd6e8ee7eb794051f9a8

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
-  - ree
   - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.6
 before_install:
   - gem update --system 2.1.11
   - gem --version

data/bin/spitball

@@ -30,6 +30,10 @@ opts = OptionParser.new do |opts|
     args[:without] = without
   end
 
+  opts.on('--bundle-config CONFIG_FILE', 'Pass a bundle-config styled configuration file with build instructions') do |bundle_config|
+    args[:bundle_config] = bundle_config
+  end
+
   opts.on('-g', '--generate-only', "Only generate, don't download") do
     args[:generate] = true
   end
@@ -52,9 +56,11 @@ end
 
 gemfile = File.read(args[:gemfile])
 gemfile_lock = File.read("#{args[:gemfile]}.lock")
+bundle_config = File.read(args[:bundle_config]) if args[:bundle_config]
 
 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])
+  Spitball::Remote.new(gemfile, gemfile_lock, :host => args[:host], :port => (args[:port] || 8080).to_i,
+    :without => args[:without], :bundle_config => bundle_config) :
+  Spitball.new(gemfile, gemfile_lock, :without => args[:without], :bundle_config => bundle_config)
 
 args[:generate] ? ball.cache! : ball.copy_to(args[:destination])

data/bin/spitball-server

@@ -5,6 +5,9 @@ require 'optparse'
 require 'sinatra'
 require 'json'
 
+
+configure { set :server, :puma }
+
 # cargo culting sinatra's option parser, since it has trouble
 # with rubygem stub files
 
@@ -58,7 +61,7 @@ post '/create' do
   else
     without = request_version = request.env["HTTP_#{Spitball::WITHOUT_HEADER.gsub(/-/, '_').upcase}"]
     without &&= without.split(',')
-    ball = Spitball.new(params['gemfile'], params['gemfile_lock'], :without => without)
+    ball = Spitball.new(params['gemfile'], params['gemfile_lock'], :without => without, :bundle_config => params['bundle_config'])
     url = "#{request.url.split("/create").first}/#{ball.digest}.tgz"
     response['Location'] = url
 

data/lib/spitball.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'tempfile'
 require 'digest/md5'
 require 'ext/bundler_lockfile_parser'
 require 'ext/bundler_fake_dsl'
@@ -25,6 +26,7 @@ class Spitball
   PROTOCOL_VERSION = '1'
   PROTOCOL_HEADER = "X-Spitball-Protocol"
   WITHOUT_HEADER = "X-Spitball-Without"
+  BUNDLE_CONFIG_ENV = 'BUNDLE_CONFIG'
 
   include Spitball::Digest
   include Spitball::ClientCommon
@@ -38,10 +40,23 @@ class Spitball
     @options      = options
     @without      = options[:without].is_a?(Enumerable) ? options[:without].map(&:to_sym) : (options[:without] ? [options[:without].to_sym] : [])
     @parsed_lockfile, @dsl = Bundler::FakeLockfileParser.new(gemfile_lock), Bundler::FakeDsl.new(gemfile)
+
+    use_bundle_config(options[:bundle_config]) if options[:bundle_config]
+
     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 use_bundle_config(bundle_config)
+    tempfile = Tempfile.new('bundle_config')
+    File.open(tempfile.path, 'w') { |f| f.write options[:bundle_config] }
+    original_config_path = ENV[BUNDLE_CONFIG_ENV]
+    ENV[BUNDLE_CONFIG_ENV] = tempfile.path
+    @bundle_config = Bundler::Settings.new
+    tempfile.close
+    ENV[BUNDLE_CONFIG_ENV] = original_config_path
+  end
+
   def cached?
     File.exist? tarball_path
   end
@@ -49,14 +64,17 @@ class Spitball
   def cache!(sync = true)
     return if cached?
     lock = Spitball::FileLock.new(bundle_path('lock'))
-    if lock.acquire_lock
+
+    # We check cached again to avoid falling into a race condition
+    if lock.acquire_lock && !cached?
       begin
-       create_bundle
+        create_bundle
       ensure
         lock.release_lock
       end
     elsif sync
-      sleep 0.1 until cached?
+      sleep 0.5
+      cache!
     end
   end
 
@@ -119,12 +137,13 @@ class Spitball
   end
 
   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('/'))}")
+    build_args = @bundle_config["build.#{name}"] if @bundle_config
+    cache_dir = File.join(Repo.gemcache_path, "#{name}-#{::Digest::MD5.hexdigest([name, version, sources_opt(@parsed_lockfile.sources), build_args].join('/'))}")
     unless File.exist?(cache_dir)
       FileUtils.mkdir_p(cache_dir)
       out = ""
       Dir.chdir($pwd) do
-        out = `#{Spitball.gem_cmd} install #{name} -v'#{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)} #{generate_build_args(build_args)} 2>&1`
       end
       if $? == 0
         puts out
@@ -138,6 +157,10 @@ class Spitball
     `cp -R #{cache_dir}/* #{bundle_path}`
   end
 
+  def generate_build_args(build_args)
+    build_args ? "-- #{build_args}" : ''
+  end
+
   def sources_opt(sources)
     Array(ENV['SOURCE_OVERRIDE'] ||
       sources.

data/lib/spitball/remote.rb

@@ -12,6 +12,7 @@ class Spitball::Remote
     @port      = opts[:port]
     @without   = (opts[:without] || []).map{|w| w.to_sym}
     @cache_dir = ENV['SPITBALL_CACHE'] || "/tmp/spitball-#{ENV['USER']}/client"
+    @bundle_config = opts[:bundle_config]
     FileUtils.mkdir_p(@cache_dir)
     use_cache_file
   end
@@ -23,7 +24,7 @@ class Spitball::Remote
   end
 
   def cache_file
-    hash = ::Digest::MD5.hexdigest(([@host, @port, @gemfile, @gemfile_lock, Spitball::PROTOCOL_VERSION] + @without).join('/'))
+    hash = ::Digest::MD5.hexdigest(([@host, @port, @gemfile, @gemfile_lock, Spitball::PROTOCOL_VERSION, @bundle_config] + @without).join('/'))
     File.join(@cache_dir, hash)
   end
 
@@ -36,7 +37,9 @@ class Spitball::Remote
 
     url = URI.parse("http://#{@host}:#{@port}/create")
     req = Net::HTTP::Post.new(url.path)
-    req.form_data = {'gemfile' => @gemfile, 'gemfile_lock' => @gemfile_lock}
+    data = {'gemfile' => @gemfile, 'gemfile_lock' => @gemfile_lock}
+    data['bundle_config'] = @bundle_config if @bundle_config
+    req.form_data = data
     req.add_field Spitball::PROTOCOL_HEADER, Spitball::PROTOCOL_VERSION
     req.add_field Spitball::WITHOUT_HEADER, @without.join(',')
 

data/lib/spitball/version.rb

@@ -1,3 +1,3 @@
 class Spitball
-  VERSION = '0.7.4' unless const_defined?(:VERSION)
+  VERSION = '0.8.1' unless const_defined?(:VERSION)
 end

data/spec/spitball_spec.rb

@@ -71,7 +71,7 @@ describe Spitball do
         done_caching = true
       end
 
-      sleep 0.5
+      sleep 0.1
       done_caching.should_not == true
 
       cached = true
@@ -80,6 +80,16 @@ describe Spitball do
     end
   end
 
+  describe "generate_build_args" do
+    it "returns an empty string for nil" do
+      @spitball.send(:generate_build_args, nil).should == ''
+    end
+
+    it "returns arguments prepended with double dashes for a string" do
+      @spitball.send(:generate_build_args, '--build-args=joesmith').should == '-- --build-args=joesmith'
+    end
+  end
+
   describe "create_bundle" do
     it "generates a bundle at the bundle_path" do
       mock(@spitball).install_gem(anything).times(any_times)
@@ -143,7 +153,7 @@ describe Spitball do
       @spitball.send(:sources_opt, parsed_lockfile.sources).should == "--source http://rubygems.org/"
     end
 
-    it "does not add --clear sources for rubygems >= 1.4.0" do
+    it "adds --clear sources for rubygems >= 1.4.0" do
       @spitball = Spitball.new(@gemfile, @lockfile)
       parsed_lockfile =  @spitball.instance_variable_get("@parsed_lockfile")
       Gem::VERSION = "1.4.0"
@@ -356,4 +366,4 @@ describe Bundler::FakeDsl do
     dsl.__groups[:development].should == ["rails"]
     dsl.__groups[:test].should == ["json_pure"]
   end
-end
+end

data/spitball-server.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'json'
+  s.add_dependency 'puma'
   s.add_dependency 'sem_ver'
   s.add_dependency 'sinatra', '~> 1.2.0'
   s.add_development_dependency 'rspec', "~> 1.3.0"

metadata

@@ -1,123 +1,111 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spitball
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 4
-  version: 0.7.4
+version: !ruby/object:Gem::Version
+  version: 0.8.1
 platform: ruby
-authors: 
+authors:
 - Matt Freels
 - Brandon Mitchell
 - Joshua Hull
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-05-31 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2015-08-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sem_ver
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
-  name: rspec
   prerelease: false
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: diff-lcs
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rr
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  name: rake
   prerelease: false
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: phocus
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: phocus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Use bundler to generate gem tarball packages.
 email: freels@twitter.com
-executables: 
+executables:
 - spitball
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
-- .gitignore
-- .travis.yml
+files:
+- ".gitignore"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -142,38 +130,29 @@ files:
 - spitball.gemspec
 homepage: http://github.com/twitter/spitball
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: spitball
-rubygems_version: 1.8.3
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use bundler to generate gem tarball packages
-test_files: 
+test_files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/spitball_spec.rb
+has_rdoc: