rspec-web 0.1.5 → 0.1.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-web (0.1.1)
+    rspec-web (0.1.5)
       em-websocket (~> 0.3.6)
       haml (~> 3.1.4)
       rspec (~> 2.8.0)

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/bin/rspec-web

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
+
+require 'pathname'
+lib = Pathname.new(__FILE__).dirname.join('..', 'lib').expand_path.to_s
+$:.unshift(lib) unless $:.include?(lib)
 require 'rspec_web'
 
 RspecWeb::WebSocketServer.run!

data/lib/rspec_web/formatter.rb

@@ -13,7 +13,6 @@ module RspecWeb
       puts "View at http://0.0.0.0:4567"
       
       @timestamp = Time.now.to_i
-      
       @socket = WebSocket.new("ws://localhost:10081")
       
       message = { receiver: "server", method: "identify", arguments: ["rspec"] }
@@ -24,113 +23,74 @@ module RspecWeb
     end
     
     def example_group_started(example_group)
-      # puts "#{__method__} -----------------------"
+      
     end
     
     def example_group_finished(example_group)
-      # puts "#{__method__} -----------------------"
-      # # puts "example_group => #{example_group.inspect}"
+      
     end
     
     def example_started(example)
-      # puts "#{__method__} -----------------------"
-      # # puts "example => #{example.inspect}"
+      
     end
     
     def example_passed(example)
-      # puts "#{__method__} -----------------------"
-      
-      data = {
-        :started_at => example.metadata[:execution_result][:started_at].to_i,
-        :finished_at => example.metadata[:execution_result][:started_at].to_i,
-        :run_time => example.metadata[:execution_result][:run_time],
-        :file_path => example.metadata[:file_path],
-        :line_number => example.metadata[:line_number],
-        :description => example.metadata[:full_description]
-      }
-      
+      data = example_to_hash(example)
       message = { receiver: "web", method: "addToPassing", arguments: [@timestamp, data] }
       @socket.send(message.to_json)
     end
     
     def example_pending(example)
-      # puts "#{__method__} -----------------------"
-      
-      data = {
-        :started_at => example.metadata[:execution_result][:started_at].to_i,
-        :finished_at => example.metadata[:execution_result][:started_at].to_i,
-        :run_time => example.metadata[:execution_result][:run_time],
-        :file_path => example.metadata[:file_path],
-        :line_number => example.metadata[:line_number],
-        :description => example.metadata[:full_description]
-      }
-      
+      data = example_to_hash(example)
       message = { receiver: "web", method: "addToPending", arguments: [@timestamp, data] }
       @socket.send(message.to_json)
     end
     
     def example_failed(example)
-      # puts "#{__method__} -----------------------"
-      
-      data = {
-        :started_at => example.metadata[:execution_result][:started_at].to_i,
-        :finished_at => example.metadata[:execution_result][:started_at].to_i,
-        :run_time => example.metadata[:execution_result][:run_time],
-        :file_path => example.metadata[:file_path],
-        :line_number => example.metadata[:line_number],
-        :description => example.metadata[:full_description]
-      }
-      
+      data = example_to_hash(example)
       message = { receiver: "web", method: "addToFailing", arguments: [@timestamp, data] }
       @socket.send(message.to_json)
     end
     
     def start_dump
-      # puts "#{__method__} -----------------------"
     end
     
     def dump_failed(example)
-      # puts "#{__method__} -----------------------"
-      # puts "example => #{example.inspect}"
     end
     
     def dump_summary(duration, example_count, failure_count, pending_count)
-      # puts "#{__method__} -----------------------"
-      # puts "duration => #{duration.inspect}"
-      # puts "example_count => #{example_count.inspect}"
-      # puts "failure_count => #{failure_count.inspect}"
-      # puts "pending_count => #{pending_count.inspect}"
     end
     
     def message(message)
-      # puts "#{__method__} -----------------------"
-      # puts "message => #{message.inspect}"
     end
     
     def dump_failures
-      # puts "#{__method__} -----------------------"
     end
     
     def dump_pending
-      # puts "#{__method__} -----------------------"
     end
     
     def format_backtrace(backtrace, example)
-      # puts "#{__method__} -----------------------"
-      # puts "backtrace => #{backtrace.inspect}"
-      # # puts "example => #{example.inspect}"
     end
     
     def close
-      # puts "#{__method__} -----------------------"
-      
       puts "Specs finished!.. "
-      
       message = { receiver: "server", method: "disconnect", arguments: ["rspec"] }
-      
       @socket.send(message.to_json)
-      
       @socket.close
     end
+    
+    private
+    
+    def example_to_hash(example)
+      {
+        :started_at => example.metadata[:execution_result][:started_at].to_i,
+        :finished_at => example.metadata[:execution_result][:finished_at].to_i,
+        :run_time => example.metadata[:execution_result][:run_time],
+        :file_path => example.metadata[:file_path],
+        :line_number => example.metadata[:line_number],
+        :description => example.metadata[:full_description]
+      }
+    end
   end
 end

data/lib/rspec_web/web_application/public/js/script.js

@@ -18,6 +18,7 @@ function Iteration(timestamp, exampleCount, iterationEntry) {
       $('#iteration-'+timestamp+'-tab-passing-count').html(self.passingExamples.length);
       self.updateProgressBar();
       self.updateListEntryIcon();
+      $('#finishedExampleCount').html( self.finishedExampleCount() );
     },
     addToPending : function(data){
       $.extend(data, { timestamp: timestamp, exampleIndex: self.finishedExampleCount()-1 });
@@ -27,6 +28,7 @@ function Iteration(timestamp, exampleCount, iterationEntry) {
       $('#iteration-'+timestamp+'-tab-pending-count').html(self.pendingExamples.length);
       self.updateProgressBar();
       self.updateListEntryIcon();
+      $('#finishedExampleCount').html( self.finishedExampleCount() );
     },
     addToFailing : function(data){
       $.extend(data, { timestamp: timestamp, exampleIndex: self.finishedExampleCount()-1 });
@@ -36,11 +38,12 @@ function Iteration(timestamp, exampleCount, iterationEntry) {
       $('#iteration-'+timestamp+'-tab-failing-count').html(self.failingExamples.length);
       self.updateProgressBar();
       self.updateListEntryIcon();
+      $('#finishedExampleCount').html( self.finishedExampleCount() );
     }
   };
   
   this.finishedExampleCount = function(){
-    return this.passingExamples.length + this.pendingExamples.length + this.failingExamples.length;
+    return self.passingExamples.length + self.pendingExamples.length + self.failingExamples.length;
   };
   
   this.updateListEntryIcon = function(){
@@ -129,6 +132,8 @@ $(function(){
       },
       
       startNewIteration : function(timestamp, exampleCount){
+        $('#btn-run-specs').removeAttr('disabled');
+        
         var templateVariables = {
           timestamp          : timestamp,
           exampleCount       : exampleCount,
@@ -208,7 +213,6 @@ $(function(){
       }) );
       
       $self.attr('disabled', 'disabled');
-      setTimeout(function(){ $self.removeAttr('disabled'); }, 3500);
     }
   });
   

data/lib/rspec_web/web_application/views/index.haml

@@ -1,10 +1,11 @@
 !!! 5
 %html(lang="en")
   %head
+    %title Rspec Web Frontend
+    
     %meta(charset="utf-8")
     %meta(name="apple-mobile-web-app-capable" content="yes")
     %meta(name="viewport" content="width=device-width, initial-scale=1.0")
-    %title Rspec Web Frontend
     
     /[if lt IE 9]
       %script(type="text/javascript" src="http://html5shim.googlecode.com/svn/trunk/html5.js")
@@ -46,7 +47,7 @@
           
           <div class="row-fluid">
             <div class="span12">
-              <h6><%= exampleCount %> Example<%= exampleCount > 1 ? "s" : "" %></h6>
+              <h6><span id="finishedExampleCount">0</span> of <%= exampleCount %> example<%= exampleCount > 1 ? "s" : "" %> finished</h6>
             </div>
           </div>
           

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-web
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000Z
+date: 2012-03-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &70360448929180 !ruby/object:Gem::Requirement
+  requirement: &70158387964680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *70360448929180
+  version_requirements: *70158387964680
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70360448928320 !ruby/object:Gem::Requirement
+  requirement: &70158387963980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70360448928320
+  version_requirements: *70158387963980
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70360448927220 !ruby/object:Gem::Requirement
+  requirement: &70158387963360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.14
   type: :runtime
   prerelease: false
-  version_requirements: *70360448927220
+  version_requirements: *70158387963360
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70360448919500 !ruby/object:Gem::Requirement
+  requirement: &70158387962480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70360448919500
+  version_requirements: *70158387962480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70360448918640 !ruby/object:Gem::Requirement
+  requirement: &70158387959080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70360448918640
+  version_requirements: *70158387959080
 - !ruby/object:Gem::Dependency
   name: web-socket-ruby
-  requirement: &70360448917000 !ruby/object:Gem::Requirement
+  requirement: &70158387957920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70360448917000
+  version_requirements: *70158387957920
 description: A web front-end for RSpec tests.
 email: c00lryguy@gmail.com
 executables: