build-buddy 1.14.1 → 1.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ba4c0fb810c99f9f83160fed087cfe0265d4894
-  data.tar.gz: d4beedca033f53d2867182aeeecad3a67c9f409c
+  metadata.gz: 14eca58f4d3f477090e879ccc9daa6c2e6cd4ed7
+  data.tar.gz: 3f8b38b895cb96d779792147621e9531cad37a40
 SHA512:
-  metadata.gz: 691ce8fe310f1aae0719b7cf4a56effb99b14078948f4fed733b7436c5250a8293f16e58737796d739c8e4f47df10732b0b38dadccd3d057757e3f65c14498a9
-  data.tar.gz: a214d15ceea592f4bf8d632b63c593532e24b3d2b40abb3b127ce982e448e45213f6013d3312cb159eb1be216637997c625ebed6d56d97e18008fcd9abaac2de
+  metadata.gz: 3969cc949092d261451d018c8e76611990d1c33a1ebc2592c553a4fb57b7742062ca3645539e8a1e1c416993474bd37fc0a181e8b367e380cfe02cd13a6e69d4
+  data.tar.gz: 51abbb4a39671b7f381b4cdf50c66fc731ed6f6effc693931ae9a45c230591552c0bf36ce5741c36509ce86b6ebda497f6bcd654d9ddd766fe0fbe59920c9cb8

data/lib/build_buddy.rb

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

data/lib/build_buddy/builder.rb

@@ -15,7 +15,7 @@ module BuildBuddy
       @pid = nil
       @gid = nil
       @watcher = nil
-      @metrics_tempfile = nil
+      @metrics_file_name = nil
       @build_output_dir = nil
       @log_file_name = nil
     end
@@ -26,12 +26,12 @@ module BuildBuddy
       end
 
       @build_data = build_data
-      @metrics_tempfile = Tempfile.new('build-metrics')
-      @metrics_tempfile.close()
       @build_output_dir = File.join(Config.build_output_dir, @build_data._id.to_s)
+      @metrics_file_name = File.join(@build_output_dir, 'metrics.yaml')
       @log_file_name = File.join(@build_output_dir, "log.txt")
 
       FileUtils.mkdir(@build_output_dir)
+      File.new(@metrics_file_name, 'w').close
 
       repo_parts = @build_data.repo_full_name.split('/')
       git_repo_owner = repo_parts[0]
@@ -111,7 +111,7 @@ source ${BB_BUILD_SCRIPT}
       env.merge!({
           "BB_GIT_REPO_OWNER" => git_repo_owner,
           "BB_GIT_REPO_NAME" => git_repo_name,
-          "BB_METRICS_DATA_FILE" => @metrics_tempfile.path,
+          "BB_METRICS_DATA_FILE" => @metrics_file_name,
           "BB_BUILD_OUTPUT_DIR" => @build_output_dir,
           "BB_MONGO_URI" => Config.mongo_uri,
           "RBENV_DIR" => nil,
@@ -167,8 +167,8 @@ source ${BB_BUILD_SCRIPT}
       # Collect any data written to the build metrics YAML file
       metrics = {}
 
-      if File.exist?(@metrics_tempfile.path)
-        metrics_yaml = File.read(@metrics_tempfile.path)
+      if File.exist?(@metrics_file_name)
+        metrics_yaml = File.read(@metrics_file_name)
         begin
           metrics = Psych.load_stream(metrics_yaml).reduce({}, :merge)
         rescue Psych::SyntaxError => ex

data/lib/build_buddy/slacker.rb

@@ -113,7 +113,7 @@ module BuildBuddy
     end
 
     def do_help is_from_slack_channel
-      %Q(Hello#{is_from_slack_channel ? " <@#{data['user']}>" : ""}, I'm the *@#{@rt_client.self['name']}* build bot version #{BuildBuddy::VERSION}! 
+      %Q(Hello#{is_from_slack_channel ? " <@#{data['user']}>" : ""}, I'm the *@#{@rt_client.self['name']}* build bot version #{BuildBuddy::VERSION}!
 
 I understand types of build - pull requests and branch. A pull request build happens when you make a pull request to the https://github.com/#{Config.github_webhook_repo_full_name} GitHub repository.
 
@@ -285,7 +285,7 @@ I have lots of `show` commands:
       @pr_channel_id = Slacker.get_channel_id(Config.slack_pr_channel, map_channel_name_to_id, map_group_name_to_id)
 
       if @pr_channel_id.nil?
-        error "Unable to identify the PR slack channel #{channel}"
+        error "Unable to identify the PR slack channel #{Config.slack_pr_channel}"
       else
         info "Slack PR notification channel is #{@pr_channel_id} (#{Config.slack_pr_channel})"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: build-buddy
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.14.2
 platform: ruby
 authors:
 - John Lyon-smith