build-buddy 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a8a7992124d1da142da38648ea45d39b805582f
-  data.tar.gz: 6785a428216e7499fc90d437692715f3442434b2
+  metadata.gz: c3ac2498d85759e142f61aead4aebf0968721a4e
+  data.tar.gz: 6af814ee68ac2f59f23b84eeef9ca9bfd454707c
 SHA512:
-  metadata.gz: 1b789719672f1d11b0bf637063db822d66a4867d2f430e478cf7a6c212209081b2a3e00e95bcad838a220eca323142a39edc35c5fadc07e887825b820861c01d
-  data.tar.gz: 05299a51f399a428f3038f1da2de44edc9b9d671d65a7cdc9b8009f035a9173e356ae35d94b79b7aaf994bb69041ffa6e72d22ccc214f5261abf82ce5664b410
+  metadata.gz: c04cbb95121ccd2dafc9d0445a7c03e94999e48dfdc8421f4f89c7dea5d857446208e193f51451370a2917964032f031b0dc0d5798884b99abc87f7d7f1918ea
+  data.tar.gz: c9f08e085110a8a733032bc01a68d824a477f7d5b3149c0c5a968a64b085c057b92961a4602e7f35428702a306434670b5841b28afc6f32d02dc461c521b7289

data/lib/build_buddy.rb

@@ -9,5 +9,5 @@ require 'build_buddy/recorder'
 require 'build_buddy/build_data'
 
 module BuildBuddy
-  VERSION = "1.10.0"
+  VERSION = "1.11.0"
 end

data/lib/build_buddy/builder.rb

@@ -88,7 +88,7 @@ git checkout pr/$GIT_PULL_REQUEST
       when :branch
         build_root_dir = expand_vars(Config.branch_root_dir)
         env.merge!({
-          "GIT_BRANCH" => 'master',
+          "GIT_BRANCH" => build_data.branch.to_s,
           "BUILD_SCRIPT" => Config.branch_build_script
         })
         build_script += %q(
@@ -151,14 +151,17 @@ source ${BUILD_SCRIPT}
       @build_data.exit_code = (status.exited? ? status.exitstatus : -1)
 
       # Collect any data written to the build metrics YAML file
-      begin
-        metrics = Psych.load_stream(File.read(@metrics_tempfile.path)).reduce({}, :merge)
-      rescue Psych::SyntaxError => ex
-        error "There was a problem collecting build metrics: #{ex.message}"
-      end
-      if !metrics
-        metrics = {}
+      metrics = {}
+
+      if File.exist?(@metrics_tempfile.path)
+        metrics_yaml = File.read(@metrics_tempfile.path)
+        begin
+          metrics = Psych.load_stream(metrics_yaml).reduce({}, :merge)
+        rescue Psych::SyntaxError => ex
+          error "There was a problem collecting build metrics: #{ex.message}\n#{metrics_yaml}"
+        end
       end
+
       @build_data.metrics = metrics
 
       info "Process #{status.pid} #{@build_data.termination_type == :killed ? 'was terminated' : "exited (#{@build_data.exit_code})"}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-buddy
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - John Lyon-smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers