cuukie 0.1.4 → 0.2.0

data/lib/cuukie/public/cucumber.css

@@ -182,7 +182,7 @@ body {
 .cucumber ol li.undefined, td ol li.undefined, th ol li.undefined {
   border-left: 5px solid #faf834;
   border-bottom: 1px solid #faf834;
-  background: #fcfb98;
+  background: #aaaaaa;
   color: #131313;
 }
 .cucumber ol li.message, td ol li.message, th ol li.message {

data/lib/cuukie/public/cuukie.js

@@ -37,3 +37,7 @@ function skippedColors(element_id) {
   $('#'+element_id).css('background', '#E0FFFF');
   $('#'+element_id).css('color', '#000000');
 }
+function undefinedColors(element_id) {
+  $('#'+element_id).css('background', '#AAAAAA');
+  $('#'+element_id).css('color', '#000000');
+}

data/lib/cuukie/server.rb

@@ -5,96 +5,102 @@ require 'syntax/convertors/html'
 module Cuukie
   class Server < Sinatra::Base
     set :features,      []
-    set :build_status,  nil
-    set :duration,      '?'
-    set :stats,         {:scenarios => '', :steps => ''}
+    set :build_status,  'undefined'
+    set :start_time,    nil
+    set :duration,      nil
+    set :stats,         Hash.new('')
     
     get '/' do
       @features     = settings.features
       @build_status = settings.build_status
-      @duration     = settings.duration
       @stats        = settings.stats
       erb :index
     end
 
     post '/before_features' do
       settings.features.clear
-      settings.build_status = nil
-      settings.stats = {:scenarios => '', :steps => ''}
-      settings.duration = '?'
-      settings.build_status = nil
+      settings.build_status = 'undefined'
+      settings.start_time = Time.now
+      settings.duration = nil
+      settings.stats = Hash.new('')
     end
 
     post '/before_feature' do
       feature = read_from_request
-      feature['description'] = feature['description'].split("\n")
-      feature['scenarios'] = []
-      feature['id'] = settings.features.size + 1
+      feature[:keyword] = '...'
+      feature[:description] = feature[:description].split("\n")
+      feature[:scenarios] = []
+      feature[:id] = settings.features.size + 1
       settings.features << feature
       'OK'
     end
 
+    post '/feature_name' do
+      current_feature.merge! read_from_request
+      'OK'
+    end
+    
     post '/scenario_name' do
       scenario = read_from_request
-      scenario['steps'] = []
-      scenario['id'] = "scenario_#{current_feature['id']}_#{current_feature['scenarios'].size + 1}"
-      current_feature['scenarios'] << scenario
+      scenario[:steps] = []
+      scenario[:id] = "scenario_#{current_feature[:id]}_#{current_feature[:scenarios].size + 1}"
+      scenario[:status] = 'undefined'
+      current_feature[:scenarios] << scenario
       'OK'
     end
 
-    post '/before_step_result' do
+    post '/before_step' do
       step = read_from_request
-      step['table'] = []
-      current_scenario['steps'] << step
+      step[:table] = []
+      step[:status] = 'undefined'
+      current_scenario[:steps] << step
       'OK'
     end
-
-    post '/exception' do
-      current_step['exception'] = read_from_request
+    
+    post '/before_table_row' do
+      current_step[:table] << []
       'OK'
     end
     
-    post '/after_step_result' do
-      current_step.merge! read_from_request
-      if current_step['status'] == 'failed'
-        current_scenario['status'] = settings.build_status = 'failed' 
-      elsif current_step['status'] == 'pending'
-        current_scenario['status'] = 'pending'
-        settings.build_status ||= 'pending' 
-      end
+    post '/table_cell_value' do
+      data = read_from_request
+      current_step[:table].last << data[:value]
       'OK'
     end
-
-    post '/after_steps' do
-      if current_scenario['steps'].all? {|step| step['status'] == 'skipped' }
-        current_scenario['status'] = 'skipped'
-      end
-      current_scenario['status'] ||= 'passed'
+    
+    post '/doc_string' do
+      data = read_from_request
+      current_step[:multiline_string] = data[:multiline_string]
       'OK'
     end
     
-    post '/before_table_row' do
-      current_step['table'] << []
+    post '/exception' do
+      current_step[:exception] = read_from_request
       'OK'
     end
     
-    post '/table_cell_value' do
-      data = read_from_request
-      current_step['table'].last << data['value']
+    post '/after_step_result' do
+      current_step.merge! read_from_request
+      if current_step[:status] == 'failed'
+        current_scenario[:status] = settings.build_status = 'failed' 
+      elsif current_step[:status] == 'pending'
+        current_scenario[:status] = 'pending'
+        settings.build_status = 'pending' if settings.build_status == 'undefined'
+      end
       'OK'
     end
-    
-    post '/doc_string' do
-      data = read_from_request
-      current_step['multiline_string'] = data['multiline_string']
+
+    post '/after_steps' do
+      if current_scenario[:steps].all? {|step| step[:status] == 'skipped' }
+        current_scenario[:status] = 'skipped'
+      end
+      current_scenario[:status] = 'passed' if current_scenario[:status] == 'undefined'
       'OK'
     end
     
     post '/after_features' do
-      data = read_from_request
-      min, sec = data['duration'].to_f.divmod(60)
-      settings.duration = "#{min}m#{'%.3f' % sec}s" 
-      settings.build_status ||= 'passed'
+      settings.duration = read_from_request[:duration]
+      settings.build_status = 'passed' if settings.build_status == 'undefined'
       settings.stats = stats
       'OK'
     end
@@ -103,19 +109,28 @@ module Cuukie
     delete('/') { exit! }
     
     helpers do
-      def snippet(exception)
-        return '' unless exception['raw_lines']
+      def code_snippet_for(exception)
+        return '' unless exception[:raw_lines]
         result = '<pre class="ruby"><code>'
-        linenum = exception['first_line']
-        html_lines = htmlize(exception['raw_lines']).split "\n"
+        linenum = exception[:first_line]
+        html_lines = htmlize(exception[:raw_lines]).split "\n"
         html_lines.each do |html_line|
           line = "<span class=\"linenum\">#{linenum}</span>#{html_line}"
-          line = "<span class=\"offending\">#{line}</span>" if linenum == exception['marked_line']
+          line = "<span class=\"offending\">#{line}</span>" if linenum == exception[:marked_line]
           result << "#{line}<br/>"
           linenum += 1
         end
         result << '</code></pre>'
       end
+      
+      def time_label
+        settings.duration ? "Duration" : "Running time"
+      end
+      
+      def format_time
+        min, sec = time.to_i.divmod(60)
+        "#{min}':#{sec}''"
+      end
     end
     
     def current_feature
@@ -127,41 +142,47 @@ module Cuukie
       # don't have a scenario yet. this is useful to eliminate steps
       # coming from backgrounds (which will be re-sent during the
       # following scenarios anyway)
-      return { 'steps' => [{}] } if current_feature['scenarios'].empty?
-      current_feature['scenarios'].last
+      return { :steps => [{}] } if current_feature[:scenarios].empty?
+      current_feature[:scenarios].last
     end
 
     def current_step
-      current_scenario['steps'].last
+      current_scenario[:steps].last
+    end
+    
+    def time
+      return settings.duration if settings.duration
+      return 0 unless settings.start_time
+      return Time.now - settings.start_time
     end
     
     def stats
       scenarios = []
-      settings.features.each {|feature| scenarios.concat feature['scenarios'] }
+      settings.features.each {|feature| scenarios.concat feature[:scenarios] }
 
       result = {:scenarios => String.new, :steps => String.new}
-      result[:scenarios] << dump_count(scenarios.size, "scenario")
+      result[:scenarios] << pluralize(scenarios.size, "scenario")
       result[:scenarios] << counts(scenarios)
       
       steps = []
-      scenarios.each {|scenario| steps.concat scenario['steps'] }
-      result[:steps] << dump_count(steps.size, "step")
+      scenarios.each {|scenario| steps.concat scenario[:steps] }
+      result[:steps] << pluralize(steps.size, "step")
       step_count = counts steps
       result[:steps] << step_count if step_count
       result
     end
+
+    def pluralize(count, what)
+      "#{count} #{what}#{count == 1 ? '' : 's'}"
+    end    
     
     def counts(elements)
       counts = ['failed', 'skipped', 'undefined', 'pending', 'passed'].map do |status|
-        selected = elements.find_all {|element| element['status'] == status }
+        selected = elements.find_all {|element| element[:status] == status }
         selected.any? ? "#{selected.size} #{status}" : nil
       end.compact
       counts.any? ? " (#{counts.join(', ')})" : ''
     end
-
-    def dump_count(count, what)
-      "#{count} #{what}#{count == 1 ? '' : 's'}"
-    end    
     
     def htmlize(ruby)
       convertor = Syntax::Convertors::HTML.for_syntax("ruby")
@@ -172,10 +193,20 @@ module Cuukie
     
     def read_from_request
       data = JSON.parse request.body.read
-      result = data.clone
-      result.each do |k, v|
-        result[k] = escape_html(v) if v.class == String && k !~ /^raw_/
+      result = {}
+      data.each do |k, v|
+        if v.class == String && k !~ /^raw_/
+          result[k.to_sym] = escape_html(v)
+        else
+          result[k.to_sym] = v
+        end
       end
+      result
     end
   end
 end
+
+if __FILE__ == $0
+  Cuukie::Server.set :port, ARGV[0] if ARGV[0]
+  Cuukie::Server.run!
+end

data/lib/cuukie/views/index.erb

@@ -8,7 +8,6 @@
   </head>
 
   <body>
-    <!-- header -->
     <div class="cucumber"><div id="cucumber-header"><div id="label"><h1>Cucumber Features</h1></div>
       <div id="summary">
         <p id="stats"></p>
@@ -18,7 +17,7 @@
     </div>
     <script><%= @build_status %>Colors('cucumber-header')</script>
     <script type="text/javascript">
-      document.getElementById('duration').innerHTML = "Finished in <strong><%= @duration %> seconds</strong>";
+      document.getElementById('duration').innerHTML = "<%= time_label %>: <strong><%= format_time %></strong>";
     </script>
     <script type="text/javascript">
       document.getElementById('stats').innerHTML = "<%= @stats[:scenarios] %><br/><%= @stats[:steps] %>";
@@ -26,31 +25,31 @@
 
     <% @features.each do |feature| %>
       <div class="feature">
-        <h2><span class="val">Feature: <%= feature['short_name'] %></span></h2>
-        <p class="narrative"><%= feature['description'].join '<br/>' %><bbr/r></p>
+        <h2><span class="val"><%= feature[:keyword] %>: <%= feature[:short_name] %></span></h2>
+        <p class="narrative"><%= feature[:description].join '<br/>' %><bbr/r></p>
         
-        <% feature['scenarios'].each do |scenario| %>
+        <% feature[:scenarios].each do |scenario| %>
           <div class="scenario">
-            <span style="display: block;" class="scenario_file"><%= scenario['file_colon_line'] %></span>
-            <h3 style="cursor: pointer;" id="<%= scenario['id'] %>">
-              <span class="keyword"><%= scenario['keyword'] %>: </span><span class="val"><%= scenario['name'] %></span>
+            <span style="display: block;" class="scenario_file"><%= scenario[:file_colon_line] %></span>
+            <h3 style="cursor: pointer;" id="<%= scenario[:id] %>">
+              <span class="keyword"><%= scenario[:keyword] %>: </span><span class="val"><%= scenario[:name] %></span>
             </h3>
-            <script><%= scenario['status'] %>Colors('<%= scenario['id'] %>');</script>
+            <script><%= scenario[:status] %>Colors('<%= scenario[:id] %>');</script>
             <ol style="display: block;">
-            <% scenario['steps'].each do |step| %>
-              <li id="features_" class="step <%= step['status'] %>">
+            <% scenario[:steps].each do |step| %>
+              <li id="features_" class="step <%= step[:status] %>">
                 <div class="step_name">
-                  <span class="keyword"><%= step['keyword'] %></span><span class="step val"><%= step['name'] %></span>
+                  <span class="keyword"><%= step[:keyword] %></span><span class="step val"><%= step[:name] %></span>
                 </div>
-                <div class="step_file"><span><%= step['file_colon_line'] %></span></div>
-                <% if step['exception'] %>
-                  <div class="message"><pre><%= step['exception']['message'] %></pre></div>
-                  <div class="backtrace"><pre><%= step['exception']['backtrace'].gsub('\n', '<br/>') %></pre></div>
-                  <%= snippet step['exception'] %>
+                <div class="step_file"><span><%= step[:file_colon_line] %></span></div>
+                <% if step[:exception] %>
+                  <div class="message"><pre><%= step[:exception][:message] %></pre></div>
+                  <div class="backtrace"><pre><%= step[:exception][:backtrace].gsub('\n', '<br/>') %></pre></div>
+                  <%= code_snippet_for step[:exception] %>
                 <% end %>
-                <% unless step['table'].empty? %>
+                <% unless step[:table].empty? %>
                   <table>
-                  <% step['table'].each_with_index do |rowdata, row| %>
+                  <% step[:table].each_with_index do |rowdata, row| %>
                     <tr class='step' id='row_-<%= row %>'>
                     <% rowdata.each_with_index do |value, col| %>
                       <td class="step" id="row_-<%= row %>_<%= col %>"><div><span class="step param"><%= value %></span></div></td>
@@ -59,8 +58,8 @@
                   <% end %>
                   </table>
                 <% end %>
-                <% if step['multiline_string'] %>
-                  <pre class="val"><%= step['multiline_string'] %></pre>
+                <% if step[:multiline_string] %>
+                  <pre class="val"><%= step[:multiline_string] %></pre>
                 <% end %>
               </li>
             <% end %>

data/spec/cli_spec.rb

@@ -0,0 +1,86 @@
+require 'cuukie/cli'
+require 'stringio'
+
+describe "The parse_options method" do
+  include Cuukie::Cli
+
+  before :each do
+    @out = ''
+    def @out.write(data); self << data; end
+    @old_stdout, $stdout = $stdout, @out
+  end
+  
+  after :each do
+    $stdout = @old_stdout
+  end
+  
+  it "recognizes --server" do
+    parse_options(['--server'])[:server].should be_true
+  end
+  
+  it "defaults to --server = false" do
+    parse_options([])[:server].should be_false
+  end
+  
+  it "recognizes --cuukieport" do
+    parse_options(['--cuukieport', '4570'])[:cuukieport].should == 4570
+  end
+
+  it "defaults to --cuukieport 4569" do
+    parse_options([])[:cuukieport].should == 4569
+  end
+
+  it "raises error on bad --cuukieport" do
+    lambda { parse_options ['--cuukieport', 'abc'] }.should raise_error
+    lambda { parse_options ['--cuukieport'] }.should raise_error
+  end
+  
+  it "recognizes --showpage" do
+    parse_options(['--showpage'])[:showpage].should be_true
+  end
+  
+  it "defaults to --showpage = false" do
+    parse_options([])[:showpage].should be_false
+  end
+
+  it "recognizes --nowait" do
+    parse_options(['--nowait'])[:nowait].should be_true
+  end
+  
+  it "defaults to --nowait = false" do
+    parse_options([])[:nowait].should be_false
+  end
+  
+  it "recognizes --keepserver" do
+    parse_options(['--keepserver'])[:keepserver].should be_true
+  end
+  
+  it "defaults to --keepserver = false" do
+    parse_options(['--nowait'])[:keepserver].should be_false
+  end
+
+  it "shows the help with -h" do
+    parse_options ['-h']
+    @out.should match /Usage: cuukie \[/
+  end
+
+  it "shows the help with --help" do
+    parse_options ['--help']
+    @out.should match /Usage: cuukie \[/
+  end
+
+  it "the help text includes the version of Cuukie" do
+    parse_options ['-h']
+    @out.should match /cuukie \d+\.\d+\.\d+/
+  end
+
+  it "returns no result after showing help" do
+    parse_options(['-h']).should be_empty
+  end
+  
+  it "consumes recognized options" do
+    options = ['--showpage', '--invalid', '--cuukieport', '4570']
+    parse_options options
+    options.should == ['--invalid']
+  end
+end

data/spec/code_snippets_spec.rb

@@ -1,4 +1,4 @@
-require 'cuukie/cucumber/formatter/code_snippets'
+require 'cuukie/code_snippets'
 require 'tempfile'
 
 describe "The code_snippet method" do
@@ -31,12 +31,12 @@ SOURCE
     snippet['lines'].should be_nil
   end
   
-  it "returns nil if the file is not valid" do
+  it "returns a nil snippet if the file is not valid" do
     snippet = code_snippet '', 4
     snippet['lines'].should be_nil
   end
   
-  it "returns nil if it cannot find the line" do
+  it "returns a nil snippet if it cannot find the line" do
     snippet = code_snippet @source.path, 7
     snippet['lines'].should be_nil
   end
@@ -87,7 +87,7 @@ SOURCE
     end
   end
 
-  it "returns nil if the extraction fails" do
+  it "returns a nil snippet if the extraction fails" do
     backtrace_to_snippet(['abcd'])['lines'].should be_nil
   end
 end