rspectacles 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a11e46720615db03ab64f004c98feef3d72ca01
-  data.tar.gz: bddfb9c9be4d000a0bf98c4159a8daa196999eff
+  metadata.gz: 7ad15310a5b2e9712ce803911cd98521cb89bf16
+  data.tar.gz: 7ac51e01e5634330dc9c5ff6f109ebc522d7fb83
 SHA512:
-  metadata.gz: 3f64c551d1430a41e95aa4253d4110636ad904705f128521982b83fdaed38320992802bdbfbd221389972c7b1c61f3b75dfa69a32cd16856d74f5af23c2c9160
-  data.tar.gz: 646ea8a1b97d395603222c6820ba36502a72b033fcbd5e7709818ea65f57726b8c831df876a2d38f26a803532f6e7cc1933283bdcf907ae7141cbc80111e7816
+  metadata.gz: 739fc4b1b8328491e6e97854718b607fad6e6c4ca3f6256689ad8cc39ff0ba1e70b1ce3358eb6edcaa769635e3286da4c60ecad63fcf309a1a67263005be8bd7
+  data.tar.gz: 106d48147ffc87cf7e8416920cf7e7b1529694810c50ec0e3100320edd323be292eeb69f5c44ddad3ba6a0d6bcff5addfdcdb860f4bfb43f9b2c5b4580b1323b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspectacles (0.3.1)
+    rspectacles (0.4.0)
       httparty
       pg
       puma

data/README.md

@@ -54,33 +54,30 @@ Then run your specs and watch the magic happen!
 
 ## Web Server
 
-The server can be run in standalone mode:
+The server uses ActiveRecord and Postgres to store the examples.
 
-    rspectacles
+Run migrations:
+
+    # set ENV['DATABASE_URL'] to point to your database, or else database.yml defaults will be used
+    rake db:create
+    rake db:migrate
 
-Or mounted directly on your app:
+Start the server:
 
-    # routes.rb
-    mount RSpectacles::App => '/rspectacles'
+    puma
 
 ## Configuration
-If you need to change any settings, the best method is to create a yaml file
-with your settings, and set the ```RSPECTACLES_CONFIG``` environment variable so
-that both the server and formatter can locate the file.
-
-For instance:
-
-```sh
-export RSPECTACLES_CONFIG='/path/to/config/rspectacles.yml'
-```
-
-And in ```rspectacles.yml```:
-```yaml
-sinatra_port: 4567
-batch_size: 500
-rspectacles_url: 'http://127.0.0.1:4567/'
-last_run_primary_key: 'redis-rspec-last-run'
-```
+
+Configuration settings can all be set through environment variables:
+
+    # server settings
+    RSPECTACLES_PORT = 4567
+
+    # client settings
+    RSPECTACLES_URL = nil
+    RSPECTACLES_RUN_KEY = 'rspec-current-run'
+    RSPECTACLES_BATCH_SIZE = 1000
+    RSPECTACLES_TIMEOUT = 15
 
 ## Contributing
 

data/bin/console

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bundle exec irb -r rspectacles/app

data/db/migrate/20170912153508_create_runs.rb

@@ -0,0 +1,20 @@
+require 'rspectacles/app/models/example'
+require 'rspectacles/app/models/run'
+
+class CreateRuns < ActiveRecord::Migration[5.1]
+  def change
+    create_table :runs do |t|
+      t.integer :total_time
+      t.string :rspec_run, null: false
+
+      t.timestamps
+    end
+
+    add_index :runs, :rspec_run, unique: true
+    add_reference :examples, :run
+
+    Example.all.distinct.pluck(:rspec_run).each do |run|
+      Run.where(rspec_run: run).first_or_create
+    end
+  end
+end

data/db/migrate/20170912175547_associate_runs.rb

@@ -0,0 +1,23 @@
+class AssociateRuns < ActiveRecord::Migration[5.1]
+  def up
+    add_column :examples, :duration, :numeric, null: false, default: 0
+    remove_column :runs, :total_time
+
+    Run.all.find_each do |r|
+      r.update_attributes id: r.rspec_run
+    end
+
+    count = Example.all.size
+    Example.all.find_each do |e|
+      e.update_column :duration, e.properties['duration'].to_f
+
+      count -= 1
+      puts count
+    end
+  end
+
+  def down
+    remove_column :examples, :duration
+    add_column :runs, :total_time, :integer
+  end
+end

data/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170907205819) do
+ActiveRecord::Schema.define(version: 20170912175547) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -18,7 +18,17 @@ ActiveRecord::Schema.define(version: 20170907205819) do
   create_table "examples", force: :cascade do |t|
     t.string "rspec_run", null: false
     t.text "properties"
+    t.bigint "run_id"
+    t.decimal "duration", default: "0.0", null: false
     t.index ["rspec_run"], name: "index_examples_on_rspec_run"
+    t.index ["run_id"], name: "index_examples_on_run_id"
+  end
+
+  create_table "runs", force: :cascade do |t|
+    t.string "rspec_run", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["rspec_run"], name: "index_runs_on_rspec_run", unique: true
   end
 
 end

data/lib/rspectacles/adapter/logger.rb

@@ -39,7 +39,7 @@ module RSpectacles
       end
 
       def post_results(messages)
-        HTTParty.post(full_uri, timeout: 5,
+        HTTParty.post(full_uri, timeout: config.timeout,
                                 body: { examples: messages }.to_json,
                                 headers: { 'Content-Type' => 'application/json' })
       rescue Net::ReadTimeout

data/lib/rspectacles/app/models/example.rb

@@ -1,4 +1,5 @@
 class Example < ActiveRecord::Base
+  belongs_to :run, primary_key: :rspec_run, foreign_key: :rspec_run
   serialize :properties, Hash
 
   def as_json(*_)

data/lib/rspectacles/app/models/run.rb

@@ -0,0 +1,11 @@
+class Run < ActiveRecord::Base
+  has_many :examples, primary_key: :rspec_run, foreign_key: :rspec_run
+
+  def total_count
+    @total_count ||= examples.size
+  end
+
+  def runtime
+    @runtime ||= examples.sum(:duration)
+  end
+end

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

@@ -1,3 +1,11 @@
+table {
+}
+
+th, td {
+  text-align: left;
+  padding: 8px 16px;
+}
+
 ul {
  border: 1px solid #eee;
  list-style-type: none;

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

@@ -1,5 +1,5 @@
 /*global define: true d3: true */
-define(['jquery', 'pathtree', 'mustache'], function ($, PathTree, Mustache) {
+define(['jquery', 'pathtree', 'details', 'mustache'], function ($, PathTree, details) {
   'use strict';
 
 
@@ -62,31 +62,6 @@ define(['jquery', 'pathtree', 'mustache'], function ($, PathTree, Mustache) {
       return pad(min) + ':' + pad(sec);
     }
 
-    function showDetails() {
-      var data = showDetails.current
-        , mappedData = $.extend({
-          name: ''
-        , line_number: ''
-        , status: ''
-        , duration: ''
-        , time_or_count: options.isCount ? 'Examples' : 'ms'
-        , minutes: ''
-        , value: null
-        }, data)
-        , map
-      ;
-
-      if (mappedData.value) {
-        if (!options.isCount) {
-          mappedData.minutes = secToMin(mappedData.value);
-          mappedData.value = parseInt(mappedData.value * 1000);
-        }
-      }
-
-      $('.example-wrapper').html(Mustache.render(tmpl, mappedData));
-    }
-    showDetails.current = {};
-
     function getValue() {
       return options.isCount ?
                   function () { return 1; } :
@@ -106,7 +81,7 @@ define(['jquery', 'pathtree', 'mustache'], function ($, PathTree, Mustache) {
           .attr("d", arc)
           .each(stash)
           .style("fill", getColor)
-          .call(showDetails);
+          .call(details.update);
     }
 
     function onEnter(path) {
@@ -117,11 +92,8 @@ define(['jquery', 'pathtree', 'mustache'], function ($, PathTree, Mustache) {
         .style("fill", getColor)
         .style("fill-rule", "evenodd")
         .each(stash)
-        .on('mouseover', function (d) {
-          showDetails.current = d;
-          showDetails();
-        })
-        .call(showDetails);
+        .on('mouseover', details.update)
+        .call(details.update);
     }
 
     function onExit(path) {

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

@@ -0,0 +1,51 @@
+define(['jquery', 'mustache'], function ($, Mustache) {
+  var me
+    , defaults
+    , current = {}
+    , tmpl = $('#template').html()
+    , isCount = false
+    ;
+
+  defaults = function () {
+    return {
+      name: ''
+    , line_number: ''
+    , status: ''
+    , duration: ''
+    , time_or_count: isCount ? 'Examples' : 'ms'
+    , minutes: ''
+    , value: null
+    };
+  };
+
+  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 render() {
+    if (current.value) {
+      if (!isCount) {
+        current.minutes = secToMin(current.value);
+        current.value = parseInt(current.value * 1000);
+      }
+    }
+
+    $('.example-wrapper').html(Mustache.render(tmpl, current));
+  }
+
+  return {
+    update: function (d) {
+      current = $.extend({}, defaults(), d);
+      render();
+    }
+
+  , isCount: function (value) {
+      isCount = value;
+    }
+  };
+});

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

@@ -22,28 +22,32 @@ define(['riffle'], function (riffle) {
 
     function batched(delay, maxSize) {
       var batch = []
+        , timer
         ;
 
       delay = delay || 100;
+      maxSize = maxSize || 100;
 
-      return stream(function (o, i) {
-        batch = batch.concat(i);
-
-        function clear() {
-          batch.length > 0 && o(batch);
-          batch = [];
+      function clear(o) {
+        if (batch.length > 0) {
+          o(batch.splice(0, maxSize));
         }
 
-        if (maxSize && batch.length > maxSize) {
-          clear();
-        } else {
-          setTimeout(clear, delay);
+        if (batch.length < 1) {
+          clearInterval(timer);
+          timer = null;
         }
+      }
+
+      return stream(function (o, i) {
+        batch = batch.concat(i);
+
+        if (!timer) { timer = setInterval(function () { clear(o); }, delay); }
       });
     }
 
     jsonEvents = each.input(ajaxStream(ajaxUri).invoke());
 
-    return { example: batched().input(jsonEvents) };
+    return { example: batched(10, 1000).input(jsonEvents) };
   };
 });

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

@@ -0,0 +1,24 @@
+define(function () {
+  return function () {
+    var isCount = false;
+    var me;
+
+    d3.selectAll("input").on("change", function () {
+      var newCount = this.value === 'count';
+
+      if (newCount !== isCount) {
+        isCount = newCount;
+        me.onChange(isCount);
+      }
+    });
+
+    return me = {
+      isCount: function () {
+        return isCount;
+      },
+
+      onChange: function () {
+      }
+    }
+  }
+});

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

@@ -1,5 +1,5 @@
 /*global require: true */
-require(['chart', 'exampleStream'], function (chart, examples) {
+require(['zoomable', 'exampleStream'], function (chart, examples) {
   'use strict';
 
   var

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

@@ -0,0 +1,131 @@
+define(['jquery', 'pathtree', 'details', 'form'], function ($, PathTree, details, countForm) {
+  return function (options) {
+    var width = 960,
+        height = 700,
+        radius = (Math.min(width, height) / 2) - 10,
+        form = countForm(),
+        me;
+
+    function arcTween(a) {
+      var i = d3.interpolate({ x: a.x0, dx: a.dx0 }, a);
+      return function tweener(t) {
+        var b = i(t);
+        a.x0 = b.x;
+        a.dx0 = b.dx;
+        return arc(b);
+      };
+    }
+
+    var x = d3.scale.linear()
+        .range([0, 2 * Math.PI]);
+
+    var y = d3.scale.sqrt()
+        .range([0, radius]);
+
+    var color = d3.scale.category20c();
+
+    var partition = d3.layout.partition()
+        .sort(function(a, b) { return d3.ascending(a.name, b.name); })
+        .value(function(d) { return d.size; });
+
+    var arc = d3.svg.arc()
+        .startAngle(function(d) { return Math.max(0, Math.min(2 * Math.PI, x(d.x))); })
+        .endAngle(function(d) { return Math.max(0, Math.min(2 * Math.PI, x(d.x + d.dx))); })
+        .innerRadius(function(d) { return Math.max(0, y(d.y)); })
+        .outerRadius(function(d) { return Math.max(0, y(d.y + d.dy)); });
+
+    var svg = d3.select("body").append("svg")
+        .attr("width", width)
+        .attr("height", height)
+      .append("g")
+        .attr("transform", "translate(" + width / 2 + "," + (height / 2) + ")");
+
+    function getValue() {
+      return form.isCount() ?
+                  function () { return 1; } :
+                  function (d) { return d.size; };
+    }
+
+    function getColor(d) {
+      if (d.status && d.status === 'failed') {
+        return '#f00';
+      } else {
+        return color(((d.children ? d : d.parent) || {}).name);
+      }
+    }
+
+    function stash(d) {
+      d.x0 = d.x;
+      d.dx0 = d.dx;
+    }
+
+
+    function onUpdate(path) {
+      path
+          .attr("d", arc)
+          .each(stash)
+          .style("fill", getColor);
+    }
+
+    var render = function () {
+      var path = svg.datum(me.tree.nodes).selectAll("path")
+          .data(partition.value(getValue()).nodes);
+
+      onUpdate(path);
+      path
+        .enter().append("path")
+          .on('mouseover', details.update)
+          .attr("d", arc)
+          .style("fill", getColor)
+          .style("stroke", function (d) { return 'rgba(255,255,255,0.3)'; })
+          .style("fill-rule", "evenodd")
+          .on("click", click);
+
+      form.onChange = function (isCount) {
+        details.isCount(isCount);
+
+        path
+          .data(partition.value(getValue()).nodes)
+          .transition()
+            .duration(1500)
+            .attrTween("d", arcTween);
+      };
+
+      render = function () {
+        path.datum(me.tree.nodes)
+            .data(partition.value(getValue()).nodes);
+      };
+    };
+
+    function click(d) {
+      svg.transition()
+          .duration(750)
+          .tween("scale", function() {
+            var xd = d3.interpolate(x.domain(), [d.x, d.x + d.dx]),
+                yd = d3.interpolate(y.domain(), [d.y, 1]),
+                yr = d3.interpolate(y.range(), [d.y ? 20 : 0, radius]);
+            return function(t) { x.domain(xd(t)); y.domain(yd(t)).range(yr(t)); };
+          })
+        .selectAll("path")
+          .attrTween("d", function(d) { return function() { return arc(d); }; });
+    }
+
+    d3.select(self.frameElement).style("height", height + "px");
+
+    return me = {
+      tree: new PathTree(),
+
+      render: render,
+
+      reset: function () {
+        me.tree = new PathTree();
+        me.render();
+      },
+
+      push: function (data) {
+        me.tree.add(data);
+        me.render();
+      }
+    };
+  }
+});

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

@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+  <title>RSpectacles</title>
+  <link rel='stylesheet' href='<%= versioned_stylesheet 'style' %>' />
+</head>
+<body>
+  <table>
+    <tr>
+      <th>Run</th>
+      <th>Examples</th>
+      <th>Time</th>
+      <th>Created At</th>
+    </tr>
+    <% @runs.each do |run| %>
+      <tr>
+        <td>
+          <a href='/watch/<%= run.rspec_run %>'>Run #<%= run.rspec_run %></a>
+        </td>
+        <td>
+          <%= run.examples.size %>
+        </td>
+        <td>
+          <% mm, ss = run.runtime.divmod(60) %>
+          <%= mm.to_i %>:<%= ss.to_i.to_s.rjust(2, '0') %>
+        </td>
+        <td>
+          <%= run.created_at.strftime('%Y-%m-%d %H:%M:%S') %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+</body>

data/lib/rspectacles/app.rb

@@ -4,6 +4,7 @@ require 'json'
 require 'sinatra/activerecord'
 require 'rspectacles/config.rb'
 require 'rspectacles/app/models/example'
+require 'rspectacles/app/models/run'
 require 'puma'
 
 module RSpectacles
@@ -27,6 +28,11 @@ module RSpectacles
     end
 
     # Routes
+    get '/' do
+      @runs = Run.all.limit(25).order(created_at: :desc)
+      erb :runs
+    end
+
     get '/watch/:key' do
       erb :index
     end
@@ -43,11 +49,14 @@ module RSpectacles
     post '/examples' do
       payload = JSON.parse(request.body.read)
 
+      run = Run.where(rspec_run: payload['examples'].first['rspec_run']).first_or_create
       data = payload['examples'].map do |args|
-        { rspec_run: args['rspec_run'], properties: args }
+        { rspec_run: args['rspec_run'], duration: args['duration'].to_f, properties: args }
       end
 
-      { errors: Example.create(data).count { |i| !i.persisted? } }.to_json
+      examples = Example.create(data)
+
+      { errors: examples.count { |i| !i.persisted? } }.to_json
     end
   end
 end

data/lib/rspectacles/config.rb

@@ -11,8 +11,9 @@ module RSpectacles
     def defaults
       {
         sinatra_port: ENV['RSPECTACLES_PORT'] || ENV['PORT'] || 4567,
-        batch_size: (ENV['RSPECTACLES_BATCH_SIZE'] || 100).to_i,
-        last_run_primary_key: ENV['RSPECTACLES_LAST_RUN_KEY'] || ENV['CIRCLE_BUILD_NUM'] || 'rspec-last-run',
+        batch_size: (ENV['RSPECTACLES_BATCH_SIZE'] || 1000).to_i,
+        last_run_primary_key: ENV['RSPECTACLES_RUN_KEY'] || ENV['CIRCLE_BUILD_NUM'] || 'rspec-current-run',
+        timeout: (ENV['RSPECTACLES_TIMEOUT'] || 15).to_i,
         rspectacles_url: ENV['RSPECTACLES_URL']
       }
     end

data/lib/rspectacles/version.rb

@@ -1,3 +1,3 @@
 module RSpectacles
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspectacles
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Wheeler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -126,7 +126,7 @@ description: Visualize rspec test running in the browser
 email:
 - mwheeler@g2crowd.com
 executables:
-- rspectacles
+- console
 extensions: []
 extra_rdoc_files: []
 files:
@@ -138,9 +138,11 @@ files:
 - Procfile
 - README.md
 - Rakefile
-- bin/rspectacles
+- bin/console
 - config.ru
 - db/migrate/20170907205819_create_examples_table.rb
+- db/migrate/20170912153508_create_runs.rb
+- db/migrate/20170912175547_associate_runs.rb
 - db/schema.rb
 - lib/rspectacles.rb
 - lib/rspectacles/adapter/batched_logger.rb
@@ -148,10 +150,13 @@ files:
 - lib/rspectacles/app.rb
 - lib/rspectacles/app/helpers.rb
 - lib/rspectacles/app/models/example.rb
+- lib/rspectacles/app/models/run.rb
 - lib/rspectacles/app/public/css/style.css
 - lib/rspectacles/app/public/js/chart.js
 - lib/rspectacles/app/public/js/d3.js
+- lib/rspectacles/app/public/js/details.js
 - lib/rspectacles/app/public/js/exampleStream.js
+- lib/rspectacles/app/public/js/form.js
 - lib/rspectacles/app/public/js/jquery.js
 - lib/rspectacles/app/public/js/mustache.js
 - lib/rspectacles/app/public/js/pathtree.js
@@ -159,7 +164,9 @@ files:
 - lib/rspectacles/app/public/js/require.js
 - lib/rspectacles/app/public/js/riffle.js
 - lib/rspectacles/app/public/js/script.js
+- lib/rspectacles/app/public/js/zoomable.js
 - lib/rspectacles/app/views/index.erb
+- lib/rspectacles/app/views/runs.erb
 - lib/rspectacles/config.rb
 - lib/rspectacles/config/database.yml
 - lib/rspectacles/formatter/base.rb

data/bin/rspectacles

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-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', RSpectacles.config.sinatra_port