blade 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 036f656e11ef4e58b8754e1fa79f3dd2b201ec6d
-  data.tar.gz: 861f57df946610dcf07e195476e316b8a665e73c
+  metadata.gz: f3b7b89ebef6e891ac308f65cf9935faf057482f
+  data.tar.gz: bfa25e592269250f945798b9403331a741486fa8
 SHA512:
-  metadata.gz: 89495488ab78a6b6d95a745573530abcdb18f4e2c23fd42f7e52865a15ae0802e2234bd201e50240475a4150201531bc67432006851da299119ed70761424a99
-  data.tar.gz: 31ced33e906e14e7bc223aa72466634e28740edb2c2348f450f9c2c7317768eb75c7355814efd4139f5c8071823b5a5bc538435daa1e7b9420bd0ed2dceebb97
+  metadata.gz: ff881b9e9aca8302fe4a646588b9cc31bad686a867b4ad42772c6d38bef819d02d43e293e6af75a349426d4e0705141228014c70b86bd1805849206d3bab3a66
+  data.tar.gz: c386316e4c95d86ddbb2e55e2e71852ef5e8db88429b6c26c08b5c12eafca99c8747d4d3623cee6c9d83984321806069c7b1e5988dc114bef4e9fe3e52af9275

data/assets/index.coffee

@@ -1,12 +1,15 @@
 @Blade =
-  suiteDidBegin: (details) ->
-    publish("/tests", event: "begin", total: details.total)
+  suiteDidBegin: ({total}) ->
+    event = "begin"
+    publish("/tests", {event, total})
 
-  testDidEnd: (details) ->
-    publish("/tests", event: "result", result: details.pass, name: details.name, message: details.message)
+  testDidEnd: ({name, status, message}) ->
+    event = "result"
+    publish("/tests", {event, name, status, message})
 
-  suiteDidEnd: (details) ->
-    publish("/tests", event: "end", total: details.total)
+  suiteDidEnd: ({total}) ->
+    event = "end"
+    publish("/tests", {event, total})
 
 publish = (channel, data = {}) ->
   client.publish(channel, copy(data, {session_id})) if session_id?

data/lib/blade.rb

@@ -83,14 +83,14 @@ module Blade
 
   private
     def handle_exit
-      %w( INT ).each do |signal|
-        trap(signal) { stop }
-      end
-
       at_exit do
         stop
         exit $!.status if $!.is_a?(SystemExit)
       end
+
+      %w( INT ).each do |signal|
+        trap(signal) { exit(1) }
+      end
     end
 
     def load_config_file!

data/lib/blade/combined_test_results.rb

@@ -24,7 +24,7 @@ class Blade::CombinedTestResults
   end
 
   def failed?
-    statuses.include?("failed")
+    states.include?("failed")
   end
 
   private
@@ -36,7 +36,7 @@ class Blade::CombinedTestResults
       all_test_results.map(&:total).compact
     end
 
-    def statuses
-      all_test_results.map(&:status)
+    def states
+      all_test_results.map(&:state)
     end
 end

data/lib/blade/interface/ci.rb

@@ -13,8 +13,8 @@ module Blade::CI
 
   private
     def process_result(details)
-      if details.has_key?("pass")
-        log details["pass"] ? "." : "F"
+      if details.has_key?("status")
+        log details["status"] == "pass" ? "." : "F"
       end
 
       if details["completed"]

data/lib/blade/interface/runner/tab.rb

@@ -6,16 +6,16 @@ class Blade::Runner::Tab < Blade::Model
     extend Forwardable
     def_delegators "Blade::Runner", :create_window
 
-    attr_reader :window, :status_window, :content_window
+    attr_reader :window, :state_window, :content_window
 
     def install(options = {})
       top = options[:top]
       @window = create_window(top: top, height: 3)
 
       top = @window.begy + @window.maxy + 1
-      @status_window = create_window(top: top, height: 1)
+      @state_window = create_window(top: top, height: 1)
 
-      top = @status_window.begy + @status_window.maxy + 1
+      top = @state_window.begy + @state_window.maxy + 1
       @content_window = create_window(top: top)
       @content_window.scrollok(true)
     end
@@ -93,7 +93,7 @@ class Blade::Runner::Tab < Blade::Model
   end
 
   def dot
-    status == "pending" ? "○" : "●"
+    state == "pending" ? "○" : "●"
   end
 
   def index
@@ -104,8 +104,8 @@ class Blade::Runner::Tab < Blade::Model
     Blade::Session.find(id)
   end
 
-  def status
-    session.test_results.status
+  def state
+    session.test_results.state
   end
 
   def active?
@@ -122,8 +122,8 @@ class Blade::Runner::Tab < Blade::Model
     self.active = true
     draw
 
-    tabs.status_window.addstr(session.to_s)
-    tabs.status_window.noutrefresh
+    tabs.state_window.addstr(session.to_s)
+    tabs.state_window.noutrefresh
 
     tabs.content_window.addstr(session.test_results.to_s)
     tabs.content_window.noutrefresh
@@ -135,8 +135,8 @@ class Blade::Runner::Tab < Blade::Model
     self.active = false
     draw
 
-    tabs.status_window.clear
-    tabs.status_window.noutrefresh
+    tabs.state_window.clear
+    tabs.state_window.noutrefresh
 
     tabs.content_window.clear
     tabs.content_window.noutrefresh
@@ -163,7 +163,7 @@ class Blade::Runner::Tab < Blade::Model
   end
 
   def color
-    case status
+    case state
     when "running"  then colors.yellow
     when "finished" then colors.green
     when /fail/     then colors.red

data/lib/blade/server.rb

@@ -9,7 +9,8 @@ module Blade::Server
 
   def start
     Faye::WebSocket.load_adapter("thin")
-    Rack::Server.start(app: app, Port: Blade.config.port, server: "thin")
+    Thin::Logging.silent = true
+    Thin::Server.start("localhost", Blade.config.port, app, signals: false)
   end
 
   def websocket_url(path = "")

data/lib/blade/test_results.rb

@@ -1,5 +1,5 @@
 class Blade::TestResults
-  attr_reader :session_id, :status, :lines, :passes, :failures, :total
+  attr_reader :session_id, :state, :lines, :passes, :failures, :total
 
   def initialize(session_id)
     @session_id = session_id
@@ -16,7 +16,7 @@ class Blade::TestResults
     @lines = []
     @passes = []
     @failures = []
-    @status = "pending"
+    @state = "pending"
     @total = 0
   end
 
@@ -26,30 +26,29 @@ class Blade::TestResults
     case details["event"]
     when "begin"
       reset
-      @status = "running"
+      @state = "running"
       @total = details["total"]
       @lines << publication[:line] = "1..#{@total}"
     when "result"
-      pass = details["result"]
       args = details.values_at("name", "message")
 
-      if pass
+      if details["status"] == "pass"
         line = Pass.new(*args).to_s
         @passes << line
       else
         line = Failure.new(*args).to_s
         @failures << line
-        @status = "failing"
+        @state = "failing"
       end
       @lines << line
 
-      publication.merge!(line: line, pass: pass)
+      publication.merge!(line: line, status: details["status"])
     when "end"
-      @status = failures.any? ? "failed" : "finished"
+      @state = failures.any? ? "failed" : "finished"
       publication[:completed] = true
     end
 
-    publication.merge!(status: status, session_id: session_id)
+    publication.merge!(state: state, session_id: session_id)
     Blade.publish("/results", publication)
   end
 

data/lib/blade/version.rb

@@ -1,3 +1,3 @@
 module Blade
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blade
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Javan Makhmali
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-30 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Blade