spitball 0.3.2 → 0.4.0

data/Rakefile

@@ -1,4 +1,5 @@
 ROOT_DIR = File.expand_path(File.dirname(__FILE__))
+VERSION_FILE = File.expand_path("lib/spitball/version.rb", ROOT_DIR)
 
 require 'rubygems' rescue nil
 require 'rake'
@@ -12,22 +13,37 @@ Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-# gemification with jeweler
-# FIXME: stop using jeweler when I get smarter.
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "spitball"
-    gem.summary = "get a bundle"
-    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", "Joshua Hull"]
-
-    gem.add_dependency 'sinatra', '>= 1.0'
-    gem.add_development_dependency 'rspec'
-    gem.add_development_dependency 'rr'
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+namespace :version do
+  def update_version
+    source = File.read(VERSION_FILE)
+    new_v = nil
+    File.open(VERSION_FILE, 'w') do |f|
+      f.write source.gsub(/\d+\.\d+\.\d+/) {|v|
+        new_v = yield(*v.split(".").map {|i| i.to_i}).join(".")
+      }
+    end
+    new_v
+  end
+
+  def commit_version(v)
+    system "git add #{VERSION_FILE} && git c -m 'release version #{v}' && git tag #{v}"
+  end
+
+  task :incr_major do
+    new_v = update_version {|m,_,_| [m+1, 0, 0] }
+    commit_version(new_v)
+  end
+
+  task :incr_minor do
+    new_v = update_version {|ma,mi,_| [ma, mi+1, 0] }
+    commit_version(new_v)
+  end
+
+  task :incr_patch do
+    new_v = update_version {|ma,mi,p| [ma, mi, p+1] }
+    commit_version(new_v)
   end
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
 end

data/bin/spitball

@@ -20,13 +20,13 @@ opts = OptionParser.new do |opts|
     args[:port] = port
   end
 
-  opts.on('--without a,b,c', Array, 'Excluded groups in the tarball. Does not apply to remote spitballs') do |without|
-    args[:without] = without
+  opts.on('-v', '--version', 'Display the version and quit') do
+    puts Spitball::VERSION
+    exit!(0)
   end
 
-  opts.on('--version') do
-    puts Spitball::VERSION
-    exit 0
+  opts.on('--without a,b,c', Array, 'Excluded groups in the tarball. Does not apply to remote spitballs') do |without|
+    args[:without] = without
   end
 
   opts.separator ""
@@ -49,7 +49,7 @@ gemfile = File.read(args[:gemfile])
 gemfile_lock = File.read("#{args[:gemfile]}.lock")
 
 ball = args[:host] ?
-  Spitball::Remote.new(gemfile, gemfile_lock, :host => args[:host], :port => (args[:port] || 8080).to_i) :
+  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])
 
 ball.copy_to args[:destination]

data/bin/spitball-server

@@ -46,40 +46,48 @@ end
 # 202 Accepted if it does not. The body of the response is the URI for
 # the tarball.
 post '/create' do
-  ball = Spitball.new(params['gemfile'], params['gemfile_lock'])
-  url = "#{request.url.split("/create").first}/#{ball.digest}.tgz"
-  response['Location'] = url
-
-  if ball.cached?
-    status 201
-    "Bundle tarball pre-cached.\n"
+  request_version = request.env["HTTP_#{Spitball::PROTOCOL_HEADER.gsub(/-/, '_').upcase}"]
+  if request_version != Spitball::PROTOCOL_VERSION
+    status 403
+    "Received version #{request_version} but need version #{Spitball::PROTOCOL_VERSION}"
   else
-    status 202
+    without = request_version = request.env["HTTP_#{Spitball::WITHOUT_HEADER.gsub(/-/, '_').upcase}"]
+    without &&= without.split(',')
+    ball = Spitball.new(params['gemfile'], params['gemfile_lock'], :without => without)
+    url = "#{request.url.split("/create").first}/#{ball.digest}.tgz"
+    response['Location'] = url
 
-    i,o = IO.pipe
+    if ball.cached?
+      status 201
+      "Bundle tarball pre-cached.\n"
+    else
+      status 202
 
-    # 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
+      i,o = IO.pipe
+
+      # 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
-      exit!
-    end
 
-    o.close
-    Process.detach(pid)
+      o.close
+      Process.detach(pid)
 
-    Streamer.new(i)
+      Streamer.new(i)
+    end
   end
 end

data/lib/spitball.rb

@@ -9,12 +9,15 @@ class Spitball
   require 'spitball/repo'
   require 'spitball/file_lock'
   require 'spitball/remote'
+  require 'spitball/version'
 
   class ServerFailure < StandardError; end
   class ClientError < StandardError; end
   class BundleCreationFailure < StandardError; end
 
-  VERSION = '1.0'
+  PROTOCOL_VERSION = '1'
+  PROTOCOL_HEADER = "X-Spitball-Protocol"
+  WITHOUT_HEADER = "X-Spitball-Without"
 
   include Spitball::Digest
   include Spitball::ClientCommon

data/lib/spitball/remote.rb

@@ -10,6 +10,7 @@ class Spitball::Remote
     @gemfile_lock = gemfile_lock
     @host = opts[:host]
     @port = opts[:port]
+    @without = (opts[:without] || []).map{|w| w.to_sym}
   end
 
   def cached?
@@ -22,14 +23,17 @@ 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}
-
+    req.add_field Spitball::PROTOCOL_HEADER, Spitball::PROTOCOL_VERSION
+    req.add_field Spitball::WITHOUT_HEADER, @without.join(',')
     res = Net::HTTP.new(url.host, url.port).start do |http|
+      http.read_timeout = 3000
       http.request(req) {|r| puts r.read_body }
     end
 
     case res.code
     when '201', '202' # Created, Accepted
       @tarball_url = res['Location']
+    when '403'
     else
       raise Spitball::ServerFailure, "Expected 2xx response code. Got #{res.code}."
     end
@@ -49,6 +53,7 @@ class Spitball::Remote
   end
 
   def get_tarball_data(location)
+    puts "location --> #{location.inspect}"
     uri = URI.parse(location)
 
     if (res = Net::HTTP.get_response(uri)).code == '200'
@@ -56,7 +61,7 @@ class Spitball::Remote
     else
       raise Spitball::ServerFailure, "Spitball download failed."
     end
-  rescue URI::InvalidURIError => e
-    raise Spitball::ClientError, e.message
+  #rescue URI::InvalidURIError => e
+  #  raise Spitball::ClientError, e.message
   end
 end

data/lib/spitball/version.rb

@@ -0,0 +1,3 @@
+class Spitball
+  VERSION = '0.4.0'
+end

data/spitball.gemspec

@@ -1,69 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "spitball/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{spitball}
-  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"]
-  s.date = %q{2010-10-28}
+  s.name        = "spitball"
+  s.version     = Spitball::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Matt Freels", "Brandon Mitchell", "Joshua Hull"]
+  s.email       = "freels@twitter.com"
+  s.homepage    = "http://rubygems.org/gems/spitball"
+  s.summary     = %q{Use bundler to generate gem tarball packages.}
   s.description = %q{Use bundler to generate gem tarball packages.}
-  s.email = %q{freels@twitter.com}
-  s.executables = ["spitball", "spitball-cache-cleanup", "spitball-server"]
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-     "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/client_common.rb",
-     "lib/spitball/digest.rb",
-     "lib/spitball/file_lock.rb",
-     "lib/spitball/remote.rb",
-     "lib/spitball/repo.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/spitball_spec.rb",
-     "spitball.gemspec"
-  ]
-  s.homepage = %q{http://github.com/freels/spitball}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{get a bundle}
-  s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/spitball_spec.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "spitball"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      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<sinatra>, [">= 1.0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<rr>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<sinatra>, [">= 1.0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<rr>, [">= 0"])
-  end
-end
+  s.add_dependency 'sinatra', '>= 1.0'
+  s.add_development_dependency 'rspec', "~> 1.3.0"
+  s.add_development_dependency 'rr'
+  s.add_development_dependency 'rake'
 
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- spec/*`.split("\n")
+  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.extra_rdoc_files = [ "README.md" ]
+  s.require_paths    = ["lib"]
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spitball
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Matt Freels
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 -07:00
+date: 2010-11-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 27
         segments: 
+        - 1
+        - 3
         - 0
-        version: "0"
+        version: 1.3.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -63,6 +65,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Use bundler to generate gem tarball packages.
 email: freels@twitter.com
 executables: 
@@ -77,7 +93,6 @@ files:
 - .gitignore
 - README.md
 - Rakefile
-- VERSION
 - bin/spitball
 - bin/spitball-cache-cleanup
 - bin/spitball-server
@@ -89,17 +104,18 @@ files:
 - lib/spitball/file_lock.rb
 - lib/spitball/remote.rb
 - lib/spitball/repo.rb
+- lib/spitball/version.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/spitball_spec.rb
 - spitball.gemspec
 has_rdoc: true
-homepage: http://github.com/freels/spitball
+homepage: http://rubygems.org/gems/spitball
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -122,11 +138,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: spitball
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: get a bundle
+summary: Use bundler to generate gem tarball packages.
 test_files: 
+- spec/spec.opts
 - spec/spec_helper.rb
 - spec/spitball_spec.rb

data/VERSION

@@ -1 +0,0 @@
-0.3.2