mrspec 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c9a8ec8e15096ad06f0d9b147e4f91091f5e5e0
-  data.tar.gz: 61a4ea17a6e18f6d7c3b7aee9903248f3f76c930
+  metadata.gz: 67f780aa00ec439a3a02949504abde99cf6fcf6a
+  data.tar.gz: 587d8a5cdb8d00d0cf43116277bd46267a41a0c7
 SHA512:
-  metadata.gz: e7df803969216c5e9a1c81f956d84e5ca280b929d4a90f8ae3da596884093a852734f5d8edfad384640fbbacdd8b34f469717dea82f26c4c0699dc86e5a00426
-  data.tar.gz: cd7a2ce65de8d084b6d70536e363e24f7b3b0918565f91e5b11996197e8743d429dbed449bb489254c139e5f53e427b22aa84801dbe8757e45f752c53757c4aa
+  metadata.gz: ca564c0d264259457e0b35417aacd89e7382fa2e3e0ec508068634312cf87e89213a2a0aa9311eb00667bccb4f55ad1414402271a0371164e23359497787d1bd
+  data.tar.gz: 4bc61ec3937446e6a0bf1b2ee6a57604f831acd457b8cb85d494ea2febd61427ff59a7fb73f8214e5f679e4d65ba4326a68d53215886bf41a76dce2e4c02192f

data/.rspec

@@ -1,5 +1,2 @@
 --colour
 --fail-fast
---require error_to_communicate/at_exit
---require error_to_communicate/rspec_formatter
---format WhatWeveGotHereIsAnErrorToCommunicate::RSpecFormatter

data/bin/mrspec

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'what_weve_got_here_is_an_error_to_communicate'
+
 # Load our lib
 $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 require 'mrspec'

data/lib/mrspec/{option_parser.rb → add_options_to_rspec_parser.rb}

@@ -22,12 +22,18 @@ class RSpec::Core::Parser
     # calling exit and toplevel puts, b/c that's what RSpec's does https://github.com/rspec/rspec-core/blob/c7c1154934c42b5f6905bb7bd22025fe6c8a816c/lib/rspec/core/option_parser.rb#L290
     # and I don't feel like figuring out how to work around it.
     option_parser.on('-v', '--version', 'Display the version.') do
-      puts "mrspec     #{MRspec::VERSION}\n"\
-           "rspec-core #{RSpec::Core::Version::STRING}\n"\
-           "minitest   #{Minitest::VERSION}\n"
+      $stdout.puts "mrspec     #{MRspec::VERSION}\n"\
+                   "rspec-core #{RSpec::Core::Version::STRING}\n"\
+                   "minitest   #{Minitest::VERSION}\n"
       exit
     end
 
+    format_description = option_parser.top.short['f'].desc
+    first_option       = format_description.find { |s| s[/\[[a-zA-Z]\]/] }
+    leading_whitespace = first_option[/^\s*/]
+    index              = format_description.index first_option
+    format_description.insert index, "#{leading_whitespace}[w]hat (we've got here is an error to communicate)"
+
     option_parser
   end
 

data/lib/mrspec/configuration.rb

@@ -1,5 +1,6 @@
-require 'mrspec/declare_minitests'
 require 'rspec/core'
+require 'mrspec/declare_minitests'
+require 'error_to_communicate/rspec_formatter'
 
 module MRspec
   class Configuration < RSpec::Core::Configuration
@@ -8,11 +9,21 @@ module MRspec
       disable_monkey_patching!
       filter_gems_from_backtrace 'mrspec', 'minitest'
       self.pattern = pattern.sub '*_spec.rb', '{*_spec,*_test,test_*}.rb'
+      self.default_formatter = WhatWeveGotHereIsAnErrorToCommunicate::RSpecFormatter
     end
 
     def load_spec_files(*)
       super
       MRspec::DeclareMinitests.call(RSpec, Minitest, Minitest::Runnable.runnables)
     end
+
+    def add_formatter(*args)
+      if args.any? { |formatter| formatter == 'w' || formatter =~ /^what/ }
+        super WhatWeveGotHereIsAnErrorToCommunicate::RSpecFormatter
+      else
+        super
+      end
+    end
+
   end
 end

data/lib/mrspec/version.rb

@@ -1,3 +1,3 @@
 module MRspec
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/lib/mrspec.rb

@@ -3,4 +3,4 @@ require 'mrspec/minitest_metadata'
 require 'mrspec/fix_backtraces_on_minitest_spec'
 require 'mrspec/runner'
 require 'mrspec/configuration'
-require 'mrspec/option_parser'
+require 'mrspec/add_options_to_rspec_parser'

data/mrspec.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rspec-core", "~> 3.0"
   s.add_dependency "minitest",   "~> 5.0"
+  s.add_dependency "what_weve_got_here_is_an_error_to_communicate", "~> 0.0.3"
 
   s.add_development_dependency "haiti",    ">= 0.2.2", "< 0.3"
   s.add_development_dependency "cucumber", "~> 2.0"
-  s.add_development_dependency "what_weve_got_here_is_an_error_to_communicate", "> 0"
 end

data/test/test_formatter_configuration.rb

@@ -0,0 +1,39 @@
+require 'support/helper'
+
+class TestFormatterConfiguration < Minitest::Spec
+  def formatters_are!(*formatters, &block)
+    config = MRspec::Configuration.new
+    block.call config
+    assert_equal formatters, config.formatters.map(&:class)
+  end
+
+  it 'defaults to WhatWeveGotHereIsAnErrorToCommunicate::RSpecFormatter' do
+    refute_equal RSpec::Core::Configuration.new.default_formatter,
+                 WhatWeveGotHereIsAnErrorToCommunicate::RSpecFormatter
+
+    assert_equal MRspec::Configuration.new.default_formatter,
+                 WhatWeveGotHereIsAnErrorToCommunicate::RSpecFormatter
+  end
+
+
+  it 'doesn\'t fuck up the normal formatter selection' do
+    formatters_are! RSpec::Core::Formatters::ProgressFormatter do |config|
+      config.add_formatter 'p'
+    end
+  end
+
+
+  it 'can be specified with "--format w" and "--format what<anything>"' do
+    formatters_are! WhatWeveGotHereIsAnErrorToCommunicate::RSpecFormatter do |config|
+      config.add_formatter 'what'
+    end
+
+    formatters_are! WhatWeveGotHereIsAnErrorToCommunicate::RSpecFormatter do |config|
+      config.add_formatter 'whatever'
+    end
+
+    assert_raises ArgumentError, /\bwha\b/ do
+      MRspec::Configuration.new.add_formatter 'wha'
+    end
+  end
+end

data/test/test_parser_monkey_patches.rb

@@ -70,6 +70,24 @@ class TestParserMonkeyPatches < Minitest::Spec
     # Giving up on making sure these are equivalent, it's not the end of the world if they aren't
     # I'm basically at a point where I think that no one should use OptionParser
     it 'sets the correct description for the versions'
+
+    it 'includes the what_weve_got_here_is_an_error_to_communicate formatter in the help screen' do
+      parser     = Parser.new.mrspec_parser({})
+      help       = record_hostile_parsing parser, '--help'
+      formatters = help.lines
+                       .drop_while { |l| l !~ /--format/ }
+                       .drop(1)
+                       .take_while { |l| l =~ /^\s*\[/ }
+      refute_empty formatters
+      indentation, initials = formatters.map { |formatter_line|
+                                [formatter_line[/^\s*/].length,
+                                 formatter_line[/\[.\]/]
+                                ]
+                              }.transpose
+      first_indentation = indentation.first
+      indentation.each { |i| assert_equal first_indentation, i }
+      assert_equal '[w]', initials.first
+    end
   end
 
   it 'stores the current parser in .parser_method' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mrspec
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Josh Cheek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: what_weve_got_here_is_an_error_to_communicate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: haiti
   requirement: !ruby/object:Gem::Requirement
@@ -72,20 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: what_weve_got_here_is_an_error_to_communicate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 'Allows you to run Minitest tests and specs with RSpec''s runner, thus
   you can write both Minitest and RSpec, side-by-side, and take advantage of the many
   incredibly helpful features it supports (primarily: better formatters, --colour,
@@ -106,17 +106,18 @@ files:
 - features/mrspec.feature
 - features/support/env.rb
 - lib/mrspec.rb
+- lib/mrspec/add_options_to_rspec_parser.rb
 - lib/mrspec/configuration.rb
 - lib/mrspec/declare_minitests.rb
 - lib/mrspec/fix_backtraces_on_minitest_spec.rb
 - lib/mrspec/minitest_assertion_for_rspec.rb
 - lib/mrspec/minitest_metadata.rb
-- lib/mrspec/option_parser.rb
 - lib/mrspec/runner.rb
 - lib/mrspec/version.rb
 - mrspec.gemspec
 - test/support/helper.rb
 - test/support/mock.rb
+- test/test_formatter_configuration.rb
 - test/test_mrspec.rb
 - test/test_parser_monkey_patches.rb
 homepage: https://github.com/JoshCheek/mrspec
@@ -148,6 +149,7 @@ test_files:
 - features/support/env.rb
 - test/support/helper.rb
 - test/support/mock.rb
+- test/test_formatter_configuration.rb
 - test/test_mrspec.rb
 - test/test_parser_monkey_patches.rb
 has_rdoc: