spectator 1.2.6 → 1.2.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5c72941ed2f2136eca2366723b7942f51ceb7f8b
+  data.tar.gz: 5807a32aeb0a36890c8329376d08d8c1305bc94b
+SHA512:
+  metadata.gz: a6309a9b3167ccc4b92b280c6637beaa3e4b07a3ffc29bfc98af9df82980644056bd0df2893807a701e8dfc7d1fbb66b0052a48cb271df9a88b52226d1a0a903
+  data.tar.gz: 4bdae2d7f3005dbcfa613f1cd33662855291e957dfc6969fb4ce78d4d3a83d26a88fcd140aec19c51c4a18c456cba29bc433c69a0ab82e0a9297066f8083473b

data/README.md

@@ -1,5 +1,7 @@
 # Spectator
 
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/elia/spectator)
+
 _Test driven development red-green cycle for simple people!_
 
 ## The gist

data/lib/spectator.rb

@@ -17,29 +17,35 @@ module Spectator
     include CommandLine
     include Specs
     include Control
-    
+
     def matchers
       @matchers ||= []
     end
-    
+
     def queue
       @queue ||= Queue.new
     end
-    
+
     def watch_paths!
-      listener = Listen.to(Dir.pwd, :relative_paths => true)
-      listener.filter %r{^(app|spec|lib|script)/}
-      listener.change do  |modified, added, removed|
-        [modified, added].flatten.each { |relative| queue.push relative }
-      end
-      listener.start(false)
+      listener.start
       sleep
     end
-    
+
+    def listener
+      @listener ||= begin
+        listener = Listen.to(Dir.pwd, :relative_paths => true)
+        listener = listener.filter %r{^(app|spec|lib|script)/}
+        listener = listener.change do  |modified, added, removed|
+          [modified, added].flatten.each { |relative| queue.push relative }
+        end
+      end
+    end
+
+
     def puts *args
       print args.join("\n")+"\n"
     end
-    
+
     def run_specs specs
       rules.each do |(regexp, action)|
         regexp = Regexp.new(regexp)
@@ -49,37 +55,41 @@ module Spectator
         end
       end
     end
-    
+
     def wait_for_changes
       puts '--- Waiting for changes...'.cyan
-      
+
       loop do
-        sleep 0.1 while queue.empty?
-        
+        sleep 0.1 while queue.empty? or interrupted?
+
         files = []
         queue.size.times do
           files << queue.pop
         end
-        
+
         files.compact!
         redo if files.empty?
-        
-        
-        specs = Set.new
-        files.each do |file|
-          matched = matchers.map do |matcher|
-            file.scan(matcher).flatten.first.to_s.gsub(/\.rb$/,'')
-          end.flatten.reject(&:empty?)
-          specs += matched.uniq.map { |m| specs_for(m) }.flatten
-        end
-        rspec_files *specs.to_a
+
+        rspec_files(*specs_for(files))
+      end
+    end
+
+    def specs_for files
+      specs = Set.new
+      files = [files] unless files.respond_to? :each
+      files.each do |file|
+        matched = matchers.map do |matcher|
+          file.scan(matcher).flatten.first.to_s.gsub(/\.rb$/,'')
+        end.flatten.reject(&:empty?)
+        specs += matched.uniq.map { |m| specs_for_file(m) }.flatten
       end
+      specs.to_a
     end
-    
+
     def initialize &block
       yield self if block_given?
-      
-      
+
+
       matchers << %r{^spec/(.*)_spec\.rb$}
       matchers << %r{^(?:app|lib|script)/(.*)(?:\.rb|\.\w+|)$}
 
@@ -89,9 +99,9 @@ module Spectator
       watch_paths!
     end
   end
-  
-  
-  
+
+
+
   def self.run
     Runner.new
   end

data/lib/spectator/control.rb

@@ -1,3 +1,5 @@
+require 'thread'
+
 module Spectator
   module Control
     def exit
@@ -13,28 +15,67 @@ module Spectator
 
     def trap_int!
       # Ctrl-C
-
       @interrupted ||= false
+      @signal_queue = []
+      @signals_handler = Thread.new do
+        loop do
+          sleep(0.3)
+          if signal_queue.any?
+            listener.pause
+            ask_what_to_do!
+            listener.unpause
+            Thread.pass
+            signal_queue.shift
+          end
+        end
+      end
 
       Signal.trap('INT') do
+        abort!     if exiting?
+        start_exit if interrupted?
+        signal_queue << :int
         puts ' (Interrupted with CTRL+C)'.red
-        if @interrupted
-          @exiting ? abort! : exit
-        else
-          @interrupted = true
-          print '--- What to do now? (q=quit, a=all-specs): '.yellow
-          $stdout.flush
-          case STDIN.gets.chomp.strip.downcase
-          when 'q'; @interrupted = false; exit
-          when 'a'; @interrupted = false; rspec_all
-          else
-            @interrupted = false
-            puts '--- Bad input, ignored.'.yellow
-          end
-          puts '--- Waiting for changes...'.cyan
+      end
+    end
+
+    attr_reader :signal_queue
+
+
+    private
+
+    def interrupted?
+      signal_queue.any?
+    end
+
+    def ask_what_to_do!
+      if @exiting
+        abort!
+      else
+        answer = ask('--- What to do now? (q=quit, a=all-specs): ')
+        case answer
+        when 'q' then start_exit
+        when 'a' then rspec_all
+        else puts '--- Bad input, ignored.'.yellow
         end
+        puts '--- Waiting for changes...'.cyan
       end
     end
-    
+
+    def start_exit
+      return if exiting?
+      @exiting = true
+      exit
+    end
+
+    def exiting?
+      @exiting
+    end
+
+    def ask question
+      print question.yellow
+      $stdout.flush
+      STDIN.gets.chomp.strip.downcase
+    end
+
   end
 end

data/lib/spectator/specs.rb

@@ -32,7 +32,7 @@ module Spectator
       rspec files.join(' ')
     end
 
-    def specs_for(path)
+    def specs_for_file(path)
       print "--- Searching specs for #{path.inspect}...".yellow
       specs = match_specs path, Dir['spec/**/*_spec.rb']
       puts specs.empty? ? ' nothing found.'.red : " #{specs.size} matched.".green

data/lib/spectator/version.rb

@@ -1,3 +1,3 @@
 module Spectator
-  VERSION = '1.2.6'
+  VERSION = '1.2.8'
 end

data/spectator.gemspec

@@ -19,10 +19,11 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w[lib]
-  
-  s.add_dependency 'listen'
-  s.add_dependency 'term-ansicolor'
-  s.add_dependency 'notify'
+
+  s.add_dependency 'listen',          '~> 1.3.0'
+  s.add_dependency 'term-ansicolor',  '~> 1.2.2'
+  s.add_dependency 'notify',          '~> 0.5.2'
+
   s.add_development_dependency 'rake',    '~> 0.9'
   s.add_development_dependency 'bundler', '~> 1.0'
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spectator
 version: !ruby/object:Gem::Version
-  version: 1.2.6
-  prerelease: 
+  version: 1.2.8
 platform: ruby
 authors:
 - Elia
@@ -10,63 +9,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
-  requirement: &70338823216840 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70338823216840
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70338823216280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70338823216280
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: notify
-  requirement: &70338823215640 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70338823215640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70338823214580 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70338823214580
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70338823213940 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70338823213940
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Watches specs for a Ruby (1.8 or 1.9) or Rails (2 or 3) project
 email:
 - elia@schito.me
@@ -90,27 +104,25 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rspec-rails-watchr
-rubygems_version: 1.8.17
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Watches specs for a Ruby or Rails project
 test_files: []
-has_rdoc: