build-buddy 1.8.4 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 656443f17239c6954ec716ef56dce64a6ad0a33b
-  data.tar.gz: bf937f8268594356e0bfc79bcbb6163a4134e386
+  metadata.gz: 76cc3ddfbee154ee1432443968a760f9e17e79e8
+  data.tar.gz: 575d15f41abb55fcbc7e0e8174144f3926e5c568
 SHA512:
-  metadata.gz: a04a74c2e86297a87a5f0ec98ede406e05456073479d661edd298c90df868ffc896b5b1aa4078f7e8858a2df6d5d3286434c8e60f9eacfcb3ab80db5af269994
-  data.tar.gz: 0f45e9e4bb55b51107369dad1555f3074dd6b04273c24721f72cf8b12b7c4b55cc089bb0174f85c7cf8b0f098c26dbc8e364d1fb9a676dff23eca3702820b1a8
+  metadata.gz: cc093742b96214e7f4f5a2e1c58bb1fe39efe77fadacec41d75a86672da153d6098bc90b48dbc11c7571bb83c490fad7b19a7cba2dc04e536c110a72763c88c2
+  data.tar.gz: 456bcf537cd820466616367118a23fdef23c67c08842c9d6ead7ed35cf3ed86fa38809f303be637ab81f67dd91b423d4ba89a295ae1e247cd034cd9a3841dfc4

data/lib/build_buddy.rb

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

data/lib/build_buddy/builder.rb

@@ -81,7 +81,7 @@ module BuildBuddy
       begin
         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}"
+        error "There was a problem collecting build metrics: #{ex.message}"
       end
       if !metrics
         metrics = {}

data/lib/build_buddy/config.rb

@@ -19,12 +19,14 @@ module BuildBuddy
     attr_accessor :valid_release_versions
     attr_accessor :kill_build_after_mins
     attr_accessor :server_base_uri
+    attr_accessor :mongo_uri
   end
 
   class << self
     def configure
       Config.github_webhook_port = 4567
       Config.kill_build_after_mins = 30
+      Config.mongo_uri = 'mongodb://localhost:27017/build-buddy'
       block_given? ? yield(Config) : Config
     end
 

data/lib/build_buddy/recorder.rb

@@ -11,8 +11,9 @@ module BuildBuddy
 
     def initialize()
       Mongo::Logger.logger.level = ::Logger::FATAL
-      @mongo ||= Mongo::Client.new([ '127.0.0.1:27017' ], :database => 'build-buddy')
-      info "Connected to MongoDB"
+      mongo_uri = BuildBuddy::Config.mongo_uri
+      @mongo ||= Mongo::Client.new(mongo_uri)
+      info "Connected to MongoDB at '#{mongo_uri}'"
       @mongo[:builds].indexes.create_one({:start_time => -1}, :name => "reverse_build_order")
     end
 

data/lib/build_buddy/scheduler.rb

@@ -53,7 +53,12 @@ module BuildBuddy
 
     def on_build_interval
       if @active_build.nil?
-        if @build_queue.length > 0
+        # No active build so...
+        if @done_queue.length > 0  # First, send any completed build statuses
+          build_data = @done_queue.pop
+          Celluloid::Actor[:slacker].async.notify_channel(build_data)
+          Celluloid::Actor[:recorder].async.update_build_data(build_data)
+        elsif @build_queue.length > 0  # Then, check if there are any builds waiting to go
           build_data = @build_queue.pop()
           @active_build = build_data
           Celluloid::Actor[:recorder].async.record_build_data(build_data)
@@ -62,14 +67,11 @@ module BuildBuddy
                 build_data.repo_full_name, build_data.repo_sha, :pending, "This build has started")
           end
           Celluloid::Actor[:builder].async.start_build(build_data)
-        elsif @done_queue.length > 0
-          build_data = @done_queue.pop
-          Celluloid::Actor[:slacker].async.notify_channel(build_data)
-          Celluloid::Actor[:recorder].async.update_build_data(build_data)
-        else
+        else # Otherwise, stop the timer until we get a build queued.
           @build_timer.cancel
           @build_timer = nil
           info "Build timer stopped"
+          # Now we won't get any more build intervals
         end
       else
         # Make sure that the build has not run too long and kill if necessary

data/lib/build_buddy/server.rb

@@ -11,7 +11,7 @@ module BuildBuddy
 
     def initialize()
       super("127.0.0.1", Config.github_webhook_port, &method(:on_connection))
-      info "Listening on port #{Config.github_webhook_port}"
+      info "Web server listening on port #{Config.github_webhook_port}"
     end
 
     def on_connection(connection)

data/lib/build_buddy/slacker.rb

@@ -286,13 +286,20 @@ Ask me `what happened` to get a list of recent builds and log files and `what op
           info "Release branch build #{status_message}"
         end
 
+        # See https://api.slack.com/docs/attachments for more information about formatting Slack attachments
+        attach = [
+            :title => build_data.type == :pull_request ? "Pull Request" : "Branch Build",
+            :text => message,
+            :color => build_data.termination_type == :killed ? :warning : build_data.exit_code != 0 ? :danger : :good,
+        ]
+
         if build_data.flags.include?(:test_channel)
           unless @test_slack_channel.nil?
-            @rt_client.message(channel: @test_slack_channel, text: message)
+            @rt_client.message(channel: @test_slack_channel, text: message, attachments: attach)
           end
         else
           unless @build_slack_channel.nil?
-            @rt_client.message(channel: @build_slack_channel, text: message)
+            @rt_client.message(channel: @build_slack_channel, text: message, attachments: attach)
           end
         end
       end

metadata

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