stoplight 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 817cede2460b3309d9d6b2eed1e2eb5fd7c089e0
-  data.tar.gz: 7c5b0b24c68c0d4b63bdcf285dc97d0a67b2eedb
+  metadata.gz: 314c63808a80e427881c2d09152f74e68f4ffd37
+  data.tar.gz: 67ab9ca03f20512f5b119b95eec17494d7fdf726
 SHA512:
-  metadata.gz: 128a58ba2d5667ca408a05696defb2cb8152a20c3f4f28e641d18e4ca91730b5209fb8f376fcff019989984fb49fdb75bdc9fbb24a8485e390e41b79799cbb37
-  data.tar.gz: b6766506606eda2a21886582ea626517a2f9d01d0b0967a63b323d67e58103167780ec91ff0ce018d9d341adaf07bca5261e8cc223a78dc06688391e58c1cf4c
+  metadata.gz: 5a758d0cd6beeb2b0c034f424ec4b4b2fc1fe72f11a7eb598fe195e408437ec6ba3dd95aa9b29554d5a9e8a0727fabbfdc46aade4a7c1674cf457467459032c5
+  data.tar.gz: 50eb0565526a389406422fdca3b93a9ce4923bd7ab7e50aa558b976ca09ed56ee976c9bcc3fc4b0f72c6a28290964e4a676d1c6dbb741ae45fed26b9f30619ab

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.4.1 (2014-10-03)
+
+- Fixed a bug that caused green to red notifications to sometimes not be sent.
+
 ## v0.4.0 (2014-09-17)
 
 - Made stoplights handle failing notifiers by logging the failure to standard

data/README.md

@@ -33,7 +33,7 @@ Check out [stoplight-admin][12] for controlling your stoplights.
 Add it to your Gemfile:
 
 ``` rb
-gem 'stoplight', '~> 0.4.0'
+gem 'stoplight', '~> 0.4.1'
 ```
 
 Or install it manually:

data/lib/stoplight/data_store/base.rb

@@ -8,23 +8,25 @@ module Stoplight
         fail NotImplementedError
       end
 
-      # @return [nil]
       def clear_stale
         fail NotImplementedError
       end
 
       # @param _name [String]
-      # @return [nil]
       def clear(_name)
         fail NotImplementedError
       end
 
       # @param _name [String]
-      # @return [nil]
       def sync(_name)
         fail NotImplementedError
       end
 
+      # @param _name [String]
+      def greenify(_name)
+        fail NotImplementedError
+      end
+
       # @group Colors
 
       # @param name [String]
@@ -72,7 +74,6 @@ module Stoplight
       end
 
       # @param _name [String]
-      # @return [nil]
       def clear_attempts(_name)
         fail NotImplementedError
       end
@@ -93,7 +94,6 @@ module Stoplight
       end
 
       # @param _name [String]
-      # @return [nil]
       def clear_failures(_name)
         fail NotImplementedError
       end
@@ -114,7 +114,6 @@ module Stoplight
       end
 
       # @param _name [String]
-      # @return [nil]
       def clear_state(_name)
         fail NotImplementedError
       end
@@ -135,7 +134,6 @@ module Stoplight
       end
 
       # @param _name [String]
-      # @return [nil]
       def clear_threshold(_name)
         fail NotImplementedError
       end
@@ -156,7 +154,6 @@ module Stoplight
       end
 
       # @param _name [String]
-      # @return [nil]
       def clear_timeout(_name)
         fail NotImplementedError
       end

data/lib/stoplight/data_store/memory.rb

@@ -15,7 +15,6 @@ module Stoplight
         names
           .select { |name| get_failures(name).empty? }
           .each { |name| clear(name) }
-        nil
       end
 
       def clear(name)
@@ -28,7 +27,11 @@ module Stoplight
 
       def sync(name)
         set_threshold(name, get_threshold(name))
-        nil
+      end
+
+      def greenify(name)
+        clear_attempts(name)
+        clear_failures(name)
       end
 
       def get_color(name)
@@ -49,7 +52,6 @@ module Stoplight
 
       def clear_attempts(name)
         attempts.delete(name)
-        nil
       end
 
       def get_failures(name)
@@ -65,7 +67,6 @@ module Stoplight
 
       def clear_failures(name)
         @data.delete(DataStore.failures_key(name))
-        nil
       end
 
       def get_state(name)
@@ -79,7 +80,6 @@ module Stoplight
 
       def clear_state(name)
         states.delete(name)
-        nil
       end
 
       def get_threshold(name)
@@ -93,7 +93,6 @@ module Stoplight
 
       def clear_threshold(name)
         thresholds.delete(name)
-        nil
       end
 
       def get_timeout(name)
@@ -107,7 +106,6 @@ module Stoplight
 
       def clear_timeout(name)
         timeouts.delete(name)
-        nil
       end
 
       private

data/lib/stoplight/data_store/redis.rb

@@ -18,7 +18,6 @@ module Stoplight
         names
           .select { |name| get_failures(name).empty? }
           .each { |name| clear(name) }
-        nil
       end
 
       def clear(name)
@@ -29,19 +28,23 @@ module Stoplight
           clear_threshold(name)
           clear_timeout(name)
         end
-
-        nil
       end
 
       def sync(name)
         threshold = @redis.hget(DataStore.thresholds_key, name)
         threshold = normalize_threshold(threshold)
         @redis.hset(DataStore.thresholds_key, name, threshold)
-        nil
       rescue ::Redis::BaseError => error
         raise Error::BadDataStore, error
       end
 
+      def greenify(name)
+        @redis.pipelined do
+          clear_attempts(name)
+          clear_failures(name)
+        end
+      end
+
       def get_color(name)
         DataStore.colorize(*colorize_args(name))
       end
@@ -56,7 +59,6 @@ module Stoplight
 
       def clear_attempts(name)
         @redis.hdel(DataStore.attempts_key, name)
-        nil
       end
 
       def get_failures(name)
@@ -71,7 +73,6 @@ module Stoplight
 
       def clear_failures(name)
         @redis.del(DataStore.failures_key(name))
-        nil
       end
 
       def get_state(name)
@@ -86,7 +87,6 @@ module Stoplight
 
       def clear_state(name)
         @redis.hdel(DataStore.states_key, name)
-        nil
       end
 
       def get_threshold(name)
@@ -101,7 +101,6 @@ module Stoplight
 
       def clear_threshold(name)
         @redis.hdel(DataStore.thresholds_key, name)
-        nil
       end
 
       def get_timeout(name)
@@ -116,7 +115,6 @@ module Stoplight
 
       def clear_timeout(name)
         @redis.hdel(DataStore.timeouts_key, name)
-        nil
       end
 
       private

data/lib/stoplight/light.rb

@@ -110,7 +110,7 @@ module Stoplight
     private
 
     def run_green
-      code.call.tap { Stoplight.data_store.clear_failures(name) }
+      code.call.tap { Stoplight.data_store.greenify(name) }
     rescue => error
       handle_error(error)
       raise
@@ -129,7 +129,7 @@ module Stoplight
 
     def handle_error(error)
       if error_allowed?(error)
-        Stoplight.data_store.clear_failures(name)
+        Stoplight.data_store.greenify(name)
       else
         Stoplight.data_store.record_failure(name, Failure.create(error))
       end

data/lib/stoplight.rb

@@ -14,7 +14,7 @@ require 'stoplight/notifier/io'
 
 module Stoplight
   # @return [Gem::Version]
-  VERSION = Gem::Version.new('0.4.0')
+  VERSION = Gem::Version.new('0.4.1')
 
   @data_store = DataStore::Memory.new
   @notifiers = [Notifier::IO.new($stderr)]

data/spec/stoplight/data_store/base_spec.rb

@@ -10,6 +10,7 @@ describe Stoplight::DataStore::Base do
     clear_stale
     clear
     sync
+    greenify
     green?
     yellow?
     red?

data/spec/stoplight/light_spec.rb

@@ -111,6 +111,28 @@ describe Stoplight::Light do
     end
   end
 
+  context 'conditionally failing' do
+    let(:code_result) { fail error if @fail }
+    let(:name) { 'failing' }
+
+    it 'clears the attempts' do
+      @fail = true
+      light.threshold.succ.times do
+        begin
+          light.run
+        rescue error_class, Stoplight::Error::RedLight
+          nil
+        end
+      end
+
+      @fail = false
+      Stoplight.data_store.set_timeout(light.name, 0)
+      light.run
+
+      expect(Stoplight.data_store.get_attempts(light.name)).to eq(0)
+    end
+  end
+
   context 'with Redis' do
     let(:data_store) { Stoplight::DataStore::Redis.new(redis) }
     let(:redis) { Redis.new }

data/spec/support/data_store.rb

@@ -12,28 +12,20 @@ shared_examples_for 'a data store' do
   let(:timeout) { rand(100) }
 
   it { expect(data_store.names).to eql([]) }
-  it { expect(data_store.clear_stale).to eql(nil) }
-  it { expect(data_store.clear(name)).to eql(nil) }
-  it { expect(data_store.sync(name)).to eql(nil) }
   it { expect(data_store.get_color(name)).to eql(Stoplight::DataStore::COLOR_GREEN) }
   it { expect(data_store.green?(name)).to eql(true) }
   it { expect(data_store.yellow?(name)).to eql(false) }
   it { expect(data_store.red?(name)).to eql(false) }
   it { expect(data_store.get_attempts(name)).to eql(Stoplight::DataStore::DEFAULT_ATTEMPTS) }
   it { expect(data_store.record_attempt(name)).to eql(1) }
-  it { expect(data_store.clear_attempts(name)).to eql(nil) }
   it { expect(data_store.get_failures(name)).to eql(Stoplight::DataStore::DEFAULT_FAILURES) }
   it { expect(data_store.record_failure(name, failure)).to eql(failure) }
-  it { expect(data_store.clear_failures(name)).to eql(nil) }
   it { expect(data_store.get_state(name)).to eql(Stoplight::DataStore::DEFAULT_STATE) }
   it { expect(data_store.set_state(name, state)).to eql(state) }
-  it { expect(data_store.clear_state(name)).to eql(nil) }
   it { expect(data_store.get_threshold(name)).to eql(Stoplight::DataStore::DEFAULT_THRESHOLD) }
   it { expect(data_store.set_threshold(name, threshold)).to eql(threshold) }
-  it { expect(data_store.clear_threshold(name)).to eql(nil) }
   it { expect(data_store.get_timeout(name)).to eql(Stoplight::DataStore::DEFAULT_TIMEOUT) }
   it { expect(data_store.set_timeout(name, timeout)).to eql(timeout) }
-  it { expect(data_store.clear_timeout(name)).to eql(nil) }
 
   it 'clears stale lights' do
     data_store.sync(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stoplight
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Cameron Desautels
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips