stoplight-admin 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0879fc696fce33c32c2afe1769e837be1cdd1b82
-  data.tar.gz: 6d29c9e9f672519c8ea867ff62accbae2f945206
+  metadata.gz: 769b6e691b419f97ee606652bddd01307783f77a
+  data.tar.gz: c40bc731a677289cc682974d31fb82a5876d1c56
 SHA512:
-  metadata.gz: 161081a2c5ca3ba61857098396552adcfda01561553382140802feb8987b456f58971a0781a4440bf863f1d43ddfb932290edee5da312d955b964bf629449865
-  data.tar.gz: 231234d5c87992008f5d93af1e221ccdbaa25b15d1b77fbc82282888bcddbefac795136041d2e7e7d777357e4d6e4a9f38098e853b361219f9e59dea5383f55d
+  metadata.gz: e4aa180eefdde7aa5f8f1b2bcdb4e8260f1971893dfeff4a0a799104a800deaf1257f49d0db69c91cbc6efa02c6cebca20d7f7207c375b7f300f65953ab383f4
+  data.tar.gz: 49de8912aa8db7aabc672e4d7adec280a2a7b85df30b11e02d785f716e17a1b6ded2a4a5cc5652f1f79267abbe32d3b8f9f82e0dbb950e90bb1a62601b695fae

data/README.md

@@ -18,7 +18,7 @@ First you'll need a `Gemfile`:
 ``` rb
 source 'https://rubygems.org'
 
-gem 'stoplight-admin', '~> 0.2.8'
+gem 'stoplight-admin', '~> 0.2.9'
 ```
 
 Run [Bundler][3] to install the dependencies:

data/lib/sinatra/stoplight_admin.rb

@@ -8,14 +8,14 @@ module Sinatra
   module StoplightAdmin
     module Helpers
       COLORS = [
-        GREEN = Stoplight::DataStore::COLOR_GREEN,
-        YELLOW = Stoplight::DataStore::COLOR_YELLOW,
-        RED = Stoplight::DataStore::COLOR_RED
+        GREEN = Stoplight::Color::GREEN,
+        YELLOW = Stoplight::Color::YELLOW,
+        RED = Stoplight::Color::RED
       ].freeze
 
       def data_store
         return @data_store if defined?(@data_store)
-        @data_store = Stoplight.data_store = settings.data_store
+        @data_store = Stoplight::Light.default_data_store = settings.data_store
       end
 
       def lights
@@ -26,29 +26,27 @@ module Sinatra
       end
 
       def light_info(light)
-        color = Stoplight.data_store.get_color(light)
-        attempts = color == GREEN ? 0  : data_store.get_attempts(light)
-        failures = color == GREEN ? [] : data_store.get_failures(light)
+        l = Stoplight::Light.new(light) {}
+        color = l.color
+        failures, state = l.data_store.get_all(l)
 
         {
           name: light,
           color: color,
           failures: failures,
-          attempts: attempts,
-          locked: locked?(light)
+          locked: locked?(state)
         }
       end
 
       def light_sort_key(light)
-        [COLORS.index(light[:color]),
-         light[:attempts] * -1,
+        [-COLORS.index(light[:color]),
          light[:name]]
       end
 
-      def locked?(light_name)
-        [Stoplight::DataStore::STATE_LOCKED_GREEN,
-         Stoplight::DataStore::STATE_LOCKED_RED]
-          .include?(data_store.get_state(light_name))
+      def locked?(state)
+        [Stoplight::State::LOCKED_GREEN,
+         Stoplight::State::LOCKED_RED]
+          .include?(state)
       end
 
       def stat_params(ls)
@@ -70,36 +68,36 @@ module Sinatra
       end
 
       def lock(light)
+        l = Stoplight::Light.new(light) {}
         new_state =
-          if Stoplight.data_store.green?(light)
-            Stoplight::DataStore::STATE_LOCKED_GREEN
+          case l.color
+          when Stoplight::Color::GREEN
+            Stoplight::State::LOCKED_GREEN
           else
-            Stoplight::DataStore::STATE_LOCKED_RED
+            Stoplight::State::LOCKED_RED
           end
 
-        data_store.set_state(light, new_state)
+        data_store.set_state(l, new_state)
       end
 
       def unlock(light)
-        data_store.set_state(light, Stoplight::DataStore::STATE_UNLOCKED)
+        l = Stoplight::Light.new(light) {}
+        data_store.set_state(l, Stoplight::State::UNLOCKED)
       end
 
       def green(light)
-        if data_store.get_state(light) == Stoplight::DataStore::STATE_LOCKED_RED
-          new_state = Stoplight::DataStore::STATE_LOCKED_GREEN
-          data_store.set_state(light, new_state)
+        l = Stoplight::Light.new(light) {}
+        if data_store.get_state(l) == Stoplight::State::LOCKED_RED
+          new_state = Stoplight::State::LOCKED_GREEN
+          data_store.set_state(l, new_state)
         end
 
-        data_store.clear_attempts(light)
-        data_store.clear_failures(light)
+        data_store.clear_failures(l)
       end
 
       def red(light)
-        data_store.set_state(light, Stoplight::DataStore::STATE_LOCKED_RED)
-      end
-
-      def purge
-        data_store.clear_stale
+        l = Stoplight::Light.new(light) {}
+        data_store.set_state(l, Stoplight::State::LOCKED_RED)
       end
 
       def with_lights
@@ -144,15 +142,10 @@ module Sinatra
 
       app.post '/green_all' do
         data_store.names
-          .reject { |l| Stoplight.data_store.green?(l) }
+          .reject { |l| Stoplight::Light.new(l) {}.color == Stoplight::Color::GREEN }
           .each { |l| green(l) }
         redirect to('/')
       end
-
-      app.post '/purge' do
-        purge
-        redirect to('/')
-      end
     end
   end
 

data/lib/sinatra/views/index.haml

@@ -3,12 +3,14 @@
   %p Cop lights, flashlights, spotlights, strobe lights…
 
 .main
-  - if lights.any?
-    .btn-group
+  - if lights.empty?
+    .alert.alert-warning{role: 'alert'}
+      %strong No lights found.
+      Ensure that your Stoplight data store is properly configured and that your Stoplight blocks have been run.
+  - else
+    .well
       %form{method: 'post', action: url('/green_all')}
         %button.btn-lg.btn.btn-success{type: 'submit', disabled: count_red + count_yellow > 0 ? nil : 'disabled'} Greenify All
-      %form{method: 'post', action: url('/purge')}
-        %button.btn-lg.btn.btn-default{type: 'submit'} Purge Lights
 
     .progress
       .progress-bar.progress-bar-danger{style: "width: #{percent_red}%"}
@@ -25,11 +27,9 @@
             %th Status
             %th
               %abbr{title: 'Locked lights will not change color automatically.'} Locked?
+            %th Name
             %th
               %abbr{title: 'Exceptions which caused the light to turn red.'} Failures
-            %th
-              %abbr{title: 'Number of times the light was invoked while red.'} Attempts
-            %th Name
         %tbody
           - lights.each do |l|
             %tr
@@ -63,6 +63,8 @@
                     %input{type: 'hidden', name: 'names', value: URI.escape(l[:name])}
                     %button{type: 'submit', class: 'btn btn-link'}
                       %span{class: 'glyphicon glyphicon-minus'}
+              %td.name
+                = l[:name]
               %td.failures
                 - if l[:failures]
                   %ul
@@ -75,12 +77,3 @@
                         @
                         %span.timestamp
                           &= failure.time
-              %td.attempts
-                - if l[:attempts] > 0
-                  = l[:attempts]
-              %td.name
-                = l[:name]
-  - else
-    .alert.alert-warning{role: 'alert'}
-      %strong No lights found.
-      Ensure that your Stoplight data store is properly configured and that your Stoplight blocks have been run.

data/lib/sinatra/views/layout.haml

@@ -6,20 +6,11 @@
 
     %title Stoplight Admin
 
-    %link{rel: 'stylesheet', href: '//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css'}
-    %link{rel: 'stylesheet', href: '//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css'}
-    %link{rel: 'shortcut icon', href: 'https://i.imgur.com/qvfoNuh.png'}
+    %link{rel: 'stylesheet', href: '//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css'}
+    %link{rel: 'stylesheet', href: '//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap-theme.min.css'}
+    %link{rel: 'shortcut icon', href: '//i.imgur.com/qvfoNuh.png'}
 
     :css
-      body {
-        padding-top: 70px;
-        padding-bottom: 30px;
-      }
-
-      .progress {
-        margin-top: 30px
-      }
-
       td.indicator {
         font-size: 200%;
       }
@@ -46,7 +37,7 @@
       }
 
   %body
-    .navbar.navbar-inverse.navbar-fixed-top{role: 'navigation'}
+    .navbar.navbar-inverse.navbar-static-top{role: 'navigation'}
       .container
         .navbar-header
           %a{class: 'navbar-brand', href: url('/')} Stoplight Admin
@@ -54,4 +45,4 @@
     .container{role: 'main'}
       = yield
 
-    %script{src: '//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js'}
+    %script{src: '//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js'}

data/stoplight-admin.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'stoplight-admin'
-  spec.version       = '0.2.8'
+  spec.version       = '0.2.9'
   spec.authors       = ['Cameron Desautels', 'Taylor Fausak']
   spec.email         = %w(camdez@gmail.com taylor@fausak.me)
   spec.summary       = %q{A simple administration interface for the stoplight gem.}
@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'haml', '~> 4.0.5'
   spec.add_dependency 'redis', '~> 3.1.0'
   spec.add_dependency 'sinatra', '~> 1.4.5'
-  spec.add_dependency 'stoplight', '~> 0.4.1'
+  spec.add_dependency 'stoplight', '~> 0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stoplight-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Cameron Desautels
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.0
 description: A simple administration interface for the stoplight gem.
 email:
 - camdez@gmail.com
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: A simple administration interface for the stoplight gem.