buildbox 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f440103d7897a20e804e7a4a24b81699cd29e3b3
-  data.tar.gz: 1c70d6f1809989aba284dd197a9804bf84693e1e
+  metadata.gz: 29832c2693fb640f1003b5a010eeb170a792f9c2
+  data.tar.gz: dd13bc62a427512418a1bdaa7dabce4098c009dd
 SHA512:
-  metadata.gz: 3fe2b5ab4c51c94ccd7efa13d69757decc2f48448ce206ef51f0ae4735090b05a947b257590bf21e1e6647f7a53b0bde114813afdd74abd729b7c7caaebd104c
-  data.tar.gz: f3a8445fe4b4af7aa8eaf8d16f8935980b051461de31638afbd2509f5e0979dc174cadabe2469d8c53c0fd53671bde7457601f516d80c129a2d3c4b55cb69497
+  metadata.gz: bc853759496d74190b5b5edf806325693bace3870809c3e78ef868a2e8bc45f33cadb3f3feab5268ec54f0d76ccbf600d682fea035fa863284b253ee1c6f1ded
+  data.tar.gz: 2d728c74a1571837bd7d3c93f85b49574bc65fb393435c8b61b69f2987012c13129de744df72415cf201e5d3520527b4eb1eeb223956305401dd3cb5ff0cbbe0

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    buildbox (0.2.2)
+    buildbox (0.2.3)
       celluloid (~> 0.14)
+      childprocess (~> 0.3)
       faraday (~> 0.8)
       faraday_middleware (~> 0.9)
       hashie (~> 2.0)
@@ -12,8 +13,10 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.5)
-    celluloid (0.14.1)
-      timers (>= 1.0.0)
+    celluloid (0.15.1)
+      timers (~> 1.1.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
     diff-lcs (1.2.4)
@@ -21,8 +24,9 @@ GEM
       multipart-post (~> 1.2.0)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
+    ffi (1.9.0)
     hashie (2.0.5)
-    multi_json (1.7.9)
+    multi_json (1.8.0)
     multipart-post (1.2.0)
     rake (10.1.0)
     rspec (2.14.1)

data/bin/buildbox-pty

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+
+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

data/buildbox-ruby.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hashie',             '~> 2.0'
   spec.add_dependency 'multi_json',         '~> 1.7'
   spec.add_dependency 'celluloid',          '~> 0.14'
+  spec.add_dependency 'childprocess',       '~> 0.3'
 end

data/lib/buildbox.rb

@@ -7,7 +7,6 @@ module Buildbox
   autoload :Command,       "buildbox/command"
   autoload :CLI,           "buildbox/cli"
   autoload :Configuration, "buildbox/configuration"
-  autoload :Environment,   "buildbox/environment"
   autoload :Monitor,       "buildbox/monitor"
   autoload :Runner,        "buildbox/runner"
   autoload :Script,        "buildbox/script"
@@ -24,6 +23,10 @@ module Buildbox
     @logger ||= Logger.new(STDOUT).tap { |logger| logger.level = Logger::INFO }
   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/cli.rb

@@ -28,10 +28,10 @@ module Buildbox
       end
 
       @commands['agent:setup'] = OptionParser.new do |opts|
-        opts.banner = "Usage: buildbox setup:add [token]"
+        opts.banner = "Usage: buildbox agent:setup [token]"
 
         opts.on("--help", "You're looking at it.") do
-          puts @commands['setup:add']
+          puts @commands['agent:setup']
           exit
         end
       end
@@ -61,7 +61,7 @@ module Buildbox
 
         if command == "agent:start"
           Buildbox::Server.new.start
-        elsif command == "setup:add"
+        elsif command == "agent:setup"
           if @argv.length == 0
             puts "No token provided"
             exit 1
@@ -86,7 +86,7 @@ module Buildbox
             Buildbox.config.update(:api_key => api_key)
 
             puts "Successfully added your api_key"
-            puts "You can now add agents with: buildbox setup:add [agent_token]"
+            puts "You can now add agents with: buildbox agent:setup [agent_token]"
           rescue
             puts "Could not authenticate your api_key"
             exit 1

data/lib/buildbox/command.rb

@@ -1,3 +1,4 @@
+require 'childprocess'
 require 'pty'
 
 module Buildbox
@@ -5,63 +6,69 @@ module Buildbox
     class Result < Struct.new(:output, :exit_status)
     end
 
-    def self.run(command, options = {}, &block)
-      new(command, options).run(&block)
+    def self.command(command, options = {}, &block)
+      new(command, options).start(&block)
     end
 
-    def initialize(command, options = {})
-      @command       = command
+    def self.script(script, options = {}, &block)
+      new(script, options).start(&block)
+    end
+
+    def initialize(arguments, options = {})
+      @arguments     = arguments
+      @environment   = options[:environment] || {}
       @directory     = options[:directory] || "."
-      @read_interval = options[:read_interval] || 5
     end
 
-    def run(&block)
-      output = ""
-      read_io, write_io, pid = nil
+    def start(&block)
+      read_io, write_io = IO.pipe
 
-      # spawn the process in a pseudo terminal so colors out outputted
-      read_io, write_io, pid = PTY.spawn("cd #{expanded_directory} && #{@command}")
+      arguments         = [ *runner, *@arguments ].compact.map(&:to_s) # all arguments must be a string
+      process           = ChildProcess.build(*arguments)
+      process.cwd       = expanded_directory
+      process.io.stdout = process.io.stderr = write_io
 
-      # we don't need to write to the spawned io
+      @environment.each_pair do |key, value|
+        process.environment[key] = value
+      end
+
+      process.start
       write_io.close
 
-      loop do
-        fds, = IO.select([read_io], nil, nil, read_interval)
-        if fds
-          # should have some data to read
-          begin
-            chunk         = read_io.read_nonblock(10240)
-            cleaned_chunk = UTF8.clean(chunk)
-
-            output << chunk
-            yield cleaned_chunk if block_given?
-          rescue Errno::EAGAIN, Errno::EWOULDBLOCK
-            # do select again
-          rescue EOFError, Errno::EIO # EOFError from OSX, EIO is raised by ubuntu
-            break
-          end
+      output = ""
+      begin
+        loop do
+          chunk         = read_io.readpartial(10240)
+          cleaned_chunk = UTF8.clean(chunk)
+
+          output << chunk
+          yield cleaned_chunk if block_given?
         end
-        # if fds are empty, timeout expired - run another iteration
+      rescue EOFError
       end
 
-      # we're done reading, yay!
-      read_io.close
-
-      # just wait until its finally finished closing
-      Process.waitpid(pid)
+      process.wait
 
       # the final result!
-      Result.new(output.chomp, $?.exitstatus)
+      Result.new(output.chomp, process.exit_code)
     end
 
     private
 
-    def expanded_directory
-      File.expand_path(@directory)
+    # 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
 
-    def read_interval
-      @read_interval
+    def expanded_directory
+      File.expand_path(@directory)
     end
   end
 end

data/lib/buildbox/configuration.rb

@@ -5,7 +5,7 @@ require 'json'
 module Buildbox
   class Configuration < Hashie::Mash
     def agent_access_tokens
-      env_agents = ENV['BUILDBOX_WORKERS']
+      env_agents = ENV['BUILDBOX_AGENTS']
 
       if env_agents.nil?
         self[:agent_access_tokens] || []
@@ -24,7 +24,7 @@ module Buildbox
 
     def check
       unless api_key
-        puts "No api_key set. You can set it with\nbuildbox authenticate [api_key]"
+        puts "No api_key set. You can set it with\nbuildbox auth:login [api_key]"
         exit 1
       end
     end

data/lib/buildbox/runner.rb

@@ -15,13 +15,16 @@ module Buildbox
 
     def start
       info "Starting to build #{namespace}/#{@build.number} starting..."
-      info "Running command: #{command}"
 
       FileUtils.mkdir_p(directory_path)
       File.open(script_path, 'w+') { |file| file.write(@build.script) }
+      File.chmod(0777, script_path)
+
+      info "Running script: #{script_path}"
 
       build.output = ""
-      result = Command.run(command, :directory => directory_path) do |chunk|
+      result = Command.script(script_path, :environment => @build.env,
+                                           :directory   => directory_path) do |chunk|
         build.output << chunk
       end
 
@@ -35,12 +38,6 @@ module Buildbox
 
     private
 
-    def command
-      export = environment.any? ? "export #{environment};" : ""
-
-      "#{export} chmod +x #{script_path} && #{script_path}"
-    end
-
     def directory_path
       @directory_path ||= Buildbox.root_path.join(namespace)
     end
@@ -52,9 +49,5 @@ module Buildbox
     def namespace
       "#{@build.project.team.name}/#{@build.project.name}"
     end
-
-    def environment
-      @environment ||= Environment.new(@build.env)
-    end
   end
 end

data/lib/buildbox/version.rb

@@ -1,3 +1,3 @@
 module Buildbox
-  VERSION = "0.2.2"
+  VERSION = "0.2.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.command(%{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.command('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')
+      result = Buildbox::Command.command('echo hello world 1>&2')
 
       result.exit_status.should == 0
       result.output.should == "hello world"
     end
 
     it "handles commands that fail and returns the correct status" do
-      result = Buildbox::Command.run('(exit 1)')
+      result = Buildbox::Command.command('(exit 1)')
 
       result.exit_status.should_not == 0
       result.output.should == ''
     end
 
     it "handles running malformed commands" do
-      result = Buildbox::Command.run('if (')
+      result = Buildbox::Command.command('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.command('echo hello world') do |chunk|
         unless chunk.nil?
           chunked_output += chunk
         end
@@ -56,51 +56,12 @@ describe Buildbox::Command do
       chunked_output.should == "hello world\r\n"
     end
 
-    it "can collect chunks at paticular intervals" do
-      command = Buildbox::Command.new(nil, :read_interval => 0.1)
-
-      chunked_output = ''
-      result = Buildbox::Command.run('sleep 0.5; echo hello world') do |chunk|
-        unless chunk.nil?
-          chunked_output += chunk
-        end
-      end
-
-      result.exit_status.should == 0
-      result.output.should == "hello world"
-      chunked_output.should == "hello world\r\n"
-    end
-
-    it "can collect chunks from within a thread" do
-      chunked_output = ''
-      result = nil
-      worker_thread = Thread.new do
-        result = Buildbox::Command.run('echo before sleep; sleep 1; echo after sleep') do |chunk|
-          unless chunk.nil?
-            chunked_output += chunk
-          end
-        end
-      end
-
-      worker_thread.run
-      sleep(0.5)
-      result.should be_nil
-      chunked_output.should == "before sleep\r\n"
-
-      worker_thread.join
-
-      result.should_not be_nil
-      result.exit_status.should == 0
-      result.output.should == "before sleep\r\nafter sleep"
-      chunked_output.should == "before sleep\r\nafter sleep\r\n"
-    end
-
     it 'returns a result when running an invalid command in a thread' 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.command('sillycommandlololol')
+        second_result = Buildbox::Command.command('export FOO=bar; doesntexist.rb')
       end
       thread.join
 
@@ -113,9 +74,9 @@ describe Buildbox::Command do
       second_result.output.should =~ /doesntexist.rb:.+not found/
     end
 
-    it "captures color'd output" do
+    it "captures color'd output from a command" do
       chunked_output = ''
-      result = Buildbox::Command.run("rspec #{FIXTURES_PATH.join('rspec', 'test_spec.rb')} --color") do |chunk|
+      result = Buildbox::Command.command("rspec #{FIXTURES_PATH.join('rspec', 'test_spec.rb')}") do |chunk|
         chunked_output += chunk unless chunk.nil?
       end
 
@@ -124,8 +85,26 @@ describe Buildbox::Command do
       chunked_output.should include("32m")
     end
 
+    it "runs scripts in a tty" do
+      chunked_output = ''
+      result = Buildbox::Command.script(FIXTURES_PATH.join('tty_script')) do |chunk|
+        chunked_output += chunk unless chunk.nil?
+      end
+
+      result.output.should == "true"
+      result.exit_status.should == 123
+    end
+
+    it "still runs even if pty isn't available" do
+      PTY.should_receive(:spawn).and_raise(RuntimeError.new)
+      result = Buildbox::Command.command('echo hello world')
+
+      result.exit_status.should == 0
+      result.output.should == "hello world"
+    end
+
     it "supports utf8 characters" do
-      result = Buildbox::Command.run('echo "hello"; echo "\xE2\x98\xA0"')
+      result = Buildbox::Command.command('echo "hello"; echo "\xE2\x98\xA0"')
 
       result.exit_status.should == 0
       # just trying to interact with the string that has utf8 in it to make sure that it

data/spec/fixtures/tty_script

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+puts STDOUT.tty?
+
+exit 123

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildbox
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Keith Pitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -80,11 +80,26 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: Ruby client for buildbox
 email:
 - me@keithpitt.com
 executables:
 - buildbox
+- buildbox-pty
 extensions: []
 extra_rdoc_files: []
 files:
@@ -96,6 +111,7 @@ files:
 - README.md
 - Rakefile
 - bin/buildbox
+- bin/buildbox-pty
 - buildbox-ruby.gemspec
 - lib/buildbox.rb
 - lib/buildbox/agent.rb
@@ -104,7 +120,6 @@ files:
 - lib/buildbox/cli.rb
 - lib/buildbox/command.rb
 - lib/buildbox/configuration.rb
-- lib/buildbox/environment.rb
 - lib/buildbox/monitor.rb
 - lib/buildbox/runner.rb
 - lib/buildbox/server.rb
@@ -116,7 +131,6 @@ files:
 - spec/buildbox/buildbox/cli_spec.rb
 - spec/buildbox/buildbox/command_spec.rb
 - spec/buildbox/buildbox/configuration_spec.rb
-- spec/buildbox/buildbox/environment_spec.rb
 - spec/buildbox/buildbox/monitor_spec.rb
 - spec/buildbox/buildbox/runner_spec.rb
 - spec/buildbox/buildbox/server_spec.rb
@@ -143,6 +157,7 @@ files:
 - spec/fixtures/repo.git/objects/e9/8d8a9be514ef53609a52c9e1b820dbcc8e6603
 - spec/fixtures/repo.git/refs/heads/master
 - spec/fixtures/rspec/test_spec.rb
+- spec/fixtures/tty_script
 - spec/integration/running_a_build_spec.rb
 - spec/spec_helper.rb
 - spec/support/silence_logger.rb
@@ -178,7 +193,6 @@ test_files:
 - spec/buildbox/buildbox/cli_spec.rb
 - spec/buildbox/buildbox/command_spec.rb
 - spec/buildbox/buildbox/configuration_spec.rb
-- spec/buildbox/buildbox/environment_spec.rb
 - spec/buildbox/buildbox/monitor_spec.rb
 - spec/buildbox/buildbox/runner_spec.rb
 - spec/buildbox/buildbox/server_spec.rb
@@ -205,6 +219,7 @@ test_files:
 - spec/fixtures/repo.git/objects/e9/8d8a9be514ef53609a52c9e1b820dbcc8e6603
 - spec/fixtures/repo.git/refs/heads/master
 - spec/fixtures/rspec/test_spec.rb
+- spec/fixtures/tty_script
 - spec/integration/running_a_build_spec.rb
 - spec/spec_helper.rb
 - spec/support/silence_logger.rb

data/lib/buildbox/environment.rb

@@ -1,17 +0,0 @@
-module Buildbox
-  class Environment
-    def initialize(environment)
-      @environment = environment
-    end
-
-    def any?
-      @environment && @environment.keys.length > 0
-    end
-
-    def to_s
-      @environment.to_a.map do |key, value|
-        %{#{key}=#{value.inspect}}
-      end.join(" ")
-    end
-  end
-end

data/spec/buildbox/buildbox/environment_spec.rb

@@ -1,4 +0,0 @@
-require 'spec_helper'
-
-describe Buildbox::Environment do
-end