rspectacles 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b059e11c0d0891e0e0431c7f488a7cb53ee6d686
-  data.tar.gz: 3293d969d4ccf58b694db2ff24f89ac0fc84db40
+  metadata.gz: 9f024e91d28c10cfdbd896b30f6c9e31f2959fc1
+  data.tar.gz: f20a35bf4feb597b6e614cfd2f74374580826fa0
 SHA512:
-  metadata.gz: 798ad85e223d4cc8653239accbb8ed8f150008f83e764583729dec68f30462fd42d75f6af2c457c62abca98927e8e65baba30e255643592131f1730b51ce545f
-  data.tar.gz: 6118d2397c4a9ea2d7775c9e40bb18f16ac9f1db707b653e9ce329eb752f1fde157682af4c074a966d14c87eb7418a7232c1b0677a31c79b1ee3836e717bdb75
+  metadata.gz: e36dda6c4ad7c39d0158bfe42c35126b47619866775b795f3f264738f865cc7e5d15ae9a5d716fa686d4c24fc7e455be7464754eb522344fe6d78e2df8eab87a
+  data.tar.gz: de35af08da4c23bf202eb08a048fd4188905fb4fea8d46f13900a89b74559d278e4b862065239d742f309eb89c4b847257fe36caa841969c65a428d906d7e35a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspectacles (0.0.9)
+    rspectacles (0.1.0)
       em-hiredis (~> 0.2.1)
       rake
       redis

data/README.md

@@ -20,8 +20,8 @@ Or in your Gemfile:
 
 Then add the formatter to your .rspec file:
 
-    --require 'rspectacles/redis_formatter'
-    --format RSpectacles::RedisFormatter
+    --require rspectacles/formatter/redis
+    --format RSpectacles::Formatter::Redis
 
     --format progress # or whatever other formatters you want to use
 

data/lib/rspectacles/adapter/redis_logger.rb

@@ -0,0 +1,50 @@
+require 'rspectacles/config'
+require 'redis'
+require 'uri'
+require 'json'
+
+module RSpectacles
+  module Adapter
+    class RedisLogger
+      attr_reader :redis
+
+      def initialize
+        @redis = ::Redis.new host: uri.host, port: uri.port, password: uri.password
+      end
+
+      def config
+        RSpectacles.config
+      end
+
+      def uri
+        @uri ||= URI.parse config.redis_uri
+      end
+
+      def delete_last_log
+        redis.del config.last_run_primary_key
+      end
+
+      def log(message)
+        redis.publish config.pubsub_channel_name, message
+        redis.lpush config.last_run_primary_key, message
+      end
+
+      def log_formatted(example)
+        message = format_example(example)
+        redis.publish config.pubsub_channel_name, message
+        redis.lpush config.last_run_primary_key, message
+      end
+
+      def format_example(example)
+        {
+          :description => example.description,
+          :full_description => example.full_description,
+          :status => example.execution_result.status,
+          :duration => example.execution_result.run_time,
+          :file_path => example.metadata[:file_path],
+          :line_number  => example.metadata[:line_number]
+        }.to_json
+      end
+    end
+  end
+end

data/lib/rspectacles/app/public/js/chart.js

@@ -53,6 +53,15 @@ define(['jquery', 'pathtree', 'mustache'], function ($, PathTree, Mustache) {
       };
     }
 
+    function secToMin(time) {
+      var pad = function (val) { return ('00' + val).slice(-2); }
+        , min = parseInt(time / 60)
+        , sec = parseInt(time % 60)
+        ;
+
+      return pad(min) + ':' + pad(sec);
+    }
+
     function showDetails() {
       var data = showDetails.current
         , mappedData = $.extend({
@@ -60,14 +69,18 @@ define(['jquery', 'pathtree', 'mustache'], function ($, PathTree, Mustache) {
         , line_number: ''
         , status: ''
         , duration: ''
-        , time_or_count: options.isCount ? 'Examples' : 'Seconds'
+        , time_or_count: options.isCount ? 'Examples' : 'ms'
+        , minutes: ''
         , value: null
         }, data)
         , map
       ;
 
       if (mappedData.value) {
-        !options.isCount && (mappedData.value = mappedData.value.toFixed(3));
+        if (!options.isCount) {
+          mappedData.minutes = secToMin(mappedData.value);
+          mappedData.value = parseInt(mappedData.value * 1000);
+        }
       }
 
       $('.example-wrapper').html(Mustache.render(tmpl, mappedData));

data/lib/rspectacles/app/views/index.erb

@@ -19,10 +19,13 @@
       <li class='{{ status }}'><span id='status'>{{ status }}</span></li>
       <li><strong>Description:</strong></li>
       <li class='name'>{{ name }}</li>
+      {{# file_path }}
       <li><strong>File:</strong></li>
       <li>{{ file_path }}:<span id='line_number'>{{ line_number }}</span></li>
+      {{/ file_path }}
       <li>
         <span id='value'>{{ value }}</span> <span id='time_or_count'> {{ time_or_count }}</span>
+        <span id='minutes'>{{# minutes }} ({{ minutes }}) {{/ minutes }}</span>
       </li>
     </ul>
   </script>

data/lib/rspectacles/formatter/legacy/redis.rb

@@ -0,0 +1,48 @@
+require 'rspec/core/formatters/base_formatter'
+require 'rspectacles/adapter/redis_logger'
+
+module RSpectacles
+  module Formatter
+    module Legacy
+      class Redis < RSpec::Core::Formatters::BaseFormatter
+        def initialize(_)
+        end
+
+        def logger
+          @logger ||= RSpectacles::Adapter::RedisLogger.new
+        end
+
+        def message(message)
+          logger.log "message:#{message}"
+        end
+
+        def start(example_count)
+          logger.log 'status:start'
+          logger.delete_last_log
+        end
+
+        def stop
+          logger.log 'status:stop'
+        end
+
+        def example_started(example)
+        end
+
+        def example_passed(example)
+          logger.log_formatted example
+        end
+
+        def example_pending(example)
+          logger.log_formatted example
+        end
+
+        def example_failed(example)
+          logger.log_formatted example
+        end
+
+        def close
+        end
+      end
+    end
+  end
+end

data/lib/rspectacles/formatter/redis.rb

@@ -0,0 +1,46 @@
+require 'rspectacles/adapter/redis_logger'
+
+module RSpectacles
+  module Formatter
+    class Redis
+      RSpec::Core::Formatters.register self,
+                                       *%i(example_passed
+                                           example_failed
+                                           start
+                                           stop
+                                           message)
+
+      def initialize(_)
+      end
+
+      def logger
+        @logger ||= RSpectacles::Adapter::RedisLogger.new
+      end
+
+      def message(notification)
+        logger.log "message:#{notification.message}"
+      end
+
+      def start(_)
+        logger.log 'status:start'
+        logger.delete_last_log
+      end
+
+      def stop(_)
+        logger.log 'status:stop'
+      end
+
+      def example_passed(notification)
+        logger.log_formatted notification.example
+      end
+
+      def example_pending(notification)
+        logger.log_formatted notification.example
+      end
+
+      def example_failed(notification)
+        logger.log_formatted notification.example
+      end
+    end
+  end
+end

data/lib/rspectacles/version.rb

@@ -1,3 +1,3 @@
 module RSpectacles
-  VERSION='0.0.9'
+  VERSION='0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspectacles
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Michael Wheeler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -111,6 +111,7 @@ files:
 - bin/rspectacles
 - config.ru
 - lib/rspectacles.rb
+- lib/rspectacles/adapter/redis_logger.rb
 - lib/rspectacles/app.rb
 - lib/rspectacles/app/helpers.rb
 - lib/rspectacles/app/public/css/style.css
@@ -126,7 +127,8 @@ files:
 - lib/rspectacles/app/public/js/script.js
 - lib/rspectacles/app/views/index.erb
 - lib/rspectacles/config.rb
-- lib/rspectacles/redis_formatter.rb
+- lib/rspectacles/formatter/legacy/redis.rb
+- lib/rspectacles/formatter/redis.rb
 - lib/rspectacles/version.rb
 - rspectacles.gemspec
 - spec/javascripts/resources/qunit.css

data/lib/rspectacles/redis_formatter.rb

@@ -1,82 +0,0 @@
-require 'rspec/core/formatters/base_formatter'
-require 'rspectacles/config'
-require 'ostruct'
-require 'redis'
-require 'uri'
-require 'json'
-
-module RSpectacles
-  class RedisFormatter < RSpec::Core::Formatters::BaseFormatter
-    attr_accessor :redis
-
-    class << self
-      def config
-        RSpectacles.config
-      end
-    end
-
-    def initialize(output)
-      uri = URI.parse config.redis_uri
-      self.redis = Redis.new host: uri.host, port: uri.port, password: uri.password
-    end
-
-    def message(message)
-      log "message:#{message}"
-    end
-
-    def start(example_count)
-      log 'status:start'
-      redis.del config.last_run_primary_key
-    end
-
-    def stop
-      log 'status:stop'
-    end
-
-    def example_started(example)
-    end
-
-    def example_passed(example)
-      log_formatted example
-    end
-
-    def example_pending(example)
-      log_formatted example
-    end
-
-    def example_failed(example)
-      log_formatted example
-    end
-
-    def close
-    end
-
-    private
-
-    def config
-      self.class.config
-    end
-
-    def log(message)
-      redis.publish config.pubsub_channel_name, message
-      redis.lpush config.last_run_primary_key, message
-    end
-
-    def log_formatted(example)
-      message = format_example(example)
-      redis.publish config.pubsub_channel_name, message
-      redis.lpush config.last_run_primary_key, message
-    end
-
-    def format_example(example)
-      {
-        :description => example.description,
-        :full_description => example.full_description,
-        :status => example.execution_result[:status],
-        :duration => example.execution_result[:run_time],
-        :file_path => example.metadata[:file_path],
-        :line_number  => example.metadata[:line_number]
-      }.to_json
-    end
-  end
-end