ampel_extase 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae725820fd3303481216d55d24f2469dbc2f71a2
-  data.tar.gz: e707f917125e83cb174c96a19db891dde8fce21b
+  metadata.gz: 98397c6d3db5a5951ba8eb4b6eadb6a78babbeac
+  data.tar.gz: 366beb6df5bf0b866f4c92888d7587d4204320f0
 SHA512:
-  metadata.gz: 670dc15299ed7b16b420a33678acf4bece81fff5fbf24de671d0669e43184bf476a66d49d030f59015e822f88f6c31506a4933750dc996760ce6d91c71e5347e
-  data.tar.gz: 533e98f06fbbc95dc602c88f6607d17a47243e1e97cabcdd8c3f29a0950bb25a83bdc245578e3f92a59c6f01f6bd2afe1260e4333586fa6e22d2d68a33064a05
+  metadata.gz: b5db8988d151209942500312d96381605cd6d079627f4fdeef70620f9d70f02a25652c9381db8f0ab5357a739a25c8c50a89421c2119bc2966b91d1d79ea83ea
+  data.tar.gz: 2e8f4244d62306c792f683356773846e5aabc1e76fcf027f8e16f5006d83341f6ac935d909f76cbcb88dd6dfe754da97ecb5e1f028b4b2defdf05da920305cb5

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/ampel_extase.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: ampel_extase 0.5.0 ruby lib
+# stub: ampel_extase 0.5.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ampel_extase"
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Florian Frank"]
-  s.date = "2015-08-27"
+  s.date = "2015-08-31"
   s.description = "Library to control the build traffic light. Yes, we can\u{2026}"
   s.email = "flori@ping.de"
   s.executables = ["ampel_control"]

data/lib/ampel_extase/jenkins_state_observer.rb

@@ -41,6 +41,8 @@ class AmpelExtase::JenkinsStateObserver
     self
   end
 
+  attr_reader :state_changed_at
+
   def fetch_new_state
     AmpelExtase::BuildState.for [ last_result, building? ]
   end

data/lib/ampel_extase/jenkins_warning_state_observer.rb

@@ -21,7 +21,6 @@ class AmpelExtase::JenkinsWarningStateObserver
 
   def on_state_change(duration, &block)
     @observers.each do |observer|
-      observer.expired?(duration) and next
       observer.on_state_change do |state|
         if %w[ FAILURE ABORTED ].include?(state.last_result)
           block.(state)
@@ -32,7 +31,11 @@ class AmpelExtase::JenkinsWarningStateObserver
     self
   end
 
+  def last_state_change
+    @observers.map(&:state_changed_at).max
+  end
+
   def expired?(duration)
-    @observers.all? { |observer| observer.expired?(duration) }
+    Time.now - last_state_change > duration
   end
 end

data/lib/ampel_extase/version.rb

@@ -1,6 +1,6 @@
 module AmpelExtase
   # AmpelExtase version
-  VERSION         = '0.5.0'
+  VERSION         = '0.5.1'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/spec/ampel_extase/jekins_state_observer_spec.rb

@@ -80,7 +80,7 @@ describe AmpelExtase::JenkinsStateObserver do
         jso
       end
       expect(jso.instance_variable_get(:@build_state)).to eq bs_initial
-      expect(jso.instance_variable_get(:@state_changed_at)).to eq past
+      expect(jso.state_changed_at).to eq past
       allow(client).to receive(:fetch_build).with(:last_completed_build).
         and_return('result' => 'SUCCESS')
       allow(client).to receive(:fetch_build).with(:last_build).
@@ -97,7 +97,7 @@ describe AmpelExtase::JenkinsStateObserver do
         }.to yield_with_args(bs_success)
       end
       expect(jso.instance_variable_get(:@build_state)).to eq bs_success
-      expect(jso.instance_variable_get(:@state_changed_at)).to eq now
+      expect(jso.state_changed_at).to eq now
       allow(client).to receive(:fetch_build).with(:last_completed_build).
         and_return('result' => 'FAILURE')
       allow(client).to receive(:fetch_build).with(:last_build).

data/spec/ampel_extase/jenkins_warning_state_observer_spec.rb

@@ -5,8 +5,18 @@ describe AmpelExtase::JenkinsWarningStateObserver do
     described_class.new [ observer ]
   end
 
+  let :client do
+    double('AmpelExtase::JenkinsClient', url: 'http://foo/bar')
+  end
+
   let :observer do
-    double('AmpelExtase::JenkinsStateObserver')
+    AmpelExtase::JenkinsStateObserver.new client
+  end
+
+  before do
+    allow(client).to receive(:fetch).and_return true
+    allow_any_instance_of(AmpelExtase::JenkinsStateObserver).to receive(:puts)
+    allow_any_instance_of(AmpelExtase::JenkinsClient).to receive(:puts)
   end
 
   describe '.for_urls' do
@@ -37,23 +47,34 @@ describe AmpelExtase::JenkinsWarningStateObserver do
       AmpelExtase::BuildState.for [ 'FAILURE', true ]
     end
 
-    it 'skips observers that are already expired b4 duration' do
-      expect(observer).to receive(:expired?).with(666).and_return true
-      expect(observer).not_to receive(:on_state_change)
+    it 'delegates on_state_change to observers' do
+      expect(observer).to receive(:on_state_change)
       jenkins_warning_state_observer.on_state_change(666)
     end
 
+    it 'executes state change action on FAILURE/ABORTED result' do
+      allow(observer).to receive(:fetch_new_state).and_return bs_failure
+      executed = false
+      jenkins_warning_state_observer.on_state_change(666) do
+        executed = true
+      end
+      expect(executed).to eq true
+    end
+
     it 'skips states where the last result is not FAILURE/ABORTED' do
-      expect(observer).to receive(:expired?).with(666).and_return false
-      allow(observer).to receive(:on_state_change)
-      jenkins_warning_state_observer.on_state_change(666)
+      allow(observer).to receive(:fetch_new_state).and_return bs_success
+      executed = false
+      jenkins_warning_state_observer.on_state_change(666) do
+        executed = true
+      end
+      expect(executed).to eq false
     end
   end
 
   describe '#expired?' do
     it 'checks if all of its observers are expired' do
-      expect(observer).to receive(:expired?).with(666)
-      jenkins_warning_state_observer.expired?(666)
+      expect(observer).to receive(:state_changed_at).and_return Time.now - 666
+      expect(jenkins_warning_state_observer).to be_expired(60)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ampel_extase
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar