diff --git a/bin/spitball-server b/bin/spitball-server
index c65a9c8..4e6decb 100755
--- a/bin/spitball-server
+++ b/bin/spitball-server
@@ -5,6 +5,9 @@ require 'optparse'
require 'sinatra'
require 'json'
+# TODO: Sinatra needs to be updated. Once we update let's add in auto-reload.
+# require "sinatra/reloader" if development?
+
# cargo culting sinatra's option parser, since it has trouble
# with rubygem stub files
@@ -19,10 +22,20 @@ OptionParser.new { |op|
# always run
set :run, true
+set :root, File.dirname(__FILE__)
+set :views, File.expand_path(File.join(settings.root, '..', 'lib', 'templates'))
+
mime_type :gemfile, 'text/plain'
mime_type :lock, 'text/plain'
mime_type :tgz, 'application/x-compressed'
+get '/' do
+ @digests = Spitball::Repo.cached_digests
+ @env = `#{$:.inspect}\n#{Spitball.gem_cmd} env`
+ @protocol_version = Spitball::PROTOCOL_VERSION
+ erb :index
+end
+
# return json array of cached SHAs
get '/list' do
content_type :json
@@ -42,59 +55,110 @@ get '/:digest.:format' do |digest, format|
send_file Spitball::Repo.bundle_path(digest, format), :type => format
end
+# A common set of validation for the create spitball methods
+before '/create*' do
+ request_version = request.env["HTTP_#{Spitball::PROTOCOL_HEADER.gsub(/-/, '_').upcase}"] || params['protocol_version']
+
+ if request_version != Spitball::PROTOCOL_VERSION
+ halt 403, "Received version #{request_version} but need version #{Spitball::PROTOCOL_VERSION}"
+ end
+
+ if params[:gemfile].nil?
+ halt 400, "gemfile parameter was null. Please supply a valid Gemfile"
+ end
+
+ if params[:gemfile_lock].nil?
+ halt 400, "gemfile_lock parameter was null. Please supply a valid Gemfile.lock"
+ end
+
+ @without = request_version = request.env["HTTP_#{Spitball::WITHOUT_HEADER.gsub(/-/, '_').upcase}"] || params['without']
+ @without &&= @without.split(',')
+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
+post '/create_by_form' do
+
+ # More specific validation checking for form upload data
+ if params[:gemfile][:tempfile].nil?
+ halt 400, "gemfile parameter was null. Please supply a valid Gemfile"
+ end
+
+ if params[:gemfile_lock][:tempfile].nil?
+ halt 400, "gemfile_lock parameter was null. Please supply a valid Gemfile.lock"
+ end
+
+ # Since this is just a debugging form, I think it's ok to let any exception bubble up to the user
+ ball = Spitball.new(params[:gemfile][:tempfile].read, params[:gemfile_lock][:tempfile].read, :without => @without)
+
+ spitball_url = "/#{ball.digest}.tgz"
+
+ if ball.cached?
+ redirect to(spitball_url)
+ else
+ status 202
+ create_spitball(ball)
+ body "Your spitball is being generated. Please check #{spitball_url} in a few minutes"
+ end
+end
+
+# POST a gemfile from a command line client. 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}"
+
+ # Spitball was previously returning the entire html stack trace on errors. This made it extremely difficult
+ # to debug on the client side. Gracefully handle errors here and return them nicely to the user.
+ begin
+ ball = Spitball.new(params[:gemfile], params[:gemfile_lock], :without => @without)
+ rescue Object => e
+ puts e.backtrace
+ halt 500, e.message
+ end
+
+ response['Location'] = "#{request.url.split("/create").first}/#{ball.digest}.tgz"
+
+ if ball.cached?
+ status 201
+ "Bundle tarball pre-cached.\n"
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
+ status 202
+ create_spitball(ball)
+ end
+end
+
+private
+
+def create_spitball(spitball)
- o.close
- Process.detach(pid)
+ i,o = IO.pipe
+ o.sync = true
- Streamer.new(i)
+ # 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
+ spitball.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
diff --git a/lib/spitball.rb b/lib/spitball.rb
index dcc84c6..e3cd622 100644
--- a/lib/spitball.rb
+++ b/lib/spitball.rb
@@ -17,6 +17,7 @@ class Spitball
class ServerFailure < StandardError; end
class ClientError < StandardError; end
class BundleCreationFailure < StandardError; end
+ class GemfileParsingError < StandardError; end
def self.gem_cmd
ENV['GEM_CMD'] || 'gem'
@@ -37,7 +38,19 @@ def initialize(gemfile, gemfile_lock, options = {})
@gemfile_lock = gemfile_lock
@options = options
@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)
+
+ begin
+ @parsed_lockfile = Bundler::FakeLockfileParser.new(gemfile_lock)
+ rescue StandardError => se
+ raise GemfileParsingError, "There was an error parsing your gemfile.lock. Please ensure the file is valid and try again"
+ end
+
+ begin
+ @dsl = Bundler::FakeDsl.new(gemfile)
+ rescue StandardError => se
+ raise GemfileParsingError, "There was an error parsing your Gemfile. Please ensure the file is valid and try again"
+ end
+
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
end
diff --git a/lib/spitball/version.rb b/lib/spitball/version.rb
index 2c5a852..65bd34a 100644
--- a/lib/spitball/version.rb
+++ b/lib/spitball/version.rb
@@ -1,3 +1,3 @@
class Spitball
- VERSION = '0.7.3' unless const_defined?(:VERSION)
+ VERSION = '0.8.0' unless const_defined?(:VERSION)
end
diff --git a/lib/templates/index.erb b/lib/templates/index.erb
new file mode 100644
index 0000000..971438a
--- /dev/null
+++ b/lib/templates/index.erb
@@ -0,0 +1,27 @@
+Spitball!
+
+
+
Env
+
+
<%= @digests.length %> Cached Digests
+
+
+ <% for digest in @digests %>
+ - <%= digest %> tgz
+ <% end %>
+
+
+