rspec-autotest 1.0.0.beta1 → 1.0.0.rc1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzRkNjFhODIxN2ZjM2Q1ZTUzNjI3NTY5OTRlNDNkOTE4MGM1MmM2OQ==
-  data.tar.gz: !binary |-
-    ZGVmZTAyZmEyMzYwNTlhMDZiM2U5MjMxMTgyZjBkMjQ5ODk5NTU0Nw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MzMwNmIzNDVjN2I4NWNjNWYwODgwMGNmYzQ0YjY0ZDZlMmZkZGU0MzNkN2E5
-    YWI1NjRiMWVlZjBjYzY4NWNkYTkyMTNmM2JjY2E5MTUzOGE5NDk3ODJhMDMz
-    YzUzY2VmNTRiZGRjYTgwYTRiMTM0OThkMzhlYjc1NTM3OWExZWY=
-  data.tar.gz: !binary |-
-    NGY1M2I1ODUyNmJiNWY4MWUxZDgxNDk3ODEzMzU0NWM0NmNjYjYwODFkNjNl
-    YTI2MDBhMzI5NjZhMzRmNDM0Mjc5NjY5OWJjM2U2YjMzZTBlN2FkNDc5Mzli
-    MGY3NTQzNzBmNWE1YjkyZWQ4ZWJhYzllNmZhNDlkYTgwNGJjMWY=
+SHA1:
+  metadata.gz: b9182ec51c2aec875f4950717a1dce83f9e28ad8
+  data.tar.gz: 2af05b5a7bac2709394b71af7d13349f0d9ca7fe
+SHA512:
+  metadata.gz: 755d933cf426cf0044ec09073d1467079f14fdc3fa3affd5785d9d5aee15c1e96eb3fb0354111c2e89d215339e963451b315c4b1f3b8fef0f34be7497952c266
+  data.tar.gz: f4b3c85a888f7c6ffed7c21769d50afec3ca86047a88c15c9a4edd442a4c82ece57c0decf8c3d87be3152a891e9c43171bce0bc52bfa3296948802a382ad14a2

data/.rspec

@@ -1,3 +1,3 @@
---default_path spec
 --order rand
 --warnings
+--color

data/.travis.yml

@@ -5,9 +5,19 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.1.1
+  - 2.1.2
   - ree
   - jruby-18mode
-  - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
-  - 2.0.0
+  - jruby
+  - rbx
+env:
+  - RSPEC_BRANCH=master
+  - RSPEC_BRANCH=2-99-maintenance
+matrix:
+  allow_failures:
+    - rvm: rbx
+  fast_finish: true
+

data/Gemfile

@@ -2,12 +2,15 @@ source "https://rubygems.org"
 
 gemspec
 
-%w[rspec rspec-core rspec-expectations rspec-mocks].each do |lib|
+%w[rspec rspec-core rspec-expectations rspec-mocks rspec-support].each do |lib|
+  branch = ENV.fetch('RSPEC_BRANCH', 'master')
+  next if branch == '2-99-maintenance' && lib == 'rspec-support'
+
   library_path = File.expand_path("../../#{lib}", __FILE__)
-  if File.exist?(library_path)
+  if File.exist?(library_path) && !ENV['USE_GIT_REPOS']
     gem lib, :path => library_path
   else
-    gem lib, :git => "git://github.com/rspec/#{lib}.git", :branch => '2-99-maintenance'
+    gem lib, :git => "git://github.com/rspec/#{lib}.git", :branch => branch
   end
 end
 
@@ -18,7 +21,4 @@ platforms :ruby do
   gem 'github-markup', '0.7.2'
 end
 
-### dep for ci/coverage
-gem 'coveralls', :require => false
-
 eval File.read('Gemfile-custom') if File.exist?('Gemfile-custom')

data/lib/autotest/discover.rb

@@ -1 +1 @@
-Autotest.add_discovery { "rspec2" } if File.exist?("./.rspec")
+Autotest.add_discovery { "rspec" }

data/lib/rspec/autotest.rb

@@ -4,8 +4,7 @@ require 'autotest'
 # Derived from the `Autotest` class, extends the `autotest` command to work
 # with RSpec.
 #
-class Autotest::Rspec2 < Autotest
-
+class Autotest::Rspec < Autotest
   def initialize
     super()
     clear_mappings
@@ -13,7 +12,7 @@ class Autotest::Rspec2 < Autotest
 
     # Example for Ruby 1.8: http://rubular.com/r/AOXNVDrZpx
     # Example for Ruby 1.9: http://rubular.com/r/85ag5AZ2jP
-    self.failed_results_re = /^\s*\d+\).*\n\s+(?:\e\[\d*m)?Failure.*(\n(?:\e\[\d*m)?\s+#\s(.*)?:\d+(?::.*)?(?:\e\[\d*m)?)+$/m
+    self.failed_results_re = /^\s*\d+\).*\n\s+(?:\e\[\d*m)?Failure.*(\n(?:(?:\e\[\d*m)|(?:\s))+#\s(.*)?:\d+(?::.*)?(?:\e\[\d*m)?)+$/m
     self.completed_re = /\n(?:\e\[\d*m)?\d* examples?/m
   end
 
@@ -44,7 +43,7 @@ class Autotest::Rspec2 < Autotest
   # Overrides Autotest's implementation to generate the rspec command to run
   def make_test_cmd(files_to_test)
     files_to_test.empty? ? '' :
-      %|#{prefix}"#{ruby}"#{suffix} -S "#{RSpec::Core.path_to_executable}" --tty #{normalize(files_to_test).keys.flatten.map { |f| %|"#{f}"|}.join(' ')}|
+      %|#{prefix}"#{ruby}"#{suffix} -S "#{::RSpec::Core.path_to_executable}" --tty #{normalize(files_to_test).keys.flatten.map { |f| %|"#{f}"|}.join(' ')}|
   end
 
   # Generates a map of filenames to Arrays for Autotest

data/lib/rspec/autotest/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Autotest
-    VERSION = "1.0.0.beta1"
+    VERSION = "1.0.0.rc1"
   end
 end

data/lib/rspec/rails/autotest.rb

@@ -23,16 +23,16 @@
 $:.push(*Dir["vendor/rails/*/lib"])
 
 require 'active_support/core_ext'
-require 'autotest/rspec2'
+require 'autotest/rspec'
 
-class Autotest::RailsRspec2 < Autotest::Rspec2
+class Autotest::RailsRspec < Autotest::Rspec
 
   def initialize
     super
-    setup_rails_rspec2_mappings
+    setup_rails_rspec_mappings
   end
 
-  def setup_rails_rspec2_mappings
+  def setup_rails_rspec_mappings
     %w{coverage/ db/ doc/ log/ public/ script/ tmp/ vendor/rails vendor/plugins vendor/gems}.each do |exception|
       add_exception(/^([\.\/]*)?#{exception}/)
     end

data/rspec-autotest.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.8.7'
 
-  spec.add_dependency "rspec-core", ">= 2.99.0.pre"
+  spec.add_dependency "rspec-core", ">= 2.99.0.beta1", "< 4.0.0"
 
   spec.add_development_dependency "bundler",        "~> 1.3"
   spec.add_development_dependency "rake",           "~> 10.0.0"

data/spec/autotest/discover_spec.rb

@@ -1,19 +1,8 @@
 require "spec_helper"
 
 describe "autotest/discover.rb" do
-  context "with ./.rspec present" do
-    it "adds 'rspec2' to the list of discoveries" do
-      File.stub(:exist?).with("./.rspec") { true }
-      Autotest.should_receive(:add_discovery)
-      load File.expand_path("../../../lib/autotest/discover.rb", __FILE__)
-    end
-  end
-
-  context "with ./.rspec absent" do
-    it "does not add 'rspec2' to the list of discoveries" do
-      File.stub(:exist?) { false }
-      Autotest.should_not_receive(:add_discovery)
-      load File.expand_path("../../../lib/autotest/discover.rb", __FILE__)
-    end
+  it "adds 'rspec' to the list of discoveries" do
+    expect(Autotest).to receive(:add_discovery)
+    load File.expand_path("../../../lib/autotest/discover.rb", __FILE__)
   end
 end

data/spec/autotest/failed_results_re_spec.rb

@@ -5,39 +5,52 @@ describe "failed_results_re for autotest" do
     group = RSpec::Core::ExampleGroup.describe("group")
     group.example("example") { yield }
     io = StringIO.new
-    formatter = RSpec::Core::Formatters::BaseTextFormatter.new(io)
-    reporter = RSpec::Core::Reporter.new(formatter)
-
-    group.run(reporter)
-    reporter.report(1, nil) {}
+    run_group(group, io)
     io.string
   end
 
+  if RSpec::Core::Version::STRING.to_f >= 3
+    def run_group(group, io)
+      options = RSpec::Core::ConfigurationOptions.new([])
+      config  = RSpec::Core::Configuration.new
+      runner  = RSpec::Core::Runner.new(options, config)
+      runner.setup(io, io)
+      runner.run_specs([group])
+    end
+  else
+    def run_group(group, io)
+      formatter = RSpec::Core::Formatters::BaseTextFormatter.new(io)
+      reporter = RSpec::Core::Reporter.new(formatter)
+      group.run(reporter)
+      reporter.report(1, nil) { }
+    end
+  end
+
   shared_examples "autotest failed_results_re" do
     it "matches a failure" do
       output = run_example { fail }
-      expect(output).to match(Autotest::Rspec2.new.failed_results_re)
+      expect(output).to match(Autotest::Rspec.new.failed_results_re)
       expect(output).to include(__FILE__.sub(File.expand_path('.'),'.'))
     end
 
     it "does not match when there are no failures" do
       output = run_example { } # pass
-      expect(output).not_to match(Autotest::Rspec2.new.failed_results_re)
+      expect(output).not_to match(Autotest::Rspec.new.failed_results_re)
       expect(output).not_to include(__FILE__.sub(File.expand_path('.'),'.'))
     end
   end
 
   context "with color enabled" do
     before do
-      RSpec.configuration.stub(:color_enabled? => true)
+      allow(RSpec.configuration).to receive(:color_enabled?).and_return(true)
     end
 
     include_examples "autotest failed_results_re"
   end
 
-  context "with color disabled " do
+  context "with color disabled" do
     before do
-      RSpec.configuration.stub(:color_enabled? => false)
+      allow(RSpec.configuration).to receive(:color_enabled?).and_return(false)
     end
 
     include_examples "autotest failed_results_re"

data/spec/autotest/rspec_rails_spec.rb

@@ -1,12 +1,12 @@
 require "spec_helper"
-require "autotest/rails_rspec2"
+require "autotest/rails_rspec"
 
-describe Autotest::RailsRspec2 do
+describe Autotest::RailsRspec do
 
-  let(:rails_rspec2_autotest) { Autotest::RailsRspec2.new }
+  let(:rails_rspec_autotest) { Autotest::RailsRspec.new }
 
   describe 'exceptions' do
-    let(:exceptions_regexp) { rails_rspec2_autotest.exceptions }
+    let(:exceptions_regexp) { rails_rspec_autotest.exceptions }
 
     it "matches './log/test.log'" do
       expect(exceptions_regexp).to match('./log/test.log')
@@ -27,8 +27,8 @@ describe Autotest::RailsRspec2 do
 
   describe 'mappings' do
     it 'runs model specs when support files change' do
-      rails_rspec2_autotest.find_order = %w(spec/models/user_spec.rb spec/support/blueprints.rb)
-      expect(rails_rspec2_autotest.test_files_for('spec/support/blueprints.rb')).to(
+      rails_rspec_autotest.find_order = %w(spec/models/user_spec.rb spec/support/blueprints.rb)
+      expect(rails_rspec_autotest.test_files_for('spec/support/blueprints.rb')).to(
         include('spec/models/user_spec.rb'))
     end
   end

data/spec/autotest/rspec_spec.rb

@@ -1,13 +1,13 @@
 require "spec_helper"
-require "autotest/rspec2"
+require "autotest/rspec"
 
-describe Autotest::Rspec2 do
-  let(:rspec_autotest) { Autotest::Rspec2.new }
+describe Autotest::Rspec do
+  let(:rspec_autotest) { Autotest::Rspec.new }
   let(:spec_cmd) { RSpec::Core.path_to_executable }
   let(:ruby_cmd) { "/path/to/ruby" }
 
   before do
-    File.stub(:exist?) { false }
+    allow(File).to receive(:exist?) { false }
   end
 
   it "uses autotest's prefix" do
@@ -17,7 +17,7 @@ describe Autotest::Rspec2 do
 
   describe "commands" do
     before do
-      rspec_autotest.stub(:ruby => ruby_cmd)
+      allow(rspec_autotest).to receive(:ruby).and_return(ruby_cmd)
       files = %w[file_one file_two]
       @files_to_test = {
         files[0] => [],
@@ -128,7 +128,7 @@ describe Autotest::Rspec2 do
       ['filename.rb', './filename.rb', File.expand_path('filename.rb')].each do |file|
         @files_to_test[file] = []
       end
-      expect(rspec_autotest.normalize(@files_to_test)).to have(1).file
+      expect(rspec_autotest.normalize(@files_to_test).size).to eq(1)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,18 +1,7 @@
 require 'rubygems'
-require 'rspec/autorun'
 require 'rspec/autotest'
 require 'aruba/api'
 
-unless ENV['NO_COVERALLS']
-  require 'simplecov' if RUBY_VERSION.to_f > 1.8
-  require 'coveralls'
-  Coveralls.wear! do
-    add_filter '/bundle/'
-    add_filter '/spec/'
-    add_filter '/tmp/'
-  end
-end
-
 if RUBY_PLATFORM == 'java'
   # Works around https://jira.codehaus.org/browse/JRUBY-5678
   require 'fileutils'
@@ -23,13 +12,12 @@ end
 Dir['./spec/support/**/*.rb'].map {|f| require f}
 
 RSpec.configure do |c|
-
   c.expect_with :rspec do |expectations|
     expectations.syntax = :expect
   end
 
   # runtime options
-  c.treat_symbols_as_metadata_keys_with_true_values = true
+  c.treat_symbols_as_metadata_keys_with_true_values = true if RSpec::Core::Version::STRING.to_f < 3
   c.filter_run :focus
   c.run_all_when_everything_filtered = true
 end

data/spec/support/matchers.rb

@@ -9,8 +9,14 @@ RSpec::Matchers.define :map_specs do |specs|
     @file = file
   end
 
-  failure_message_for_should do
-    "expected #{@autotest.class} to map #{@specs.inspect} to #{@file.inspect}\ngot #{@actual.inspect}"
+  if respond_to?(:failure_message)
+    failure_message do
+      "expected #{@autotest.class} to map #{@specs.inspect} to #{@file.inspect}\ngot #{@actual.inspect}"
+    end
+  else
+    failure_message_for_should do
+      "expected #{@autotest.class} to map #{@specs.inspect} to #{@file.inspect}\ngot #{@actual.inspect}"
+    end
   end
 
   def prepare(autotest)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-autotest
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Steven Baker
@@ -10,104 +10,110 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.99.0.pre
+        version: 2.99.0.beta1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.99.0.beta1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.99.0.pre
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: ZenTest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.6'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: RSpec Autotest integration
@@ -116,17 +122,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Changelog.md
 - Gemfile
 - License.txt
 - README.md
 - Rakefile
 - lib/autotest/discover.rb
-- lib/autotest/rails_rspec2.rb
-- lib/autotest/rspec2.rb
+- lib/autotest/rails_rspec.rb
+- lib/autotest/rspec.rb
 - lib/rspec/autotest.rb
 - lib/rspec/autotest/version.rb
 - lib/rspec/rails/autotest.rb
@@ -144,25 +150,25 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: rspec
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-autotest-1.0.0.beta1
+summary: rspec-autotest-1.0.0.rc1
 test_files:
 - spec/autotest/discover_spec.rb
 - spec/autotest/failed_results_re_spec.rb