spitball 0.5.1 → 0.6.1

data/Gemfile

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

data/README.md

@@ -20,7 +20,7 @@ pull packages down from said server.
             --version
 
     environment variables:
-            SPITBALL_CACHE		     Specifies the cache dir. Defaults to /tmp/spitball
+            SPITBALL_CACHE		           Specifies the cache dir. Defaults to /tmp/spitball-username
 
 ### TODO
 

data/Rakefile

@@ -14,39 +14,24 @@ Spec::Rake::SpecTask.new(:spec) do |t|
 end
 
 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}'"
-  end
-
-  desc "Increment the major version and commit"
-  task :incr_major do
-    new_v = update_version {|m,_,_| [m+1, 0, 0] }
-    commit_version(new_v)
-  end
-
-  desc "Increment the minor version and commit"
-  task :incr_minor do
-    new_v = update_version {|ma,mi,_| [ma, mi+1, 0] }
-    commit_version(new_v)
-  end
-
-  desc "Increment the patch version and commit"
-  task :incr_patch do
-    new_v = update_version {|ma,mi,p| [ma, mi, p+1] }
-    commit_version(new_v)
-  end
+namespace :spitball do
+  Bundler::GemHelper.install_tasks(:name => 'spitball')
 end
+
+class NonTaggingGemHelper < Bundler::GemHelper
+  def guard_already_tagged; end
+  def tag_version; yield if block_given?; end
+end
+
+namespace :spitball_server do
+  NonTaggingGemHelper.install_tasks(:name => 'spitball-server')
+end
+
+desc "build spitball/spitball-server"
+task :build => [:'spitball:build', :'spitball_server:build']
+
+desc "install spitball/spitball-server"
+task :install => [:'spitball:install', :'spitball_server:install']
+
+desc "release spitball/spitball-server"
+task :release => [:'spitball:release', :'spitball_server:release']

data/bin/spitball

@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+
+require 'spitball'
+require 'optparse'
+require 'net/http'
+require 'fileutils'
+
+STDOUT.sync = true
+
+args = {}
+opts = OptionParser.new do |opts|
+  opts.banner = "Usage: spitball [options] GEMFILE ARCHIVE"
+  opts.separator ""
+  opts.separator "options:"
+
+  opts.on('-h', '--host HOST', 'Get the tarball from a remote spitball server') do |host|
+    args[:host] = host
+  end
+
+  opts.on('-p', '--port PORT', 'Specify the remote server port. Default 8080') do |port|
+    args[:port] = port
+  end
+
+  opts.on('-v', '--version', 'Display the version and quit') do
+    puts Spitball::VERSION
+    exit!(0)
+  end
+
+  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.on('-g', '--generate-only', "Only generate, don't download") do
+    args[:generate] = true
+  end
+
+  opts.separator ""
+  opts.separator "environment variables:"
+  opts.separator "\tSPITBALL_CACHE\t\t     Specifies the cache dir. Defaults to /tmp/spitball-#{ENV['USER']}"
+  opts.separator ""
+end
+
+opts.permute!(ARGV)
+
+args[:gemfile] = ARGV[0]
+args[:destination] = ARGV[1]
+
+unless args[:gemfile] and args[:destination]
+  puts opts.help
+  exit 1
+end
+
+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, :without => args[:without]) :
+  Spitball.new(gemfile, gemfile_lock, :without => args[:without])
+
+args[:generate] ? ball.cache! : ball.copy_to(args[:destination])

data/bin/spitball-cache-cleanup

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+require 'spitball'
+require 'optparse'
+
+args = {}
+
+opts = OptionParser.new do |opts|
+  opts.banner = "Usage: spitball-cache-cleanup [options]"
+  opts.separator ""
+  opts.separator "options:"
+
+  opts.on('-w', '--access-window SECONDS', 'Access window within which tarballs are kept. Default 30 days') do |access_window|
+    args[:access_window] = access_window
+  end
+end
+
+opts.permute!(ARGV)
+
+args[:access_window] ||= 2592000
+
+Spitball::Repo.clean_up_unused(args[:access_window].to_i)

data/bin/spitball-server

@@ -0,0 +1,100 @@
+#!/usr/bin/env ruby
+
+require 'spitball'
+require 'optparse'
+require 'sinatra'
+require 'json'
+
+# cargo culting sinatra's option parser, since it has trouble
+# with rubygem stub files
+
+OptionParser.new { |op|
+  op.on('-x')        {       set :lock, true }
+  op.on('-e env')    { |val| set :environment, val.to_sym }
+  op.on('-s server') { |val| set :server, val }
+  op.on('-p port')   { |val| set :port, val.to_i }
+  op.on('-o addr')   { |val| set :bind, val }
+}.parse!(ARGV.dup)
+
+# always run
+set :run, true
+
+mime_type :gemfile, 'text/plain'
+mime_type :lock, 'text/plain'
+mime_type :tgz, 'application/x-compressed'
+
+# return json array of cached SHAs
+get '/list' do
+  content_type :json
+  JSON.dump Spitball::Repo.cached_digests
+end
+
+get '/env' do
+  content_type :text
+  `#{$:.inspect}\n#{Spitball.gem_cmd} env`
+end
+
+# return tgz or gemfile of cached SHA or 404
+get '/:digest.:format' do |digest, format|
+  error 400 unless ['tgz', 'gemfile'].include? format
+
+  # this returns 404 on Errno::ENOENT
+  send_file Spitball::Repo.bundle_path(digest, format), :type => format
+end
+
+class Streamer
+  def initialize(io); @io = io end
+  def each; while buf = @io.read(200); yield buf end end
+end
+
+# POST a gemfile. Returns 201 Created if the bundle already exists, or
+# 202 Accepted if it does not. The body of the response is the URI for
+# the tarball.
+post '/create' do
+  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
+    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
+
+    if ball.cached?
+      status 201
+      "Bundle tarball pre-cached.\n"
+    else
+      status 202
+
+      i,o = IO.pipe
+      o.sync = true
+
+      # 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
+          $stdout.sync = true
+          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
+
+      o.close
+      Process.detach(pid)
+
+      Streamer.new(i)
+    end
+  end
+end

data/lib/spitball/remote.rb

@@ -11,7 +11,7 @@ class Spitball::Remote
     @host      = opts[:host]
     @port      = opts[:port]
     @without   = (opts[:without] || []).map{|w| w.to_sym}
-    @cache_dir = File.join(ENV['SPITBALL_CACHE'] || File.join(ENV['HOME'], '.spitball'), 'client')
+    @cache_dir = ENV['SPITBALL_CACHE'] || "/tmp/spitball-#{ENV['USER']}/client"
     FileUtils.mkdir_p(@cache_dir)
     use_cache_file
   end

data/lib/spitball/repo.rb

@@ -1,7 +1,7 @@
 module Spitball::Repo
   extend self
 
-  WORKING_DIR = ENV['SPITBALL_CACHE'] || '/tmp/spitball'
+  WORKING_DIR = ENV['SPITBALL_CACHE'] || "/tmp/spitball-#{ENV['USER']}"
 
   def bundle_path(digest, extension = nil)
     extension = ".#{extension}" unless extension.nil? or extension.empty?

data/lib/spitball/version.rb

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

data/spitball-server.gemspec

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path("../lib/spitball/version", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = "spitball-server"
+  s.version     = Spitball::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Matt Freels", "Brandon Mitchell", "Joshua Hull"]
+  s.email       = "freels@twitter.com"
+  s.homepage    = ""
+  s.summary     = %q{Use bundler to generate gem tarball packages -- server!}
+  s.description = %q{Use bundler to generate gem tarball packages - server!}
+
+  s.rubyforge_project = "spitball-server"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = ['spitball-server', 'spitball-cache-cleanup']
+  s.require_paths = ["lib"]
+
+  s.add_dependency 'sinatra', '~> 1.2.0'
+  s.add_development_dependency 'rspec', "~> 1.3.0"
+  s.add_development_dependency 'diff-lcs'
+  s.add_development_dependency 'rr'
+  s.add_development_dependency 'rake', '0.8.7'
+  s.add_development_dependency 'phocus'
+end

data/spitball.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "spitball/version"
+require File.expand_path("../lib/spitball/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "spitball"
@@ -17,12 +16,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', "~> 1.3.0"
   s.add_development_dependency 'diff-lcs'
   s.add_development_dependency 'rr'
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake', '0.8.7'
   s.add_development_dependency 'phocus'
 
   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.executables      = ['spitball']
   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: 9
+  hash: 5
   prerelease: 
   segments: 
   - 0
-  - 5
+  - 6
   - 1
-  version: 0.5.1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Matt Freels
@@ -17,13 +17,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 -07:00
+date: 2011-07-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -34,12 +33,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
+  requirement: *id001
+  name: rspec
   type: :development
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: diff-lcs
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,12 +47,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id002
+  name: diff-lcs
   type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,26 +61,28 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id003
+  name: rr
   type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 49
         segments: 
         - 0
-        version: "0"
+        - 8
+        - 7
+        version: 0.8.7
+  requirement: *id004
+  name: rake
   type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: phocus
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -90,12 +91,13 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id005
+  name: phocus
   type: :development
-  version_requirements: *id005
 description: Use bundler to generate gem tarball packages.
 email: freels@twitter.com
-executables: []
-
+executables: 
+- spitball
 extensions: []
 
 extra_rdoc_files: 
@@ -105,6 +107,9 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- bin/spitball
+- bin/spitball-cache-cleanup
+- bin/spitball-server
 - lib/ext/bundler_fake_dsl.rb
 - lib/ext/bundler_lockfile_parser.rb
 - lib/spitball.rb
@@ -117,6 +122,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/spitball_spec.rb
+- spitball-server.gemspec
 - spitball.gemspec
 has_rdoc: true
 homepage: http://rubygems.org/gems/spitball