spitball 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/bin/spitball-server

@@ -58,7 +58,12 @@ post '/create' do
     pid = open("|-")
 
     if pid == nil # child
-      ball.cache!
+      begin
+        ball.cache!
+      rescue Object => e
+        puts "#{e.class}: #{e}", e.backtrace.map{|l| "\t#{l}" }
+        exit! 1
+      end
       exit!
     end
 

data/lib/spitball.rb

@@ -53,15 +53,17 @@ class Spitball
 
     File.open(gemfile_path, 'w') {|f| f.write gemfile }
 
-    if system "cd #{bundle_path} && bundle install #{bundle_path} --disable-shared-gems #{without_clause}"
+    if system "cd #{bundle_path} && bundle install #{bundle_path} --disable-shared-gems #{without_clause} 2>&1"
 
       # rewrite bang lines to #!/usr/bin/env ruby
       # in serious lameness, OS X sed (more posix compliant?) requires
       # a slightly different sed incantation for in place editing
-      if RUBY_PLATFORM =~ /linux/
-        system "cd #{bundle_path} && find bin/* -exec sed -i'' '1,1 s|^#!/.*/ruby[ ]*|#!/usr/bin/env ruby|' {} \;"
-      else
-        system "cd #{bundle_path} && find bin/* -exec sed -i '' '1,1 s|^#!/.*/ruby[ ]*|#!/usr/bin/env ruby|' {} \;"
+      if Dir["#{bundle_path}/bin/*"].length > 0
+        if RUBY_PLATFORM =~ /linux/
+          system "cd #{bundle_path} && find bin/* -exec sed -i'' '1,1 s|^#!/.*/ruby[ ]*|#!/usr/bin/env ruby|' {} \\;"
+        else
+          system "cd #{bundle_path} && find bin/* -exec sed -i '' '1,1 s|^#!/.*/ruby[ ]*|#!/usr/bin/env ruby|' {} \\;"
+        end
       end
 
       system "tar czf #{tarball_path}.#{Process.pid} -C #{bundle_path} ."

data/lib/spitball/remote.rb

@@ -3,8 +3,6 @@ require 'uri'
 
 class Spitball::Remote
 
-  WAIT_SECONDS = 240
-
   def initialize(gemfile, host, port)
     @gemfile = gemfile
     @host = host
@@ -46,14 +44,10 @@ class Spitball::Remote
   def get_tarball_data(location)
     uri = URI.parse(location)
 
-    (WAIT_SECONDS / 2).times do
-      if (res = Net::HTTP.get_response(uri)).code == '200'
-        return res.body
-      else
-        sleep 2
-      end
+    if (res = Net::HTTP.get_response(uri)).code == '200'
+      return res.body
+    else
+      raise Spitball::ServerFailure, "Spitball download failed."
     end
-
-    raise Spitball::ServerFailure, "Spitball download timed out."
   end
 end

data/spitball.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{spitball}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Freels", "Brandon Mitchell"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spitball
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Matt Freels