rspectacles 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 036f403d5d6ce0d712e8da685836a27e7ed668d0
-  data.tar.gz: ca29ea924c129b9e215b64291f5a2a89df920c20
+  metadata.gz: 003d7cba8ab931d6de4f17920e73607ef342b36a
+  data.tar.gz: 816b05b8c5cfd7a43f8b48ca516ec319e5e073ef
 SHA512:
-  metadata.gz: ee7dd6b6a26913e5f113b1a8c33e2d7f1652647e2d0cb6837482457182c9912cdeb9f20847d081271947b67f38c1154897d6f72ad8c8085cecb4e64b172dc413
-  data.tar.gz: f276b04aa124ed5bd3d393ed01b2d77ab7c17807e3388290c477fb270dd26079f074d36105ea13b98f6298a9f0a696b9f09f773b293d8118d912eecca25da113
+  metadata.gz: 67f223e3cc98eb61f017226d41885b37d014c5f49b5fbb4df68db26d6252d8d49f4878a4980b533be433974930a2c199c36f619a5bda2ab36cf2882342deebed
+  data.tar.gz: b21d65f9c4bdc5b9372b3c4d1c58da21ba823b9bbccf31497863dc3ab47ac95a94d81b064604869c06aea9afb220f4318838ac6e8f41b700b6fc923c3b385acb

data/Gemfile.lock

@@ -1,27 +1,28 @@
 PATH
   remote: .
   specs:
-    rspectacles (0.1.0)
-      em-hiredis (>= 0.2.1)
+    rspectacles (0.2.0)
+      em-hiredis (>= 0.3.0)
       rake
       redis
-      sinatra (~> 1.4.5)
+      sinatra (>= 1.4.5)
       thin (>= 1.5.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    daemons (1.1.9)
+    daemons (1.2.4)
     diff-lcs (1.1.3)
-    em-hiredis (0.2.1)
-      hiredis (~> 0.4.0)
-    eventmachine (1.0.3)
-    hiredis (0.4.5)
-    rack (1.5.2)
+    em-hiredis (0.3.1)
+      eventmachine (~> 1.0)
+      hiredis (~> 0.6.0)
+    eventmachine (1.2.3)
+    hiredis (0.6.1)
+    rack (1.6.8)
     rack-protection (1.5.3)
       rack
-    rake (10.3.1)
-    redis (3.0.7)
+    rake (12.0.0)
+    redis (3.3.3)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -30,15 +31,15 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.2)
-    sinatra (1.4.5)
-      rack (~> 1.4)
+    sinatra (1.4.7)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    thin (1.6.2)
-      daemons (>= 1.0.9)
-      eventmachine (>= 1.0.0)
-      rack (>= 1.0.0)
-    tilt (1.4.1)
+      tilt (>= 1.3, < 3)
+    thin (1.7.0)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
+    tilt (2.0.7)
 
 PLATFORMS
   ruby
@@ -46,3 +47,6 @@ PLATFORMS
 DEPENDENCIES
   rspec
   rspectacles!
+
+BUNDLED WITH
+   1.14.6

data/lib/rspectacles/adapter/batched_redis_logger.rb

@@ -0,0 +1,34 @@
+require 'rspectacles/adapter/redis_logger'
+
+module RSpectacles
+  module Adapter
+    class BatchedRedisLogger < RedisLogger
+      def queued_messages
+        @queued_messages ||= []
+      end
+
+      def stop
+        super
+        flush_queue
+      end
+
+      def batch_size
+        config.batch_size
+      end
+
+      def queue(message)
+        puts test_run_key, message
+        queued_messages << message
+      end
+
+      def flush_queue
+        queued_messages.each do |message|
+          redis.publish config.pubsub_channel_name, message
+          redis.lpush test_run_key, message
+        end
+
+        @queued_messages = []
+      end
+    end
+  end
+end

data/lib/rspectacles/adapter/redis_logger.rb

@@ -6,10 +6,11 @@ require 'json'
 module RSpectacles
   module Adapter
     class RedisLogger
-      attr_reader :redis
+      attr_reader :redis, :test_run_key
 
-      def initialize
-        @redis = ::Redis.new host: uri.host, port: uri.port, password: uri.password
+      def initialize(test_run_key: nil)
+        @redis = ::Redis.new host: uri.host, port: uri.port, password: uri.password, username: uri.user
+        @test_run_key = test_run_key || config.last_run_primary_key
       end
 
       def config
@@ -24,25 +25,41 @@ module RSpectacles
         redis.del config.last_run_primary_key
       end
 
+      def stop
+        log 'status:stop'
+      end
+
+      def start
+        log 'status:start'
+      end
+
+      def message(text)
+        log "message:#{text}"
+      end
+
       def log(message)
-        redis.publish config.pubsub_channel_name, message
-        redis.lpush config.last_run_primary_key, message
+        queue "#{test_run_key}:#{message}"
       end
 
       def log_formatted(example)
         message = format_example(example)
+        queue message
+      end
+
+      def queue(message)
         redis.publish config.pubsub_channel_name, message
-        redis.lpush config.last_run_primary_key, message
+        redis.lpush test_run_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]
+          rspec_run: test_run_key,
+          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

data/lib/rspectacles/app.rb

@@ -26,10 +26,15 @@ module RSpectacles
     end
 
     uri = URI.parse config.redis_uri
-    redis = Redis.new host: uri.host, port: uri.port
+    redis = Redis.new host: uri.host, port: uri.port, password: uri.password, username: uri.user
 
     # Routes
-    get '/' do
+    get '/watch/:key' do
+      erb :index
+    end
+
+    get '/watch' do
+      params['key'] = config.last_run_primary_key
       erb :index
     end
 
@@ -40,8 +45,8 @@ module RSpectacles
       end
     end
 
-    get '/last' do
-      redis.lrange(config.last_run_primary_key, 0, -1).to_json
+    get '/last/:key' do
+      redis.lrange(params['key'], 0, -1).to_json
     end
 
     # pubsub and streaming - EventMachine support only

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

@@ -2,7 +2,7 @@
 define(['riffle'], function (riffle) {
   'use strict';
 
-  return function streams(serverUri, ajaxUri) {
+  return function streams(serverUri, ajaxUri, currentRun) {
     var stream = riffle.stream
       , me
       , serverEvents
@@ -12,6 +12,8 @@ define(['riffle'], function (riffle) {
       , each
       , stringEvents
       , allEvents
+      , allExamples
+      , scopedExamples
       , eventToString
       ;
 
@@ -70,12 +72,16 @@ define(['riffle'], function (riffle) {
     stringEvents = eventToString.input(serverEvents);
     ajaxEvents = each.input(ajaxStream(ajaxUri).invoke());
     allEvents = stream().input(stringEvents, ajaxEvents);
+    allExamples = toJson.input(matching(/^\{/).input(allEvents));
+    scopedExamples = stream(function (o, i) {
+      if (i.rspec_run === currentRun) { o(i); }
+    }).input(allExamples);
 
     return me = {
-      message: matching(/^message:/).input(stringEvents)
-    , start: matching(/^status:start/).input(stringEvents)
-    , stop: matching(/^status:stop/).input(stringEvents)
-    , example: batched().input(toJson.input(matching(/^\{/).input(allEvents)))
+      message: matching(new RegExp('^' + currentRun + ':message:')).input(stringEvents)
+    , start: matching(new RegExp('^' + currentRun + ':status:start')).input(stringEvents)
+    , stop: matching(new RegExp('^' + currentRun + ':status:stop')).input(stringEvents)
+    , example: batched().input(scopedExamples)
     };
   };
 });

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

@@ -6,7 +6,8 @@ require(['chart', 'exampleStream'], function (chart, examples) {
       bodyEl = document.querySelector('body')
     , uri = bodyEl.dataset.streamUrl
     , ajaxUri = bodyEl.dataset.lastUrl
-    , streams = examples(uri, ajaxUri)
+    , currentRun = bodyEl.dataset.currentRun
+    , streams = examples(uri, ajaxUri, currentRun)
     , c = chart()
     ;
 

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

@@ -5,7 +5,7 @@
   <title>RSpectacles</title>
   <link rel='stylesheet' href='<%= versioned_stylesheet 'style' %>' />
 </head>
-<body data-stream-url=<%= url '/stream' %> data-last-url=<%= url '/last' %>>
+<body data-stream-url=<%= url '/stream' %> data-last-url=<%= url "/last/#{params['key']}" %> data-current-run=<%= params['key'] %>>
   <form>
     <label><input type="radio" name="mode" value="size" checked> Time</label>
     <label><input type="radio" name="mode" value="count"> Count</label>

data/lib/rspectacles/config.rb

@@ -1,32 +1,41 @@
 require 'ostruct'
 require 'yaml'
+require 'erb'
 
 module RSpectacles
   class Config
     def initialize
-      user_options = load_user_opts
-      @opts = OpenStruct.new defaults.merge(user_options)
+      @opts = OpenStruct.new defaults.merge(yml || {})
     end
 
     def defaults
       {
-        sinatra_port: 4567,
-        pubsub_channel_name: 'redis-rspec-examples',
-        last_run_primary_key: 'redis-rspec-last-run',
-        redis_uri: 'redis://127.0.0.1:6379/'
+        sinatra_port: ENV['RSPECTACLES_PORT'] || ENV['PORT'] || 4567,
+        batch_size: (ENV['RSPECTACLES_BATCH_SIZE'] || 100).to_i,
+        pubsub_channel_name: ENV['RSPECTACLES_CHANNEL'] || 'redis-rspec-examples',
+        last_run_primary_key: ENV['RSPECTACLES_LAST_RUN_KEY'] || 'redis-rspec-last-run',
+        redis_uri: ENV['RSPECTACLES_REDIS_URL'] || 'redis://127.0.0.1:6379/'
       }
     end
 
-    def load_user_opts
-      if ENV['RSPECTACLES_CONFIG'] && ::File.exists?(::File.expand_path(ENV['RSPECTACLES_CONFIG']))
-        YAML.load_file(::File.expand_path(ENV['RSPECTACLES_CONFIG']))
-      else
-        {}
+    def method_missing(method, *args)
+      @opts.send method, *args
+    end
+
+    private
+
+    def yml_path
+      if ENV['RSPECTACLES_CONFIG']
+        ::File.expand_path(ENV['RSPECTACLES_CONFIG'])
       end
     end
 
-    def method_missing(method, *args)
-      @opts.send method, *args
+    def yml_exists?
+      yml_path && ::File.exist?(yml_path)
+    end
+
+    def yml
+      @yml ||= ::YAML.load(::ERB.new(IO.read(yml_path)).result) if yml_exists?
     end
   end
 

data/lib/rspectacles/formatter/batched_redis.rb

@@ -0,0 +1,19 @@
+require 'rspectacles/adapter/batched_redis_logger'
+require 'rspectacles/formatter/redis'
+
+module RSpectacles
+  module Formatter
+    class BatchedRedis < RSpectacles::Formatter::Redis
+      RSpec::Core::Formatters.register self,
+                                       *%i(example_passed
+                                           example_failed
+                                           start
+                                           stop
+                                           message)
+
+      def logger
+        @logger ||= RSpectacles::Adapter::BatchedRedisLogger.new(test_run_key: current_run_key)
+      end
+    end
+  end
+end

data/lib/rspectacles/formatter/redis.rb

@@ -16,20 +16,19 @@ module RSpectacles
       end
 
       def logger
-        @logger ||= RSpectacles::Adapter::RedisLogger.new
+        @logger ||= RSpectacles::Adapter::RedisLogger.new(test_run_key: current_run_key)
       end
 
       def message(notification)
-        logger.log "message:#{notification.message}"
+        logger.message notification.message
       end
 
       def start(_)
-        logger.log 'status:start'
-        logger.delete_last_log
+        logger.start
       end
 
       def stop(_)
-        logger.log 'status:stop'
+        logger.stop
       end
 
       def example_passed(notification)
@@ -43,6 +42,14 @@ module RSpectacles
       def example_failed(notification)
         logger.log_formatted notification.example
       end
+
+      def current_run_key
+        ENV['CURRENT_RSPEC_RUN'] || config.last_run_primary_key
+      end
+
+      def config
+        RSpectacles.config
+      end
     end
   end
 end

data/lib/rspectacles/version.rb

@@ -1,3 +1,3 @@
 module RSpectacles
-  VERSION='0.1.3'
+  VERSION='0.2.0'
 end

data/rspectacles.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec'
   s.add_dependency 'rake'
   s.add_dependency 'thin', '>= 1.5.1'
-  s.add_dependency 'sinatra', '~> 1.4.5'
+  s.add_dependency 'sinatra', '>= 1.4.5'
   s.add_dependency 'redis'
-  s.add_dependency 'em-hiredis', '~> 0.3.0'
+  s.add_dependency 'em-hiredis', '>= 0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspectacles
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Wheeler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2017-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -56,14 +56,14 @@ dependencies:
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
 - !ruby/object:Gem::Dependency
@@ -84,14 +84,14 @@ dependencies:
   name: em-hiredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
 description: Visualize rspec test running in the browser
@@ -111,6 +111,7 @@ files:
 - bin/rspectacles
 - config.ru
 - lib/rspectacles.rb
+- lib/rspectacles/adapter/batched_redis_logger.rb
 - lib/rspectacles/adapter/redis_logger.rb
 - lib/rspectacles/app.rb
 - lib/rspectacles/app/helpers.rb
@@ -127,6 +128,7 @@ files:
 - lib/rspectacles/app/public/js/script.js
 - lib/rspectacles/app/views/index.erb
 - lib/rspectacles/config.rb
+- lib/rspectacles/formatter/batched_redis.rb
 - lib/rspectacles/formatter/legacy/redis.rb
 - lib/rspectacles/formatter/redis.rb
 - lib/rspectacles/version.rb
@@ -156,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rspectacles
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Visualize rspec test running in the browser