spitball 0.6.1 → 0.7.0

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - ree
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gemspec :name => 'spitball-server'
+gemspec :name => 'spitball-server'

data/README.md

@@ -1,4 +1,4 @@
-## spitball
+## spitball [![Build Status](https://secure.travis-ci.org/twitter/spitball.png?branch=master)](http://travis-ci.org/twitter/spitball) [![Code Climate](https://codeclimate.com/github/twitter/spitball.png)](https://codeclimate.com/github/twitter/spitball)
 
 A very simple gem package generation tool built on `bundler`. Pass it a
 gem file, it spits out a tarball of the generated gem

data/lib/spitball.rb

@@ -3,6 +3,8 @@ require 'digest/md5'
 require 'ext/bundler_lockfile_parser'
 require 'ext/bundler_fake_dsl'
 
+$pwd = Dir.pwd
+
 class Spitball
   require 'spitball/client_common'
   require 'spitball/digest'
@@ -33,7 +35,7 @@ class Spitball
     @gemfile      = gemfile
     @gemfile_lock = gemfile_lock
     @options      = options
-    @without      = (options[:without] || []).map{|w| w.to_sym}
+    @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)
     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
@@ -74,7 +76,7 @@ class Spitball
 
     Dir.chdir(Repo.gemcache_path) do
       @dsl.__gem_names.each do |spec|
-        spec_name = spec.first
+        spec_name = spec
         if @groups_to_install.any?{|group| @dsl.__groups[group].include?(spec_name)}
           if found_spec = @parsed_lockfile.specs.find {|spec| spec.name == spec_name}
             install_gem(found_spec)
@@ -119,7 +121,10 @@ class Spitball
     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 = `#{Spitball.gem_cmd} install #{name} -v'#{version}' --no-rdoc --no-ri --ignore-dependencies -i#{cache_dir} #{sources_opt(@parsed_lockfile.sources)} 2>&1`
+      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`
+      end
       if $? == 0
         puts out
       else
@@ -133,7 +138,7 @@ class Spitball
   end
 
   def sources_opt(sources)
-    Array(ENV['SOURCE_OVERRIDE'] || 
+    Array(ENV['SOURCE_OVERRIDE'] ||
       sources.
         map{|s| s.remotes}.flatten.
         map{|s| s.to_s}.
@@ -160,4 +165,4 @@ class Spitball
   def tarball_path
     Repo.bundle_path(digest, 'tgz')
   end
-end
+end

data/lib/spitball/version.rb

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

data/spec/spitball_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require './spec/spec_helper'
 
 describe Spitball do
   before do
@@ -124,7 +124,7 @@ describe Spitball do
           activerecord
       end_lockfile
     end
-    
+
     it "should use without" do
       @spitball = Spitball.new(@gemfile, @lockfile)
       mock(@spitball).install_and_copy_spec(anything, anything).times(9)
@@ -288,4 +288,4 @@ describe Spitball do
       end
     end
   end
-end
+end

data/spitball-server.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = ['spitball-server', 'spitball-cache-cleanup']
   s.require_paths = ["lib"]
 
+  s.add_dependency 'json'
   s.add_dependency 'sinatra', '~> 1.2.0'
   s.add_development_dependency 'rspec', "~> 1.3.0"
   s.add_development_dependency 'diff-lcs'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spitball
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Matt Freels
@@ -17,12 +17,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-30 00:00:00 -07:00
-default_executable: 
+date: 2013-11-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,12 +31,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  requirement: *id001
   name: rspec
+  prerelease: false
   type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,12 +45,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
   name: diff-lcs
+  prerelease: false
   type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,12 +59,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
   name: rr
+  prerelease: false
   type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -77,12 +75,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  requirement: *id004
   name: rake
+  prerelease: false
   type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,9 +89,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
   name: phocus
+  prerelease: false
   type: :development
+  version_requirements: *id005
 description: Use bundler to generate gem tarball packages.
 email: freels@twitter.com
 executables: 
@@ -104,6 +103,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -124,7 +124,6 @@ files:
 - spec/spitball_spec.rb
 - spitball-server.gemspec
 - spitball.gemspec
-has_rdoc: true
 homepage: http://rubygems.org/gems/spitball
 licenses: []
 
@@ -154,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: spitball
-rubygems_version: 1.6.2
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 summary: Use bundler to generate gem tarball packages