build-buddy 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2e0974a582454abd083fe575b4269ea1450e756
-  data.tar.gz: 498646e9e12f031b09ad62e5ba880c62e902ddbd
+  metadata.gz: bc533f6854862178451a21df0a4d84ae2061990b
+  data.tar.gz: be19e66a1a5dee3caf7dc857cf8960582331775a
 SHA512:
-  metadata.gz: 30825c02f387e0ea0644307d9c19dd686919a6f13cb54afa2714a724ac4f6820024d9fd0827acffd01c5ed929c99176de17e02564fe01ac591ba8c32bdf5765e
-  data.tar.gz: 0f4a15c1da473892e6fbef0158d7e09aaa83c4523f3578fd9cd02f74b0f30a491d832cae5229ea9514d0fbc1673218ec616052a44c2eb4305893f9946487ec97
+  metadata.gz: 462ec0136b74bafc5a3a93f8c1914ad1f6b39a2a7a90b34fdea196ee180e57e3a7c63a3e4b42762881cc791fea3c773da9f72e5e43600afd247abdd3199b5883
+  data.tar.gz: 8ba1d443cc60f29858b6dc5fa27b358c7d4b74a119ea46b1939a31afff428bc446d5c7345ff25cba07416974619c843ab84a3a165efe5c5e886f27741904df54

data/lib/build_buddy.rb

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

data/lib/build_buddy/builder.rb

@@ -79,7 +79,7 @@ module BuildBuddy
 
       # Collect any data written to the build metrics YAML file
       begin
-        metrics = Psych.load_file(@metrics_tempfile.path)
+        metrics = Psych.load_stream(File.read(@metrics_tempfile.path)).reduce({}, :merge)
       rescue Psych::SyntaxError => ex
         error "There was a problem collecting bulid metrics: #{ex.message}"
       end

data/lib/build_buddy/gitter.rb

@@ -14,9 +14,15 @@ module BuildBuddy
       info "Connected to Github"
     end
 
-    def set_status(repo_full_name, repo_sha, status, description)
-      @gh_client.create_status(
-          repo_full_name, repo_sha, status.to_s, { :description => description.length > 140 ? "#{description[0..136]}..." : description})
+    def set_status(repo_full_name, repo_sha, status, description, target_url)
+      options = {
+          :description => description.length > 140 ? "#{description[0..136]}..." : description,
+          :context => 'build-buddy'
+      }
+      unless target_url.nil?
+        options[:target_url] = target_url
+      end
+      @gh_client.create_status(repo_full_name, repo_sha, status.to_s, options)
     end
   end
 end

data/lib/build_buddy/server.rb

@@ -28,15 +28,22 @@ module BuildBuddy
               else
                 payload = JSON.parse(payload_text)
                 pull_request = payload['pull_request']
-                build_data = BuildData.new(
-                    :type => :pull_request,
-                    :pull_request => pull_request['number'],
-                    :flags => [],
-                    :repo_sha => pull_request['head']['sha'],
-                    :repo_full_name => pull_request['base']['repo']['full_name'])
-                info "Got pull request #{build_data.pull_request} from GitHub"
-                Celluloid::Actor[:scheduler].queue_a_build(build_data)
-                request.respond 200
+                pull_request_action = pull_request['action']
+
+                case action
+                when 'opened', 'reopened', 'synchronize'
+                  build_data = BuildData.new(
+                      :type => :pull_request,
+                      :pull_request => pull_request['number'],
+                      :flags => [],
+                      :repo_sha => pull_request['head']['sha'],
+                      :repo_full_name => pull_request['base']['repo']['full_name'])
+                  info "Got #{action} pull request #{build_data.pull_request} from GitHub"
+                  Celluloid::Actor[:scheduler].queue_a_build(build_data)
+                  request.respond 200, "Building"
+                else
+                  request.respond 200, "Ignoring"
+                end
               end
             when 'ping'
               request.respond 200, "Running"

data/lib/build_buddy/slacker.rb

@@ -31,8 +31,10 @@ module BuildBuddy
 
     def self.get_build_flags message
       flags = []
-      message.split(',').each do |s|
-        flags.push(s.lstrip.rstrip.gsub(' ', '_').to_sym)
+      unless message.nil?
+        message.split(',').each do |s|
+          flags.push(s.lstrip.rstrip.gsub(' ', '_').to_sym)
+        end
       end
       flags
     end
@@ -70,19 +72,25 @@ module BuildBuddy
           else
             response = "I'm sorry, I am not allowed to build the `#{version}` release branch"
           end
-        when /stop/i
-          if scheduler.stop_build
-            response = "OK, I stopped the currently running build."
-          else
-            response = "There is no build running to stop."
-          end
         else
-          response = "Sorry#{from_slack_channel ? " <@#{data['user']}>" : ""}, I'm not sure if you want do a `master` or release branch build, or maybe `stop` any running build?"
+          response = "Sorry#{from_slack_channel ? " <@#{data['user']}>" : ""}, I'm not sure if you want do a `master` or release branch build"
         end
       end
       response
     end
 
+    def do_stop
+      scheduler = Celluloid::Actor[:scheduler]
+
+      if scheduler.stop_build
+        response = "OK, I stopped the currently running build."
+      else
+        response = "There is no build running to stop."
+      end
+
+      response
+    end
+
     def do_status
       scheduler = Celluloid::Actor[:scheduler]
       build_data = scheduler.active_build
@@ -123,37 +131,51 @@ I can run builds of the master branch if you say `build master`. I can do builds
 
 I can stop any running build if you ask me to `stop build`, even pull request builds.  I am configured to let the *#{Config.slack_build_channel}* channel know if master or release builds are stopped.
 
-You can also ask me for `status` and I'll tell you what's being built and what's in the queue and `history` to get a list of recent builds.
+You can also ask me for `status` and I'll tell you what's being built.
+
+Ask me `what happened` to get a list of recent builds and log files and `what options` to see the list of options for running builds.
 )
     end
 
-    def do_history(message)
-      case message.lstrip.rstrip
-      when /([0-9]+)/
-        limit = $1.to_i
-      else
-        limit = 5
-      end
+    def do_what(question)
+      question = question.lstrip.rstrip
 
-      recorder = Celluloid::Actor[:recorder]
-      build_datas = recorder.get_build_data_history(limit)
+      case question
+      when /happened/
+        case question
+        when /([0-9]+)/
+          limit = $1.to_i
+        else
+          limit = 5
+        end
 
-      if build_datas.count == 0
-        response = "No builds have performed yet"
-      else
-        response = "Here are the last #{build_datas.count} builds:\n"
-        build_datas.each do |build_data|
-          response += "A "
-          response += case build_data.type
-                      when :master
-                        "`master` branch build"
-                      when :release
-                        "`#{build_data.branch}` release branch build"
-                      when :pull_request
-                        "pull request `#{build_data.pull_request}` build"
-                      end
-          response += " at #{build_data.start_time.to_s}. #{Config.server_base_uri + '/log/' + build_data._id.to_s}\n"
+        recorder = Celluloid::Actor[:recorder]
+        build_datas = recorder.get_build_data_history(limit)
+
+        if build_datas.count == 0
+          response = "No builds have performed yet"
+        else
+          response = "Here are the last #{build_datas.count} builds:\n"
+          build_datas.each do |build_data|
+            response += "A "
+            response += case build_data.type
+                        when :master
+                          "`master` branch build"
+                        when :release
+                          "`#{build_data.branch}` release branch build"
+                        when :pull_request
+                          "pull request `#{build_data.pull_request}` build"
+                        end
+            response += " at #{build_data.start_time.to_s}. #{Config.server_base_uri + '/log/' + build_data._id.to_s}\n"
+          end
         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
+)
+      else
+        response = "I'm not sure what to say..."
       end
       response
     end
@@ -231,10 +253,12 @@ You can also ask me for `status` and I'll tell you what's being built and what's
           do_build $1, from_slack_channel, slack_user_name
         when /status/i
           do_status
-        when /history(.*)/
-          do_history $1
+        when /what(.*)/
+          do_what $1
         when /help/i, /what can/i
           do_help from_slack_channel
+        when /stop/i
+          do_stop
         else
           "Sorry#{from_slack_channel ? " <@#{data['user']}>" : ""}, I'm not sure how to respond."
         end
@@ -248,10 +272,9 @@ You can also ask me for `status` and I'll tell you what's being built and what's
 
       if build_data.type == :pull_request
         message = "The buddy build #{status_message}"
-        Celluloid::Actor[:gitter].async.set_status(
-            build_data.repo_full_name, build_data.repo_sha,
-            build_data.termination_type == :killed ? :failure : build_data.exit_code != 0 ? :error : :success,
-            message)
+        git_status = (build_data.termination_type == :killed ? :failure : build_data.exit_code != 0 ? :error : :success)
+        git_url = (git_status == :error ? "#{Config.server_base_uri + '/log/' + build_data._id.to_s}" : nil)
+        Celluloid::Actor[:gitter].async.set_status(build_data.repo_full_name, build_data.repo_sha, git_status, git_message, git_url)
         info "Pull request build #{status_message}"
       else
         status_message += "Log file at #{Config.server_base_uri + '/log/' + build_data._id.to_s}."

metadata

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