spectator 1.2.11 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3250e47a3847d52f1c8b48be5b9c922a5cf38a83
-  data.tar.gz: f37e2c2263492ccce1d604aabb257a086935ddcb
+  metadata.gz: cc53eefa112ce5dd549660142e9691fec2b7147e
+  data.tar.gz: be808d5963f8a0878c6cd51b0f6ef8dc2e4a4578
 SHA512:
-  metadata.gz: 2ab6190cc9fd6f03e4bda7deca8191c9be17cc30d8e148f86edd2d1513294922f15c39e60b2a359df4fffd6cba3707b6ee2130a724d4500272a138e8c0490651
-  data.tar.gz: ec6565d41c1195a15b757a6a91e8a73776a99df708e1639e76e481a134906a7bba97dfb724f1c1a324a699f70a28d6b405cacdd524dbeefc8efd4b28cd0ec5a1
+  metadata.gz: b3e3a241bb6569789aac25566d109e99330a07bf82021809e8f592d3138afd31e57b2f69e71b097d8037cf3486a4162ea6cd6a227dd01781548af11dfa3e668b
+  data.tar.gz: 80aff3fe557a50be933613d3977b8b7dc822d4933eb4adbe3eecf217aff9267e84c211fa0c7e5fad46f77c243a7a9719888eaa5d1418cc9c5592c875a9873b45

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--warnings
+--require spec_helper

data/Gemfile

@@ -2,3 +2,9 @@ source 'http://rubygems.org'
 
 # See gem's dependencies in: rspec-rails-watchr.gemspec
 gemspec
+
+def self.osx?
+  RUBY_PLATFORM.include? 'darwin'
+end
+
+gem 'terminal-notifier' if osx?

data/README.md

@@ -38,12 +38,12 @@ Type `a` and `ENTER` (or `CTRL+C` again) to execute the whole suite of specs.
 
 If you want to override some path matching:
 
-**`BASE_DIR_GLOB`:**
+**`BASE_DIR_REGEXP`:**
 
 The glob that expanded will list the directories that contains the code. **Default:**
 
 
-**`SPEC_DIR_GLOB`:**
+**`SPEC_DIR_REGEXP`:**
 
 The glob that expanded will list the directories that contains the specs. **Default:**
 
@@ -58,16 +58,16 @@ The full command that will run your specs. **Default:** `bundle exec rspec` (or
 
 ```shell
 # this will match lib/opal/parser.rb to spec/cli/parser.rb
-BASE_DIR_GLOB='lib/opal' SPEC_DIR_GLOB='spec/cli' spectator
+BASE_DIR_REGEXP='lib/opal' SPEC_DIR_REGEXP='spec/cli' spectator
 ```
 
 
 #### Exported ENV variables
 
 ```shell
-export BASE_DIR_GLOB="{opal/corelib,stdlib}"
-export SPEC_DIR_GLOB="spec/{corelib,stdlib}"
-export RSPEC_COMMAND="bundle exec mspec run -t ./bin/opal -I$(dirname $(gem which mspec)) -Ilib -rmspec/opal/mspec_fixes.rb"
+BASE_DIR_REGEXP: '(?:opal/corelib|stdlib|spec)'
+SPEC_DIR_REGEXP: '(?:spec/corelib/core|spec/stdlib/\w+/spec)'
+RSPEC_COMMAND: 'bundle exec ./bin/opal-mspec'
 spectator
 ```
 
@@ -76,8 +76,8 @@ spectator
 
 ```yaml
 # contents of ".spectator" file
-BASE_DIR_GLOB: 'lib/opal'
-SPEC_DIR_GLOB: 'spec/cli'
+BASE_DIR_REGEXP: 'lib/opal'
+SPEC_DIR_REGEXP: 'spec/cli'
 ```
 
     spectator
@@ -87,8 +87,8 @@ SPEC_DIR_GLOB: 'spec/cli'
 
 ```shell
 # contents of ".my-spectator-config" file
-BASE_DIR_GLOB: 'lib/opal'
-SPEC_DIR_GLOB: 'spec/cli'
+BASE_DIR_REGEXP: 'lib/opal'
+SPEC_DIR_REGEXP: 'spec/cli'
 ```
 
     spectator .my-spectator-config

data/bin/spectator

@@ -1,9 +1,19 @@
 #!/usr/bin/env ruby
 # coding: utf-8
 
-
-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."
+usage = "Usage: spectator [yaml-config]"
+case ARGV.first
+when '-h'
+  puts usage
+when '--help', 'help'
+  puts usage
+  puts
+  puts "To control spectator hit CTRL-C while it's running."
+  puts "You'll get this prompt:"
+  puts "--- What to do now? (q=quit, a=all-specs): "
+  puts
+  puts 'Hit CTRL-C again or type "q" and then ENTER to quit.'
+  puts 'Type "a" and then ENTER to run the full spec suite.'
   exit
 end
 
@@ -11,8 +21,9 @@ require 'spectator'
 
 require 'yaml'
 config_file = ARGV.first || '.spectator'
-YAML.load_file(config).each do |name, value|
+YAML.load_file(config_file).each do |name, value|
   ENV[name] ||= value
 end if File.exist? config_file
 
-Spectator.run
+config = Spectator.config(debug: ARGV.include?('--debug'))
+Spectator.run(config)

data/lib/spectator.rb

@@ -1,109 +1,98 @@
-# coding: utf-8
-
-require 'term/ansicolor'
+require 'ostruct'
 require 'thread'
-require 'listen'
-require 'set'
-
 require 'spectator/version'
-require 'spectator/command_line'
-require 'spectator/specs'
-require 'spectator/control'
+require 'spectator/debug'
+require 'spectator/color'
+require 'spectator/path_watcher'
+require 'spectator/specs_matcher'
+require 'spectator/success_notifier'
+require 'spectator/spec_runner'
+require 'spectator/ui'
 
 module Spectator
-  class Runner
-    String.send :include, Term::ANSIColor
+  extend self
 
-    include CommandLine
-    include Specs
-    include Control
+  def config(overrides_hash = {})
+    Config.new(default_config_hash.merge(env_config_hash).merge(overrides_hash))
+  end
 
-    def matchers
-      @matchers ||= []
-    end
+  def env_config_hash
+    config = {}
+    config[:rspec_command]   = ENV['RSPEC_COMMAND']   if ENV['RSPEC_COMMAND']
+    config[:spec_dir_regexp] = ENV['SPEC_DIR_REGEXP'] if ENV['SPEC_DIR_REGEXP']
+    config[:base_dir_regexp] = ENV['BASE_DIR_REGEXP'] if ENV['BASE_DIR_REGEXP']
+    config[:debug]           = ENV['SPECTATOR_DEBUG'] if ENV['SPECTATOR_DEBUG']
+    config
+  end
 
-    def queue
-      @queue ||= Queue.new
-    end
+  def default_config_hash
+    {
+      rspec_command:   (File.exist?('.rspec') ? 'rspec' : 'spec'),
+      spec_dir_regexp: 'spec',
+      base_dir_regexp: 'app|lib|script',
+      debug:           false,
+    }
+  end
 
-    def watch_paths!
-      listener.start
-      sleep
-    end
+  Config = Class.new(OpenStruct)
 
-    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
+  class Runner
+    def initialize(config)
+      @config            = config
+      @path_watcher      = PathWatcher.new(config)
+      @ui                = UI.new(config)
+      @spec_runner       = SpecRunner.new(config)
+      @success_notifier  = SuccessNotifier.new(config)
+      @specs_matcher     = SpecsMatcher.new(config)
     end
 
+    attr_reader :config, :path_watcher, :ui, :spec_runner, :success_notifier, :specs_matcher
 
-    def puts *args
-      print args.join("\n")+"\n"
-    end
+    def run
+      $spectator_debug = config.debug
 
-    def run_specs specs
-      rules.each do |(regexp, action)|
-        regexp = Regexp.new(regexp)
-        if file =~ regexp
-          m = regexp.match(file)
-          action.call(m)
+      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
-    end
-
-    def wait_for_changes
-      puts '--- Waiting for changes...'.cyan
 
-      loop do
-        sleep 0.1 while queue.empty? or interrupted?
-
-        files = []
-        queue.size.times do
-          files << queue.pop
+      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
-
-        files.compact!
-        redo if files.empty?
-
-        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
+      trap('INT') { ui.interrupt! }
 
-    def initialize &block
-      yield self if block_given?
+      ui.on(:run_all) do
+        next unless ui.can_run_specs?
 
-      spec_dir_glob = ENV['SPEC_DIR_GLOB'] || 'spec'
-      base_dir_glob = ENV['BASE_DIR_GLOB'] || 'app|lib|script'
-      matchers << %r{^#{spec_dir_glob}/(.*)_spec\.rb$}
-      matchers << %r{^(?:#{base_dir_glob})/(.*)(?:\.rb|\.\w+|)$}
+        ui.status = :running_specs
+        result = ui.run(spec_runner.command)
+        success_notifier.notify(result)
+        ui.status = nil if ui.status == :running_specs
+      end
 
-      trap_int!
-      Thread.abort_on_exception = true
-      @runner  = Thread.new { wait_for_changes }
-      watch_paths!
+      ui.start
     end
   end
 
-
-
-  def self.run
-    Runner.new
+  def run(*args, &block)
+    Runner.new(*args, &block).run
   end
 end

data/lib/spectator/color.rb

@@ -0,0 +1,2 @@
+require 'term/ansicolor'
+String.send :include, Term::ANSIColor

data/lib/spectator/debug.rb

@@ -0,0 +1,10 @@
+module Kernel
+  alias real_p p
+  def p(*args)
+    real_p(*args) if $spectator_debug
+  end
+  def p_print(*args)
+    print(*args) if $spectator_debug
+  end
+end
+

data/lib/spectator/path_watcher.rb

@@ -0,0 +1,50 @@
+require 'listen'
+require 'thread'
+require 'spectator/debug'
+
+module Spectator
+  class PathWatcher
+
+    def initialize(config)
+      @config = config
+      @queue = Queue.new
+    end
+
+    def has_changed_files?
+      queue.size > 0
+    end
+
+    def on_change &block
+      @on_change = block if block_given?
+      @on_change
+    end
+
+    def pop_files
+      files = []
+      queue.size.times { files << queue.pop }
+      files
+    end
+
+    def watch_paths!
+      listener.start
+    end
+
+    attr_reader :queue, :config
+    private :queue, :config
+
+    def listener
+      @listener ||= begin
+        listener = Listen.to(Dir.pwd, :relative_paths => true)
+        p [:watching, config.base_dir_regexp]
+        listener = listener.filter %r{^(#{config.base_dir_regexp}|#{config.spec_dir_regexp})/}
+        listener = listener.change do  |modified, added, removed|
+          p ['modified, added, removed', modified, added, removed]
+          files = [modified, added].flatten
+          files.each { |relative| queue.push relative }
+          p on_change
+          on_change.call(files) if on_change && files.any?
+        end
+      end
+    end
+  end
+end

data/lib/spectator/spec_runner.rb

@@ -0,0 +1,16 @@
+module Spectator
+  class SpecRunner
+    def initialize(config)
+      @config = config
+    end
+    attr_reader :config
+
+    def command files = default_files
+      "#{config.rspec_command} #{files.join(' ')}"
+    end
+
+    def default_files
+      Dir['**/**'].grep(%r{^(?:#{config.spec_dir_regexp}\b)/?$})
+    end
+  end
+end

data/lib/spectator/specs_matcher.rb

@@ -0,0 +1,40 @@
+require 'spectator/debug'
+require 'spectator/color'
+
+module Spectator
+  class SpecsMatcher
+    def initialize(config)
+      @config = config
+      @matchers = [
+        %r{^#{config.spec_dir_regexp}/(.*)_spec\.rb$},
+        %r{^(?:#{config.base_dir_regexp})/(.*)(?:\.rb|\.\w+|)$},
+      ]
+    end
+    attr_reader :matchers
+
+    def specs_for(files)
+      files.flat_map do |path|
+        matchable_paths = self.matchable_paths(path)
+        print "--- Searching specs for #{path.inspect} (as: #{matchable_paths.join(", ")})...".yellow
+        specs = match_specs(matchable_paths)
+        puts specs.empty? ? ' nothing found.'.red : " #{specs.size} matched.".green
+        specs
+      end
+    end
+
+    def matchable_paths(file)
+      matchers.map do |matcher|
+        file.scan(matcher).flatten.first.to_s.gsub(/\.rb$/,'')
+      end.flatten.reject(&:empty?)
+    end
+
+    def match_specs matchable_paths
+      matchable_paths.uniq.map do |path|
+        # Dir['**/**'].grep(%r{^#{config.spec_dir_regexp}}).grep(/\b#{path}((_spec)?\.rb)?$/)
+        Dir['**/**'].grep(%r{^#{config.spec_dir_regexp}}).grep(/\b#{path}_spec\.rb$/)
+      end.flatten
+    end
+
+    attr_reader :config, :files
+  end
+end

data/lib/spectator/success_notifier.rb

@@ -0,0 +1,37 @@
+require 'notify'
+
+module Spectator
+  class SuccessNotifier
+
+    def initialize(config)
+      @config ||= config
+      if osx?
+        begin
+          require 'terminal-notifier'
+        rescue LoadError => e
+          $stderr.puts e.message
+          $stderr.puts 'On OSX you should use notification center: gem install terminal-notifier'.red
+        end
+      end
+    end
+
+    def notify(success)
+      message = success ? success_message : failed_message
+      Thread.new { Notify.notify 'RSpec Result:', message }
+    end
+
+    def success_message
+      @success_message ||= osx? ? '🎉 SUCCESS'.freeze :
+                                  '♥♥ SUCCESS :) ♥♥'.freeze
+    end
+
+    def failed_message
+      @failed_message ||= osx? ? '💔 FAILED'.freeze :
+                                 '♠♠ FAILED >:( ♠♠'.freeze
+    end
+
+    def osx?
+      @osx ||= RUBY_PLATFORM.include? 'darwin'
+    end
+  end
+end

data/lib/spectator/ui.rb

@@ -0,0 +1,122 @@
+require 'thread'
+require 'spectator/debug'
+require 'spectator/color'
+
+module Spectator
+  class UI
+    def initialize(config)
+      @mutex = Mutex.new
+      @status_mutex = Mutex.new
+      @status = nil
+      @status_callbacks = {}
+      @callbacks = {}
+      @queue = Queue.new
+    end
+
+    def << event
+      @queue << event
+      p event
+    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
+      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
+
+    def noop
+      @noop ||= lambda {}
+    end
+
+    def interrupt!
+      self.interrupted_status = status
+      self << :interrupt
+    end
+
+    attr_accessor :interrupted_status
+
+    def on_status status, &block
+      @status_callbacks[status] = block
+    end
+
+    def on event, &block
+      @callbacks[event] = block
+    end
+
+    def ask_what_to_do
+      self.status = :wait_for_input
+      answer = ask('--- What to do now? (q=quit, a=all-specs): ')
+      case answer
+      when 'q' then exit
+      when 'a' then run_all
+      else
+        puts '--- Bad input, ignored.'.yellow
+        wait_for_changes
+      end
+    end
+
+    def run_all
+      self.status = :waiting_for_changes
+      self << :run_all
+    end
+
+    def wait_for_changes
+      return if status == :waiting_for_changes
+      self.status = :waiting_for_changes
+      puts '--- Waiting for changes...'.cyan
+    end
+
+    def ask question
+      print question.yellow
+      $stdout.flush
+      STDIN.gets.chomp.strip.downcase
+    end
+
+    def exit
+      self.status = :exiting
+      puts '--- Exiting...'.white
+      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
+      puts "=== running: #{cmd} ".ljust(terminal_columns, '=').cyan
+      success = system cmd
+      puts "=== time: #{(Time.now - start).to_i} seconds ".ljust(terminal_columns, '=').cyan
+      success
+    ensure
+      $running = false
+    end
+
+    def can_run_specs?
+      p [:can_run_specs?, status]
+      status == :waiting_for_changes
+    end
+  end
+end

data/lib/spectator/version.rb

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

data/spec/spec_helper.rb

@@ -0,0 +1,82 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# (such as loading up an entire rails app) will add to the boot time of your
+# test suite on EVERY test run, even for an individual file that may not need
+# all of that loaded.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # RSpec filters the backtrace by default so as not to be so noisy.
+    # This causes the full backtrace to be printed when running a single
+    # spec file (e.g. to troubleshoot a particular spec failure).
+    config.full_backtrace = true
+
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.formatter = 'doc' if config.formatters.none?
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # Enable only the newer, non-monkey-patching expect syntax.
+    # For more details, see:
+    #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+    expectations.syntax = :expect
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Enable only the newer, non-monkey-patching expect syntax.
+    # For more details, see:
+    #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+    mocks.syntax = :expect
+
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended.
+    mocks.verify_partial_doubles = true
+  end
+=end
+end

data/spec/spectator_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'spectator'
+
+$spectator_debug = true
+
+describe Spectator do
+  it 'does something' do
+    #nope
+  end
+end
+
+describe Spectator::SpecRunner do
+  let(:config) { Spectator.config }
+  subject(:runner) { described_class.new(config) }
+
+  describe '#default_files' do
+    it 'is spec dir' do
+      expect(runner.default_files).to eq(['spec'])
+    end
+  end
+
+end

data/spectator.gemspec

@@ -19,6 +19,7 @@ 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.required_ruby_version = '>= 1.9'
 
   s.add_dependency 'listen',          '~> 1.3.0'
   s.add_dependency 'term-ansicolor',  '~> 1.2.2'
@@ -26,4 +27,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake',    '~> 10'
   s.add_development_dependency 'bundler', '~> 1.0'
+  s.add_development_dependency 'rspec',   '>= 3.0.0.beta2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spectator
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.3.0
 platform: ruby
 authors:
 - Elia
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -81,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0.beta2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0.beta2
 description: Watches specs for a Ruby (1.8 or 1.9) or Rails (2 or 3) project
 email:
 - elia@schito.me
@@ -90,16 +104,23 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
 - bin/spectator
 - lib/spectator.rb
-- lib/spectator/command_line.rb
-- lib/spectator/control.rb
-- lib/spectator/specs.rb
+- lib/spectator/color.rb
+- lib/spectator/debug.rb
+- lib/spectator/path_watcher.rb
+- lib/spectator/spec_runner.rb
+- lib/spectator/specs_matcher.rb
+- lib/spectator/success_notifier.rb
+- lib/spectator/ui.rb
 - lib/spectator/version.rb
+- spec/spec_helper.rb
+- spec/spectator_spec.rb
 - spectator.gemspec
 homepage: ''
 licenses:
@@ -113,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -125,4 +146,6 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Watches specs for a Ruby or Rails project
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/spectator_spec.rb

data/lib/spectator/command_line.rb

@@ -1,19 +0,0 @@
-module Spectator
-  module CommandLine
-    def terminal_columns
-      cols = `stty -a 2>&1`.scan(/ (\d+) columns/).flatten.first
-      $?.success? ? cols.to_i : 0
-    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

@@ -1,81 +0,0 @@
-require 'thread'
-
-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_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
-      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

@@ -1,69 +0,0 @@
-# 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 full_rspec_command
-      @full_rspec_command ||= ENV['RSPEC_COMMAND'] || "bundle exec #{rspec_command}"
-    end
-
-    def rspec options
-      unless options.empty?
-        success = run("#{full_rspec_command} #{options}")
-        notify( success ? success_message : failed_message )
-      end
-    end
-
-    def success_message
-      @success_message ||= osx? ? '🎉 SUCCESS'.freeze :
-                                  '♥♥ SUCCESS :) ♥♥'.freeze
-    end
-
-    def failed_message
-      @failed_message ||= osx? ? '💔 FAILED'.freeze :
-                                 '♠♠ FAILED >:( ♠♠'.freeze
-    end
-
-    def osx?
-      @osx ||= RUBY_PLATFORM.include? 'darwin'
-    end
-
-    def rspec_all
-      rspec ENV['SPEC_DIR_GLOB'] || 'spec'
-    end
-
-    def rspec_files *files
-      rspec files.join(' ')
-    end
-
-    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
-      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