spectator 1.1.a4 → 1.2

data/README.md

@@ -1,14 +1,6 @@
 # Usage
 
-In your specs.watchr file just add:
-
-```ruby
-    require 'rspec-rails-watchr'
-    
-    @specs_watchr ||= Rspec::Rails::Watchr.new(self)
-```
-
-Then launch `watchr` as usual (probably `bundle exec watchr`).
+Launch `spectator` as usual (probably `bundle exec spectator`).
 
 ## Instructions
 
@@ -19,12 +11,12 @@ you get the following prompt:
     ^C (Interrupted with CTRL+C)
     --- What to do now? (q=quit, a=all-specs, r=reload): 
 
-## Advanced
+## Advanced (upcoming!)
 
 If you want to override some path matching:
 
 ```ruby
-    @specs_watchr ||= Rspec::Rails::Watchr.new(self) do |path, specs|
+    spectate do
       case path
       when %r{lib/calibration_with_coefficients}
         specs.grep(%r{models/(logarithmic|polynomial)_calibration})
@@ -36,4 +28,4 @@ If you want to override some path matching:
 
 
 
-Copyright (c) 2011 Elia Schito, released under the MIT license
+Copyright (c) 2011-2012 Elia Schito, released under the [MIT license](https://github.com/elia/spectator/blob/master/MIT-LICENSE)

data/bin/spectator

@@ -1,57 +1,12 @@
 #!/usr/bin/env ruby
 # coding: utf-8
 
-require 'fssm'
-require 'rspec-rails-watchr'
-require 'pathname'
 
-class Peepr
-  def watch regexp, &block
-    @rules ||= []
-    @rules << [regexp, block]
-  end
-  attr_reader :rules
-  
-  
-  def set_files files
-    files.each do |file|
-      changed? file
-    end
-  end
-  
-  def changed? file
-    @files ||= {}
-    return false unless File.exists? file
-    mtime   = File.mtime(file)
-    changed = (@files[file] and @files[file] < mtime)
-    @files[file] = mtime
-    return changed
-  end
+if %w[--help help -h].include? ARGV.first
+  echo "Spectator doesn't take any arguments, to run the whole suite hit CTRL-C, type 'a' and press ENTER."
+  exit
 end
 
-peepr   = Peepr.new
-# fsevent = FSEvent .new
-watchr  = SpecWatchr.new(peepr)
+require 'spectator'
 
-def watchr.reload!
-end
-
-peepr.set_files Dir[File.join(Dir.pwd, '{app,spec,lib,script}/**/*')]
-
-
-
-$launcher = lambda do |_, file|
-  peepr.rules.each do |(regexp, action)|
-    regexp = Regexp.new(regexp)
-    if file =~ regexp
-      m = regexp.match(file)
-      action.call(m)
-    end
-  end
-end
-
-FSSM.monitor(Dir.pwd, '{app,spec,lib,script}/**/*') do
-  update {|base, relative| $launcher[base, relative] }
-  create {|base, relative| $launcher[base, relative] }
-  delete {|base, relative| '''do nothing'''         }
-end
+Spectator.run

data/lib/spectator.rb

@@ -0,0 +1,92 @@
+# coding: utf-8
+
+require 'term/ansicolor'
+require 'thread'
+require 'fssm'
+require 'set'
+
+require 'spectator/version'
+require 'spectator/command_line'
+require 'spectator/specs'
+require 'spectator/control'
+
+module Spectator
+  class Runner
+    String.send :include, Term::ANSIColor
+
+    include CommandLine
+    include Specs
+    include Control
+    
+    def matchers
+      @matchers ||= []
+    end
+    
+    def queue
+      @queue ||= Queue.new
+    end
+    
+    def watch_paths!
+      FSSM.monitor(Dir.pwd, '{app,spec,lib,script}/**/*') do |monitor|
+        monitor.update {|base, relative| puts relative; queue.push relative }
+        monitor.create {|base, relative| puts relative; queue.push relative }
+        monitor.delete {|base, relative| puts relative; '''do nothing'''            }
+      end
+    end
+    
+    def puts *args
+      print args.join("\n")+"\n"
+    end
+    
+    def run_specs specs
+      rules.each do |(regexp, action)|
+        regexp = Regexp.new(regexp)
+        if file =~ regexp
+          m = regexp.match(file)
+          action.call(m)
+        end
+      end
+    end
+    
+    def wait_for_changes
+      puts '--- Waiting for changes...'.cyan
+      
+      loop do
+        sleep 0.1 while queue.empty?
+        
+        files = []
+        queue.size.times do
+          files << queue.pop
+        end
+
+        specs = Set.new
+        files.each do |file|
+          specs += matchers.map do |matcher|
+            file_signature = $1.gsub(/\.rb$/,'') if matcher =~ file
+            specs_for file
+          end.flatten
+        end
+        
+        rspec_files specs
+      end
+    end
+    
+    def initialize &block
+      yield self if block_given?
+      
+      
+      matchers << %r{^spec/(.*)_spec\.rb$}
+      matchers << %r{^(?:app|lib|script)/(.*)(?:\.rb|\.\w+|)$}
+
+      trap_int!
+      @runner  = Thread.new { wait_for_changes }
+      watch_paths!
+    end
+  end
+  
+  
+  
+  def self.run
+    Runner.new
+  end
+end

data/lib/spectator/command_line.rb

@@ -0,0 +1,19 @@
+module Spectator
+  module CommandLine
+    def terminal_columns
+      cols = `stty -a`.scan(/ (\d+) columns/).flatten.first
+      $?.success? ? cols.to_i : nil
+    end
+
+    def run cmd
+      puts "=== running: #{cmd} ".ljust(terminal_columns, '=').cyan
+      success = system cmd
+      puts "===".ljust(terminal_columns, '=').cyan
+      success
+    end
+
+    def clear!
+      system 'clear'
+    end
+  end
+end

data/lib/spectator/control.rb

@@ -0,0 +1,39 @@
+module Spectator
+  module Control
+    def exit
+      @exiting = true
+      puts '--- Exiting...'.white
+      Kernel.exit
+    end
+
+    def abort!
+      puts '--- Forcing abort...'.white
+      Kernel.abort("\n")
+    end
+
+    def trap_int!
+      # Ctrl-C
+
+      @interrupted ||= false
+
+      Signal.trap('INT') do
+        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
+          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
+    end
+    
+  end
+end

data/lib/spectator/specs.rb

@@ -0,0 +1,51 @@
+# coding: utf-8
+
+module Spectator
+  module Specs
+    def notify message
+      Thread.new do
+        begin
+          require 'notify'
+          Notify.notify 'RSpec Result:', message
+        rescue
+          nil
+        end
+      end
+    end
+
+    def rspec_command
+      @rspec_command ||= File.exist?('./.rspec') ? 'rspec' : 'spec'
+    end
+
+    def rspec options
+      unless options.empty?
+        success = run("bundle exec #{rspec_command} #{options}")
+        notify( success ? '♥♥ SUCCESS :) ♥♥' : '♠♠ FAILED >:( ♠♠' )
+      end
+    end
+
+    def rspec_all
+      rspec 'spec'
+    end
+
+    def rspec_files *files
+      rspec files.join(' ')
+    end
+
+    def specs_for(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
+      specs
+    end
+
+    def default_rails_matcher path, specs
+      specs.grep(/\b#{path}((_spec)?\.rb)?$/)
+    end
+
+    def match_specs path, specs
+      matched_specs = @custom_matcher.call(path, specs) if @custom_matcher
+      matched_specs = default_rails_matcher(path, specs) if matched_specs.nil?
+    end
+  end
+end

data/lib/spectator/version.rb

@@ -1,3 +1,3 @@
 module Spectator
-  VERSION = '1.1.a4'
-end
+  VERSION = '1.2'
+end

data/spectator.gemspec

@@ -7,9 +7,9 @@ Gem::Specification.new do |s|
   s.name        = 'spectator'
   s.version     = Spectator::VERSION
   s.authors     = %w[Elia Schito]
-  s.email       = %w[perlelia@gmail.com]
+  s.email       = %w[elia@schito.me]
   s.homepage    = ''
-  s.summary     = %q{Watches specs for a Ruby (1.8 or 1.9) or Rails (2 or 3) project}
+  s.summary     = %q{Watches specs for a Ruby or Rails project}
   s.description = %q{Watches specs for a Ruby (1.8 or 1.9) or Rails (2 or 3) project}
   s.license     = 'MIT'
 

metadata

@@ -1,151 +1,115 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spectator
-version: !ruby/object:Gem::Version 
-  hash: 149
-  prerelease: 4
-  segments: 
-  - 1
-  - 1
-  - a
-  - 4
-  version: 1.1.a4
+version: !ruby/object:Gem::Version
+  version: '1.2'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Elia
 - Schito
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fssm
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70097386550760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: term-ansicolor
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70097386550760
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: &70097386550340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: notify
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70097386550340
+- !ruby/object:Gem::Dependency
+  name: notify
+  requirement: &70097386549920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70097386549920
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70097386549360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70097386549360
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70097386548840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *70097386548840
 description: Watches specs for a Ruby (1.8 or 1.9) or Rails (2 or 3) project
-email: 
-- perlelia@gmail.com
-executables: 
+email:
+- elia@schito.me
+executables:
 - spectator
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
 - bin/spectator
-- lib/rspec-rails-watchr.rb
-- lib/rspec-rails-watchr/version.rb
+- lib/spectator.rb
+- lib/spectator/command_line.rb
+- lib/spectator/control.rb
+- lib/spectator/specs.rb
 - lib/spectator/version.rb
 - spectator.gemspec
-homepage: ""
-licenses: 
+homepage: ''
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rspec-rails-watchr
-rubygems_version: 1.8.11
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: Watches specs for a Ruby (1.8 or 1.9) or Rails (2 or 3) project
+summary: Watches specs for a Ruby or Rails project
 test_files: []
-
-has_rdoc: 

data/lib/rspec-rails-watchr.rb

@@ -1,154 +0,0 @@
-# coding: utf-8
-
-require 'rspec-rails-watchr/version'
-require 'term/ansicolor'
-
-class SpecWatchr
-  String.send :include, Term::ANSIColor
-
-  module CommandLine
-    def terminal_columns
-      cols = `stty -a`.scan(/ (\d+) columns/).flatten.first
-      $?.success? ? cols.to_i : nil
-    end
-
-    def run cmd
-      puts "=== running: #{cmd} ".ljust(terminal_columns, '=').cyan
-      success = system cmd
-      puts "===".ljust(terminal_columns, '=').cyan
-      success
-    end
-
-    def clear!
-      system 'clear'
-    end
-  end
-
-  module Specs
-    def notify message
-      Thread.new do
-        begin
-          require 'notify'
-          Notify.notify 'RSpec Result:', message
-        rescue
-          nil
-        end
-      end
-    end
-
-    def rspec_command
-      @rspec_command ||= File.exist?('./.rspec') ? 'rspec' : 'spec'
-    end
-
-    def rspec options
-      unless options.empty?
-        success = run("bundle exec #{rspec_command} #{options}")
-        notify( success ? '♥♥ SUCCESS :) ♥♥' : '♠♠ FAILED >:( ♠♠' )
-      end
-    end
-
-    def rspec_all
-      rspec 'spec'
-    end
-
-    def rspec_files *files
-      rspec files.join(' ')
-    end
-
-    def specs_for(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
-      specs
-    end
-
-    def default_rails_matcher path, specs
-      specs.grep(/\b#{path}((_spec)?\.rb)?$/)
-    end
-
-    def match_specs path, specs
-      matched_specs = @custom_matcher.call(path, specs) if @custom_matcher
-      matched_specs = default_rails_matcher(path, specs) if matched_specs.nil?
-    end
-  end
-
-  module Control
-    def exit_watchr
-      @exiting = true
-      puts '--- Exiting...'.white
-      exit
-    end
-
-    def abort_watchr!
-      puts '--- Forcing abort...'.white
-      abort("\n")
-    end
-
-    def reload!
-      # puts ARGV.join(' ')
-      exec('bundle exec ' << $0)
-    end
-
-    def reload_file_list
-      require 'shellwords'
-      system "touch #{__FILE__.shellescape}"
-      # puts '--- Watch\'d file list reloaded.'.green
-    end
-
-    def trap_int!
-      # Ctrl-C
-
-      @interrupted ||= false
-
-      Signal.trap('INT') { 
-        puts  ' (Interrupted with CTRL+C)'.red
-        if @interrupted
-          @exiting ? abort_watchr : exit_watchr
-        else
-          @interrupted = true
-          # reload_file_list
-          print '--- What to do now? (q=quit, a=all-specs, r=reload): '.yellow
-          case STDIN.gets.chomp.strip.downcase
-          when 'q'; @interrupted = false; exit_watchr
-          when 'a'; @interrupted = false; rspec_all
-          when 'r'; @interrupted = false; reload!
-          else
-            @interrupted = false
-            puts '--- Bad input, ignored.'.yellow
-          end
-          puts '--- Waiting for changes...'.cyan
-        end
-      }
-    end
-  end
-
-
-  include CommandLine
-  include Specs
-  include Control
-
-  def initialize watchr, &block
-    @custom_matcher = block if block_given?
-    @watchr = watchr
-
-    watchr.watch('^spec/(.*)_spec\.rb$')                     {|m| rspec_files specs_for(m[1])}
-    watchr.watch('^(?:app|lib|script)/(.*)(?:\.rb|\.\w+|)$') {|m| rspec_files specs_for(m[1].gsub(/\.rb$/,''))}
-
-    trap_int!
-
-    puts '--- Waiting for changes...'.cyan
-  end
-end
-
-
-class Object
-  module Rspec
-    module Rails
-      module Watchr
-        def self.new *args, &block
-          SpecWatchr.new *args, &block
-        end
-      end
-    end
-  end
-end

data/lib/rspec-rails-watchr/version.rb

@@ -1,7 +0,0 @@
-module Rspec
-  module Rails
-    module Watchr
-      VERSION = '1.0.2'
-    end
-  end
-end