rspectacles 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b75957f7c35b3b3ce7cf3689fccf1b2283905eb
-  data.tar.gz: b073ea404ac798f4c113c111a45dd6c2faef3da8
+  metadata.gz: 92fd52dccf56cd933bfa9361092dd7590e767cd8
+  data.tar.gz: d58bfa299fdfb27798a1de5d8e4e578318dea9d7
 SHA512:
-  metadata.gz: a352c263f686deef03c0521799ccdf969db839fd98b7c208f14fccf981f99f35d9c57396ce8d77938591ea7db50b3403a2e585874dd2a6cd3a1d2281ef372f42
-  data.tar.gz: 8b6972c2c68a783be7e7246cecc04397d4afc88f423a051321c769f3c29f2cf82a34928d4729e5d661c77505f5be2f81f17f8c74e8159a2a3c1207c69b1d1da5
+  metadata.gz: aa73df7297d3b0daaf259c41ae0068c52ef1a84f3ba6909f33356d459ccf8c8803a5dbefce4b74a09c8ad8c8189df12889990615d946fa429ed42937a0efb354
+  data.tar.gz: 5c05f8a496b3f28f99f06a1a9e07add764f64cfebd0bd4a5789bec0e3c7612c183247587f4430fe503bc4ad07096931e532f2c05bdc21120c86de6e300dcf1aa

data/.gitignore

@@ -1,3 +1,4 @@
 pkg/*
 .ruby-gemset
 .ruby-version
+tmp/*

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspectacles (0.0.4)
+    rspectacles (0.0.6)
       em-hiredis (~> 0.2.1)
       rake
       redis
@@ -9,7 +9,7 @@ PATH
       thin (>= 1.5.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     daemons (1.1.9)
     diff-lcs (1.1.3)

data/bin/rspectacles

@@ -1,16 +1,12 @@
 #!/usr/bin/env ruby
-#
 
-require 'eventmachine'
-EM.run do
-  begin
-    require 'rspectacles/app.rb'
-  rescue LoadError => e
-    require 'rubygems'
-    path = File.expand_path '../../lib', __FILE__
-    $:.unshift(path) if File.directory?(path) && !$:.include?(path)
-    require 'rspectacles/app.rb'
-  end
-
-  Thin::Server.start RSpectacles::App, '0.0.0.0', 4567
+begin
+  require 'rspectacles/app.rb'
+rescue LoadError => e
+  require 'rubygems'
+  path = File.expand_path '../../lib', __FILE__
+  $:.unshift(path) if File.directory?(path) && !$:.include?(path)
+  require 'rspectacles/app.rb'
 end
+
+Thin::Server.start RSpectacles::App, '0.0.0.0', 4567

data/config.ru

@@ -0,0 +1,4 @@
+$LOAD_PATH.unshift ::File.expand_path(::File.dirname(__FILE__) + '/lib')
+require 'rspectacles/app'
+
+run RSpectacles::App.new

data/lib/rspectacles/app/helpers.rb

@@ -0,0 +1,15 @@
+RSpectacles::App.helpers do
+  def versioned_stylesheet(stylesheet)
+    checksum = File.mtime(File.join(public_dir, 'css', "#{stylesheet}.css")).to_i
+    url "/css/#{stylesheet}.css?#{checksum}"
+  end
+
+  def versioned_javascript(js)
+    checksum = File.mtime(File.join(public_dir, 'js', "#{js}.js")).to_i
+    url "/js/#{js}.js?#{checksum}"
+  end
+
+  def public_dir
+    File.expand_path('../../app/public', __FILE__)
+  end
+end

data/lib/rspectacles/app/public/css/style.css

@@ -1,3 +1,19 @@
+ul {
+ border: 1px solid #eee;
+ list-style-type: none;
+ margin: 0;
+ padding: 15px;
+ font-size: 12px;
+}
+
+li {
+  margin: 0;
+  padding: 0;
+}
+
+.failed { color: red; }
+.passed { color: green; }
+
 body {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   margin: auto;
@@ -21,19 +37,3 @@ form {
   overflow: auto;
   max-width: 350px;
 }
-
-ul {
- border: 1px solid #eee;
- list-style-type: none;
- margin: 0;
- padding: 15px;
- font-size: 12px;
-}
-
-li {
-  margin: 0;
-  padding: 0;
-}
-
-.failed { color: red; }
-.passed { color: green; }

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

@@ -74,25 +74,28 @@ define(['jquery', 'pathtree', 'mustache'], function ($, PathTree, Mustache) {
                   function (d) { return d.size; };
     }
 
+    function getColor(d) {
+      if (d.status && d.status === 'failed') {
+        return '#f00';
+      } else {
+        return options.color(((d.children ? d : d.parent) || {}).name);
+      }
+    }
+
     function render() {
       var path = svg.datum(me.tree.nodes).selectAll("path")
           .data(partition.value(getValue()).nodes);
 
       path
           .attr("d", arc)
-          .each(stash);
+          .each(stash)
+          .style("fill", getColor);
 
       path.enter().append("path")
           .attr("display", function (d) { return d.depth ? null : "none"; })
           .attr("d", arc)
-          .style("stroke", function (d) { return '#fff'; })
-          .style("fill", function (d) {
-            if (d.status && d.status === 'failed') {
-              return '#f00';
-            } else {
-              return options.color(((d.children ? d : d.parent) || {}).name);
-            }
-          })
+          .style("stroke", function (d) { return 'rgba(255,255,255,0.3)'; })
+          .style("fill", getColor)
           .style("fill-rule", "evenodd")
           .each(stash)
           .on('mouseover', showDetails);

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

@@ -2,7 +2,7 @@
 define(['riffle'], function (riffle) {
   'use strict';
 
-  return function streams(uri) {
+  return function streams(serverUri, ajaxUri) {
     var stream = riffle.stream
       , me
       , serverEvents
@@ -17,7 +17,7 @@ define(['riffle'], function (riffle) {
       ;
 
     serverEvents = stream(function (o, i) {
-      new EventSource(uri).addEventListener('message', o);
+      new EventSource(serverUri).addEventListener('message', o);
     }).invoke();
 
     function ajaxStream(url, args) {
@@ -69,7 +69,7 @@ define(['riffle'], function (riffle) {
     }
 
     stringEvents = eventToString.input(serverEvents);
-    ajaxEvents = each.input(ajaxStream('/last').invoke());
+    ajaxEvents = each.input(ajaxStream(ajaxUri).invoke());
     allEvents = stream().input(stringEvents, ajaxEvents);
 
     return me = {

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

@@ -43,7 +43,7 @@ define(['jquery'], function ($) {
     data.forEach(function (node) {
       var path = node.file_path.split('/');
 
-      ['.', 'spec'].forEach(function (v) {
+      ['.'].forEach(function (v) {
         if (path[0] === v) { path.shift(); }
       });
 

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

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

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

@@ -3,9 +3,9 @@
 <html>
 <head>
   <title>RSpectacles</title>
-  <link rel='stylesheet' href='<%= url 'css/style.css' %>' />
+  <link rel='stylesheet' href='<%= versioned_stylesheet 'style' %>' />
 </head>
-<body data-stream-url=<%= url '/stream' %>>
+<body data-stream-url=<%= url '/stream' %> data-last-url=<%= url '/last' %>>
   <form>
     <label><input type="radio" name="mode" value="size" checked> Time</label>
     <label><input type="radio" name="mode" value="count"> Count</label>
@@ -27,9 +27,9 @@
     </ul>
   </script>
 
-  <script type='text/javascript' src='<%= url '/js/d3.js' %>'></script>
-  <script type='text/javascript' src='<%= url '/js/plates.js' %>'></script>
-  <script type='text/javascript' data-main='<%= url 'js/script' %>' src='<%= url '/js/require.js' %>'></script>
+  <script type='text/javascript' src='<%= versioned_javascript 'd3' %>'></script>
+  <script type='text/javascript' src='<%= versioned_javascript 'plates' %>'></script>
+  <script type='text/javascript' data-main='<%= versioned_javascript 'script' %>' src='<%= versioned_javascript 'require' %>'></script>
   <script>
     require.config({ urlArgs: (new Date().getTime())});
   </script>

data/lib/rspectacles/app.rb

@@ -8,6 +8,7 @@ require 'thin'
 
 module RSpectacles
   class App < Sinatra::Base
+    require 'rspectacles/app/helpers'
     connections = []
     dir = File.dirname(File.expand_path(__FILE__))
     set :app_file, __FILE__
@@ -22,8 +23,7 @@ module RSpectacles
     end
 
     uri = URI.parse 'redis://127.0.0.1:6379/'
-    $emredis = nil
-    $redis = Redis.new host: uri.host, port: uri.port
+    redis = Redis.new host: uri.host, port: uri.port
 
     # Routes
     get '/' do
@@ -38,22 +38,16 @@ module RSpectacles
     end
 
     get '/last' do
-      $redis.lrange('redis-rspec-last-run', 0, -1).to_json
-    end
-
-    def dump_last_run(out)
-      $emredis.lrange('redis-rspec-last-run', 0, -1) do |list|
-        list.each { |msg| out << "data: #{msg}\n\n" }
-      end
+      redis.lrange('redis-rspec-last-run', 0, -1).to_json
     end
 
+    # pubsub and streaming - EventMachine support only
     EM.next_tick do
-      $emredis = EM::Hiredis.connect(uri)
+      emredis = EM::Hiredis.connect(uri)
 
-      $emredis.pubsub.subscribe 'redis-rspec-examples' do |message|
+      emredis.pubsub.subscribe 'redis-rspec-examples' do |message|
         connections.each { |out| out << "data: #{message}\n\n" }
       end
     end
   end
 end
-

data/lib/rspectacles/version.rb

@@ -1,3 +1,3 @@
 module RSpectacles
-  VERSION='0.0.4'
+  VERSION='0.0.6'
 end

data/rspectacles.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/G2Labs-net/rspectacles'
   s.summary     = %q{Visualize rspec test running in the browser}
   s.description = %q{Visualize rspec test running in the browser}
+  s.license     = 'MIT'
 
   s.rubyforge_project = 'rspectacles'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspectacles
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Michael Wheeler
@@ -108,8 +108,10 @@ files:
 - LICENSE
 - Rakefile
 - bin/rspectacles
+- config.ru
 - lib/rspectacles.rb
 - lib/rspectacles/app.rb
+- lib/rspectacles/app/helpers.rb
 - lib/rspectacles/app/public/css/style.css
 - lib/rspectacles/app/public/js/chart.js
 - lib/rspectacles/app/public/js/d3.js
@@ -130,7 +132,8 @@ files:
 - spec/javascripts/test.html
 - spec/javascripts/tests/pathtree_spec.js
 homepage: https://github.com/G2Labs-net/rspectacles
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []