spitball 0.3.0 → 0.3.1

data/Rakefile

@@ -24,9 +24,7 @@ begin
     gem.homepage = "http://github.com/freels/spitball"
     gem.authors = ["Matt Freels", "Brandon Mitchell", "Joshua Hull"]
 
-    gem.add_dependency 'bundler', '~> 1.0.0'
-    gem.add_dependency 'sinatra', '~> 1.0'
-
+    gem.add_dependency 'sinatra', '>= 1.0'
     gem.add_development_dependency 'rspec'
     gem.add_development_dependency 'rr'
   end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/ext/bundler_lockfile_parser.rb

@@ -25,18 +25,26 @@ module Bundler
   private
 
     TYPES = {
-      "GIT"  => Bundler::Source::Git,
-      "GEM"  => Bundler::Source::Rubygems,
-      "PATH" => Bundler::Source::Path
+      "GIT"  => 'git',
+      "GEM"  => 'gem',
+      "PATH" => 'path'
     }
 
+    GemSource = Struct.new(:remotes)
+
     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)
+        case @type
+        when 'GEM'
+          @current_source = GemSource.new([])
+          @current_source.remotes << @opts['remote']
+        else
+          raise
+        end
         @sources << @current_source
       when /^  ([a-z]+): (.*)$/i
         value = $2
@@ -63,20 +71,11 @@ module Bundler
         name, version, pinned = $1, $2, $4
         version = version.split(",").map { |d| d.strip } if version
 
-        dep = Bundler::Dependency.new(name, version)
+        dep = Gem::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
@@ -87,8 +86,10 @@ module Bundler
       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
+        @current_spec = Gem::Specification.new
+        @current_spec.name = name
+        @current_spec.version = version
+        #@current_spec.source = @current_source
         @specs << @current_spec
       elsif line =~ %r{^ {6}#{NAME_VERSION}$}
         name, version = $1, $2

data/lib/spitball/remote.rb

@@ -11,8 +11,19 @@ class Spitball::Remote
   end
 
   def copy_to(path)
-    data = generate_remote_tarball
-    File.open(path, 'w') { |f| f.write data }
+    case path
+    when /\.tar\.gz$/, /\.tgz$/
+      data = generate_remote_tarball
+      File.open(path, 'w') { |f| f.write data }
+    else
+      begin
+        File.open('tmp.tgz', 'w') { |f| f.write data }
+        FileUtils.mkdir_p path
+        `tar xvf tmp.tgz -C #{path}`
+      ensure
+        FileUtils.rm_rf('tmp.tgz')
+      end
+    end
   end
 
   private

data/lib/spitball.rb

@@ -1,6 +1,5 @@
 require 'fileutils'
 require 'digest/md5'
-require 'bundler'
 require 'ext/bundler_lockfile_parser'
 require 'ext/bundler_fake_dsl'
 

data/spec/spitball_spec.rb

@@ -29,7 +29,7 @@ describe Spitball 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)
-      capture_stdout { @spitball.cache! }
+      @spitball.cache!
       @spitball.should be_cached
     end
   end
@@ -97,7 +97,7 @@ describe Spitball do
           end
         end_gemfile
 
-      @lockfile = <<-end_lockfile.strip.gsub(/\n[ ]{6}/m, "\n")
+      @lockfile = <<-end_lockfile.strip.gsub(/\n[ ]{8}/m, "\n")
         GEM
           remote: http://rubygems.org/
           specs:
@@ -127,10 +127,10 @@ describe Spitball do
     
     it "should use without" do
       @spitball = Spitball.new(@gemfile, @lockfile)
-      mock(@spitball).install_gem(anything, anything).times(3)
+      mock(@spitball).install_gem(anything, anything).times(7)
       @spitball.create_bundle
       @spitball = Spitball.new(@gemfile, @lockfile, :without => 'development')
-      mock(@spitball).install_gem(anything, anything).times(1)
+      mock(@spitball).install_gem(anything, anything).times(6)
       @spitball.create_bundle
     end
   end

data/spitball.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{spitball}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Freels", "Brandon Mitchell", "Joshua Hull"]
-  s.date = %q{2010-10-27}
+  s.date = %q{2010-10-28}
   s.description = %q{Use bundler to generate gem tarball packages.}
   s.email = %q{freels@twitter.com}
   s.executables = ["spitball", "spitball-cache-cleanup", "spitball-server"]
@@ -51,19 +51,16 @@ 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>, ["~> 1.0.0"])
-      s.add_runtime_dependency(%q<sinatra>, ["~> 1.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>, ["~> 1.0.0"])
-      s.add_dependency(%q<sinatra>, ["~> 1.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>, ["~> 1.0.0"])
-    s.add_dependency(%q<sinatra>, ["~> 1.0"])
+    s.add_dependency(%q<sinatra>, [">= 1.0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rr>, [">= 0"])
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spitball
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Matt Freels
@@ -17,32 +17,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 -07:00
+date: 2010-10-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 15
         segments: 
@@ -50,11 +34,11 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,11 +48,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,7 +62,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 description: Use bundler to generate gem tarball packages.
 email: freels@twitter.com
 executables: