spectator 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc53eefa112ce5dd549660142e9691fec2b7147e
-  data.tar.gz: be808d5963f8a0878c6cd51b0f6ef8dc2e4a4578
+  metadata.gz: 8224d0dbd81297094686627e2c57a002ee6ebb10
+  data.tar.gz: d03578fac43dec450fca0c13e9710ffc2e04fde8
 SHA512:
-  metadata.gz: b3e3a241bb6569789aac25566d109e99330a07bf82021809e8f592d3138afd31e57b2f69e71b097d8037cf3486a4162ea6cd6a227dd01781548af11dfa3e668b
-  data.tar.gz: 80aff3fe557a50be933613d3977b8b7dc822d4933eb4adbe3eecf217aff9267e84c211fa0c7e5fad46f77c243a7a9719888eaa5d1418cc9c5592c875a9873b45
+  metadata.gz: ccc07eaab375e7ca4ed446a9780db3ab3b235d92ff220aa4f1ca9579199facdbd28e1bb074fe059412ae35240b4e7b8f1defd288ca32e0297ca4524762650b6a
+  data.tar.gz: db74db3619284f9641f06241d7cc12408ea793d1899a8ee471aa6142af89bae64e8cb5f612477c4ef18dc56175bb6374153f5f10060bc69aa267a523e1d1b09c

data/README.md

@@ -1,6 +1,6 @@
 # Spectator
 
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/elia/spectator)
+[![Code Climate](http://img.shields.io/codeclimate/github/kabisaict/flow.svg)](https://codeclimate.com/github/elia/spectator)
 
 _Test driven development red-green cycle for simple people!_
 

data/lib/spectator.rb

@@ -54,41 +54,44 @@ module Spectator
       path_watcher.on_change { ui << :run_specs }
       path_watcher.watch_paths!
 
-      ui.on(:run_specs) do
-        next unless ui.can_run_specs?
-        ui.status = :running_specs
-        files = path_watcher.pop_files
-        specs = specs_matcher.specs_for(files)
-        if specs.any?
-          result = ui.run spec_runner.command(specs)
-          success_notifier.notify(result)
-        end
-        ui.wait_for_changes
-      end
-
-      ui.on(:interrupt) do
-        puts ' (Interrupted with CTRL+C)'.red
-        p [ui.status, ui.interrupted_status]
-        case ui.interrupted_status
-        when :wait_for_input then ui.exit
-        when :running_specs  then ui.wait_for_changes
-        when :exiting        then Kernel.abort
-        else Thread.new { ui.ask_what_to_do }
-        end
-      end
+      ui.on(:run_all) { run_all_handler }
+      ui.on(:run_specs) { run_specs_handler }
+      ui.on(:interrupt) { interrupt_handler }
 
       trap('INT') { ui.interrupt! }
+      ui.start
+    end
 
-      ui.on(:run_all) do
-        next unless ui.can_run_specs?
+    def run_all_handler
+      return unless ui.can_run_specs?
 
-        ui.status = :running_specs
-        result = ui.run(spec_runner.command)
+      ui.status = :running_specs
+      result = ui.run(spec_runner.command)
+      success_notifier.notify(result)
+      ui.status = nil if ui.status == :running_specs
+    end
+
+    def run_specs_handler
+      return unless ui.can_run_specs?
+      ui.status = :running_specs
+      files = path_watcher.pop_files
+      specs = specs_matcher.specs_for(files)
+      if specs.any?
+        result = ui.run spec_runner.command(specs)
         success_notifier.notify(result)
-        ui.status = nil if ui.status == :running_specs
       end
+      ui.wait_for_changes
+    end
 
-      ui.start
+    def interrupt_handler
+      puts ' (Interrupted with CTRL+C)'.red
+      p [ui.status, ui.interrupted_status]
+      case ui.interrupted_status
+      when :wait_for_input then ui.exit
+      when :running_specs  then ui.wait_for_changes
+      when :exiting        then Kernel.abort
+      else Thread.new { ui.ask_what_to_do }
+      end
     end
   end
 

data/lib/spectator/success_notifier.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'notify'
 
 module Spectator

data/lib/spectator/ui.rb

@@ -6,7 +6,6 @@ module Spectator
   class UI
     def initialize(config)
       @mutex = Mutex.new
-      @status_mutex = Mutex.new
       @status = nil
       @status_callbacks = {}
       @callbacks = {}
@@ -19,30 +18,14 @@ module Spectator
     end
 
     def start
-      queue = @queue
-      mutex = @mutex
-
-      thread = Thread.new do
-        loop do
-          wait_for_changes
-          event = queue.pop
-          p [:queue, event]
-          mutex.synchronize { @callbacks[event].call }
-        end
-      end
+      wait_for_changes
+      thread = Thread.new { event_loop }
       p thread
       Thread.pass
       sleep
     end
 
-    attr_reader :status
-
-    def status= status
-      @status_mutex.synchronize do
-        @status = status
-        (@status_callbacks[status] || noop).call
-      end
-    end
+    attr_accessor :status
 
     def noop
       @noop ||= lambda {}
@@ -55,10 +38,6 @@ module Spectator
 
     attr_accessor :interrupted_status
 
-    def on_status status, &block
-      @status_callbacks[status] = block
-    end
-
     def on event, &block
       @callbacks[event] = block
     end
@@ -98,11 +77,6 @@ module Spectator
       super
     end
 
-    def terminal_columns
-      cols = `stty -a 2>&1`.scan(/ (\d+) columns/).flatten.first
-      $?.success? ? cols.to_i : 80
-    end
-
     def run cmd
       $running = true
       start = Time.now
@@ -118,5 +92,22 @@ module Spectator
       p [:can_run_specs?, status]
       status == :waiting_for_changes
     end
+
+
+    private
+
+    def terminal_columns
+      cols = `tput cols 2> /dev/tty`.strip.to_i
+      ($?.success? && cols.nonzero?) ? cols : 80
+    end
+
+    def event_loop
+      loop do
+        event = @queue.pop
+        p [:queue, event]
+        @mutex.synchronize { @callbacks[event].call }
+      end
+    end
+
   end
 end

data/lib/spectator/version.rb

@@ -1,3 +1,3 @@
 module Spectator
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/spec/spectator_spec.rb

@@ -1,13 +1,7 @@
 require 'spec_helper'
 require 'spectator'
 
-$spectator_debug = true
-
-describe Spectator do
-  it 'does something' do
-    #nope
-  end
-end
+# $spectator_debug = true
 
 describe Spectator::SpecRunner do
   let(:config) { Spectator.config }
@@ -18,5 +12,4 @@ describe Spectator::SpecRunner do
       expect(runner.default_files).to eq(['spec'])
     end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spectator
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Elia
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen