chicanery 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae8d3b8f2e9b341beba34ae7d3d3876c73c3c6b1
-  data.tar.gz: 3d4547a9747c5cc24cda09dab73c02c8a17c0fb3
+  metadata.gz: 10a2f31b2de883be54826b643b9bcdb8302f92d3
+  data.tar.gz: 18fca2caf13b57a4aa6a411f070a40ff64ae2517
 SHA512:
-  metadata.gz: 9219bfa43c30c733006621aa5aec6a0b4d7bc86f3fe736fcd60b712543ea953c600a1cd2421458b4859c1442cd162d18c2bd230fdd1fff70f14e4a6fb47f1d8d
-  data.tar.gz: 728bd0f84bea90d00734173b1ee7eafc1134d2ae4a250e3108911276a1db9291510599b6d4e68fe1707fb47ea803c1d9eb00d7a2cf07c22353baee7c9d8d3106
+  metadata.gz: ecd3c65a9e6ca02735cda32d37b42d73428fb11f1f7d27b2f62f665befb512b3f49f73d9dee1e043bb3ffc4dc6b95088ce4f833554bfcc83f750b7b9ad006ed2
+  data.tar.gz: 6d956f8f614c256deecf00abcd28af7b588543e21a38e5248b177deca96861137ef7aeae5b97167df004f6a6c8687ff9b2723a698e3fe13f08041d66a26553f3

data/Gemfile.lock

@@ -1,13 +1,15 @@
 PATH
   remote: .
   specs:
-    chicanery (0.1.7)
+    chicanery (0.1.8)
+      colorize (~> 0)
       nokogiri (~> 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.6)
+    colorize (0.7.3)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)

data/chicanery.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'nokogiri', '~>1'
+  gem.add_dependency 'colorize', '~>0'
 
   gem.add_development_dependency 'rake', '~>0'
   gem.add_development_dependency 'rspec', '~>2'

data/lib/chicanery.rb

@@ -16,7 +16,7 @@ module Chicanery
   include Repos
   include Sites
 
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 
   def poll_period seconds=nil
     @poll_period = seconds if seconds

data/lib/chicanery/debug.rb

@@ -0,0 +1,12 @@
+module Chicanery
+  module Debug
+    def verbose message
+      return unless ENV['CHICANERY_DEBUG'] == 'verbose'
+      $stderr.puts message
+    end
+
+    def verbose_blue message
+      verbose message.colorize(:blue)
+    end
+  end
+end

data/lib/chicanery/handlers.rb

@@ -1,5 +1,10 @@
+require 'chicanery/debug'
+require 'colorize'
+
 module Chicanery
   module Handlers
+    include Debug
+
     %w{run started succeeded failed broken fixed commit up down crashed recovered}.each do |status|
       class_eval <<-EOF
         def when_#{status} &block
@@ -11,6 +16,7 @@ module Chicanery
         end
 
         def notify_#{status}_handlers *args
+          verbose_blue \"\t\tnow #{status}\"
           #{status}_handlers.each {|handler| handler.call *args }
         end
       EOF

data/lib/chicanery/servers.rb

@@ -1,36 +1,67 @@
 require 'chicanery/collections'
 require 'chicanery/handlers'
+require 'chicanery/debug'
 
 module Chicanery
   module Servers
     include Collections
     include Handlers
+    include Debug
 
     def check_servers current_state, previous_state
       current_state[:servers] = {}
+      verbose_blue "Execution #{Time.now}"
       servers.each do |server|
+        verbose "examining server #{server.name}"
         current_jobs = server.jobs
-        compare_jobs current_jobs, previous_state[:servers][server.name] if previous_state[:servers]
+        if previous_state[:servers] && previous_state[:servers][server.name]
+          compare_jobs current_jobs, previous_state[:servers][server.name]
+        else
+          verbose "\tno past server #{server.name} state for comparison"
+        end
         current_state[:servers][server.name] = current_jobs
       end
     end
 
     def compare_jobs current_jobs, previous_jobs
-      return unless previous_jobs
       current_jobs.each do |job_name, job|
-        compare_job job_name, job, previous_jobs[job_name] if previous_jobs[job_name]
+        verbose "\texamining job #{job_name} (now #{job[:activity]}, was #{job[:last_build_status]})"
+        if previous_jobs[job_name]
+          compare_job job_name, job, previous_jobs[job_name]
+        else
+          verbose "\tno past job #{job_name} state for comparison"
+        end
       end
     end
 
     def compare_job name, current, previous
-      if current[:activity] == :building and previous[:activity] == :sleeping
-        notify_started_handlers name, current
+      if current[:activity] == :building
+        verbose "\t\tcurrently building"
+        hack_for_forgetful_ci current, previous
+        if previous[:activity] == :sleeping
+          notify_started_handlers name, current
+        end
+        return
       end
-      return unless current[:last_build_time] != previous[:last_build_time]
+      unless current[:last_build_time] != previous[:last_build_time] || current[:last_build_status] != previous[:last_build_status]
+        verbose "\t\tno change in timestamp or build status"
+        return
+      end
+      verbose "\t\t#{previous[:last_build_status]} -> #{current[:last_build_status]}"
       notify_succeeded_handlers name, current if current[:last_build_status] == :success
       notify_failed_handlers name, current if current[:last_build_status] == :failure
-      notify_broken_handlers name, current if current[:last_build_status] == :failure and previous[:last_build_status] == :success
-      notify_fixed_handlers name, current if current[:last_build_status] == :success and previous[:last_build_status] == :failure
+      notify_broken_handlers name, current if current[:last_build_status] == :failure && previous[:last_build_status] == :success
+      notify_fixed_handlers name, current if current[:last_build_status] == :success && previous[:last_build_status] == :failure
+    end
+
+    def hack_for_forgetful_ci current, previous
+      # the following unfortunate hack is to compensate for cctray implementations (semaphore) which lose last build information when building
+      return if current[:last_build_time] > 0
+      verbose "\t\tcopying previous build content"
+      %w(build_time build_status label).each do |property|
+        key = "last_#{property}".to_sym
+        current[key] = previous[key]
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chicanery
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Mark Ryall
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,7 @@ files:
 - lib/chicanery.rb
 - lib/chicanery/cctray.rb
 - lib/chicanery/collections.rb
+- lib/chicanery/debug.rb
 - lib/chicanery/git.rb
 - lib/chicanery/handlers.rb
 - lib/chicanery/persistence.rb