build-buddy 1.14.12 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4a53a52262ce0a6feb427789507488b1f6136db
-  data.tar.gz: 7190fe0cbb248504e373477ced6e01956e49dc52
+  metadata.gz: b047d2b1bc2a825a18ba63df01115b0f7564a965
+  data.tar.gz: 02cfc587d188363d5e48aba4d7234e423498a129
 SHA512:
-  metadata.gz: ce7839045e68f0e251a8e1d6ccb5964aa48ae128cea5767ddde92d462124788e492e6bb951622e5f939d08648ffd32c2800b3194e5de3aef735d9f75c2485f19
-  data.tar.gz: b4791ee73bd087fd9bc371cdd7fd7f40df095415b8e371d1ee5f5173c9f2dec0fc0057fd9e5746a6883fe15cdb6e47a88494c921e37a4ab62a736898c2f27940
+  metadata.gz: 1fd06cea76d507a0e03d9248ae7f5f5d440071d9dcde85362d1736501634f32aa8b9c63049d287624a722af3a2898591e6bc74aba459038ab5caebb5a1d5adc5
+  data.tar.gz: d68577afdc4f51a768265c85b671a1374aed7c3aed6bd7b70c34d85cce3d00510efc3e255c5dbf5d99c7ff9fd98713d339c717a9ca19cac57ed8b5c1b3e39e52

data/lib/build_buddy.rb

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

data/lib/build_buddy/build_data.rb

@@ -35,6 +35,8 @@ module BuildBuddy
     attr_accessor :flags
     attr_accessor :metrics
 
+    GITHUB_URL = "https://github.com"
+
     def initialize(args)
       args.each do |key, value|
         begin
@@ -72,14 +74,26 @@ module BuildBuddy
 
     def status_verb
       if @termination_type == :killed
-        'was stopped'
+        'stopped'
       else
         @exit_code != 0 ? 'failed' : 'succeeded'
       end
     end
 
-    def pull_request_uri
-      "https://github.com/#{@repo_full_name}/pull/#{@pull_request}"
+    def url_and_branch_name
+      if @type == :branch
+        branch_name = "#{@repo_full_name}/#{@branch}"
+        url = "#{GITHUB_URL}/#{@repo_full_name}/tree/#{@branch}"
+      else
+        branch_name = "#{@repo_full_name}/pr/#{@pull_request}"
+        url = "#{GITHUB_URL}/#{@repo_full_name}/pull/#{@pull_request}"
+      end
+      [url, branch_name]
+    end
+
+    def run_time
+      end_time = @end_time.nil? ? Time.now.utc : @end_time
+      Time.at(end_time - @start_time).utc.strftime('%H:%M:%S.%L')
     end
   end
 end

data/lib/build_buddy/recorder.rb

@@ -3,7 +3,6 @@ require 'bundler'
 require 'celluloid'
 require 'mongo'
 require 'bson'
-require 'gruff'
 require 'securerandom'
 require_relative './config.rb'
 

data/lib/build_buddy/slacker.rb

@@ -110,24 +110,27 @@ module BuildBuddy
       response
     end
 
-    def do_show_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}!
+    def do_show_help(is_from_slack_channel, slack_user_name)
+      text_for_branch_list = Config.allowed_build_branches.count > 0 ? " or " + Config.allowed_build_branches.map { |branch| "`build #{branch}`"}.join(', ') : 0
 
-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.
+      %Q(Hello#{is_from_slack_channel ? '' : " <@#{slack_user_name}>"}, I'm the *@#{@rt_client.self['name']}* build bot v#{BuildBuddy::VERSION}!
 
-For branch builds, I can run builds of the master branch if you say `build master`. I can do builds of release branches, e.g. `build v2.3` but only for those branches that I am allowed to build in by configuration file.
+I understand _pull requests_ and _branch builds_.
 
-I can stop any running build if you ask me to `stop build X`, even pull request builds if you give the id X from the `show status` or `show queue` command.
+A _pull request_ build happens when you make a pull request to the `<#{BuildData::GITHUB_URL}/#{Config.github_webhook_repo_full_name}|#{Config.github_webhook_repo_full_name}>` GitHub repository.  *TIP* you can restart a failed pull request by pushing more changes to the branch.  Use `git commit --allow-empty` if you simply need to retry the build.
 
-I will let the *#{Config.slack_build_channel}* channel know about branch build activity and the *#{Config.slack_pr_channel} channel know about PR activity.
+To do a _branch build_ you can tell me to `build master`#{text_for_branch_list}.
+
+I will let the *#{Config.slack_build_channel}* channel know about _branch build_ activity and the *#{Config.slack_pr_channel}* channel know about _pull request_ activity.
 
 I have lots of `show` commands:
 
 - `show status` and I'll tell you what my status is
-- `show queue` and I will show you what is in the queue
-- `show options` to a see a list of build options
+- `show queue` and I will show you what is in the queue to build
 - `show builds` to see the last 5 builds or `show last N builds` to see a list of the last N builds
-- `show report` to get a link to the latest build report
+- `show report` to get a link to the latest build report, if there is one
+
+Stop any running build with `stop build bb-xxx`.  Use `show queue` to get a valid `bb-xxx` identifier.
 )
     end
 
@@ -155,30 +158,32 @@ I have lots of `show` commands:
       else
         response = ''
         if build_datas.count < limit
-          response += "There have only been #{build_datas.count} builds:\n"
+          response += "There have only been #{build_datas.count} builds"
         else
-          response += "Here are the last #{build_datas.count} builds:\n"
+          response += "Here are the last #{build_datas.count} builds"
         end
+        attachments = []
         build_datas.each do |build_data|
-          response += "A "
-          response += case build_data.type
-                      when :branch
-                        "`#{build_data.branch}` branch build"
-                      when :pull_request
-                        "pull request build #{build_data.pull_request_uri}"
-                      end
-          response += " at #{build_data.start_time.to_s}. #{BuildData.server_log_uri(build_data._id)}"
+          text = "[`#{build_data.start_time.to_s}`]"
+          branch_url, branch_name = build_data.url_and_branch_name
+          text += " `<#{branch_url}|#{branch_name}>`"
+          text += "\n`<#{BuildData.server_log_uri(build_data._id)}|#{build_data._id.to_s}>`"
           unless build_data.started_by.nil?
-            response += " started by #{build_data.started_by}"
+            text += " by *@#{build_data.started_by}*"
           end
-          response += " #{build_data.status_verb}"
+          text += " #{build_data.status_verb}"
           unless build_data.stopped_by.nil?
-            response += " by #{build_data.stopped_by}"
+            text += " by *@#{build_data.stopped_by}*"
           end
-          response += ".\n"
+          text += " ran for `#{build_data.run_time}`"
+          attachments.push({
+            :mrkdwn_in => [ :text ],
+            :text => text,
+            :color => build_data.termination_type == :killed ? :warning : build_data.exit_code != 0 ? :danger : :good,
+          })
         end
       end
-      response
+      [response, attachments]
     end
 
     def do_show_status
@@ -187,63 +192,51 @@ I have lots of `show` commands:
       queue_length = scheduler.queue_length
       response = ''
       if build_data.nil?
-        response = "There is currently no build running"
+        response = "There are no builds running"
         if queue_length == 0
           response += " and no builds in the queue."
         else
           response += " and #{queue_length} in the queue."
         end
       else
-        case build_data.type
-        when :pull_request
-          response = "There is a pull request build in progress for https://github.com/#{build_data.repo_full_name}/pull/#{build_data.pull_request} (#{build_data.bb_id})"
-        when :branch
-          response = "There is a build of the `#{build_data.branch}` branch of https://github.com/#{build_data.repo_full_name} in progress (#{build_data.bb_id})"
-        end
+        branch_url, branch_name = build_data.url_and_branch_name
+        response = "`<#{branch_url}|#{branch_name}>` `<#{build_data.server_log_uri}|#{build_data._id.to_s}>` in progress (`#{build_data.bb_id}`)"
         unless build_data.started_by.nil?
-          response += " started by " + build_data.started_by
-        end
-        unless build_data.stopped_by.nil?
-          response += " stopped by #{build_data.stopped_by}"
+          response += " by *@#{build_data.started_by}*"
         end
-        response += '.'
-        if queue_length == 1
-          response += " There is one build in the queue."
+        response += " running for `#{build_data.run_time}`."
+        if queue_length == 0
+          response += " No builds in the queue."
         elsif queue_length > 1
-          response += " There are #{queue_length} builds in the queue."
+          response += " #{queue_length} build#{queue_length > 1 ? 's' : ''} in the queue."
         end
       end
       response
     end
 
-    def do_show_options
-      %Q(You can add the following options to builds:
-- *test channel* to have notifications go to the test channel
-- *no upload* to not have the build upload
-)
-    end
-
     def do_show_queue
       build_datas = Celluloid::Actor[:scheduler].get_build_queue
-      if build_datas.count == 0
+      queue_length = build_datas.count
+      if queue_length == 0
         response = "There are no builds in the queue."
       else
-        response = 'The following builds are in the queue:\n'
+        response = "There are #{queue_length} build#{queue_length > 1 ? 's' : ''} in the queue"
+        attachments = []
         build_datas.each { |build_data|
-          response += "- #{build_data.bb_id}, a "
-          response += case build_data.type
-                      when :branch
-                        "`#{build_data.branch}` branch build"
-                      when :pull_request
-                        "pull request build #{build_data.pull_request_uri}"
-                      end
+          text = "`#{build_data.bb_id}`"
+          branch_url, branch_name = build_data.url_and_branch_name
+          text += " `<#{branch_url}|#{branch_name}>`"
           unless build_data.started_by.nil?
-            response += " started by #{build_data.started_by}"
+            text += " by *@#{build_data.started_by}*"
           end
-          response += ".\n"
+          attachments.push({
+            :mrkdwn_in => [ :text ],
+            :text => text,
+            :color => "#439FE0"
+          })
         }
       end
-      response
+      [response, attachments]
     end
 
     def do_show_report
@@ -332,7 +325,7 @@ I have lots of `show` commands:
 
       message = message.strip
 
-      response = case message
+      response, attachments = case message
                  when /stop +build +(bb-\d+)/i
                    do_stop $1, is_from_slack_channel, slack_user_name
                  when /build +([a-z0-9\.]+)/i
@@ -349,49 +342,47 @@ I have lots of `show` commands:
                    do_show_report
                  when /show queue/
                    do_show_queue
-                 when /show options/
-                   do_show_options
                  when /help/i
-                   do_show_help is_from_slack_channel
+                   do_show_help is_from_slack_channel, slack_user_name
                  when /^relay(.*)/i # This must be sent directly to build-buddy
                    do_relay $1, slack_user_name
                  else
                    "Sorry#{is_from_slack_channel ? ' ' + slack_user_name : ''}, I'm not sure how to respond."
-                 end
-      @rt_client.message channel: data['channel'], text: response
+                              end
+      @rt_client.web_client.chat_postMessage(channel: data['channel'], text: response, attachments: attachments, as_user: true)
+      #@rt_client.message channel: data['channel'], text: response
       info "Slack message '#{message}' from #{data['channel']} handled"
     end
 
     def notify_channel(build_data)
       status_verb = build_data.status_verb
+      attachment_message = ''
 
+      branch_url, branch_name = build_data.url_and_branch_name
       if build_data.type == :branch
-        message = "A `#{build_data.branch}` branch build #{status_verb}"
-        short_message = message
         info "Branch build #{status_verb}"
       else
-        message = "Pull request <https://github.com/#{build_data.repo_full_name}/pull/#{build_data.pull_request}|#{build_data.pull_request_title}> build #{status_verb}"
-        short_message = "Pull request #{build_data.pull_request} #{status_verb}"
+        attachment_message += "<#{branch_url}|*#{build_data.pull_request_title}*>"
         info "Pull request build #{status_verb}"
       end
 
+      message = "`<#{branch_url}|#{branch_name}>` build #{status_verb}"
       if build_data.termination_type == :killed and build_data.stopped_by != nil
-        message += " by #{build_data.stopped_by}"
+        message += " by *@#{build_data.stopped_by}*"
       end
-
-      message += ". Log file at #{build_data.server_log_uri}"
+      attachment_message += "\n`<#{build_data.server_log_uri}|#{build_data._id.to_s}>` ran for `#{build_data.run_time}`"
 
       # See https://api.slack.com/docs/attachments for more information about formatting Slack attachments
-      attachments = [
-          :title => build_data.type == :pull_request ? "Pull Request" : "Branch Build",
-          :text => message,
+      attachments = [{
+          :mrkdwn_in => [ :text ],
+          :text => attachment_message,
           :color => build_data.termination_type == :killed ? :warning : build_data.exit_code != 0 ? :danger : :good,
-      ]
+      }]
 
       if build_data.type == :branch
-        @rt_client.web_client.chat_postMessage(channel: @build_channel_id, text: short_message, attachments: attachments, as_user: true) unless @build_channel_id.nil?
+        @rt_client.web_client.chat_postMessage(channel: @build_channel_id, text: message, attachments: attachments, as_user: true) unless @build_channel_id.nil?
       else
-        @rt_client.web_client.chat_postMessage(channel: @pr_channel_id, text: short_message, attachments: attachments, as_user: true) unless @pr_channel_id.nil?
+        @rt_client.web_client.chat_postMessage(channel: @pr_channel_id, text: message, attachments: attachments, as_user: true) unless @pr_channel_id.nil?
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-buddy
 version: !ruby/object:Gem::Version
-  version: 1.14.12
+  version: 1.15.0
 platform: ruby
 authors:
 - John Lyon-smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers
@@ -150,20 +150,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: gruff
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: code-tools
   requirement: !ruby/object:Gem::Requirement