spitball 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/spitball.rb

@@ -4,6 +4,7 @@ require 'ext/bundler_lockfile_parser'
 require 'ext/bundler_fake_dsl'
 
 class Spitball
+  require 'spitball/client_common'
   require 'spitball/digest'
   require 'spitball/repo'
   require 'spitball/file_lock'
@@ -16,6 +17,7 @@ class Spitball
   VERSION = '1.0'
 
   include Spitball::Digest
+  include Spitball::ClientCommon
 
   attr_reader :gemfile, :gemfile_lock, :without, :options
 
@@ -26,11 +28,6 @@ class Spitball
     @without      = (options[:without] || []).map{|w| w.to_sym}
   end
 
-  def copy_to(dest)
-    cache!
-    FileUtils.cp(tarball_path, dest)
-  end
-
   def cached?
     File.exist? tarball_path
   end
@@ -51,6 +48,13 @@ class Spitball
     end
   end
 
+  private
+
+  def copy_tarball_data(dest)
+    cache!
+    FileUtils.cp(tarball_path, dest)
+  end
+
   def create_bundle
     ENV['BUNDLE_GEMFILE'] = gemfile_path # make bundler happy! :) *cry*
     Spitball::Repo.make_cache_dirs

data/lib/spitball/client_common.rb

@@ -0,0 +1,30 @@
+module Spitball::ClientCommon
+  def copy_to(path)
+    case path
+    when /\.tar\.gz$/, /\.tgz$/
+      copy_tarball_data(path)
+    else
+      tmp_tgz = File.join(path, 'spitball.tgz')
+      FileUtils.mkdir_p path
+
+      copy_tarball_data(tmp_tgz)
+      `tar xzf #{tmp_tgz} -C #{path}`
+
+      FileUtils.rm_rf(tmp_tgz)
+    end
+  end
+
+  def cached?
+    raise NotImplementedError
+  end
+
+  def cache!
+    raise NotImplementedError
+  end
+
+  private
+
+  def copy_tarball_data(path)
+    raise NotImplementedError
+  end
+end

data/lib/spitball/remote.rb

@@ -3,6 +3,8 @@ require 'uri'
 
 class Spitball::Remote
 
+  include Spitball::ClientCommon
+
   def initialize(gemfile, gemfile_lock, opts = {})
     @gemfile = gemfile
     @gemfile_lock = gemfile_lock
@@ -10,25 +12,13 @@ class Spitball::Remote
     @port = opts[:port]
   end
 
-  def copy_to(path)
-    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
+  def cached?
+    !!@tarball_url
   end
 
-  private
+  def cache!(sync = true) # ignore sync
+    return if cached?
 
-  def generate_remote_tarball
     url = URI.parse("http://#{@host}:#{@port}/create")
     req = Net::HTTP::Post.new(url.path)
     req.form_data = {'gemfile' => @gemfile, 'gemfile_lock' => @gemfile_lock}
@@ -37,21 +27,25 @@ class Spitball::Remote
       http.request(req) {|r| puts r.read_body }
     end
 
-    print "\nDownloading tarball..."; $stdout.flush
+    case res.code
+    when '201', '202' # Created, Accepted
+      @tarball_url = res['Location']
+    else
+      raise Spitball::ServerFailure, "Expected 2xx response code. Got #{res.code}."
+    end
+  rescue URI::InvalidURIError => e
+    raise Spitball::ClientError, e.message
+  end
 
-    data =
-      case res.code
-      when '201', '202' # Created, Accepted
-        get_tarball_data res['Location']
-      else
-        raise Spitball::ServerFailure, "Expected 2xx response code. Got #{res.code}."
-      end
+  private
 
+  def copy_tarball_data(path)
+    cache!
+    print "\nDownloading tarball..."; $stdout.flush
+    data = get_tarball_data @tarball_url
     puts "done."
 
-    data
-  rescue URI::InvalidURIError => e
-    raise Spitball::ClientError, e.message
+    File.open(path, 'w') { |f| f.write data }
   end
 
   def get_tarball_data(location)
@@ -62,5 +56,7 @@ class Spitball::Remote
     else
       raise Spitball::ServerFailure, "Spitball download failed."
     end
+  rescue URI::InvalidURIError => e
+    raise Spitball::ClientError, e.message
   end
 end

data/spec/spitball_spec.rb

@@ -83,8 +83,8 @@ describe Spitball do
   describe "create_bundle" do
     it "generates a bundle at the bundle_path" do
       mock(@spitball).install_gem(anything, anything).times(any_times)
-      capture_stdout { @spitball.create_bundle }
-      File.exist?(@spitball.tarball_path).should == true
+      capture_stdout { @spitball.send :create_bundle }
+      File.exist?(@spitball.send(:tarball_path)).should == true
     end
   end
 
@@ -128,10 +128,10 @@ describe Spitball do
     it "should use without" do
       @spitball = Spitball.new(@gemfile, @lockfile)
       mock(@spitball).install_gem(anything, anything).times(7)
-      @spitball.create_bundle
+      @spitball.send :create_bundle
       @spitball = Spitball.new(@gemfile, @lockfile, :without => 'development')
       mock(@spitball).install_gem(anything, anything).times(6)
-      @spitball.create_bundle
+      @spitball.send :create_bundle
     end
   end
 end

data/spitball.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{spitball}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Freels", "Brandon Mitchell", "Joshua Hull"]
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "lib/ext/bundler_fake_dsl.rb",
      "lib/ext/bundler_lockfile_parser.rb",
      "lib/spitball.rb",
+     "lib/spitball/client_common.rb",
      "lib/spitball/digest.rb",
      "lib/spitball/file_lock.rb",
      "lib/spitball/remote.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spitball
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Matt Freels
@@ -84,6 +84,7 @@ files:
 - lib/ext/bundler_fake_dsl.rb
 - lib/ext/bundler_lockfile_parser.rb
 - lib/spitball.rb
+- lib/spitball/client_common.rb
 - lib/spitball/digest.rb
 - lib/spitball/file_lock.rb
 - lib/spitball/remote.rb