build-buddy 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b047d2b1bc2a825a18ba63df01115b0f7564a965
-  data.tar.gz: 02cfc587d188363d5e48aba4d7234e423498a129
+  metadata.gz: 71d3b93e2aa1cf310586d98a001ad1aeb8a9b6ae
+  data.tar.gz: 899ef4ca9076a751015a13bf1ce66990e53ba752
 SHA512:
-  metadata.gz: 1fd06cea76d507a0e03d9248ae7f5f5d440071d9dcde85362d1736501634f32aa8b9c63049d287624a722af3a2898591e6bc74aba459038ab5caebb5a1d5adc5
-  data.tar.gz: d68577afdc4f51a768265c85b671a1374aed7c3aed6bd7b70c34d85cce3d00510efc3e255c5dbf5d99c7ff9fd98713d339c717a9ca19cac57ed8b5c1b3e39e52
+  metadata.gz: 16965b5a8f3c9e5cf88e84fdd057f5649a2948b16c94cd854a3f7cdf2a42779f074aab6c5e4f3ee1714a99427ec8f06e551d987d271337c99d72992315ac722b
+  data.tar.gz: 5e702e6e2aab68fe65945e30d8e54503f7325be9226ac1c609ab0a10f342b4fe21e1e84c375c615d288f33e1407c8ed861ccd3c542c64d21316d324d6b70f311

data/lib/build_buddy.rb

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

data/lib/build_buddy/build_data.rb

@@ -93,7 +93,8 @@ module BuildBuddy
 
     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')
+      start_time = @start_time.nil? ? end_time : @start_time
+      Time.at(end_time - start_time).utc.strftime('%H:%M:%S.%L')
     end
   end
 end

data/lib/build_buddy/builder.rb

@@ -123,7 +123,7 @@ source ${BB_BUILD_SCRIPT}
 
       unless build_data.flags.nil?
         build_data.flags.each do |flag|
-          env["BB_BUILD_FLAG_#{flag.to_s.upcase}"] = 1
+          env["BB_BUILD_FLAG_#{flag.to_s.upcase}"] = '1'
         end
       end
 

data/lib/build_buddy/slacker.rb

@@ -41,7 +41,7 @@ module BuildBuddy
       flags = []
       unless message.nil?
         message.split(',').each do |s|
-          flags.push(s.lstrip.rstrip.downcase.gsub(' ', '_').to_sym)
+          flags.push(s.lstrip.rstrip.gsub(' ', '_').to_sym)
         end
       end
       flags
@@ -61,20 +61,26 @@ module BuildBuddy
         message = message.strip
 
         case message
-        when /^master(?: +with +(?<flags>[a-z ]+))?/i
+        when /^master(?: +with +(?<flags>[a-z ,]+))?/i
           flags = Slacker.extract_build_flags($~[:flags])
           response = "OK, I've queued a build of the `master` branch."
+          if flags.count > 0
+            response += " (#{flags.join(", ")})"
+          end
           scheduler.queue_a_build(BuildData.new(
               :type => :branch,
               :branch => 'master',
               :flags => flags,
               :repo_full_name => Config.github_webhook_repo_full_name,
               :started_by => slack_user_name))
-        when /^(?<version>v\d+\.\d+)(?: with )?(?<flags>.*)?/
+        when /^(?<version>v\d+\.\d+)(?: +with +(?<flags>[a-z ,]+))?/
           flags = Slacker.extract_build_flags($~[:flags])
           version = $~[:version]
           if Config.allowed_build_branches.include?(version)
             response = "OK, I've queued a build of the `#{version}` branch."
+            if flags.count > 0
+              response += " (#{flags.join(", ")})"
+            end
             scheduler.queue_a_build(BuildData.new(
                 :type => :branch,
                 :branch => version,
@@ -176,6 +182,9 @@ Stop any running build with `stop build bb-xxx`.  Use `show queue` to get a vali
             text += " by *@#{build_data.stopped_by}*"
           end
           text += " ran for `#{build_data.run_time}`"
+          if build_data.flags.count > 0
+            text += " (#{build_data.flags.join(", ")})"
+          end
           attachments.push({
             :mrkdwn_in => [ :text ],
             :text => text,
@@ -204,7 +213,11 @@ Stop any running build with `stop build bb-xxx`.  Use `show queue` to get a vali
         unless build_data.started_by.nil?
           response += " by *@#{build_data.started_by}*"
         end
-        response += " running for `#{build_data.run_time}`."
+        response += " running for `#{build_data.run_time}`"
+        if build_data.flags.count > 0
+          response += " (#{build_data.flags.join(", ")})"
+        end
+        response += '.'
         if queue_length == 0
           response += " No builds in the queue."
         elsif queue_length > 1
@@ -229,6 +242,9 @@ Stop any running build with `stop build bb-xxx`.  Use `show queue` to get a vali
           unless build_data.started_by.nil?
             text += " by *@#{build_data.started_by}*"
           end
+          if build_data.flags.count > 0
+            response += " (#{build_data.flags.join(", ")})"
+          end
           attachments.push({
             :mrkdwn_in => [ :text ],
             :text => text,
@@ -328,7 +344,7 @@ Stop any running build with `stop build bb-xxx`.  Use `show queue` to get a vali
       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
+                 when /build +([a-z0-9, ]+)/i
                    do_build $1, is_from_slack_channel, slack_user_name
                  when /(?:show +)?status/
                    do_show_status

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-buddy
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - John Lyon-smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers