ampel_extase 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae6a5d724b7c06425fca0953f0e8035cd802f492
-  data.tar.gz: c8b9a89b451637c118264ed8988e5302178d261b
+  metadata.gz: ae725820fd3303481216d55d24f2469dbc2f71a2
+  data.tar.gz: e707f917125e83cb174c96a19db891dde8fce21b
 SHA512:
-  metadata.gz: 85e5bc084b1e0ba6bcaf5293c77b854bbd557c444f6e3e55a4b642395902f689abadf60979f0740cbcb88c7842b82e0121391f280cd8798109f66f41b21ae5df
-  data.tar.gz: c97d946b4225c5a50392d6dc8a7739b5da698c68c8e9d11ffabc3ec2d6d6abed207a0b50a32b7d6de2f6273bb05fad513382e89f267f5a86d77cf3161321428a
+  metadata.gz: 670dc15299ed7b16b420a33678acf4bece81fff5fbf24de671d0669e43184bf476a66d49d030f59015e822f88f6c31506a4933750dc996760ce6d91c71e5347e
+  data.tar.gz: 533e98f06fbbc95dc602c88f6607d17a47243e1e97cabcdd8c3f29a0950bb25a83bdc245578e3f92a59c6f01f6bd2afe1260e4333586fa6e22d2d68a33064a05

data/.travis.yml

@@ -0,0 +1,9 @@
+rvm:
+  - 2.1
+  - 2.2
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+env:
+  - CODECLIMATE_REPO_TOKEN=6a30c15f0405afc4bcdb43205af4520a2b38cc422d014198f599a25a1df2cacf

data/Rakefile

@@ -23,6 +23,7 @@ GemHadar do
   development_dependency 'simplecov',      '~>0.9'
   development_dependency 'rspec',          '~>3.0'
   development_dependency 'byebug'
+  development_dependency 'codeclimate-test-reporter'
 
   default_task_dependencies :spec
 end

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/ampel_extase.gemspec

@@ -1,25 +1,25 @@
 # -*- encoding: utf-8 -*-
-# stub: ampel_extase 0.4.0 ruby lib
+# stub: ampel_extase 0.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ampel_extase"
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   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-26"
+  s.date = "2015-08-27"
   s.description = "Library to control the build traffic light. Yes, we can\u{2026}"
   s.email = "flori@ping.de"
   s.executables = ["ampel_control"]
-  s.extra_rdoc_files = ["README.md", "lib/ampel_extase.rb", "lib/ampel_extase/build_state.rb", "lib/ampel_extase/controller.rb", "lib/ampel_extase/jenkins_client.rb", "lib/ampel_extase/jenkins_multi_state_observer.rb", "lib/ampel_extase/jenkins_state_observer.rb", "lib/ampel_extase/light_switcher.rb", "lib/ampel_extase/version.rb"]
-  s.files = [".gitignore", ".utilsrc", "Gemfile", "README.md", "Rakefile", "VERSION", "ampel_extase.gemspec", "bin/ampel_control", "lib/ampel_extase.rb", "lib/ampel_extase/build_state.rb", "lib/ampel_extase/controller.rb", "lib/ampel_extase/jenkins_client.rb", "lib/ampel_extase/jenkins_multi_state_observer.rb", "lib/ampel_extase/jenkins_state_observer.rb", "lib/ampel_extase/light_switcher.rb", "lib/ampel_extase/version.rb", "spec/ampel_extase/build_state_spec.rb", "spec/ampel_extase/controller_spec.rb", "spec/ampel_extase/jekins_state_observer_spec.rb", "spec/ampel_extase/jenkins_client_spec.rb", "spec/ampel_extase/light_switcher_spec.rb", "spec/spec_helper.rb"]
+  s.extra_rdoc_files = ["README.md", "lib/ampel_extase.rb", "lib/ampel_extase/build_state.rb", "lib/ampel_extase/controller.rb", "lib/ampel_extase/jenkins_client.rb", "lib/ampel_extase/jenkins_state_observer.rb", "lib/ampel_extase/jenkins_warning_state_observer.rb", "lib/ampel_extase/light_switcher.rb", "lib/ampel_extase/version.rb"]
+  s.files = [".gitignore", ".travis.yml", ".utilsrc", "Gemfile", "README.md", "Rakefile", "VERSION", "ampel_extase.gemspec", "bin/ampel_control", "lib/ampel_extase.rb", "lib/ampel_extase/build_state.rb", "lib/ampel_extase/controller.rb", "lib/ampel_extase/jenkins_client.rb", "lib/ampel_extase/jenkins_state_observer.rb", "lib/ampel_extase/jenkins_warning_state_observer.rb", "lib/ampel_extase/light_switcher.rb", "lib/ampel_extase/version.rb", "spec/ampel_extase/build_state_spec.rb", "spec/ampel_extase/controller_spec.rb", "spec/ampel_extase/jekins_state_observer_spec.rb", "spec/ampel_extase/jenkins_client_spec.rb", "spec/ampel_extase/jenkins_warning_state_observer_spec.rb", "spec/ampel_extase/light_switcher_spec.rb", "spec/spec_helper.rb"]
   s.homepage = "http://github.com/flori/ampel_extase"
   s.licenses = ["GPL-2"]
   s.rdoc_options = ["--title", "AmpelExtase - Library to control the build traffic light", "--main", "README.md"]
   s.rubygems_version = "2.4.8"
   s.summary = "Library to control the build traffic light"
-  s.test_files = ["spec/ampel_extase/build_state_spec.rb", "spec/ampel_extase/controller_spec.rb", "spec/ampel_extase/jekins_state_observer_spec.rb", "spec/ampel_extase/jenkins_client_spec.rb", "spec/ampel_extase/light_switcher_spec.rb", "spec/spec_helper.rb"]
+  s.test_files = ["spec/ampel_extase/build_state_spec.rb", "spec/ampel_extase/controller_spec.rb", "spec/ampel_extase/jekins_state_observer_spec.rb", "spec/ampel_extase/jenkins_client_spec.rb", "spec/ampel_extase/jenkins_warning_state_observer_spec.rb", "spec/ampel_extase/light_switcher_spec.rb", "spec/spec_helper.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>, ["~> 0.9"])
       s.add_development_dependency(%q<rspec>, ["~> 3.0"])
       s.add_development_dependency(%q<byebug>, [">= 0"])
+      s.add_development_dependency(%q<codeclimate-test-reporter>, [">= 0"])
       s.add_runtime_dependency(%q<tins>, ["~> 1.0"])
       s.add_runtime_dependency(%q<term-ansicolor>, ["~> 1.0"])
       s.add_runtime_dependency(%q<socket_switcher>, [">= 0"])
@@ -37,6 +38,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, ["~> 0.9"])
       s.add_dependency(%q<rspec>, ["~> 3.0"])
       s.add_dependency(%q<byebug>, [">= 0"])
+      s.add_dependency(%q<codeclimate-test-reporter>, [">= 0"])
       s.add_dependency(%q<tins>, ["~> 1.0"])
       s.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
       s.add_dependency(%q<socket_switcher>, [">= 0"])
@@ -46,6 +48,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<simplecov>, ["~> 0.9"])
     s.add_dependency(%q<rspec>, ["~> 3.0"])
     s.add_dependency(%q<byebug>, [">= 0"])
+    s.add_dependency(%q<codeclimate-test-reporter>, [">= 0"])
     s.add_dependency(%q<tins>, ["~> 1.0"])
     s.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
     s.add_dependency(%q<socket_switcher>, [">= 0"])

data/lib/ampel_extase/controller.rb

@@ -3,6 +3,7 @@
 require 'term/ansicolor'
 require 'ampel_extase/light_switcher'
 require 'ampel_extase/jenkins_state_observer'
+require 'ampel_extase/jenkins_warning_state_observer'
 
 class AmpelExtase::Controller
   include Term::ANSIColor
@@ -14,7 +15,8 @@ class AmpelExtase::Controller
     sleep: 10
   )
     ampel_jenkins   = AmpelExtase::JenkinsStateObserver.for_url(jenkins_url)
-    warning_jenkins = AmpelExtase::JenkinsStateObserver.for_url(warning_jenkins_url)
+    urls = warning_jenkins_url.full?(:split, ?,) || []
+    warning_jenkins = AmpelExtase::JenkinsWarningStateObserver.for_urls(*urls)
     lights = AmpelExtase::LightSwitcher.for(serial: serial)
     new(ampel_jenkins, warning_jenkins, lights, sleep: sleep)
   end
@@ -27,6 +29,7 @@ class AmpelExtase::Controller
   )
     @ampel_jenkins, @warning_jenkins, @lights, @sleep =
       ampel_jenkins, warning_jenkins, lights, sleep
+    @expire_duration = 6 * @sleep
     check_lights
   end
 
@@ -60,7 +63,7 @@ class AmpelExtase::Controller
     @ampel_jenkins.on_state_change do |state|
       perform_lights_switch state
     end
-    @warning_jenkins.on_state_change do |state|
+    @warning_jenkins.on_state_change(@expire_duration) do |state|
       perform_warning state
     end
     expire_warning
@@ -101,7 +104,7 @@ class AmpelExtase::Controller
   end
 
   def expire_warning
-    if Time.now > @warning_jenkins.state_changed_at + 6 * @sleep
+    if @warning_jenkins.expired?(@expire_duration)
       @lights.aux.off
       puts info('WARNING EXPIRED')
     end

data/lib/ampel_extase/jenkins_state_observer.rb

@@ -41,10 +41,12 @@ class AmpelExtase::JenkinsStateObserver
     self
   end
 
-  attr_reader :state_changed_at
+  def fetch_new_state
+    AmpelExtase::BuildState.for [ last_result, building? ]
+  end
 
   def on_state_change
-    new_state = AmpelExtase::BuildState.for [ last_result, building? ]
+    new_state = fetch_new_state
     if state_changed?(new_state)
       puts "state changed from #@build_state to #{new_state} => taking action"
       begin
@@ -55,5 +57,10 @@ class AmpelExtase::JenkinsStateObserver
     else
       puts "state did not change, is still #@build_state => do nothing"
     end
+    self
+  end
+
+  def expired?(duration)
+    Time.now > @state_changed_at + duration
   end
 end

data/lib/ampel_extase/jenkins_warning_state_observer.rb

@@ -0,0 +1,38 @@
+require 'ampel_extase/jenkins_state_observer'
+
+class AmpelExtase::JenkinsWarningStateObserver
+  def self.for_urls(*jenkins_urls)
+    if urls = jenkins_urls.full?
+      new urls.map { |jenkins_url|
+        AmpelExtase::JenkinsStateObserver.for_url(jenkins_url)
+      }
+    else
+      Tins::NULL
+    end
+  end
+
+  def initialize(observers)
+    @observers = observers
+  end
+
+  def check
+    @observers.each(&:check)
+  end
+
+  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)
+          return
+        end
+      end
+    end
+    self
+  end
+
+  def expired?(duration)
+    @observers.all? { |observer| observer.expired?(duration) }
+  end
+end

data/lib/ampel_extase/version.rb

@@ -1,6 +1,6 @@
 module AmpelExtase
   # AmpelExtase version
-  VERSION         = '0.4.0'
+  VERSION         = '0.5.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/controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe AmpelExtase::Controller do
   before do
     allow_any_instance_of(AmpelExtase::JenkinsClient).to receive(:puts)
-    allow_any_instance_of(AmpelExtase::Controller).to receive(:puts)
+    allow_any_instance_of(described_class).to receive(:puts)
     allow_any_instance_of(AmpelExtase::JenkinsStateObserver).to receive(:puts)
     allow_any_instance_of(described_class).to receive(:sleep)
   end
@@ -12,7 +12,11 @@ describe AmpelExtase::Controller do
     double('AmpelExtase::JenkinsClient', url: 'http://foo/bar')
   end
 
-  let :warning_client do
+  let :warning_client1 do
+    double('AmpelExtase::JenkinsClient', url: 'http://foo/bar')
+  end
+
+  let :warning_client2 do
     double('AmpelExtase::JenkinsClient', url: 'http://foo/bar')
   end
 
@@ -20,8 +24,18 @@ describe AmpelExtase::Controller do
     AmpelExtase::JenkinsStateObserver.new ampel_client
   end
 
+  let :warning_jenkins1 do
+    AmpelExtase::JenkinsStateObserver.new(warning_client1)
+  end
+
+  let :warning_jenkins2 do
+    AmpelExtase::JenkinsStateObserver.new(warning_client2)
+  end
+
   let :warning_jenkins do
-    AmpelExtase::JenkinsStateObserver.new warning_client
+    AmpelExtase::JenkinsWarningStateObserver.new [
+      warning_jenkins1, warning_jenkins2
+    ]
   end
 
   let :lights do
@@ -37,7 +51,7 @@ describe AmpelExtase::Controller do
   end
 
   before do
-    for client in [ ampel_client, warning_client ]
+    for client in [ ampel_client, warning_client1, warning_client2 ]
       allow(client).to receive(:fetch).and_return true
       allow(client).to receive(:fetch_build).and_return('result' => 'N/A')
     end
@@ -97,17 +111,26 @@ describe AmpelExtase::Controller do
       controller.instance_eval { perform }
     end
 
+    let :aux do
+      double('Device', on: true)
+    end
+
+    before do
+      controller.instance_variable_set :@lights, double('Lights', aux: aux)
+    end
+
     it 'reacts to state changes' do
       state = AmpelExtase::BuildState.for
       allow(ampel_jenkins).to receive(:state_changed?).and_return true
       expect { |b| ampel_jenkins.on_state_change(&b) }.to yield_with_args(state)
-      allow(warning_jenkins).to receive(:state_changed?).and_return true
-      expect { |b| warning_jenkins.on_state_change(&b) }.to yield_with_args(state)
+      allow(warning_jenkins1).to receive(:state_changed?).and_return true
+      state = AmpelExtase::BuildState.for [ 'FAILURE', false ]
+      allow(warning_jenkins1).to receive(:fetch_new_state).and_return state
+      expect { |b| warning_jenkins.on_state_change(60, &b) }.to yield_with_args(state)
       perform
     end
   end
 
-
   describe '#handle_crash' do
     let :exception do
       raise StandardError rescue $!
@@ -226,7 +249,7 @@ describe AmpelExtase::Controller do
 
   describe '#expire_warning' do
     let :aux do
-      double('Device')
+      double('Device', on: true)
     end
 
     before do
@@ -239,7 +262,7 @@ describe AmpelExtase::Controller do
 
     it 'expires warnings after some time' do
       allow(controller.instance_variable_get(:@warning_jenkins)).to\
-        receive(:state_changed_at).and_return Time.now - 65
+        receive(:expired?).and_return true
       expect(aux).to receive(:off)
       expect(controller).to receive(:info).with('WARNING EXPIRED').and_call_original
       expire_warning

data/spec/ampel_extase/jekins_state_observer_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe AmpelExtase::JenkinsStateObserver do
   before do
     allow_any_instance_of(AmpelExtase::JenkinsClient).to receive(:puts)
-    allow_any_instance_of(AmpelExtase::JenkinsStateObserver).to receive(:puts)
+    allow_any_instance_of(described_class).to receive(:puts)
   end
 
   let :client do
@@ -80,7 +80,7 @@ describe AmpelExtase::JenkinsStateObserver do
         jso
       end
       expect(jso.instance_variable_get(:@build_state)).to eq bs_initial
-      expect(jso.state_changed_at).to eq past
+      expect(jso.instance_variable_get(:@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.state_changed_at).to eq now
+      expect(jso.instance_variable_get(:@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_client_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe AmpelExtase::JenkinsClient do
   before do
-    allow_any_instance_of(AmpelExtase::JenkinsClient).to receive(:puts)
+    allow_any_instance_of(described_class).to receive(:puts)
   end
 
   let :client do
-    AmpelExtase::JenkinsClient.new 'http://foo/bar'
+    described_class.new 'http://foo/bar'
   end
 
   let :opened_uri do

data/spec/ampel_extase/jenkins_warning_state_observer_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe AmpelExtase::JenkinsWarningStateObserver do
+  let :jenkins_warning_state_observer do
+    described_class.new [ observer ]
+  end
+
+  let :observer do
+    double('AmpelExtase::JenkinsStateObserver')
+  end
+
+  describe '.for_urls' do
+    it 'returns a null object if there were no URLs passed' do
+      expect(described_class.for_urls).to be_nil
+    end
+
+    it 'creates a jenkins_state_observer for every URL passed' do
+      expect(AmpelExtase::JenkinsStateObserver).to receive(:for_url).with('foo')
+      expect(AmpelExtase::JenkinsStateObserver).to receive(:for_url).with('bar')
+      described_class.for_urls 'foo', 'bar'
+    end
+  end
+
+  describe '#check' do
+    it 'delegates the check to its observers' do
+      expect(observer).to receive(:check)
+      jenkins_warning_state_observer.check
+    end
+  end
+
+  describe '#on_state_change' do
+    let :bs_success do
+      AmpelExtase::BuildState.for [ 'SUCCESS', true ]
+    end
+
+    let :bs_failure 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)
+      jenkins_warning_state_observer.on_state_change(666)
+    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)
+    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)
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -4,6 +4,10 @@ if ENV['START_SIMPLECOV'].to_i == 1
     add_filter "#{File.basename(File.dirname(__FILE__))}/"
   end
 end
+if ENV['CODECLIMATE_REPO_TOKEN']
+  require "codeclimate-test-reporter"
+  CodeClimate::TestReporter.start
+end
 require 'rspec'
 require 'byebug'
 require 'ampel_extase'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ampel_extase
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement
@@ -119,12 +133,13 @@ extra_rdoc_files:
 - lib/ampel_extase/build_state.rb
 - lib/ampel_extase/controller.rb
 - lib/ampel_extase/jenkins_client.rb
-- lib/ampel_extase/jenkins_multi_state_observer.rb
 - lib/ampel_extase/jenkins_state_observer.rb
+- lib/ampel_extase/jenkins_warning_state_observer.rb
 - lib/ampel_extase/light_switcher.rb
 - lib/ampel_extase/version.rb
 files:
 - ".gitignore"
+- ".travis.yml"
 - ".utilsrc"
 - Gemfile
 - README.md
@@ -136,14 +151,15 @@ files:
 - lib/ampel_extase/build_state.rb
 - lib/ampel_extase/controller.rb
 - lib/ampel_extase/jenkins_client.rb
-- lib/ampel_extase/jenkins_multi_state_observer.rb
 - lib/ampel_extase/jenkins_state_observer.rb
+- lib/ampel_extase/jenkins_warning_state_observer.rb
 - lib/ampel_extase/light_switcher.rb
 - lib/ampel_extase/version.rb
 - spec/ampel_extase/build_state_spec.rb
 - spec/ampel_extase/controller_spec.rb
 - spec/ampel_extase/jekins_state_observer_spec.rb
 - spec/ampel_extase/jenkins_client_spec.rb
+- spec/ampel_extase/jenkins_warning_state_observer_spec.rb
 - spec/ampel_extase/light_switcher_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/flori/ampel_extase
@@ -179,5 +195,6 @@ test_files:
 - spec/ampel_extase/controller_spec.rb
 - spec/ampel_extase/jekins_state_observer_spec.rb
 - spec/ampel_extase/jenkins_client_spec.rb
+- spec/ampel_extase/jenkins_warning_state_observer_spec.rb
 - spec/ampel_extase/light_switcher_spec.rb
 - spec/spec_helper.rb

data/lib/ampel_extase/jenkins_multi_state_observer.rb

@@ -1,21 +0,0 @@
-require 'ampel_extase/jenkins_state_observer'
-
-class AmpelExtase::JenkinsMultiStateObserver
-  def self.for_urls(*jenkins_urls)
-    new jenkins_urls.map { |jenkins_url| AmpelExtase::JenkinsStateObserver.new(jenkins_url) }
-  end
-
-  def initialize(observers)
-    @observers = observers
-  end
-
-  def check
-    @observers.each(&:check)
-  end
-
-  def on_state_change(&block)
-    @observers.each do |o|
-      o.on_state_change(&block)
-    end
-  end
-end