ampel_extase 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eca730e291f909a887fece16583fd85b7d64a190
-  data.tar.gz: 85b253dc3cfd5e6057870f37d2f2a78df014b907
+  metadata.gz: ae6a5d724b7c06425fca0953f0e8035cd802f492
+  data.tar.gz: c8b9a89b451637c118264ed8988e5302178d261b
 SHA512:
-  metadata.gz: 2627d096c3a710912e73f3cad0d8451b0b6d204afe75ee3df945db721928a34c81292cf08b18ae62c77a5f2401490166bf1ee3c6df0baa05a0154dac85204a36
-  data.tar.gz: eed09f266ea160de81ed0ad1825b1e067d3dd63b1f053516b6175ff0895923c3e4e8d80a32c38a9d687120972a733a07504db92ab48d7161ed17217ee04747a1
+  metadata.gz: 85e5bc084b1e0ba6bcaf5293c77b854bbd557c444f6e3e55a4b642395902f689abadf60979f0740cbcb88c7842b82e0121391f280cd8798109f66f41b21ae5df
+  data.tar.gz: c97d946b4225c5a50392d6dc8a7739b5da698c68c8e9d11ffabc3ec2d6d6abed207a0b50a32b7d6de2f6273bb05fad513382e89f267f5a86d77cf3161321428a

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/ampel_extase.gemspec

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
-# stub: ampel_extase 0.3.1 ruby lib
+# stub: ampel_extase 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ampel_extase"
-  s.version = "0.3.1"
+  s.version = "0.4.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-25"
+  s.date = "2015-08-26"
   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_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_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_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.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.5.1"
+  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"]
 

data/bin/ampel_control

@@ -2,8 +2,11 @@
 
 require 'ampel_extase'
 
-serial      = ENV['SERIAL'].full? or
-  fail 'need env var SERIAL for path to serial port'
+serial =
+  unless ENV['DEMO']
+    serial = ENV['SERIAL'].full? or
+      fail 'need env var SERIAL for path to serial port'
+  end
 jenkins_url = ENV['JENKINS_URL'].full? or
   fail 'need env var JENKINS_URL of the form http://test2.local:8080/job/foo'
 warning_jenkins_url = ENV['WARNING_JENKINS_URL'].full?

data/lib/ampel_extase/controller.rb

@@ -63,6 +63,7 @@ class AmpelExtase::Controller
     @warning_jenkins.on_state_change do |state|
       perform_warning state
     end
+    expire_warning
   end
 
   def perform_lights_switch(state)
@@ -99,6 +100,13 @@ class AmpelExtase::Controller
     end
   end
 
+  def expire_warning
+    if Time.now > @warning_jenkins.state_changed_at + 6 * @sleep
+      @lights.aux.off
+      puts info('WARNING EXPIRED')
+    end
+  end
+
   def success(message)
     green message
   end
@@ -111,6 +119,9 @@ class AmpelExtase::Controller
     green on_red message
   end
 
+  def info(message)
+    yellow message
+  end
   def switch_all_lights_off
     @lights.each(&:off)
   end

data/lib/ampel_extase/jenkins_multi_state_observer.rb

@@ -0,0 +1,21 @@
+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

data/lib/ampel_extase/jenkins_state_observer.rb

@@ -13,13 +13,14 @@ class AmpelExtase::JenkinsStateObserver
 
   def initialize(jenkins)
     @jenkins = jenkins
-    @build_state = AmpelExtase::BuildState.for
+    set_state AmpelExtase::BuildState.for
     check
   end
 
   def check
     puts "checking jenkins configuration for #{@jenkins.url.to_s.inspect}"
     @jenkins.fetch and puts "OK"
+    self
   end
 
   def last_result
@@ -34,15 +35,25 @@ class AmpelExtase::JenkinsStateObserver
     new_state != @build_state
   end
 
+  def set_state(state)
+    @build_state = state
+    @state_changed_at = Time.now
+    self
+  end
+
+  attr_reader :state_changed_at
+
   def on_state_change
     new_state = AmpelExtase::BuildState.for [ last_result, building? ]
     if state_changed?(new_state)
       puts "state changed from #@build_state to #{new_state} => taking action"
-      yield new_state
+      begin
+        yield new_state
+      ensure
+        set_state new_state
+      end
     else
       puts "state did not change, is still #@build_state => do nothing"
     end
-  ensure
-    @build_state = new_state
   end
 end

data/lib/ampel_extase/version.rb

@@ -1,6 +1,6 @@
 module AmpelExtase
   # AmpelExtase version
-  VERSION         = '0.3.1'
+  VERSION         = '0.4.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

@@ -223,4 +223,26 @@ describe AmpelExtase::Controller do
       end
     end
   end
+
+  describe '#expire_warning' do
+    let :aux do
+      double('Device')
+    end
+
+    before do
+      controller.instance_variable_set :@lights, double('Lights', aux: aux)
+    end
+
+    let :expire_warning do
+      controller.instance_eval { expire_warning }
+    end
+
+    it 'expires warnings after some time' do
+      allow(controller.instance_variable_get(:@warning_jenkins)).to\
+        receive(:state_changed_at).and_return Time.now - 65
+      expect(aux).to receive(:off)
+      expect(controller).to receive(:info).with('WARNING EXPIRED').and_call_original
+      expire_warning
+    end
+  end
 end

data/spec/ampel_extase/jekins_state_observer_spec.rb

@@ -1,6 +1,11 @@
 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)
+  end
+
   let :client do
     double('AmpelExtase::JenkinsClient', url: 'http://foo/bar')
   end
@@ -71,7 +76,11 @@ describe AmpelExtase::JenkinsStateObserver do
     end
 
     it 'tracks changes in build state' do
+      Time.dummy(past = Time.now - 10) do
+        jso
+      end
       expect(jso.instance_variable_get(:@build_state)).to eq bs_initial
+      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).
@@ -80,8 +89,15 @@ describe AmpelExtase::JenkinsStateObserver do
         "state changed from N/A to SUCCESS (building) => "\
         "taking action"
       )
-      expect { |b| jso.on_state_change(&b) }.to yield_with_args(bs_success)
+      now = nil
+      Time.dummy(Time.now) do
+        expect { |b|
+          jso.on_state_change(&b)
+          now = Time.now
+        }.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
       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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ampel_extase
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -119,6 +119,7 @@ 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/light_switcher.rb
 - lib/ampel_extase/version.rb
@@ -135,6 +136,7 @@ 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/light_switcher.rb
 - lib/ampel_extase/version.rb
@@ -168,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Library to control the build traffic light