buildbox 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f89d17b118fdfeae221ddd724997ad6892fdb4c
-  data.tar.gz: f12dab225a000454649464200d544c9e00a39b92
+  metadata.gz: 17c1b2a9d1b7bc186af0aa5a3d93d7dea50e9864
+  data.tar.gz: dd7a3713cfed6a4f8f04eeb77fece760132833cd
 SHA512:
-  metadata.gz: c2ef1cc4e717256591146dec6b118c2bd76caf97d3cc64143616699ae50809aa4d21a1039d72f15c9e7f98a27444500ca97fbfb8068109e50eec27cf63fc3b6e
-  data.tar.gz: d255170edfba8f35bd03bff55e8f2687584cf3b52375c9a3c31e98b51e5e9a6503d1b0f0a7580b42519ff381725045f0bee2e46411399565a8696b692c4f1c24
+  metadata.gz: b15ed4fb9913f0e48dae8b18d05695b556f0714cf9a042b7f08ffec7773945e2cee92554a0f8f7a4af8870ccdbc92b0159c16df970dcd94f80a3bd16b1260a44
+  data.tar.gz: b266bba36f25497145ff582886caae1aa0da899119092deda3d4a304a24d4e35abc0c4caaca0a518859e19999038901c527f6bad9443ef83d6cb3c6d38af4356

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    buildbox (0.3.2)
+    buildbox (0.3.3)
       celluloid (~> 0.14)
       childprocess (~> 0.3)
       faraday (~> 0.8)

data/lib/buildbox.rb

@@ -5,6 +5,7 @@ module Buildbox
   autoload :API,           "buildbox/api"
   autoload :Build,         "buildbox/build"
   autoload :Command,       "buildbox/command"
+  autoload :Canceler,      "buildbox/canceler"
   autoload :CLI,           "buildbox/cli"
   autoload :Configuration, "buildbox/configuration"
   autoload :Monitor,       "buildbox/monitor"
@@ -28,10 +29,6 @@ module Buildbox
     @logger = logger
   end
 
-  def self.gem_root
-    path = File.expand_path(File.join(__FILE__, "..", ".."))
-  end
-
   def self.root_path
     path = Pathname.new File.join(ENV['HOME'], ".buildbox")
     path.mkpath unless path.exist?

data/lib/buildbox/build.rb

@@ -7,6 +7,10 @@ module Buildbox
       exit_status == 0
     end
 
+    def cancelling?
+      cancel_started == true
+    end
+
     def started?
       !started_at.nil?
     end

data/lib/buildbox/canceler.rb

@@ -0,0 +1,18 @@
+module Buildbox
+  class Canceler
+    def self.cancel(build)
+      new(build).cancel
+    end
+
+    def initialize(build)
+      @build = build
+    end
+
+    def cancel
+      @build.cancel_started = true
+
+      # Kill that damn process, yo!
+      Process.kill 'INT', @build.pid
+    end
+  end
+end

data/lib/buildbox/command.rb

@@ -13,7 +13,7 @@ module Buildbox
     # the given timeout.
     class TimeoutExceeded < StandardError; end
 
-    attr_reader :output, :exit_status
+    attr_reader :pid, :output, :exit_status
 
     def self.run(*args, &block)
       options   = args.last.is_a?(Hash) ? args.pop : {}
@@ -36,7 +36,7 @@ module Buildbox
       timeout = @options[:timeout]
 
       # Build the command we're going to run
-      arguments = [ *runner, *@arguments ].compact.map(&:to_s) # all arguments must be a string
+      arguments = [ *@arguments ].compact.map(&:to_s) # all arguments must be a string
 
       # Build the ChildProcess
       @logger.info("Starting process: #{arguments}")
@@ -44,8 +44,15 @@ module Buildbox
       process     = ChildProcess.build(*arguments)
       process.cwd = File.expand_path(@options[:directory] || Dir.pwd)
 
-      # Create the pipes so we can read the output in real tim
-      read_pipe, write_pipe = IO.pipe
+      # Create the pipes so we can read the output in real time. PTY
+      # isn't avaible on all platforms (heroku) so we just fallback to IO.pipe
+      # if it's not presetnt.
+      read_pipe, write_pipe = begin
+                                PTY.open
+                              rescue
+                                IO.pipe
+                              end
+
       process.io.stdout     = write_pipe
       process.io.stderr     = write_pipe
       process.duplex        = true
@@ -70,6 +77,9 @@ module Buildbox
         write_pipe.close
       end
 
+      # Store the process id for later cancelling!
+      @pid = process.pid
+
       # Record the start time for timeout purposes
       start_time = Time.now.to_i
 
@@ -97,7 +107,7 @@ module Buildbox
             next if data.empty?
 
             output << cleaned_data = UTF8.clean(data)
-            yield cleaned_data if block_given?
+            yield self, cleaned_data if block_given?
           end
         end
 
@@ -130,7 +140,7 @@ module Buildbox
       # If there's some that we missed
       if extra_data != ""
         output << cleaned_data = UTF8.clean(extra_data)
-        yield cleaned_data if block_given?
+        yield self, cleaned_data if block_given?
       end
 
       if RUBY_PLATFORM == "java"
@@ -145,18 +155,6 @@ module Buildbox
 
     private
 
-    # on heroku, tty isn't avaiable. so we result to just running command through
-    # bash. the downside to this, is that stuff colors aren't outputted because
-    # processes don't think they're being in a terminal.
-    def runner
-      require 'pty'
-      PTY.spawn('whoami')
-
-      [ File.join(Buildbox.gem_root, "bin", "buildbox-pty") ]
-    rescue
-      [ "bash", "-c" ]
-    end
-
     # Reads data from an IO object while it can, returning the data it reads.
     # When it encounters a case when it can't read anymore, it returns the
     # data.
@@ -190,7 +188,9 @@ module Buildbox
           # since we use some Ruby 1.9 specific exceptions.
 
           breakable = false
-          if e.is_a?(EOFError)
+
+          # EOFError from OSX, EIO is raised by ubuntu
+          if e.is_a?(EOFError) || e.is_a?(Errno::EIO)
             # An `EOFError` means this IO object is done!
             breakable = true
           elsif defined?(IO::WaitReadable) && e.is_a?(IO::WaitReadable)
@@ -200,7 +200,7 @@ module Buildbox
             # IO object is not ready to be read from yet. No problem,
             # we read as much as we can, so we break.
             breakable = true
-          elsif e.is_a?(Errno::EAGAIN)
+          elsif e.is_a?(Errno::EAGAIN) || e.is_a?(Errno::EWOULDBLOCK)
             # Otherwise, we just look for the EAGAIN error which should be
             # all that IO::WaitReadable does in Ruby 1.9.
             breakable = true

data/lib/buildbox/monitor.rb

@@ -16,12 +16,20 @@ module Buildbox
         # update_build http call, and breaking. So to make sure we're using the
         # same build object throughout this call, we can just deep dup it.
         build = Marshal.load(Marshal.dump(@build))
-        @api.update_build(build) if build.started? || build.finished?
+
+        if build.started? || build.finished?
+          new_build = @api.update_build(build)
+
+          # Try and cancel the build if we haven't tried already
+          if new_build.state == 'canceled' && !@build.cancelling?
+            Buildbox::Canceler.cancel(@build)
+          end
+        end
 
         if build.finished?
           break
         else
-          sleep 3 # 3 seconds seems reasonable for now
+          sleep 2 # 2 seconds seems reasonable for now
         end
       end
     end

data/lib/buildbox/runner.rb

@@ -25,7 +25,8 @@ module Buildbox
       @build.started_at = Time.now.utc
 
       build.output = ""
-      result = Command.run(script_path, :environment => @build.env, :directory => directory_path) do |chunk|
+      result = Command.run(script_path, :environment => @build.env, :directory => directory_path) do |command, chunk|
+        build.pid = command.pid
         build.output << chunk
       end
 

data/lib/buildbox/version.rb

@@ -1,3 +1,3 @@
 module Buildbox
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/buildbox/buildbox/command_spec.rb

@@ -5,34 +5,34 @@ require "spec_helper"
 describe Buildbox::Command do
   describe "#run" do
     it "is run within a tty" do
-      result = Buildbox::Command.run(%{ruby -e "puts STDOUT.tty?"})
+      result = Buildbox::Command.run("ruby", "-e", "puts STDOUT.tty?")
 
       result.output.should == "true"
     end
 
     it "successfully runs and returns the output from a simple comment" do
-      result = Buildbox::Command.run('echo hello world')
+      result = Buildbox::Command.run('echo', 'hello world')
 
       result.exit_status.should == 0
       result.output.should == "hello world"
     end
 
-    it "redirects stdout to stderr" do
-      result = Buildbox::Command.run('echo hello world 1>&2')
+    it "includes stderr" do
+      result = Buildbox::Command.run("ruby", "-e", "STDERR.puts 'stderr lol'")
 
       result.exit_status.should == 0
-      result.output.should == "hello world"
+      result.output.should == "stderr lol"
     end
 
     it "handles commands that fail and returns the correct status" do
-      result = Buildbox::Command.run('(exit 1)')
+      result = Buildbox::Command.run('bash', '-c', 'exit 123')
 
-      result.exit_status.should_not == 0
+      result.exit_status.should == 123
       result.output.should == ''
     end
 
     it "handles running malformed commands" do
-      result = Buildbox::Command.run('if (')
+      result = Buildbox::Command.run('bash', '-c', 'if (')
 
       result.exit_status.should_not == 0
       # bash 3.2.48 prints "syntax error" in lowercase.
@@ -45,7 +45,7 @@ describe Buildbox::Command do
 
     it "can collect output in chunks" do
       chunked_output = ''
-      result = Buildbox::Command.run('echo hello world') do |chunk|
+      result = Buildbox::Command.run('echo', 'hello world') do |command, chunk|
         unless chunk.nil?
           chunked_output += chunk
         end
@@ -60,8 +60,8 @@ describe Buildbox::Command do
       result = nil
       second_result = nil
       thread = Thread.new do
-        result = Buildbox::Command.run('sillycommandlololol')
-        second_result = Buildbox::Command.run('export FOO=bar; doesntexist.rb')
+        result = Buildbox::Command.run('bash', '-c', 'sillycommandlololol')
+        second_result = Buildbox::Command.run('bash', '-c', 'export FOO=bar; doesntexist.rb')
       end
       thread.join
 
@@ -76,7 +76,7 @@ describe Buildbox::Command do
 
     it "captures color'd output from a command" do
       chunked_output = ''
-      result = Buildbox::Command.run("rspec #{FIXTURES_PATH.join('rspec', 'test_spec.rb')}") do |chunk|
+      result = Buildbox::Command.run('rspec', FIXTURES_PATH.join('rspec', 'test_spec.rb')) do |command, chunk|
         chunked_output += chunk unless chunk.nil?
       end
 
@@ -87,7 +87,7 @@ describe Buildbox::Command do
 
     it "runs scripts in a tty" do
       chunked_output = ''
-      result = Buildbox::Command.run(FIXTURES_PATH.join('tty_script')) do |chunk|
+      result = Buildbox::Command.run(FIXTURES_PATH.join('tty_script')) do |command, chunk|
         chunked_output += chunk unless chunk.nil?
       end
 
@@ -96,8 +96,8 @@ describe Buildbox::Command do
     end
 
     it "still runs even if pty isn't available" do
-      PTY.should_receive(:spawn).and_raise(RuntimeError.new)
-      result = Buildbox::Command.run('echo hello world')
+      PTY.should_receive(:open).and_raise(RuntimeError.new)
+      result = Buildbox::Command.run('echo', 'hello world')
 
       result.exit_status.should == 0
       result.output.should == "hello world"
@@ -115,11 +115,11 @@ describe Buildbox::Command do
     it "can collect chunks from within a thread" do
       chunks = []
 
-      result = Buildbox::Command.run(FIXTURES_PATH.join('sleep_script')) do |chunk|
+      result = Buildbox::Command.run(FIXTURES_PATH.join('sleep_script')) do |command, chunk|
         chunks << chunk
       end
 
-      chunks.should == ["0\r\n", "1\r\n", "2\r\n"]
+      chunks.should == ["test 0\r\n", "test 1\r\n", "test 2\r\n"]
     end
   end
 end

data/spec/fixtures/sleep_script

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 3.times do |i|
-  puts i
+  puts "test #{i}"
   sleep 1
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildbox
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Keith Pitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -99,7 +99,6 @@ email:
 - me@keithpitt.com
 executables:
 - buildbox
-- buildbox-pty
 extensions: []
 extra_rdoc_files: []
 files:
@@ -111,12 +110,12 @@ files:
 - README.md
 - Rakefile
 - bin/buildbox
-- bin/buildbox-pty
 - buildbox-ruby.gemspec
 - lib/buildbox.rb
 - lib/buildbox/agent.rb
 - lib/buildbox/api.rb
 - lib/buildbox/build.rb
+- lib/buildbox/canceler.rb
 - lib/buildbox/cli.rb
 - lib/buildbox/command.rb
 - lib/buildbox/configuration.rb

data/bin/buildbox-pty

@@ -1,36 +0,0 @@
-#!/usr/bin/env ruby
-
-# Disable stdout,stderr buffering
-STDERR.sync = STDOUT.sync = true
-
-require 'pty'
-
-# spawn the process in a pseudo terminal so colors out outputted
-read_io, write_io, pid = PTY.spawn("bash", "-c", ARGV.join(" "))
-
-# we don't need to write to the spawned io
-write_io.close
-
-loop do
-  fds, = IO.select([read_io], nil, nil, 1)
-  if fds
-    # should have some data to read
-    begin
-      print read_io.read_nonblock(10240)
-    rescue Errno::EAGAIN, Errno::EWOULDBLOCK
-      # do select again
-    rescue EOFError, Errno::EIO # EOFError from OSX, EIO is raised by ubuntu
-      break
-    end
-  end
-  # if fds are empty, timeout expired - run another iteration
-end
-
-# we're done reading, yay!
-read_io.close
-
-# just wait until its finally finished closing
-Process.waitpid(pid)
-
-# exit with the status code that the process returned
-exit $?.exitstatus