rspec-autotest 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9182ec51c2aec875f4950717a1dce83f9e28ad8
-  data.tar.gz: 2af05b5a7bac2709394b71af7d13349f0d9ca7fe
+  metadata.gz: 2fd62255427119b6d5e036021c8c5b1600030478
+  data.tar.gz: e6747d1b142385916ce7694e19e34ecf4dcfe6be
 SHA512:
-  metadata.gz: 755d933cf426cf0044ec09073d1467079f14fdc3fa3affd5785d9d5aee15c1e96eb3fb0354111c2e89d215339e963451b315c4b1f3b8fef0f34be7497952c266
-  data.tar.gz: f4b3c85a888f7c6ffed7c21769d50afec3ca86047a88c15c9a4edd442a4c82ece57c0decf8c3d87be3152a891e9c43171bce0bc52bfa3296948802a382ad14a2
+  metadata.gz: 9daefd8838765a1039a2d32911fe42d8ed1bebeb627865ed4c26efac7a909e7c742738ca83f687a1850dcabc13835207c9165272ab7dc4d08bb74d1b363ccc7b
+  data.tar.gz: 77d9e174fd2408324632621c499d9ad78ef1d1d4a17f93e981821cc5d04a752458e49daa060ba36dd716ec29ff3fd76d160b811a1ec080666abbfa129e75ed2b

data/.rspec

@@ -1,3 +1,4 @@
 --order rand
 --warnings
 --color
+--require spec_helper

data/.travis.yml

@@ -3,21 +3,25 @@ script: "script/test_all 2>&1"
 bundler_args: "--standalone --binstubs"
 rvm:
   - 1.8.7
+  - ree
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - 2.1.1
   - 2.1.2
-  - ree
   - jruby-18mode
-  - jruby
+  - jruby-19mode
   - rbx
+  - rbx-head
+  - jruby-head
+  - ruby-head
 env:
   - RSPEC_BRANCH=master
   - RSPEC_BRANCH=2-99-maintenance
 matrix:
   allow_failures:
     - rvm: rbx
+    - rvm: jruby-head
+    - rvm: rbx-head
+    - rvm: ruby-head
   fast_finish: true
 

data/lib/rspec/autotest.rb

@@ -4,66 +4,65 @@ require 'autotest'
 # Derived from the `Autotest` class, extends the `autotest` command to work
 # with RSpec.
 #
-class Autotest::Rspec < Autotest
-  def initialize
-    super()
-    clear_mappings
-    setup_rspec_project_mappings
+class Autotest
+  class Rspec < self
+    def initialize
+      super()
+      clear_mappings
+      setup_rspec_project_mappings
 
-    # 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.completed_re = /\n(?:\e\[\d*m)?\d* examples?/m
-  end
+      # 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.completed_re = /\n(?:\e\[\d*m)?\d* examples?/m
+    end
 
-  # Adds conventional spec-to-file mappings to Autotest configuration.
-  def setup_rspec_project_mappings
-    add_mapping(%r%^spec/.*_spec\.rb$%) { |filename, _|
-      filename
-    }
-    add_mapping(%r%^lib/(.*)\.rb$%) { |_, m|
-      ["spec/#{m[1]}_spec.rb"]
-    }
-    add_mapping(%r%^spec/(spec_helper|shared/.*)\.rb$%) {
-      files_matching %r%^spec/.*_spec\.rb$%
-    }
-  end
+    # Adds conventional spec-to-file mappings to Autotest configuration.
+    def setup_rspec_project_mappings
+      add_mapping(%r{^spec/.*_spec\.rb$}) { |filename, _|
+        filename
+      }
+      add_mapping(%r{^lib/(.*)\.rb$}) { |_, m|
+        ["spec/#{m[1]}_spec.rb"]
+      }
+      add_mapping(%r{^spec/(spec_helper|shared/.*)\.rb$}) {
+        files_matching %r{^spec/.*_spec\.rb$}
+      }
+    end
 
-  # Overrides Autotest's implementation to read rspec output
-  def consolidate_failures(failed)
-    filters = new_hash_of_arrays
-    failed.each do |spec, trace|
-      if trace =~ /(.*spec\.rb)/
-        filters[$1] << spec
+    # Overrides Autotest's implementation to read rspec output
+    def consolidate_failures(failed)
+      filters = new_hash_of_arrays
+      failed.each do |spec, trace|
+        filters[$1] << spec if trace =~ /(.*spec\.rb)/
       end
+      filters
     end
-    return filters
-  end
-
-  # 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(' ')}|
-  end
 
-  # Generates a map of filenames to Arrays for Autotest
-  def normalize(files_to_test)
-    files_to_test.keys.inject({}) do |result, filename|
-      result.merge!(File.expand_path(filename) => [])
+    # 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(' ')}|
     end
-  end
 
-  private
+    # Generates a map of filenames to Arrays for Autotest
+    def normalize(files_to_test)
+      files_to_test.keys.inject({}) do |result, filename|
+        result.merge!(File.expand_path(filename) => [])
+      end
+    end
 
-  def suffix
-    using_bundler? ? "" : defined?(:Gem) ? " -rrubygems" : ""
-  end
+    private
 
-  def using_bundler?
-    prefix =~ /bundle exec/
-  end
+    def suffix
+      if !using_bundler? && defined?(:Gem)
+        return ' -rrubygems'
+      end
+      ''
+    end
 
-  def gemfile?
-    File.exist?('./Gemfile')
+    def using_bundler?
+      prefix =~ /bundle exec/
+    end
   end
 end

data/lib/rspec/autotest/version.rb

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

data/lib/rspec/rails/autotest.rb

@@ -20,65 +20,66 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-$:.push(*Dir["vendor/rails/*/lib"])
+$:.push(*Dir['vendor/rails/*/lib'])
 
 require 'active_support/core_ext'
 require 'autotest/rspec'
 
-class Autotest::RailsRspec < Autotest::Rspec
+class Autotest
+  class RailsRspec < Autotest::Rspec
+    IGNORED_FOLDERS = %w{coverage db doc log public script tmp vendor/rails vendor/plugins vendor/gems}
 
-  def initialize
-    super
-    setup_rails_rspec_mappings
-  end
-
-  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}/)
+    def initialize
+      super
+      setup_rails_rspec_mappings
     end
 
-    clear_mappings
+    def setup_rails_rspec_mappings
+      IGNORED_FOLDERS.each { |exception| add_exception(/^([\.\/]*)?#{exception}/) }
 
-    add_mapping(%r%^(test|spec)/fixtures/(.*).yml$%) { |_, m|
-      ["spec/models/#{m[2].singularize}_spec.rb"] + files_matching(%r%^spec\/views\/#{m[2]}/.*_spec\.rb$%)
-    }
-    add_mapping(%r%^spec/.*_spec\.rb$%) { |filename, _|
-      filename
-    }
-    add_mapping(%r%^app/models/(.*)\.rb$%) { |_, m|
-      ["spec/models/#{m[1]}_spec.rb"]
-    }
-    add_mapping(%r%^app/views/(.*)$%) { |_, m|
-      files_matching %r%^spec/views/#{m[1]}_spec.rb$%
-    }
-    add_mapping(%r%^app/controllers/(.*)\.rb$%) { |_, m|
-      if m[1] == "application"
-        files_matching %r%^spec/controllers/.*_spec\.rb$%
-      else
-        ["spec/controllers/#{m[1]}_spec.rb"]
-      end
-    }
-    add_mapping(%r%^app/helpers/(.*)_helper\.rb$%) { |_, m|
-      if m[1] == "application" then
-        files_matching(%r%^spec/(views|helpers)/.*_spec\.rb$%)
-      else
-        ["spec/helpers/#{m[1]}_helper_spec.rb"] + files_matching(%r%^spec\/views\/#{m[1]}/.*_spec\.rb$%)
-      end
-    }
-    add_mapping(%r%^config/routes\.rb$%) {
-      files_matching %r%^spec/(controllers|routing|views|helpers)/.*_spec\.rb$%
-    }
-    add_mapping(%r%^config/database\.yml$%) { |_, m|
-      files_matching %r%^spec/models/.*_spec\.rb$%
-    }
-    add_mapping(%r%^(spec/(spec_helper|support/.*)|config/(boot|environment(s/test)?))\.rb$%) {
-      files_matching %r%^spec/(models|controllers|routing|views|helpers)/.*_spec\.rb$%
-    }
-    add_mapping(%r%^lib/(.*)\.rb$%) { |_, m|
-      ["spec/lib/#{m[1]}_spec.rb"]
-    }
-    add_mapping(%r%^app/mailers/(.*)\.rb$%) { |_, m|
-      ["spec/mailers/#{m[1]}_spec.rb"]
-    }
+      clear_mappings
+
+      add_mapping(%r{\A(test|spec)/fixtures/(.*).yml\z}) { |_, m|
+        ["spec/models/#{m[2].singularize}_spec.rb"] + files_matching(%r{\Aspec\/views\/#{m[2]}/.*_spec\.rb\z})
+      }
+      add_mapping(%r{\Aspec/.*_spec\.rb\z}) { |filename, _|
+        filename
+      }
+      add_mapping(%r{\Aapp/models/(.*)\.rb\z}) { |_, m|
+        ["spec/models/#{m[1]}_spec.rb"]
+      }
+      add_mapping(%r{\Aapp/views/(.*)\z}) { |_, m|
+        files_matching %r{\Aspec/views/#{m[1]}_spec.rb\z}
+      }
+      add_mapping(%r{\Aapp/controllers/(.*)\.rb\z}) { |_, m|
+        if m[1] == 'application'
+          files_matching %r{\Aspec/controllers/.*_spec\.rb\z}
+        else
+          ["spec/controllers/#{m[1]}_spec.rb"]
+        end
+      }
+      add_mapping(%r{\Aapp/helpers/(.*)_helper\.rb\z}) { |_, m|
+        if m[1] == 'application'
+          files_matching(%r{\Aspec/(views|helpers)/.*_spec\.rb\z})
+        else
+          ["spec/helpers/#{m[1]}_helper_spec.rb"] + files_matching(%r{\Aspec\/views\/#{m[1]}/.*_spec\.rb\z})
+        end
+      }
+      add_mapping(%r{\Aconfig/routes\.rb\z}) {
+        files_matching %r{\Aspec/(controllers|routing|views|helpers)/.*_spec\.rb\z}
+      }
+      add_mapping(%r{\Aconfig/database\.yml\z}) { |_, m|
+        files_matching %r{\Aspec/models/.*_spec\.rb\z}
+      }
+      add_mapping(%r{\A(spec/(spec_helper|support/.*)|config/(boot|environment(s/test)?))\.rb\z}) {
+        files_matching %r{\Aspec/(models|controllers|routing|views|helpers)/.*_spec\.rb\z}
+      }
+      add_mapping(%r{\Alib/(.*)\.rb\z}) { |_, m|
+        ["spec/lib/#{m[1]}_spec.rb"]
+      }
+      add_mapping(%r{\Aapp/mailers/(.*)\.rb\z}) { |_, m|
+        ["spec/mailers/#{m[1]}_spec.rb"]
+      }
+    end
   end
 end

data/rspec-autotest.gemspec

@@ -1,33 +1,30 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
 require 'rspec/autotest/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "rspec-autotest"
+  spec.name          = 'rspec-autotest'
   spec.version       = RSpec::Autotest::VERSION
-  spec.authors       = ["Steven Baker", "David Chelimsky", "Chad Humphries"]
-  spec.email         = "rspec-users@rubyforge.org"
-  spec.homepage      = "https://github.com/rspec/rspec-autotest"
-  spec.summary       = "rspec-autotest-#{RSpec::Autotest::VERSION}"
-  spec.description   = "RSpec Autotest integration"
-  spec.license       = "MIT"
+  spec.authors       = ['Steven Baker', 'David Chelimsky', 'Chad Humphries']
+  spec.email         = 'rspec-users@rubyforge.org'
+  spec.homepage      = 'https://github.com/rspec/rspec-autotest'
+  spec.summary       = "rspec-autotest-#{spec.version}"
+  spec.description   = 'RSpec Autotest integration'
+  spec.license       = 'MIT'
 
-  spec.rubyforge_project  = "rspec"
+  spec.rubyforge_project  = 'rspec'
 
   spec.files         = `git ls-files`.split($/)
-  spec.test_files    = spec.files.grep(%r{^(spec|features)/})
-  spec.rdoc_options  = ["--charset=UTF-8"]
-  spec.require_paths = ["lib"]
+  spec.test_files    = spec.files.grep(%r{^spec/})
+  spec.rdoc_options  = ['--charset=UTF-8']
+  spec.require_paths = ['lib']
 
   spec.required_ruby_version = '>= 1.8.7'
 
-  spec.add_dependency "rspec-core", ">= 2.99.0.beta1", "< 4.0.0"
+  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"
-  spec.add_development_dependency "aruba",          "~> 0.5"
-  spec.add_development_dependency "ZenTest",        "~> 4.6"
-  spec.add_development_dependency "i18n",           "~> 0.6.4"
-  spec.add_development_dependency "activesupport",  "~> 3.0"
+  spec.add_development_dependency 'bundler',        '>= 1.3'
+  spec.add_development_dependency 'rake',           '>= 10.0.0'
+  spec.add_development_dependency 'ZenTest',        '>= 4.6'
+  spec.add_development_dependency 'activesupport',  '~> 3.0'
 end

data/spec/autotest/discover_spec.rb

@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe "autotest/discover.rb" do
   it "adds 'rspec' to the list of discoveries" do
     expect(Autotest).to receive(:add_discovery)

data/spec/autotest/failed_results_re_spec.rb

@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe "failed_results_re for autotest" do
   def run_example
     group = RSpec::Core::ExampleGroup.describe("group")

data/spec/autotest/rspec_rails_spec.rb

@@ -1,4 +1,3 @@
-require "spec_helper"
 require "autotest/rails_rspec"
 
 describe Autotest::RailsRspec do

data/spec/autotest/rspec_spec.rb

@@ -1,4 +1,3 @@
-require "spec_helper"
 require "autotest/rspec"
 
 describe Autotest::Rspec do

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'rspec/autotest'
-require 'aruba/api'
 
 if RUBY_PLATFORM == 'java'
   # Works around https://jira.codehaus.org/browse/JRUBY-5678

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-autotest
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Steven Baker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -36,72 +36,44 @@ dependencies:
   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
@@ -168,7 +140,7 @@ rubyforge_project: rspec
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-autotest-1.0.0.rc1
+summary: rspec-autotest-1.0.0.rc2
 test_files:
 - spec/autotest/discover_spec.rb
 - spec/autotest/failed_results_re_spec.rb