build-buddy 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9edf5fca3601b95a498801898c367879d99453df
-  data.tar.gz: 9abc45a421265ef5b57123d9e0a77bab0e795c4c
+  metadata.gz: 20b7313e36172e051a99a9b341a94fc92338455a
+  data.tar.gz: 578b2c07c30fc4d4cf678049ae2e9212883e1857
 SHA512:
-  metadata.gz: dc2c8482c86124374f51dca9ac2092879f2c972f993c61ac6fdaf59c32dd090c8448708461ee3364883fc47a6f1e1ecb5362a4ba01757e38c567fc861d5af4a2
-  data.tar.gz: 4f9374716fb92234bba3a8ded46f555b7ebd15749a1b8aca437831742af30d4e001aba809ddaf1bc6766feb2fac93b2886b655e9e72b9621e966f3301fab2f39
+  metadata.gz: 144e5b4600e573917693fd6389c8d7e9e7f9ea1d53a27f65806779014cbdbe6748c2add4ded28a36f619830348bd43e4a552f902a8322bf5c71920d3006e9ad3
+  data.tar.gz: c96c2800fa8975b29e3511c23dc108c78f316f103d61f6245b0d33d36098daaeacc8a9dfebcf85f3ad217930f5e4b0b6c520f55d6952a6fcd8949d32f9d0e212

data/lib/build_buddy.rb

@@ -4,6 +4,6 @@ require 'build_buddy/builder'
 require 'build_buddy/watcher'
 
 module BuildBuddy
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end
 

data/lib/build_buddy/builder.rb

@@ -15,6 +15,7 @@ module BuildBuddy
 
     def initialize
       @pid = nil
+      @gid = nil
       @watcher = nil
     end
 
@@ -27,7 +28,9 @@ module BuildBuddy
           "GIT_REPO_NAME" => repo_parts[1],
           "RBENV_DIR" => nil,
           "RBENV_VERSION" => nil,
-          "PATH" => ENV['PATH'].split(':').select { |v| !v.match(/\.rbenv\/versions/) }.join(':')
+          "RBENV_HOOK_PATH" => nil,
+          "RBENV_ROOT" => nil,
+          "PATH" => ENV['PATH'].split(':').select { |v| !v.match(/\.rbenv\/versions|Cellar\/rbenv/) }.join(':')
       }
 
       case build_data.build_type
@@ -43,15 +46,14 @@ module BuildBuddy
           raise "Unknown build type"
       end
 
-      build_log_filename = File.join(Config.build_log_dir, "build_#{build_data.build_type.to_s}_#{Time.now.utc.strftime('%Y%m%d%H%M%S')}.log")
+      build_log_filename = File.join(Config.build_log_dir, "build_#{build_data.build_type.to_s}_#{Time.now.utc.strftime('%Y%m%d%_H%M%S')}.log")
       build_data.build_log_filename = build_log_filename
 
-      command += " >#{build_log_filename} 2>&1"
-
       Bundler.with_clean_env do
-        @pid = Process.spawn(env, command)
+        @pid = Process.spawn(env, command, :pgroup => true, [:out, :err] => build_log_filename)
+        @gid = Process.getpgid(@pid)
       end
-      info "Running '#{command}' (process #{@pid})"
+      info "Running #{File.basename(command)} (pid #{@pid}, gid #{@gid}) : Log #{build_log_filename}"
 
       if @watcher
         @watcher.terminate
@@ -71,9 +73,9 @@ module BuildBuddy
     end
 
     def stop_build
-      if @pid
-        info "Killing pid #{@pid}"
-        Process.kill(:SIGABRT, @pid)
+      if @gid
+        info "Killing gid #{@gid}"
+        Process.kill(:SIGABRT, -@gid)
       end
     end
   end

data/lib/build_buddy/server.rb

@@ -126,7 +126,7 @@ module BuildBuddy
                   Celluloid::Actor[:builder].async.stop_build
                 end
               else
-                response = "Sorry#{in_channel ? " <@#{data['user']}>" : ""}, I'm not sure if you want do an internal *master*, external *M.m* build, or maybe *stop* any running build?"
+                response = "Sorry#{in_channel ? " <@#{data['user']}>" : ""}, I'm not sure if you want do a *master*, or *M.m* branch build, or maybe *stop* any running build?"
             end
           end
         when /status/i
@@ -219,9 +219,9 @@ module BuildBuddy
             { :description => "This build is in the queue" })
           info "Pull request build queued"
         when :master
-          info "Internal build queued"
+          info "`master` branch build queued"
         when :release
-          info "External build queued"
+          info "Release branch build queued"
       end
 
       if @build_timer.nil?
@@ -258,16 +258,16 @@ module BuildBuddy
             @gh_client.create_status(
               build_data.repo_full_name, build_data.repo_sha,
               build_data.termination_type == :killed ? 'failure' : build_data.exit_code != 0 ? 'error' : 'success',
-              { :description => description })
+              { :description => description.length > 140 ? "#{description[0..137]}..." : description })
             info "Pull request build #{term_msg}"
           else
             case build_data.build_type
               when :master
                 message = "A build of the `master` branch #{term_msg}."
-                info "Internal build #{term_msg}"
+                info "`master` branch build #{term_msg}"
               when :release
                 message = "A build of the `#{build_data.build_version}` branch #{term_msg}."
-                info "External build #{term_msg}"
+                info "Release branch build #{term_msg}"
             end
             unless @notify_slack_channel.nil?
               @rt_client.message(channel: @notify_slack_channel, text: message)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-buddy
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - John Lyon-smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers