rspec-rerun 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65364fcd0d558bc48418792fc46838cb31773447
-  data.tar.gz: 33af133659889ea4cca51bcc33da1de241269046
+  metadata.gz: 53e04e1642d972254feb945956ce9ae830594e5f
+  data.tar.gz: f266c90c4b476c4ac2edbaddeff61cc7a4a28c3e
 SHA512:
-  metadata.gz: 98cafbb7c1a635cbd0a67f82088649021ae86aa05bea5eaa152e265597ec9e541a1e83b71784f077328504cfbf3cc202bcf6cc47b96117960033e588b31e3e31
-  data.tar.gz: 5fff934cf2f8e821088f186c4ea8d14141196d4314062da2460b2956889ec0be62c7e021fb75b394beb063ab2fcfaab7ff5d070dfc470c220e15175d338d279f
+  metadata.gz: b7c09c26aa3c62a1c471c3fe29e581133745dbb003f31c404b04fcbb563023d57bdedd80ca1da35b16ac040e7d49dc85ad9c2396bb67a8e202023f8fcbcf7732
+  data.tar.gz: b26726a8047f0d9846c547ad841a2b3000e415fd17ae78a987e75d6b31204ee3656c99b88f635ef16b8fa1202ba86ab546077c14c88613b3990a8ceed160074c

data/lib/rspec-rerun/formatter.rb

@@ -1,18 +1,21 @@
 require 'rspec/core'
-require 'rspec/legacy_formatters'
-require 'rspec/core/formatters/base_formatter'
+require 'rspec/core/formatters'
 
 module RSpec
   module Rerun
-    class Formatter < RSpec::Core::Formatters::BaseFormatter
+    class Formatter
+      ::RSpec::Core::Formatters.register self, :dump_failures
+
       FILENAME = 'rspec.failures'
 
-      def dump_failures
-        if failed_examples.empty?
+      def initialize(_); end
+
+      def dump_failures(notification)
+        if notification.failed_examples.empty?
           clean!
         else
-          rerun_commands = failed_examples.map { |e| retry_command(e) }
-          File.write(FILENAME, rerun_commands.join(''))
+          rerun_commands = notification.failed_examples.map { |e| retry_command(e) }
+          File.write(FILENAME, rerun_commands.join("\n"))
         end
       end
 
@@ -23,7 +26,11 @@ module RSpec
       private
 
       def retry_command(example)
-        example.location.gsub("\"", "\\\"") + "\n"
+        if example.respond_to?(:rerun_argument)
+          example.rerun_argument
+        else
+          example.location.gsub("\"", "\\\"")
+        end
       end
     end
   end

data/lib/rspec-rerun/tasks.rb

@@ -31,10 +31,10 @@ module RSpec
 
           # Handle if opts is just a retry_count integer
           options = if options.is_a? Hash
-                      options
-                    else
-                      { retry_count: options }
-                    end
+            options
+          else
+            { retry_count: options }
+          end
 
           # Parse environment variables
           options[:pattern] ||= ENV['RSPEC_RERUN_PATTERN'] if ENV['RSPEC_RERUN_PATTERN']
@@ -49,25 +49,32 @@ module RSpec
           File.read(RSpec::Rerun::Formatter::FILENAME).split
         end
 
+        def failed_count
+          failing_specs.count
+        end
+
         def failure_message
-          failed_count = failing_specs.count
           "[#{Time.now}] Failed, #{failed_count} failure#{failed_count == 1 ? '' : 's'}"
         end
 
-        def rerun(args)
+        def run(args)
           Rake::Task['rspec-rerun:run'].execute(args)
         end
 
+        def rerun(args)
+          Rake::Task['rspec-rerun:rerun'].execute(args)
+        end
+
         private
 
         def dot_rspec_options
           dot_rspec_file = ['.rspec', File.expand_path('~/.rspec')].detect { |f| File.exist?(f) }
           options = if dot_rspec_file
-                      file_contents = File.read(dot_rspec_file)
-                      file_contents.split(/\n+/).map(&:shellsplit).flatten
-                    else
-                      []
-                    end
+            file_contents = File.read(dot_rspec_file)
+            file_contents.split(/\n+/).map(&:shellsplit).flatten
+          else
+            []
+          end
           options.concat ['--format', 'progress'] unless options.include?('--format')
           options
         end
@@ -88,7 +95,7 @@ desc 'Re-run failed RSpec examples.'
 RSpec::Core::RakeTask.new('rspec-rerun:rerun') do |t, args|
   failing_specs = RSpec::Rerun::Tasks.failing_specs
 
-  t.pattern = args[:pattern] if args[:pattern]
+  t.pattern = 'deliberately-left-blank'
   t.fail_on_error = false
   t.verbose = false if args[:verbose] == false
   t.rspec_opts =  RSpec::Rerun::Tasks.rspec_options(args, failing_specs.join(' '))
@@ -101,7 +108,7 @@ task 'rspec-rerun:spec' do |_t, args|
 
   fail 'retry count must be >= 1' if retry_count <= 0
   FileUtils.rm_f RSpec::Rerun::Formatter::FILENAME
-  RSpec::Rerun::Tasks.rerun(parsed_args)
+  RSpec::Rerun::Tasks.run(parsed_args)
 
   until $?.success? || retry_count == 0
     retry_count -= 1
@@ -113,6 +120,7 @@ task 'rspec-rerun:spec' do |_t, args|
 
   unless $?.success?
     $stderr.puts RSpec::Rerun::Tasks.failure_message
+    failed_count = RSpec::Rerun::Tasks.failed_count
     fail "#{failed_count} failure#{failed_count == 1 ? '' : 's'}"
   end
 end

data/lib/rspec-rerun/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Rerun
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rerun
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-legacy_formatters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.31.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.31.0
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement