guard-rspec 4.0.4 → 4.1.0

data/spec/lib/guard/rspec_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe Guard::RSpec do
-  let(:default_options) { { all_on_start: false } }
-  let(:options) { { } }
+  let(:default_options) { Guard::RSpec::Options::DEFAULTS }
+  let(:options) { {} }
   let(:plugin) { Guard::RSpec.new(options) }
   let(:runner) { double(Guard::RSpec::Runner) }
   before {
@@ -12,7 +12,12 @@ describe Guard::RSpec do
   }
 
   describe '.initialize' do
-    it 'instanciates Runner with options' do
+    it 'instanciates with default and custom options' do
+      guard_rspec = Guard::RSpec.new(foo: :bar)
+      expect(guard_rspec.options).to eq(default_options.merge(foo: :bar))
+    end
+
+    it 'instanciates Runner with all default and custom options' do
       expect(Guard::RSpec::Runner).to receive(:new).with(default_options.merge(foo: :bar))
       Guard::RSpec.new(foo: :bar)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-rspec
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.1.0
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -112,18 +112,27 @@ files:
 - lib/guard/rspec.rb
 - lib/guard/rspec/command.rb
 - lib/guard/rspec/deprecator.rb
-- lib/guard/rspec/formatters/focuser.rb
-- lib/guard/rspec/formatters/notifier.rb
-- lib/guard/rspec/inspector.rb
+- lib/guard/rspec/formatter.rb
+- lib/guard/rspec/inspectors/base_inspector.rb
+- lib/guard/rspec/inspectors/factory.rb
+- lib/guard/rspec/inspectors/focused_inspector.rb
+- lib/guard/rspec/inspectors/keeping_inspector.rb
+- lib/guard/rspec/inspectors/simple_inspector.rb
+- lib/guard/rspec/notifier.rb
+- lib/guard/rspec/options.rb
 - lib/guard/rspec/runner.rb
 - lib/guard/rspec/templates/Guardfile
 - lib/guard/rspec/version.rb
 - spec/lib/guard/rspec/command_spec.rb
 - spec/lib/guard/rspec/deprecator_spec.rb
 - spec/lib/guard/rspec/formatter_spec.rb
-- spec/lib/guard/rspec/formatters/focuser_spec.rb
-- spec/lib/guard/rspec/formatters/notifier_spec.rb
-- spec/lib/guard/rspec/inspector_spec.rb
+- spec/lib/guard/rspec/inspectors/base_inspector_spec.rb
+- spec/lib/guard/rspec/inspectors/factory_spec.rb
+- spec/lib/guard/rspec/inspectors/focused_inspector_spec.rb
+- spec/lib/guard/rspec/inspectors/keeping_inspector_spec.rb
+- spec/lib/guard/rspec/inspectors/shared_examples.rb
+- spec/lib/guard/rspec/inspectors/simple_inspector_spec.rb
+- spec/lib/guard/rspec/notifier_spec.rb
 - spec/lib/guard/rspec/runner_spec.rb
 - spec/lib/guard/rspec_spec.rb
 - spec/spec_helper.rb
@@ -147,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Guard gem for RSpec
@@ -155,9 +164,13 @@ test_files:
 - spec/lib/guard/rspec/command_spec.rb
 - spec/lib/guard/rspec/deprecator_spec.rb
 - spec/lib/guard/rspec/formatter_spec.rb
-- spec/lib/guard/rspec/formatters/focuser_spec.rb
-- spec/lib/guard/rspec/formatters/notifier_spec.rb
-- spec/lib/guard/rspec/inspector_spec.rb
+- spec/lib/guard/rspec/inspectors/base_inspector_spec.rb
+- spec/lib/guard/rspec/inspectors/factory_spec.rb
+- spec/lib/guard/rspec/inspectors/focused_inspector_spec.rb
+- spec/lib/guard/rspec/inspectors/keeping_inspector_spec.rb
+- spec/lib/guard/rspec/inspectors/shared_examples.rb
+- spec/lib/guard/rspec/inspectors/simple_inspector_spec.rb
+- spec/lib/guard/rspec/notifier_spec.rb
 - spec/lib/guard/rspec/runner_spec.rb
 - spec/lib/guard/rspec_spec.rb
 - spec/spec_helper.rb

data/lib/guard/rspec/formatters/focuser.rb

@@ -1,29 +0,0 @@
-require 'guard/rspec'
-require 'rspec/core/formatters/base_formatter'
-
-module Guard::RSpec::Formatters
-  class Focuser < ::RSpec::Core::Formatters::BaseFormatter
-
-    def dump_summary(duration, total, failures, pending)
-      _write_failed_paths_in_tmp if failures > 0
-    end
-
-    private
-
-    # Used for focus_on_failed options
-    def _write_failed_paths_in_tmp
-      FileUtils.mkdir_p('tmp')
-      File.open('./tmp/rspec_guard_result','w') do |f|
-        f.puts _failed_paths.join("\n")
-      end
-    rescue
-      # nothing really we can do, at least don't kill the test runner
-    end
-
-    def _failed_paths
-      failed = examples.select { |e| e.execution_result[:status] == 'failed' }
-      failed.map { |e| e.metadata[:location] }
-    end
-
-  end
-end

data/lib/guard/rspec/formatters/notifier.rb

@@ -1,48 +0,0 @@
-require 'guard/rspec'
-require 'guard/notifier'
-require 'rspec/core/formatters/base_formatter'
-
-module Guard::RSpec::Formatters
-  class Notifier < ::RSpec::Core::Formatters::BaseFormatter
-
-    def dump_summary(duration, total, failures, pending)
-      message = _message(total, failures, pending, duration)
-      status  = _status(failures, pending)
-      _notify(message, status)
-    end
-
-    private
-
-    def _message(example_count, failure_count, pending_count, duration)
-      message = "#{example_count} examples, #{failure_count} failures"
-      if pending_count > 0
-        message << " (#{pending_count} pending)"
-      end
-      message << "\nin #{duration.round(4)} seconds"
-      message
-    end
-
-    def _status(failure_count, pending_count)
-      if failure_count > 0
-        :failed
-      elsif pending_count > 0
-        :pending
-      else
-        :success
-      end
-    end
-
-    def _notify(message, status)
-      ::Guard::Notifier.turn_on(silent: true)
-      ::Guard::Notifier.notify(message, title: 'RSpec results', image: status, priority: _priority(status))
-    end
-
-    def _priority(status)
-      { failed:   2,
-        pending: -1,
-        success: -2
-      }[status]
-    end
-
-  end
-end

data/lib/guard/rspec/inspector.rb

@@ -1,78 +0,0 @@
-module Guard
-  class RSpec
-    class Inspector
-      FOCUSED_FILE_PATH = './tmp/rspec_guard_result'
-
-      attr_accessor :options, :failed_paths, :spec_paths
-
-      def initialize(options = {})
-        @options = {
-          focus_on_failed: true,
-          keep_failed:     false,
-          spec_paths:      %w[spec]
-        }.merge(options)
-
-        @failed_paths = []
-        @spec_paths = @options[:spec_paths]
-      end
-
-      def paths(paths = nil)
-        if paths
-          _paths(paths)
-        else
-          spec_paths
-        end
-      end
-
-      def clear_paths(paths = nil)
-        if paths
-          @failed_paths -= paths
-        else
-          @failed_paths.clear
-        end
-      end
-
-      private
-
-      def _paths(paths)
-        _focused_paths || if options[:keep_failed]
-          @failed_paths += _clean(paths)
-        else
-          _clean(paths)
-        end
-      end
-
-      def _focused_paths
-        return nil unless options[:focus_on_failed]
-        File.open(FOCUSED_FILE_PATH) { |f| f.read.split("\n")[0..10] }
-      rescue
-        nil
-      ensure
-        File.exist?(FOCUSED_FILE_PATH) && File.delete(FOCUSED_FILE_PATH)
-      end
-
-      def _clean(paths)
-        paths.uniq!
-        paths.compact!
-
-        spec_dirs   = _select_only_spec_dirs(paths)
-        spec_files  = _select_only_spec_files(paths)
-        paths       = spec_dirs + spec_files
-
-        paths
-      end
-
-      def _select_only_spec_dirs(paths)
-        paths.select { |p| File.directory?(p) || spec_paths.include?(p) }
-      end
-
-      def _select_only_spec_files(paths)
-        spec_files = spec_paths.collect { |path| Dir[File.join(path, "**{,/*/**}", "*[_.]spec.rb")] }
-        feature_files = spec_paths.collect { |path| Dir[File.join(path, "**{,/*/**}", "*.feature")] }
-        files = (spec_files + feature_files).flatten
-        paths.select { |p| files.include?(p) }
-      end
-
-    end
-  end
-end

data/spec/lib/guard/rspec/formatters/focuser_spec.rb

@@ -1,25 +0,0 @@
-require 'spec_helper.rb'
-
-require 'guard/rspec/formatters/focuser'
-
-describe Guard::RSpec::Formatters::Focuser do
-  let(:formatter) { Guard::RSpec::Formatters::Focuser.new(StringIO.new) }
-
-  describe "#dump_summary" do
-    context "with failures" do
-      let(:example) { double(
-        execution_result: { status: 'failed' },
-        metadata: { location: 'failed_location' }
-      ) }
-      after { File.delete('./tmp/rspec_guard_result') }
-
-      it "writes failed location in tmp dir" do
-        formatter.stub(:examples) { [example] }
-        formatter.dump_summary(123, 3, 1, 0)
-        result = File.open('./tmp/rspec_guard_result').read
-        expect(result).to eq "failed_location\n"
-      end
-    end
-  end
-
-end

data/spec/lib/guard/rspec/formatters/notifier_spec.rb

@@ -1,44 +0,0 @@
-require 'spec_helper.rb'
-
-require 'guard/rspec/formatters/notifier'
-
-describe Guard::RSpec::Formatters::Notifier do
-  let(:formatter) { Guard::RSpec::Formatters::Notifier.new(StringIO.new) }
-
-  describe "#dump_summary" do
-    before {
-      Guard::Notifier.stub(:turn_on)
-      Guard::Notifier.stub(:notify)
-    }
-
-    it "turns on Notifier" do
-      expect(Guard::Notifier).to receive(:turn_on).with(silent: true)
-      formatter.dump_summary(123, 3, 0, 0)
-    end
-
-    context "with only success" do
-      it "notifies success" do
-        expect(Guard::Notifier).to receive(:notify).with(
-          "3 examples, 0 failures\nin 123.0 seconds", title: "RSpec results", image: :success, priority:-2)
-        formatter.dump_summary(123, 3, 0, 0)
-      end
-    end
-
-    context "with pending" do
-      it "notifies pending too" do
-        expect(Guard::Notifier).to receive(:notify).with(
-          "3 examples, 0 failures (1 pending)\nin 123.0 seconds", title: "RSpec results", image: :pending, priority:-1)
-        formatter.dump_summary(123, 3, 0, 1)
-      end
-    end
-
-    context "with failures" do
-      it "notifies failures too" do
-        expect(Guard::Notifier).to receive(:notify).with(
-          "3 examples, 1 failures\nin 123.0 seconds", title: "RSpec results", image: :failed, priority:2)
-        formatter.dump_summary(123, 3, 1, 0)
-      end
-    end
-  end
-
-end

data/spec/lib/guard/rspec/inspector_spec.rb

@@ -1,107 +0,0 @@
-require 'spec_helper'
-
-describe Guard::RSpec::Inspector do
-  let(:options) { { } }
-  let(:inspector) { Guard::RSpec::Inspector.new(options) }
-  before { Guard::UI.stub(:warning) }
-
-  describe '.initialize' do
-    it "sets empty failed paths" do
-      expect(inspector.failed_paths).to be_empty
-    end
-  end
-
-  describe "#paths" do
-    let(:paths) { %w[spec/lib/guard/rspec/inspector_spec.rb] }
-
-    it "returns spec paths if no args" do
-      expect(inspector.paths).to eq %w[spec]
-    end
-
-    context "with custom spec_paths" do
-      let(:options) { { spec_paths: %w[custom_spec] } }
-
-      it "returns custom spec paths if no args" do
-        expect(inspector.paths).to eq %w[custom_spec]
-      end
-
-      it "returns spec path if given as argument" do
-        expect(inspector.paths(%w[custom_spec])).to eq %w[custom_spec]
-      end
-    end
-
-    it "returns new paths" do
-      expect(inspector.paths(paths)).to eq paths
-    end
-
-    it "returns uniq new paths" do
-      expect(inspector.paths(paths + paths)).to eq paths
-    end
-
-    it "returns compact new paths" do
-      expect(inspector.paths(paths + [nil])).to eq paths
-    end
-
-    it "returns only rspec file" do
-      expect(inspector.paths(paths + %w[foo])).to eq paths
-    end
-
-    it "returns only rspec directory" do
-      File.stub(:directory?) { true }
-      expect(inspector.paths(%w[spec/foo])).to eq %w[spec/foo]
-    end
-
-    it "returns spec path if given as argument" do
-      expect(inspector.paths(%w[spec])).to eq %w[spec]
-    end
-
-    context "with focused paths" do
-      before {
-        FileUtils.mkdir_p('tmp')
-        File.open(Guard::RSpec::Inspector::FOCUSED_FILE_PATH,'w') { |f|
-          f.puts 'spec/lib/guard/rspec/command_spec.rb'
-        }
-      }
-
-      it "returns them" do
-        expect(inspector.paths(paths)).to eq %w[spec/lib/guard/rspec/command_spec.rb]
-      end
-    end
-
-    context "without focused paths" do
-      it "returns new paths" do
-        expect(inspector.paths(paths)).to eq paths
-      end
-    end
-
-    context "with keep_failed options and failed_paths" do
-      let(:options) { { keep_failed: true } }
-      let(:failed_paths) { %w[spec/lib/guard/rspec/command_spec.rb] }
-      before { inspector.failed_paths = failed_paths }
-
-      it "returns failed paths alongs new paths" do
-        expect(inspector.paths(paths)).to eq failed_paths + paths
-      end
-
-      it "adds new paths to failed_paths" do
-        inspector.paths(paths)
-        expect(inspector.failed_paths).to eq failed_paths + paths
-      end
-    end
-  end
-
-  describe "#clear_paths" do
-    before { inspector.failed_paths = %w[failed_path1 failed_path2] }
-
-    it "clears all failed_paths if no args" do
-      inspector.clear_paths
-      expect(inspector.failed_paths).to be_empty
-    end
-
-    it "clears given failed_path" do
-      inspector.clear_paths(%w[failed_path1 failed_path3])
-      expect(inspector.failed_paths).to eq %w[failed_path2]
-    end
-  end
-
-end