given_core 3.7.1 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82c044841ee9503defff72cc88d40b500327dec0
-  data.tar.gz: 7d91a83e5740375f068fa55b917cf60549482026
+  metadata.gz: 4c5460fda0b68ed478e3e65df1fa7c37c6d58cbc
+  data.tar.gz: fab707bbc059a7c79280baea8627933d36755856
 SHA512:
-  metadata.gz: e244317ee8961885303bd63ab43d86c04eeb92b3d0bf4f60f81c1721f87481fc522a924e07b7d4c6d3534012168dc849974c4bc5833f2fd86bddd2a04885ed5f
-  data.tar.gz: 337ab49896640b4099737d50126cbda6f096d5049034cf2083dd7f662bb1915ab3a33c9b16031911885b94ce17c3a6786a00ddba823fdde5890e556c8cd70b9d
+  metadata.gz: b2ca385bc6f7a8583193cf7a0363222faefa96500441ebd217673d43f3aa110f5133fb2f8845a77f7f92ea8b7fa91f1919ad87e8e07842f92a41ad5c06cce788
+  data.tar.gz: fddd6ae9b41e390e03a4db1d2cf3baf81afb19528ddbdac283e81849e2b9f0d03df1ad239668d0dd685a6a9da070dde7c8177c29d4240b128de12533986cf201

data/Gemfile.lock

@@ -2,21 +2,21 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    minitest (5.7.0)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    minitest (5.8.3)
+    rake (10.5.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.1)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     sorcerer (1.0.2)
 
 PLATFORMS

data/README.md

@@ -4,7 +4,7 @@
 | :----: |
 | [![Master Build Status](https://secure.travis-ci.org/rspec-given/rspec-given.png?branch=master)](https://travis-ci.org/rspec-given/rspec-given) |
 
-Covering rspec-given, minitest-given, and given-core, version 3.7.0.
+Covering rspec-given, minitest-given, and given-core, version 3.8.0.
 
 rspec-given and minitest-given are extensions to your favorite testing
 framework to allow Given/When/Then notation when writing specs.
@@ -347,6 +347,17 @@ should use an empty _Then_ clause, like this:
     Then { }
 ```
 
+A _Then_ clause accepts arguments for user-defined RSpec metadata:
+
+```ruby
+    Then(:zippy, :foo => 17) { ... }
+```
+
+Metadata on _Then_ clauses is an RSpec-only feature. You can read more about
+metadata [in RSpec's
+documentation](https://www.relishapp.com/rspec/rspec-core/docs/metadata/user-defined-metadata).
+
+
 #### Then examples:
 
 ```ruby
@@ -760,12 +771,13 @@ _expect_.
 
 Given uses the Ripper library to parse the source lines and failing
 conditions to find all the sub-expression values upon a failure.
-Currently Ripper is not supported on Rubinius and versions of JRuby
-prior to JRuby-1.7.5.
 
-If you want to use a version of Ruby that does not support Ripper,
-then natural assertions will disabled. In addition, you should also
-disable source caching in the configuration (see the configuration
+If Ripper is not available, like on Rubinius and versions of JRuby prior to
+JRuby-1.7.5, detailed explanations of failures for natural assertions won't be
+available.  Natural assertions will still work, though.
+
+If you want to use a version of Ruby that does not support Ripper, then you
+should disable source caching in the configuration (see the configuration
 section below).
 
 ### Non-Spec Assertions
@@ -870,6 +882,14 @@ License. See the MIT-LICENSE file in the source distribution.
 
 # History
 
+* Version 3.8.0
+
+  * RSpec metadata can now be added to _Then_ clauses (see [#11](https://github.com/rspec-given/rspec-given/pull/11))
+  * Natural assertions now run on Rubinius and older versions of JRuby (see [#15](https://github.com/rspec-given/rspec-given/issues/15))
+    * WARNING: On these platforms, detailed failure explanations aren't available and source code snippets of Then clauses will only show the first line.
+    * WARNING: Assertions of void statements (e.g. `Then { }`) will fail only under runtimes lacking Ripper support
+  * `Given.ok_to_use_natural_assertions` was removed; the method was never properly supported as public, but it was publicly reachable
+
 * Version 3.7.1
 
   * Mixin Minitest extensions for both ActiveSupport::TestCase (when present) as well as for MiniTest::Spec (see [#8](https://github.com/rspec-given/rspec-given/pulls/8))

data/Rakefile

@@ -67,10 +67,6 @@ EXAMPLES = FileList['examples/**/*_spec.rb', 'examples/use_assertions.rb'].
 
 MT_EXAMPLES = FileList['examples/minitest-rails/**/*_spec.rb', 'examples/minitest/**/*_spec.rb']
 
-unless Given::NATURAL_ASSERTIONS_SUPPORTED
-  EXAMPLES.exclude("examples/stack/*.rb")
-end
-
 FAILING_EXAMPLES = FileList['examples/failing/**/*_spec.rb']
 
 desc "Run the RSpec specs and examples"

data/lib/given/extensions.rb

@@ -247,11 +247,13 @@ module Given
     # :call-seq:
     #   Then { ... assertion ... }
     #
-    def Then(opts={}, &block)
-      on_eval = opts.fetch(:on_eval, "_gvn_then")
+    def Then(*metadata, &block)
+      opts = metadata.last
+      opts = {} unless opts.is_a? Hash
+      on_eval = opts.delete(:on_eval) || "_gvn_then"
       file, line = Given.location_of(block)
       description = _Gvn_lines.line(file, line) unless Given.source_caching_disabled
-      cmd = description ? "it(description)" : "specify"
+      cmd = description ? "it(description, *metadata)" : "specify(*metadata)"
       eval %{#{cmd} do #{on_eval}(&block) end}, binding, file, line
       _Gvn_context_info[:then_defined] = true
     end
@@ -270,7 +272,6 @@ module Given
 
     # Configure the use of natural assertions in this context.
     def use_natural_assertions(enabled=true)
-      Given.ok_to_use_natural_assertions(enabled)
       _Gvn_context_info[:natural_assertions_enabled] = enabled
     end
   end

data/lib/given/line_extractor.rb

@@ -1,5 +1,4 @@
-require 'ripper'
-require 'sorcerer'
+require 'given/natural_assertion'
 require 'given/file_cache'
 
 module Given
@@ -20,6 +19,7 @@ module Given
     private
 
     def extract_lines_from(lines, line_index)
+      return lines[line_index] unless NATURAL_ASSERTIONS_SUPPORTED
       result = lines[line_index]
       while result && incomplete?(result)
         line_index += 1
@@ -29,13 +29,13 @@ module Given
     end
 
     def incomplete?(string)
-      ! complete_sexp?(parse(string))
+      !complete_sexp?(parse(string))
     end
 
     def complete_sexp?(sexp)
       Sorcerer.source(sexp)
       true
-    rescue Sorcerer::Resource::NotSexpError => ex
+    rescue Sorcerer::Resource::NotSexpError
       false
     end
 

data/lib/given/minitest/configure.rb

@@ -12,4 +12,4 @@ Minitest::Spec.send(:extend, Given::MiniTest::ClassExtensions)
 Minitest::Spec.send(:include, Given::FailureMethod)
 Minitest::Spec.send(:include, Given::InstanceExtensions)
 Minitest::Spec.send(:include, Given::MiniTest::InstanceExtensions)
-Given.use_natural_assertions if Given::NATURAL_ASSERTIONS_SUPPORTED
+Given.use_natural_assertions

data/lib/given/module_methods.rb

@@ -1,11 +1,5 @@
 
 module Given
-  # Does this platform support natural assertions?
-  RBX_IN_USE = (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx')
-  JRUBY_IN_USE = defined?(JRUBY_VERSION)
-  OLD_JRUBY_IN_USE = JRUBY_IN_USE && (JRUBY_VERSION < '1.7.5')
-
-  NATURAL_ASSERTIONS_SUPPORTED = ! (OLD_JRUBY_IN_USE || RBX_IN_USE)
 
   def self.framework
     @_gvn_framework
@@ -28,7 +22,6 @@ module Given
   # There is a similar function in Extensions that works at a
   # describe or context scope.
   def self.use_natural_assertions(enabled=true)
-    ok_to_use_natural_assertions(enabled)
     @natural_assertions_enabled = enabled
   end
 
@@ -37,16 +30,6 @@ module Given
     @natural_assertions_enabled
   end
 
-  # Is is OK to use natural assertions on this platform.
-  #
-  # An error is raised if the the platform does not support natural
-  # assertions and the flag is attempting to enable them.
-  def self.ok_to_use_natural_assertions(enabled)
-    if enabled && ! NATURAL_ASSERTIONS_SUPPORTED
-      fail ArgumentError, "Natural Assertions are disabled for JRuby"
-    end
-  end
-
   # Return file and line number where the block is defined.
   def self.location_of(block)
     eval "[__FILE__, __LINE__]", block.binding

data/lib/given/natural_assertion.rb

@@ -2,12 +2,22 @@ require 'given/module_methods'
 require 'given/evaluator'
 require 'given/binary_operation'
 
-if Given::NATURAL_ASSERTIONS_SUPPORTED
-  require 'ripper'
-  require 'sorcerer'
-end
-
 module Given
+  NATURAL_ASSERTIONS_SUPPORTED = begin
+                                   require 'ripper'
+                                   require 'sorcerer'
+                                   true
+                                 rescue LoadError
+                                   # Expected on Rubinius & old JRuby
+                                   warn <<-WARNING.gsub(/^\s+/,'')
+                                     rspec-given: WARNING: Ripper is not available, so multi-line Then
+                                     statements will not be printed correctly and detailed failure
+                                     explanations of natural assertions WILL NOT be printed. Additionally,
+                                     assertions containing void statements (e.g. `Then { }`) will fail
+                                     in this runtime.
+                                   WARNING
+                                   false
+                                 end
 
   InvalidThenError = Class.new(StandardError)
 
@@ -23,15 +33,20 @@ module Given
     VOID_SEXP = [:void_stmt]
 
     def has_content?
+      return true unless NATURAL_ASSERTIONS_SUPPORTED
       assertion_sexp != VOID_SEXP
     end
 
     def message
       @output = "#{@clause_type} expression failed at #{source_line}\n"
-      @output << "Failing expression: #{source.strip}\n" if @clause_type != "Then"
-      explain_failure
-      display_pairs(expression_value_pairs)
-      @output << "\n"
+      if NATURAL_ASSERTIONS_SUPPORTED
+        @output << "Failing expression: #{source.strip}\n" if @clause_type != "Then"
+        explain_failure
+        display_pairs(expression_value_pairs)
+        @output << "\n"
+      else
+        @output << "Failing expression (possibly truncated): #{source.strip}\n"
+      end
       @output
     end
 
@@ -174,5 +189,4 @@ module Given
       "#{@code_file}:#{@code_line}"
     end
   end
-
 end

data/lib/given/rspec/all.rb

@@ -6,10 +6,8 @@ module RSpec
   end
 end
 
-if Given::NATURAL_ASSERTIONS_SUPPORTED
-  require 'given/rspec/monkey'
-  raise "Unsupported version of RSpec (#{RSpec::Version::STRING}), unable to detect assertions" unless RSpec::Given::MONKEY
-end
+require 'given/rspec/monkey'
+raise "Unsupported version of RSpec (#{RSpec::Version::STRING}), unable to detect assertions" unless RSpec::Given::MONKEY
 
 require 'given/rspec/have_failed'
 require 'given/rspec/before_extensions'

data/lib/given/rspec/configure.rb

@@ -15,6 +15,6 @@ RSpec.configure do |c|
     c.backtrace_clean_patterns << /lib\/rspec\/given/
   end
 
-  Given.use_natural_assertions if Given::NATURAL_ASSERTIONS_SUPPORTED
+  Given.use_natural_assertions
   Given.source_caching_disabled = false
 end

data/lib/given/version.rb

@@ -2,8 +2,8 @@
 module Given
   VERSION_NUMBERS = [
     VERSION_MAJOR = 3,
-    VERSION_MINOR = 7,
-    VERSION_BUILD = 1,
+    VERSION_MINOR = 8,
+    VERSION_BUILD = 0,
   ]
   VERSION = VERSION_NUMBERS.join(".")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: given_core
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.8.0
 platform: ruby
 authors:
 - Jim Weirich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorcerer
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: given
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Core engine for RSpec::Given and Minitest::Given.