ampel_extase 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98397c6d3db5a5951ba8eb4b6eadb6a78babbeac
-  data.tar.gz: 366beb6df5bf0b866f4c92888d7587d4204320f0
+  metadata.gz: 0f658e5e1398b0e1b6e3d07d7b518fd3b2d8f4ec
+  data.tar.gz: ccf8b388f855d95651b61a2d282e065e62f40226
 SHA512:
-  metadata.gz: b5db8988d151209942500312d96381605cd6d079627f4fdeef70620f9d70f02a25652c9381db8f0ab5357a739a25c8c50a89421c2119bc2966b91d1d79ea83ea
-  data.tar.gz: 2e8f4244d62306c792f683356773846e5aabc1e76fcf027f8e16f5006d83341f6ac935d909f76cbcb88dd6dfe754da97ecb5e1f028b4b2defdf05da920305cb5
+  metadata.gz: 15ae5b5d1d0f71355d32f56b296f487915240f28bee940204fd360e2b2ec9cb0d2515b3e4d91e86724f368bff8d6c7872727e292f076e5a95a3e2a89ac98a373
+  data.tar.gz: 7eba9b6d9ac585ccc41193ea1adb2d96e05cf7cedce27da7eebdf3887d67288e9fff72beeabcad0e21c5072734e1821359549c95f80c8515380e9b86ed01663c

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0

data/ampel_extase.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ampel_extase 0.5.1 ruby lib
+# stub: ampel_extase 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ampel_extase"
-  s.version = "0.5.1"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/ampel_extase/build_state.rb

@@ -14,6 +14,10 @@ class AmpelExtase::BuildState
     !!@is_building
   end
 
+  def success?
+    %w[SUCCESS N/A].include? @last_result
+  end
+
   def to_a
     return @last_result, @is_building
   end

data/lib/ampel_extase/jenkins_state_observer.rb

@@ -41,6 +41,8 @@ class AmpelExtase::JenkinsStateObserver
     self
   end
 
+  attr_reader :build_state
+
   attr_reader :state_changed_at
 
   def fetch_new_state

data/lib/ampel_extase/jenkins_warning_state_observer.rb

@@ -31,11 +31,12 @@ class AmpelExtase::JenkinsWarningStateObserver
     self
   end
 
-  def last_state_change
-    @observers.map(&:state_changed_at).max
+  def last_failure_at
+    @observers.reject { |o| o.build_state.success? }.
+      map(&:state_changed_at).max || Time.at(0)
   end
 
   def expired?(duration)
-    Time.now - last_state_change > duration
+    Time.now - last_failure_at > duration
   end
 end

data/lib/ampel_extase/version.rb

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

data/spec/ampel_extase/build_state_spec.rb

@@ -21,18 +21,25 @@ describe AmpelExtase::BuildState do
     it 'reads N/A as a string' do
       expect(bs.to_s).to eq 'N/A'
     end
+
+    it 'is a success, provisionally' do
+      expect(bs).to be_success
+    end
   end
 
-  describe 'an intermediate state' do
+  describe 'a success state' do
     let :bs do
       described_class.for [ 'SUCCESS', true ]
     end
 
-
     it 'has SUCCESS as the last result' do
       expect(bs.last_result).to eq 'SUCCESS'
     end
 
+    it 'is a success' do
+      expect(bs).to be_success
+    end
+
     describe 'building' do
       it 'has a to_a' do
         expect(bs.to_a).to eq [ 'SUCCESS', true ]
@@ -66,6 +73,16 @@ describe AmpelExtase::BuildState do
     end
   end
 
+  describe 'a failed state' do
+    let :bs do
+      described_class.for [ 'FAILURE', true ]
+    end
+
+    it 'is not a success' do
+      expect(bs).not_to be_success
+    end
+  end
+
   describe 'equality' do
     it 'can be equal or unequal' do
       foo_true = described_class.for([ 'FOO', true ])
@@ -75,6 +92,5 @@ describe AmpelExtase::BuildState do
       expect(foo_true).not_to eq foo_false
       expect(foo_true).not_to eq bar_true
     end
-
   end
 end

data/spec/ampel_extase/jenkins_warning_state_observer_spec.rb

@@ -73,9 +73,8 @@ describe AmpelExtase::JenkinsWarningStateObserver do
 
   describe '#expired?' do
     it 'checks if all of its observers are expired' do
-      expect(observer).to receive(:state_changed_at).and_return Time.now - 666
+      expect(jenkins_warning_state_observer).to receive(:last_failure_at).and_return Time.now - 666
       expect(jenkins_warning_state_observer).to be_expired(60)
     end
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ampel_extase
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Florian Frank