mountain_berry_fields-magic_comments 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b16321bfcfcd96db10a6eba98e3b434c17af542c
+  data.tar.gz: f687ea2fc43944cf51f8043b6cea5e859b946567
+SHA512:
+  metadata.gz: 6d0bede3368a828927b6da04934e2334b391dcd964c31c7c798b0a62991094bde979590d517978b095ad8f93c5728735462b9742b5e9b6764859dfe2d0fdac87
+  data.tar.gz: 00120ec2785183453250048ee49b75b35a1113a75b603bc24194b94da15174b22cafdba50907caf40c23370969f917dd5f85fb490fc99ced8372826ce0a2a648

data/.travis.yml

@@ -1,4 +1,5 @@
 nguage: ruby
 rvm:
   - 1.9.3
+  - 2.0.0
 script: "bundle exec rake"

data/Gemfile

@@ -1,2 +1,2 @@
-source 'https://rubygems.org'
+source 'http://rubygems.org'
 gemspec

data/features/step_definitions/steps.rb

@@ -18,6 +18,11 @@ Then /^it exits with a status of (\d+), and a stderr of:$/ do |status, stderr|
   last_cmdline.stderr.chomp.should == interpret_curlies(stderr).chomp
 end
 
+Then /^it exits with a status of (\d+), and a stderr including:$/ do |status, stderr|
+  last_cmdline.exitstatus.should == status.to_i
+  last_cmdline.stderr.chomp.should include interpret_curlies(stderr).chomp
+end
+
 Then /^it prints nothing to (stdout|stderr)$/ do |descriptor|
   last_cmdline.send(descriptor).should == ''
 end

data/features/test_with_magic_comments.feature

@@ -22,6 +22,51 @@ Feature: Testing with :magic_comments
     More shit here
     """
 
+  Scenario: Passing magic comments, abbreviated
+    Given the file "Readme.mountain_berry_fields.md":
+    """
+    # Whatever
+
+      <% test 'lame Fibonacci', with: :magic_comments do %>
+      def fib(n)
+        if n <= 2
+          [1, 1]
+        else
+          series = fib(n-1)
+          series << series[-2] + series[-1]
+        end
+      end
+
+      fib(2)  # => [1, 1]
+      fib(4)  # => [1, 1, 2, 3]
+      fib(44) # => [1, 1, 2, 3, 5, 8, 13, ..., 433494437, 701408733]
+      fib(45) # => [1, 1, 2, 3, 5, 8, 13, ......
+      <% end %>
+
+    More shit here
+    """
+    When I run "mountain_berry_fields Readme.mountain_berry_fields.md"
+    Then it exits with a status of 0
+    And I see the file "Readme.md":
+    """
+    # Whatever
+
+      def fib(n)
+        if n <= 2
+          [1, 1]
+        else
+          series = fib(n-1)
+          series << series[-2] + series[-1]
+        end
+      end
+
+      fib(2)  # => [1, 1]
+      fib(4)  # => [1, 1, 2, 3]
+      fib(44) # => [1, 1, 2, 3, 5, 8, 13, ..., 433494437, 701408733]
+      fib(45) # => [1, 1, 2, 3, 5, 8, 13, ......
+
+    More shit here
+    """
 
   Scenario: Failing magic comments
     Given the file "Readme.mountain_berry_fields.md":
@@ -56,14 +101,9 @@ Feature: Testing with :magic_comments
     More shit here
     """
     When I run "mountain_berry_fields Readme.mountain_berry_fields.md"
-    Then it exits with a status of 1, and a stderr of:
+    Then it exits with a status of 1, and a stderr including:
     """
     FAILURE: basic addition
-    -:1: syntax error, unexpected '}'
-        } + { # => 12
-         ^
-
-    original file:
-        } + { # => 12
+    -:1: syntax error
     """
     And I do not see the file "Readme.md"

data/lib/mountain_berry_fields/test/magic_comments.rb

@@ -10,6 +10,7 @@ class MountainBerryFields
     #
     # Like that, but if the output isn't 3, then this will fail your test
     class MagicComments
+      ELLIPSIS_REGEX = /\s+\.{3,}\s*/
 
       Strategy.register :magic_comments, self
       include Strategy
@@ -52,7 +53,7 @@ class MountainBerryFields
 
       def pass?
         each_line_pair do |expected_line, actual_line|
-          return false unless normalize(expected_line) == normalize(actual_line)
+          return false unless lines_match?(expected_line, actual_line)
         end
         true
       end
@@ -67,8 +68,26 @@ class MountainBerryFields
           end
       end
 
-      def lines_match?(line1, line2)
-        normalize(line1) == normalize(line2)
+      def lines_match?(expected, actual)
+        if ELLIPSIS_REGEX.match(expected)
+          expected_regex = ellipses_to_wildcards_regex(normalize(expected))
+          expected_regex.match(actual)
+        else
+          normalize(expected) == normalize(actual)
+        end
+      end
+
+      # magic for " ..." in magic comments
+      #
+      # This translates a string with groups of three or more dots into a
+      # regular expression with the dot groups replaced by wildcards.
+      # For example, "Blah, blah, blah, ... and so on" is translated into
+      # /\ABlah\,\ blah\,\ blah,\.*and so on\z/.
+
+      def ellipses_to_wildcards_regex(line)
+        content_pieces = line.split(ELLIPSIS_REGEX, -1)
+                             .map(&Regexp.method(:escape))
+        /\A#{content_pieces.join('.*?')}\Z/
       end
 
       def normalize(line)

data/mountain_berry_fields-magic_comments.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "mountain_berry_fields-magic_comments"
   gem.require_paths = ["lib"]
-  gem.version       = '1.0.1'
+  gem.version       = '1.0.2'
 
   gem.add_runtime_dependency 'rcodetools',            '~> 0.8.5.0'
   gem.add_runtime_dependency 'deject',                '~> 0.2.2'

metadata

@@ -1,93 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: mountain_berry_fields-magic_comments
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Josh Cheek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-07 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcodetools
-  requirement: &70151123285680 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70151123285680
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.5.0
 - !ruby/object:Gem::Dependency
   name: deject
-  requirement: &70151123285200 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70151123285200
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: mountain_berry_fields
-  requirement: &70151123284740 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70151123284740
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: surrogate
-  requirement: &70151123284280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.1
   type: :development
   prerelease: false
-  version_requirements: *70151123284280
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70151123283820 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70151123283820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70151123283360 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70151123283360
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70151123282980 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70151123282980
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Test code samples embedded in files like readmes
 email:
 - josh.cheek@gmail.com
@@ -111,27 +131,26 @@ files:
 - spec/test/magic_comments_spec.rb
 homepage: https://github.com/JoshCheek/mountain_berry_fields-magic_comments
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Test code samples embedded in files like readmes
 test_files:
 - features/step_definitions/steps.rb