stoplight-admin 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 591bff575f74531655bad33fdccab13615dffe72
-  data.tar.gz: fad7754c050b9643d5ae2e7423e07f32f16620b5
+  metadata.gz: 0879fc696fce33c32c2afe1769e837be1cdd1b82
+  data.tar.gz: 6d29c9e9f672519c8ea867ff62accbae2f945206
 SHA512:
-  metadata.gz: 4a86a43423fda60ba5a3b308eb14a2d4f19870fcccfd4bb2e9ff00f161fc5623a10a574d9b7a5a673b4a84a8980512e8f9abe37f47ae815ee1b0598f5c6311b2
-  data.tar.gz: 7221b3349992ab825d843ae5904e84fa5a239b01daffcae38ba779344cfce700f9f08a1ea0b5c9c9e18a0affea720e49f3480253871536ffde067f74c716260f
+  metadata.gz: 161081a2c5ca3ba61857098396552adcfda01561553382140802feb8987b456f58971a0781a4440bf863f1d43ddfb932290edee5da312d955b964bf629449865
+  data.tar.gz: 231234d5c87992008f5d93af1e221ccdbaa25b15d1b77fbc82282888bcddbefac795136041d2e7e7d777357e4d6e4a9f38098e853b361219f9e59dea5383f55d

data/README.md

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

data/lib/sinatra/stoplight_admin.rb

@@ -7,6 +7,12 @@ require 'stoplight'
 module Sinatra
   module StoplightAdmin
     module Helpers
+      COLORS = [
+        GREEN = Stoplight::DataStore::COLOR_GREEN,
+        YELLOW = Stoplight::DataStore::COLOR_YELLOW,
+        RED = Stoplight::DataStore::COLOR_RED
+      ].freeze
+
       def data_store
         return @data_store if defined?(@data_store)
         @data_store = Stoplight.data_store = settings.data_store
@@ -20,13 +26,13 @@ module Sinatra
       end
 
       def light_info(light)
-        green = Stoplight.data_store.green?(light)
-        attempts = green ? 0  : data_store.get_attempts(light)
-        failures = green ? [] : data_store.get_failures(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)
 
         {
           name: light,
-          green: green,
+          color: color,
           failures: failures,
           attempts: attempts,
           locked: locked?(light)
@@ -34,7 +40,7 @@ module Sinatra
       end
 
       def light_sort_key(light)
-        [light[:green] ? 1 : 0,
+        [COLORS.index(light[:color]),
          light[:attempts] * -1,
          light[:name]]
       end
@@ -46,23 +52,21 @@ module Sinatra
       end
 
       def stat_params(ls)
-        total_count = ls.size
-        success_count = ls.count { |l| l[:green] }
-        failure_count = total_count - success_count
-
-        if total_count > 0
-          failure_percentage = (100.0 * failure_count / total_count).ceil
-          success_percentage = 100 - failure_percentage
-        else
-          failure_percentage = success_percentage = 0
-        end
-
-        {
-          success_count: success_count,
-          failure_count: failure_count,
-          success_percentage: success_percentage,
-          failure_percentage: failure_percentage
+        h = {
+          count_red: 0, count_yellow: 0, count_green: 0,
+          percent_red: 0, percent_yellow: 0, percent_green: 0
         }
+        return h if (size = ls.size).zero?
+
+        h[:count_red] = ls.count { |l| l[:color] == RED }
+        h[:count_yellow] = ls.count { |l| l[:color] == YELLOW }
+        h[:count_green] = size - h[:count_red] - h[:count_yellow]
+
+        h[:percent_red] = (100.0 * h[:count_red] / size).ceil
+        h[:percent_yellow] = (100.0 * h[:count_yellow] / size).ceil
+        h[:percent_green] = 100.0 - h[:percent_red] - h[:percent_yellow]
+
+        h
       end
 
       def lock(light)

data/lib/sinatra/views/index.haml

@@ -6,15 +6,17 @@
   - if lights.any?
     .btn-group
       %form{method: 'post', action: url('/green_all')}
-        %button.btn-lg.btn.btn-success{type: 'submit', disabled: failure_count > 0 ? nil : 'disabled'} Greenify 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: #{failure_percentage}%"}
-        .span= failure_count
-      .progress-bar.progress-bar-success{style: "width: #{success_percentage}%"}
-        .span= success_count
+      .progress-bar.progress-bar-danger{style: "width: #{percent_red}%"}
+        .span= count_red
+      .progress-bar.progress-bar-warning{style: "width: #{percent_yellow}%"}
+        .span= count_yellow
+      .progress-bar.progress-bar-success{style: "width: #{percent_green}%"}
+        .span= count_green
 
     .lights
       %table.table.table-hover
@@ -32,12 +34,18 @@
           - lights.each do |l|
             %tr
               %td.indicator
-                - if l[:green]
+                - if l[:color] == GREEN
                   %form{method: 'post', action: url('/red')}
                     %input{type: 'hidden', name: 'names', value: URI.escape(l[:name])}
                     %button{type: 'submit', class: 'btn btn-success'}
                       G
                       %span.hidden-xs> REEN
+                - elsif l[:color] == YELLOW
+                  %form{method: 'post', action: url('/green')}
+                    %input{type: 'hidden', name: 'names', value: URI.escape(l[:name])}
+                    %button{type: 'submit', class: 'btn btn-warning'}
+                      Y
+                      %span.hidden-xs> ELLOW
                 - else
                   %form{method: 'post', action: url('/green')}
                     %input{type: 'hidden', name: 'names', value: URI.escape(l[:name])}

data/lib/sinatra/views/layout.haml

@@ -8,6 +8,7 @@
 
     %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'}
 
     :css
       body {

data/stoplight-admin.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'stoplight-admin'
-  spec.version       = '0.2.7'
+  spec.version       = '0.2.8'
   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.}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stoplight-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Cameron Desautels
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: A simple administration interface for the stoplight gem.