build-buddy 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d50fe65cd2806a970546102b56304bdae80f2b6
-  data.tar.gz: 7fdd7e59a6b62df8fe884ec009020bdb85ec9cdd
+  metadata.gz: 8a552c3787d5d47a56a1e98766a255f7465f55e3
+  data.tar.gz: c7507aea8ea62bb171412ddb39aa2bdfa07463ca
 SHA512:
-  metadata.gz: cdd33b96f5b8e83ec9eff07b0555038c03f629dca285de77975928d264ab68a5a6942d5550d0fedb4a01b0211757a55512dd66ea883f262abc30bbe03015d617
-  data.tar.gz: afec166a8cce90aa46b85ff38bc3b4eddc8204afc2eeeca57a1b994dc75c151bcd6da50591d171fa772e259d65d5dfca6797a18f11cc0274d5f5e0504b362e18
+  metadata.gz: 7ea0e8ce598873347869fb3f7eec082b05b2ddde5811c2f26adbd988401fdcebc573bd2e7af3db062e744845c53b2f0dc003624a59cdb4f15c394687f37341ce
+  data.tar.gz: d5212a3ae04d87c742395759343dd810b93a159a6cbc6209a922b8c9c088718fd01fbacb15fa101a63d3c65aac152413956a7c50aa3cf2894c24986de7e90b2c

data/lib/build_buddy.rb

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

data/lib/build_buddy/scheduler.rb

@@ -45,23 +45,24 @@ module BuildBuddy
 
     def stop_build(id, slack_user_name)
       # Centralize stopping builds here
-      if @active_build != nil and @active_build._id != id
+      if @active_build != nil and @active_build._id == id
         @active_build.stopped_by = slack_user_name
         Celluloid::Actor[:builder].stop_build
-        true
+        # Build data will be recorded when the build stops
+        return :active
       end
 
       # Look for the build in the queue
-      i = @build_queue.find { |build_data| build_data._id == id}
+      i = @build_queue.find_index { |build_data| build_data._id == id}
       if i != nil
         build_data = @build_queue[i]
         @build_queue.delete_at(i)
         build_data.stopped_by = slack_user_name
         Celluloid::Actor[:recorder].async.record_build_data(build_data)
-        true
+        return :in_queue
       end
 
-      false
+      return :not_found
     end
 
     def on_build_interval

data/lib/build_buddy/slacker.rb

@@ -94,11 +94,13 @@ module BuildBuddy
       m = message.match(/[0-9abcdef]{24}/)
 
       unless m.nil?
-        if Celluloid::Actor[:scheduler].stop_build(BSON::ObjectId.from_string(m[0]), slack_user_name)
-          response = "OK#{is_from_slack_channel ? ' @' + slack_user_name : ''}, I stopped the build with identifier #{m[0]}."
-        else
-          response = "I could not find a queued or active build with that identifier"
-        end
+        result = Celluloid::Actor[:scheduler].stop_build(BSON::ObjectId.from_string(m[0]), slack_user_name)
+        response = case result
+                   when :active, :in_queue
+                     "OK#{is_from_slack_channel ? ' @' + slack_user_name : ''}, I #{result == :active ? "stopped" : "dequeued"} the build with identifier #{m[0]}."
+                   when :not_found
+                     "I could not find a queued or active build with that identifier"
+                   end
       else
         response = "You must specify the 24 digit hexadecimal build identifier. It can be an active build or a build in the queue."
       end
@@ -154,8 +156,14 @@ Build metrics and charts are available at #{Config.server_base_uri}/hud/#{Config
                           "pull request build #{build_data.pull_request_uri}"
                         end
             response += " at #{build_data.start_time.to_s}. #{Config.server_base_uri + '/log/' + build_data._id.to_s}"
-            response += ' ' + build_data.status_verb
-            response += "\n"
+            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}"
+            end
+            response += " #{build_data.status_verb}"
+            response += ".\n"
           end
         end
       when /status/
@@ -173,12 +181,15 @@ Build metrics and charts are available at #{Config.server_base_uri}/hud/#{Config
         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._id.to_s})"
+            response = "There is a pull request build in progress for https://github.com/#{build_data.repo_full_name}/pull/#{build_data.pull_request} (identifier `#{build_data._id.to_s}`)"
           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._id.to_s})"
+            response = "There is a build of the `#{build_data.branch}` branch of https://github.com/#{build_data.repo_full_name} in progress (identifier `#{build_data._id.to_s}`)"
           end
           unless build_data.started_by.nil?
-            response += build_data.started_by
+            response += " started by " + build_data.started_by
+          end
+          unless build_data.stopped_by.nil?
+            response += " stopped by #{build_data.stopped_by}"
           end
           response += '.'
           if queue_length == 1
@@ -206,11 +217,14 @@ Build metrics and charts are available at #{Config.server_base_uri}/hud/#{Config
                         when :pull_request
                           "pull request build #{build_data.pull_request_uri}"
                         end
+            response += " (identifier `#{build_data._id.to_s}`)"
             unless build_data.started_by.nil?
-              response += " by #{build_data.started_by}"
+              response += " started by #{build_data.started_by}"
             end
-            response += " (#{build_data._id.to_s})"
-            response += "\n"
+            unless build_data.stopped_by.nil?
+              response += " stopped by #{build_data.stopped_by}"
+            end
+            response += ".\n"
           }
         end
       else
@@ -285,17 +299,19 @@ Build metrics and charts are available at #{Config.server_base_uri}/hud/#{Config
       end
 
       response = case message
-        when /build (.*)/i
-          do_build $1, is_from_slack_channel, slack_user_name
-        when /show(.*)/
-          do_show $1
-        when /help/i
-          do_help is_from_slack_channel
-        when /stop(?: build)(.*)/i
-          do_stop $1, is_from_slack_channel, slack_user_name
-        else
-          "Sorry#{is_from_slack_channel ? ' ' + slack_user_name : ''}, I'm not sure how to respond."
-        end
+                 when /^ *build (.*)/i
+                   do_build $1, is_from_slack_channel, slack_user_name
+                 when /^ *status/ # Legacy support
+                   do_show 'status'
+                 when /^ *show(.*)/
+                   do_show $1
+                 when /^ *help/i
+                   do_help is_from_slack_channel
+                 when /^ *stop(?: build)(.*)/i
+                   do_stop $1, is_from_slack_channel, 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
       info "Slack message '#{message}' from #{data['channel']} handled"
     end
@@ -311,6 +327,10 @@ Build metrics and charts are available at #{Config.server_base_uri}/hud/#{Config
         info "Pull request build #{status_verb}"
       end
 
+      if build_data.termination_type == :killed and build_data.stopped_by != nil
+        message += " by #{build_data.stopped_by}"
+      end
+
       message += ". Log file at #{build_data.server_log_uri}"
 
       # See https://api.slack.com/docs/attachments for more information about formatting Slack attachments

metadata

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