build-buddy 1.14.3 → 1.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96abcbb3d97494bf58764afb274d6ca984bb733e
-  data.tar.gz: bad604376666183553e37a5ae3dc2255c8f59272
+  metadata.gz: a586377dab8683cfbe1cb9d42db7087a463d08be
+  data.tar.gz: 42b507512d9bc9f47c4efad3e3bf8af6d82b44ba
 SHA512:
-  metadata.gz: b897835e9014316508518e51a48c12a11b836961589559573959db82704b106a7f05658f46111f7afa3d22867e2950dc29650c9278f571aa8d6cf2667a10d5d7
-  data.tar.gz: b5d0e85f7a661cf6fc8ccbcaad1dd422117289915dc9fa0a94a0c94f588338b6fb2d60e0c628afaf09f34c12766cf18082991744f36b9d651a4ced110b95a211
+  metadata.gz: 1608c1fa5a9cadacc27178691c179a1046aa2ecdc6414b342658afd68d7d2d821a546077a4bf339814800808f548d333c33bfd790f46692ee5b3f542960fc573
+  data.tar.gz: e85a33cfd8dc8b0ed97771f9d4f4a3c2a4e35c7a9ced76fdb76d0541aeab93f589855a3083570d2648a8b689743a870d7bf39cff3bb2e9802d94222d362e448e

data/bin/build-buddy

@@ -34,8 +34,6 @@ module BuildBuddy
       Celluloid::Actor[:server] = Server.new
       Celluloid::Actor[:recorder] = Recorder.new
 
-      Celluloid::Actor[:recorder].async.gen_charts
-
       begin
         loop {
           sleep(5)

data/lib/build_buddy.rb

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

data/lib/build_buddy/build_data.rb

@@ -24,6 +24,7 @@ module BuildBuddy
     attr_accessor :repo_full_name
     attr_accessor :branch
     attr_accessor :pull_request
+    attr_accessor :pull_request_title
     attr_accessor :repo_sha
     attr_accessor :termination_type # :killed or :exited
     attr_accessor :started_by
@@ -53,7 +54,7 @@ module BuildBuddy
 
     def to_h
       hash = {}
-      instance_variables.each {|var| hash[var.to_s.delete("@")] = instance_variable_get(var) }
+      instance_variables.each {|var| hash[var.to_s.delete("@").to_sym] = instance_variable_get(var) }
       hash
     end
 

data/lib/build_buddy/scheduler.rb

@@ -77,6 +77,10 @@ module BuildBuddy
       i = @build_queue.find_index { |build_data| build_data.bb_id == bb_id}
       if i != nil
         build_data = @build_queue[i]
+        if build_data.build_type == :pull_request
+          Celluloid::Actor[:gitter].async.set_status(
+              build_data.repo_full_name, build_data.repo_sha, :killed, "Build was dequeued", nil)
+        end
         @build_queue.delete_at(i)
         return :in_queue
       end

data/lib/build_buddy/server.rb

@@ -36,6 +36,7 @@ module BuildBuddy
                   build_data = BuildData.new(
                       :type => :pull_request,
                       :pull_request => pull_request['number'],
+                      :pull_request_title => pull_request['title'],
                       :flags => {},
                       :repo_sha => pull_request['head']['sha'],
                       :repo_full_name => pull_request['base']['repo']['full_name'],

data/lib/build_buddy/slacker.rb

@@ -28,8 +28,8 @@ module BuildBuddy
 
       begin
         @rt_client.start_async
-      rescue
-        info "Unable to connect to Slack"
+      rescue Exception => e
+        info "Unable to connect to Slack - #{e.message}"
         self.terminate
       end
 
@@ -91,11 +91,8 @@ module BuildBuddy
       response
     end
 
-    def do_stop(message, is_from_slack_channel, slack_user_name)
-      message = message.strip
+    def do_stop(bb_id, is_from_slack_channel, slack_user_name)
       response = ''
-      m = message.match(/^(?:build +)?(bb-\d+)$/i)
-
       unless m.nil?
         bb_id = m[1].upcase
         result = Celluloid::Actor[:scheduler].stop_build(bb_id, slack_user_name)
@@ -113,7 +110,7 @@ module BuildBuddy
       response
     end
 
-    def do_help is_from_slack_channel
+    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}!
 
 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.
@@ -150,115 +147,116 @@ I have lots of `show` commands:
       info "I relayed a message for #{slack_user_name} to #{Config.slack_build_channel}, \"#{message}\""
     end
 
-    def do_show(request)
-      request = request.lstrip.rstrip
+    def do_show_builds(limit)
+      build_datas = Celluloid::Actor[:recorder].get_build_data_history(limit)
 
-      case request
-      when /builds/
-        limit = 5
-        m = request.match(/last ([0-9]+)/)
-        limit = m[1].to_i unless m.nil?
-        build_datas = Celluloid::Actor[:recorder].get_build_data_history(limit)
-
-        if build_datas.count == 0
-          response = "No builds have performed yet"
-        else
-          response = ''
-          if build_datas.count < limit
-            response += "There have only been #{build_datas.count} builds:\n"
-          else
-            response += "Here are the last #{build_datas.count} builds:\n"
-          end
-          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)}"
-            unless build_data.started_by.nil?
-              response += " started by #{build_data.started_by}"
-            end
-            response += " #{build_data.status_verb}"
-            unless build_data.stopped_by.nil?
-              response += " by #{build_data.stopped_by}"
-            end
-            response += ".\n"
-          end
-        end
-      when /status/
-        scheduler = Celluloid::Actor[:scheduler]
-        build_data = scheduler.active_build
-        queue_length = scheduler.queue_length
+      if build_datas.count == 0
+        response = "No builds have performed yet"
+      else
         response = ''
-        if build_data.nil?
-          response = "There is currently no build running"
-          if queue_length == 0
-            response += " and no builds in the queue."
-          else
-            response += " and #{queue_length} in the queue."
-          end
+        if build_datas.count < limit
+          response += "There have only been #{build_datas.count} builds:\n"
         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
+          response += "Here are the last #{build_datas.count} builds:\n"
+        end
+        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)}"
           unless build_data.started_by.nil?
-            response += " started by " + build_data.started_by
+            response += " started by #{build_data.started_by}"
           end
+          response += " #{build_data.status_verb}"
           unless build_data.stopped_by.nil?
-            response += " stopped by #{build_data.stopped_by}"
-          end
-          response += '.'
-          if queue_length == 1
-            response += " There is one build in the queue."
-          elsif queue_length > 1
-            response += " There are #{queue_length} builds in the queue."
+            response += " by #{build_data.stopped_by}"
           end
+          response += ".\n"
         end
-      when /options/
-        response = %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
-)
-      when /queue/
-        response = ''
-        build_datas = Celluloid::Actor[:scheduler].get_build_queue
-        if build_datas.count == 0
-          response = "There are no builds in the queue."
+      end
+      response
+    end
+
+    def do_show_status
+      scheduler = Celluloid::Actor[:scheduler]
+      build_data = scheduler.active_build
+      queue_length = scheduler.queue_length
+      response = ''
+      if build_data.nil?
+        response = "There is currently no build running"
+        if queue_length == 0
+          response += " and no builds in the queue."
         else
-          build_datas.each { |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 += " (#{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}"
-            end
-            response += ".\n"
-          }
+          response += " and #{queue_length} in the queue."
         end
-      when /report/
-        response = ''
-        report_uri = Celluloid::Actor[:recorder].find_report_uri
-        if report_uri.nil?
-          response = "There do not appear to be any reports generated yet"
-        else
-          response = "The last build report is at #{report_uri}"
+      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
+        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 += '.'
+        if queue_length == 1
+          response += " There is one build in the queue."
+        elsif queue_length > 1
+          response += " There are #{queue_length} builds 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
+      response = ''
+      build_datas = Celluloid::Actor[:scheduler].get_build_queue
+      if build_datas.count == 0
+        response = "There are no builds in the queue."
       else
-        response = "I'm not sure what to say..."
+        build_datas.each { |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 += " (#{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}"
+          end
+          response += ".\n"
+        }
+      end
+      response
+    end
+
+    def do_show_report
+      response = ''
+      report_uri = Celluloid::Actor[:recorder].find_report_uri
+      if report_uri.nil?
+        response = "There do not appear to be any reports generated yet"
+      else
+        response = "The last build report is at #{report_uri}"
       end
       response
     end
@@ -339,17 +337,27 @@ I have lots of `show` commands:
       message = message.strip
 
       response = case message
-                 when /^build(.*)/i
+                 when /build +([a-z0-9\.]+)/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 /^relay(.*)/i
+                 when /(?:show +)status/
+                   do_show_status
+                 when /show +(last [0-9]+ +)?builds/
+                   limit = $1.to_i unless $1.nil?
+                   if limit.nil? or limit < 5
+                     limit = 5
+                   end
+                   do_show_builds limit
+                 when /show report/
+                   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
+                 when /^relay(.*)/i # This must be sent directly to build-buddy
                    do_relay $1, slack_user_name
-                 when /^stop(.*)/i
+                 when /stop +(?:build +)?(bb-\d+)/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."
@@ -366,7 +374,7 @@ I have lots of `show` commands:
         short_message = message
         info "Branch build #{status_verb}"
       else
-        message = "A pull request https://github.com/#{build_data.repo_full_name}/pull/#{build_data.pull_request} build #{status_verb}"
+        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}"
         info "Pull request build #{status_verb}"
       end

metadata

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