lita-buildkite 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22989d66ceab9ce1f3a43b3df292832b2cf24d49
-  data.tar.gz: f4fe23a71981da40f06afda34e4e56b96abaaf66
+  metadata.gz: f2d6d1cbb193523fc730a4fca088c95df973b850
+  data.tar.gz: 0c7b5cb7886c4d1c158b171a4ede9691ee44cbc6
 SHA512:
-  metadata.gz: 4bbe9a2fcc013f1282544a886c5e768eeff3c84f67f1f0ca9ebfe0e4e9b830c6f01b40e6c491726f2922834b3ff55cc9fb150bbc35fc9d88cad6c225dc92cdaf
-  data.tar.gz: d97d57b6c9bd821a91bbf468aa43463c8d46483104a384ab2dc3e3e5daea7761a371691df57286b0cfb4c6098e764a195122c2aba60854b69d634b3b3d9eb27d
+  metadata.gz: bc9b1cd17771c91682069cb3b95055bc3d5297ee9b1ce3e38f09ff4e12097f3d38ce7fe230a8ec26df5a25bbab2cec313e6b422df6455172b0d49c2957a19620
+  data.tar.gz: f5aa95d1bafa05f914d192e4ee24ddd059454028ddfc67fc752d3ce7ebfd076be65aab089ac06ebe832bb6943cd3e6787a6e57101f556513730679babbfb9a90

data/README.md

@@ -30,6 +30,35 @@ a string of days with no failures, and commiserate when a master branch build fa
 
 This handler provides no additional chat commands. Yet.
 
+## Lita Events
+
+This handler will emit some buildkite events onto the lita event bus, allowing other handlers
+to respond them.
+
+Currently, the following events are emitted:
+
+* buildkite\_build\_finished
+* buildkite\_job\_finished
+
+To respond to the events, write a new handler that looks something like this:
+
+    class BuildkiteDebugHandler < Lita::Handlers::Handler
+      on :buildkite_build_finished, :debug
+      on :buildkite_job_finished, :debug
+
+      def debug(payload)
+        event = payload[:event]
+
+        robot.send_message(target, event.inspect)
+      end
+
+      private
+
+      def target
+        Source.new(room: Lita::Room.find_by_name(config.channel_name) || "general")
+      end
+    end
+
 ## TODO
 
 Possible ideas for new features, either via chat commands or externally triggered events:

data/lib/lita/buildkite.rb

@@ -1,5 +1,7 @@
 require "lita"
 require 'lita/buildkite_event'
+require 'lita/buildkite_build_finished_event'
+require 'lita/buildkite_job_finished_event'
 
 module Lita
   module Handlers
@@ -10,8 +12,15 @@ module Lita
       http.post "/buildkite", :buildkite_event
 
       def buildkite_event(request, response)
-        event = BuildkiteEvent.new(request.body.read)
-        robot.trigger(:buildkite_event, event: event)
+        event = BuildkiteEvent.build(request.body.read)
+        case event
+        when BuildkiteBuildFinishedEvent 
+          robot.trigger(:buildkite_build_finished, event: event)
+        when BuildkiteJobFinishedEvent 
+          robot.trigger(:buildkite_job_finished, event: event)
+        else
+          puts "UnsupportedEvent: #{event.class}"
+        end
       end
 
     end

data/lib/lita/buildkite_build_finished_event.rb

@@ -0,0 +1,54 @@
+require 'date'
+
+# Value object that wraps raw buildkite webhook data and provides convenience
+# methods for querying it
+class BuildkiteBuildFinishedEvent
+  def initialize(data)
+    @data = data
+  end
+
+  def name
+    @data.fetch("event", "")
+  end
+
+  # deprecated
+  def branch
+    build_branch
+  end
+
+  # deprecated
+  def pipeline
+    pipeline_name
+  end
+
+  def pipeline_name
+    @data.fetch("pipeline", {}).fetch("name", "")
+  end
+
+  def pipeline_slug
+    @data.fetch("pipeline", {}).fetch("slug", "")
+  end
+
+  def passed?
+    @data.fetch("build", {}).fetch("state", "") == "passed"
+  end
+
+  def build_branch
+    @data.fetch("build", {}).fetch("branch", "")
+  end
+
+  def build_created_at
+    value = @data.fetch("build", {}).fetch("created_at", nil)
+    value ? DateTime.parse(value).to_time : nil
+  end
+
+  def build_started_at
+    value = @data.fetch("build", {}).fetch("started_at", nil)
+    value ? DateTime.parse(value).to_time : nil
+  end
+
+  def build_finished_at
+    value = @data.fetch("build", {}).fetch("finished_at", nil)
+    value ? DateTime.parse(value).to_time : nil
+  end
+end

data/lib/lita/buildkite_event.rb

@@ -1,25 +1,18 @@
+require 'lita/buildkite_build_finished_event'
+require 'lita/buildkite_unknown_event'
 require 'json'
 
-# Value object that wraps raw buildkite webhook data and provides convenience
-# methods for querying it
 class BuildkiteEvent
-  def initialize(data)
-    @data = JSON.load(data)
-  end
-
-  def build_finished?
-    @data.fetch("build", {}).fetch("finished_at", "") != ""
-  end
-
-  def branch
-    @data.fetch("build", {}).fetch("branch", "")
-  end
-
-  def pipeline
-    @data.fetch("pipeline", {}).fetch("name", "")
-  end
+  def self.build(string)
+    data = JSON.load(string)
 
-  def passed?
-    @data.fetch("build", {}).fetch("state", "") == "passed"
+    case data.fetch("event", "")
+    when "build.finished" then
+      BuildkiteBuildFinishedEvent.new(data)
+    when "job.finished" then
+      BuildkiteJobFinishedEvent.new(data)
+    else
+      BuildkiteUnknownEvent.new(data)
+    end
   end
 end

data/lib/lita/buildkite_job_finished_event.rb

@@ -0,0 +1,68 @@
+require 'date'
+
+# Value object that wraps raw buildkite webhook data and provides convenience
+# methods for querying it
+class BuildkiteJobFinishedEvent
+  def initialize(data)
+    @data = data
+  end
+
+  def name
+    @data.fetch("event", "")
+  end
+
+  def job_name
+    @data.fetch("job", {}).fetch("name","")
+  end
+
+  def job_slug
+    slugorize(job_name)
+  end
+
+  def job_state
+    @data.fetch("job", {}).fetch("state","")
+  end
+
+  def job_started_at
+    value = @data.fetch("job", {}).fetch("started_at", nil)
+    value ? DateTime.parse(value).to_time : nil
+  end
+
+  def job_finished_at
+    value = @data.fetch("job", {}).fetch("finished_at", nil)
+    value ? DateTime.parse(value).to_time : nil
+  end
+
+  def agent_name
+    @data.fetch("job", {}).fetch("agent",{}).fetch("name","")
+  end
+
+  def agent_hostname
+    @data.fetch("job", {}).fetch("agent",{}).fetch("hostname","")
+  end
+
+  def build_branch
+    @data.fetch("build", {}).fetch("branch","")
+  end
+
+  def pipeline_name
+    @data.fetch("pipeline", {}).fetch("name", "")
+  end
+
+  def pipeline_slug
+    @data.fetch("pipeline", {}).fetch("slug", "")
+  end
+
+  private
+
+  def slugorize(input)
+    result = input.to_s.downcase
+    result.gsub!(/['|’]/, '')           # Remove apostrophes
+    result.gsub!('&', 'and')            # Replace & with 'and'
+    result.gsub!(/[^a-z0-9\-]/, '-')    # Get rid of anything we don't like
+    result.gsub!(/-+/, '-')             # collapse dashes
+    result.gsub!(/-$/, '')              # trim dashes
+    result.gsub!(/^-/, '')              # trim dashes
+    result
+  end
+end

data/lib/lita/buildkite_unknown_event.rb

@@ -0,0 +1,10 @@
+class BuildkiteUnknownEvent
+  def initialize(data)
+    @data = data
+  end
+
+  def name
+    @data.fetch("event", "")
+  end
+
+end

data/lib/lita/days_since_master_failure.rb

@@ -1,5 +1,5 @@
 require "lita"
-require 'lita/buildkite_event'
+require 'lita/buildkite_build_finished_event'
 require 'lita/days_since_master_failure_repository'
 
 module Lita
@@ -9,12 +9,12 @@ module Lita
     class DaysSinceMasterFailure < Handler
       config :channel_name
 
-      on :buildkite_event, :timestamp_failure
+      on :buildkite_build_finished, :timestamp_failure
 
       def timestamp_failure(payload)
         event = payload[:event]
 
-        if event.branch == "master" && event.build_finished?
+        if event.branch == "master" && event.name == "build.finished"
           process_build_finished(event) do |msg|
             robot.send_message(target, msg)
           end
@@ -24,11 +24,12 @@ module Lita
       private
 
       def process_build_finished(event, &block)
+        repository = DaysSinceMasterFailureRepository.new(redis, event.pipeline)
         repository.record_result(event.passed?) do |days_since_last_failure, prev_days_since_last_failure|
           if days_since_last_failure < prev_days_since_last_failure
-            yield "Oh Oh, #{days_since_last_failure} day(s) since the last master failure"
+            yield "Oh Oh, #{days_since_last_failure} day(s) since the last master failure on #{event.pipeline}"
           elsif days_since_last_failure > prev_days_since_last_failure
-            yield "Congratulations! #{days_since_last_failure} day(s) since the last master failure"
+            yield "Congratulations! #{days_since_last_failure} day(s) since the last master failure on #{event.pipeline}"
           end
         end
       end
@@ -37,10 +38,6 @@ module Lita
         Source.new(room: Lita::Room.find_by_name(config.channel_name) || "general")
       end
 
-      def repository
-        @repository ||= DaysSinceMasterFailureRepository.new(redis)
-      end
-
     end
 
     Lita.register_handler(DaysSinceMasterFailure)

data/lib/lita/days_since_master_failure_repository.rb

@@ -1,8 +1,10 @@
 # Provides all persistence logic for the DaysSinceMasterFailure handler, insulating
 # the handler from any knowledge of redis
 class DaysSinceMasterFailureRepository
-  def initialize(redis)
+  def initialize(redis, pipeline_name)
     @redis = redis
+    @last_failure_key = "last-failure-at-#{pipeline_name}"
+    @last_reported_days_key = "last-reported-days-#{pipeline_name}"
 
     initialise_last_failure_at_if_not_set
   end
@@ -24,7 +26,7 @@ class DaysSinceMasterFailureRepository
   end
 
   def touch_last_failure_at
-    @redis.set("last-failure-at", ::Time.now.to_i)
+    @redis.set(@last_failure_key, ::Time.now.to_i)
   end
 
   def touch_last_reported_days
@@ -32,18 +34,18 @@ class DaysSinceMasterFailureRepository
   end
 
   def fetch_last_failure_at
-    @redis.get("last-failure-at").to_i
+    @redis.get(@last_failure_key).to_i
   end
 
   def set_last_reported_days(days)
-    @redis.set("last-reported-days", days.to_i)
+    @redis.set(@last_reported_days_key, days.to_i)
   end
 
   def last_reported_days
-    @redis.get("last-reported-days").to_i
+    @redis.get(@last_reported_days_key).to_i
   end
 
   def initialise_last_failure_at_if_not_set
-    @redis.setnx("last-failure-at", ::Time.now.to_i)
+    @redis.setnx(@last_failure_key, ::Time.now.to_i)
   end
 end

data/lib/lita-buildkite.rb

@@ -1,4 +1,5 @@
 require 'lita/buildkite'
-require 'lita/buildkite_event'
+require 'lita/buildkite_build_finished_event'
+require 'lita/buildkite_job_finished_event'
 require 'lita/days_since_master_failure'
 require 'lita/days_since_master_failure_repository'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-buildkite
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - James Healy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,7 +94,10 @@ files:
 - README.md
 - lib/lita-buildkite.rb
 - lib/lita/buildkite.rb
+- lib/lita/buildkite_build_finished_event.rb
 - lib/lita/buildkite_event.rb
+- lib/lita/buildkite_job_finished_event.rb
+- lib/lita/buildkite_unknown_event.rb
 - lib/lita/days_since_master_failure.rb
 - lib/lita/days_since_master_failure_repository.rb
 homepage: http://github.com/conversation/lita-buildkite