macros4cuke 0.5.03 → 0.5.06

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTA1NWJhMjkxZGJhMjA3MTExOTNkOTEyYmYzNWNhYjJkYjkxYTllNA==
+    YTZhNThhYzQ3YzBlZjI4NjQwOGZkYzRlMTVkZTk4ODFjZTEzZjE1OQ==
   data.tar.gz: !binary |-
-    ODRlMTdiNDAyM2JhMTUwNmU0ZjVmZjcwOTBhYjY3MDA0NDhkMzQwNg==
+    ZDZjNzBjOGVjZGJlNTc3YjY3ZmYwMTI1OTkzYTk4MzRiOWQ2ODA5Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODAzYWYyNWYzNGFlOTA2N2NmYzBlYmZkZWIwZWE2NTI2M2YyMmJiNjA2MzQx
-    NzhlMGVhNDg4NzBjOGE3YThkYTRhMTExNjZlNzZlMzA2Y2IxODQ0ZGY5MTIy
-    ZjBiNjhkMWVhYzAxNjU0MGRkNGFiMGMwYWMwNmEwY2IzZTExOTY=
+    MTFhZTcxYzVjOGJiMzlkODcyYzM0ZDk0YzEyYzQ5OWU4MjdkMzRiNjRlMWMx
+    OGYyZDhlMmMxNDY2ZjZkNzNhYTJlMWI2N2EyZGU2Y2E1ZmQ4ZDhjNDVmMjhk
+    OWUzZTJhYjY1NGFiMWY4YjRlZTk5MjExYzllZTMyZTBlMmEzMjY=
   data.tar.gz: !binary |-
-    ZTY1MTE5MzM3OTQ1MmIyMzg5ZjU4ZTJmYzM5ODM3YzU1MmRkZTRkZGZlNWUy
-    ZjczOGExNTA3NDg3MzY2NWJlYzMxNjE4ZGRiYzY3ZmU2YzA4OGE1OWNjZTA3
-    ZDBkOGI5Y2YwZjZmZmY3MTExMTY2YTdjMjNjYTU2ODBlMWMxMGY=
+    MzNhYTViYTA2MDRkMWZkZjExYTk3Y2RlN2Q1Y2YwMGUzMWU4MWEwZDdkOWNm
+    OTE3NzQ0Y2M2NzY3ZmE3ZmNmNzk0N2I1NTA3NWE5OTU1NmEwODBhYTM0ZTdh
+    NWEyN2M1NjNiZWZhZGE5NDZhMzY0MGFmNzI1ODRlOTQ4YTlhZTE=

data/.rubocop.yml

@@ -1,8 +1,8 @@
 AllCops:
-  Excludes:
-    - '*/examples/**'
-    - '*/features/**'
-    - '*/gems/**'
+  Exclude:
+    - 'examples/**/*'
+    - 'features/**/*'
+    - 'gems/**/*'
 
 # This is disabled because some demos use UTF-8
 AsciiComments:
@@ -47,7 +47,10 @@ IndentationWidth :
 # Avoid methods longer than 50 lines of code
 MethodLength:
   Max: 50
-  CountComments: false
+  CountComments: false 
+ 
+NonNilCheck:
+  Enabled: false
 
 NumericLiterals:
   Enabled: false

data/.travis.yml

@@ -6,7 +6,6 @@ rvm:
   - 1.9.2
   - jruby-19mode
   - jruby-head
-  - rbx
 
 # Workaround issue of jruby-head configuration on Travis CI 
 matrix:

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+### 0.5.06 / 2014-06-30
+* [CHANGE] Spec files upgraded to RSpec3.x.x
+* [CHANGE] File `Gemfile` updated with dependency on RSpec3
+* [CHANGE] File `macros4cuke.gemspec` updated with dependency on RSpec3
+
+
+### 0.5.05 / 2014-06-30
+* [CHANGE] Many files updated for Rubocop 0.24.0. There remain 4 Rubocop offenses.
+
+
+### 0.5.04 / 2014-04-07
+* [CHANGE] File `.rubocop.yml`: Updated for Rubocop 0.20.1. NonNilCheck cop disabled.
+
+
 ### 0.5.03 / 2014-04-01
 * [CHANGE] File `README.md`: Updated the installation steps.
 * [CHANGE] Files `macro_support.rb` renamed to `use_macros4cuke.rb`

data/Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 # Prevent Bundler to load the dependencies from our .gemspec file
 
-gem "cucumber", [">= 0.5.0"]
+gem 'cucumber', [">= 0.5.0"]
 
 group :development do
-  gem "rake",  ">= 0.8.0" 
-  gem "rspec", ">= 2.11.0"
-  gem "simplecov", ">= 0.5.0"
+  gem 'rake',  '>= 0.8.0' 
+  gem 'rspec', '>= 3.0.0'
+  gem 'simplecov', '>= 0.5.0'
 end

data/Rakefile

@@ -17,18 +17,24 @@ require 'cucumber/rake/task'
 # UGLY workaround for bug in Cucumber's rake task
 if Gem::VERSION[0].to_i >= 2 && Cucumber::VERSION <= '1.3.2'
   # Monkey-patch a buggy method
-  class Cucumber::Rake::Task::ForkedCucumberRunner
-    def gem_available?(gemname)
-      if Gem::VERSION[0].to_i >= 2 
-        gem_available_new_rubygems?(gemname)
-      else
-        gem_available_old_rubygems?(gemname)
-      end
-    end  
-  end # class
+  module Cucumber
+    module Rake
+      class Task
+        class ForkedCucumberRunner
+          def gem_available?(gemname)
+            if Gem::VERSION[0].to_i >= 2 
+              gem_available_new_rubygems?(gemname)
+            else
+              gem_available_old_rubygems?(gemname)
+            end
+          end  
+        end # class
+      end # class
+    end # module
+  end # module
 end
 
-Cucumber::Rake::Task.new do |t|
+Cucumber::Rake::Task.new do |_|
 end
 
 # RSpec as testing tool
@@ -41,10 +47,10 @@ end
 
 # Combine RSpec and Cucumber tests
 desc 'Run tests, with RSpec and Cucumber'
-task :test => [:spec, :cucumber]
+task test: [:spec, :cucumber]
 
 
 # Default rake task
-task :default => :test
+task default: :test
 
-# End of file
+# End of file

data/features/step_definitions/demo_steps.rb

@@ -2,22 +2,26 @@
 # A few step definitions for demo and testing purpose.
 
 When(/^I landed in the homepage$/) do
-  #trace_steps << 'Invoked step: ... I landed in the homepage'
+  # trace_steps << 'Invoked step: ... I landed in the homepage'
 end
 
 When(/^I click "([^"]*)"$/) do |element|
-  #trace_steps << "Invoked step: ... I click \"#{element}\""
+  msg = 'Invoked step: ... I click '
+  msg << "\"#{element}\""
+  # trace_steps << msg
 end
 
 
 When(/^I fill in "(.*?)" with "(.*?)"$/) do |element, text|
-  #trace_steps << "Invoked step: ... I fill in \"#{element}\" with \"#{text}\""
+  msg = "Invoked step: ... I fill in \"#{element}\" with "
+  msg << "\"#{text}\""
+  # trace_steps << msg
 end
 
 
 Then(/^I expect the following step trace:$/) do |step_text|
-  #trace_steps.should == step_text.split(/\r?\n|\n/)
-  substeps_trace.chomp.should == step_text
+  # trace_steps.should == step_text.split(/\r?\n|\n/)
+  expect(substeps_trace.chomp).to eq(step_text)
 end
 
 
@@ -34,7 +38,7 @@ SNIPPET
   rescue Macros4Cuke::DataTableNotFound => exc
     phrase = '[fill in the form with]:'
     msg = "The step with phrase #{phrase} requires a data table."
-    exc.message.should == msg
+    expect(exc.message).to eq(msg)
   end
 end
 

data/features/support/my_formatter.rb

@@ -0,0 +1,25 @@
+module Macros4Cuke # Module used as a namespace
+
+require 'pp'
+
+class MyFormatter
+  attr_reader(:ostream)
+
+  def initialize(_, io, _)
+    @ostream = io
+  end
+  
+  
+  def step_name(_, step_match, _, _, _, _)
+    pp step_match
+    pp step_match.instance_variables
+    
+    # Returns a Cucumber::RbSupport::RbStepDefinition
+    pp step_match.instance_variable_get(:@step_definition).class
+    pp step_match.instance_variable_get(:@step_definition).object_id
+    pp step_match.instance_variable_get(:@name_to_match)
+    pp step_match.instance_variable_get(:@step_arguments)
+  end
+end # class
+
+end # module

data/lib/macro_steps.rb

@@ -47,7 +47,7 @@ end
 #  |password|unguessable|
 When(/^I \[([^\]]+)\]:$/) do |macro_phrase, table_argument|
   # Ensure that the second argument is of the correct type
-  unless table_argument.kind_of?(Cucumber::Ast::Table)
+  unless table_argument.is_a?(Cucumber::Ast::Table)
     fail(Macros4Cuke::DataTableNotFound.new(macro_phrase))
   end
 

data/lib/macros4cuke/application.rb

@@ -19,10 +19,10 @@ class Application
   # Entry point for the application object.
   def run!(theCmdLineArgs)
     @options = options_from(theCmdLineArgs)
-    if options[:setup]
-      options[:setup].each do |a_path|
-        setup_project(a_path)
-      end
+    return unless options[:setup]
+    
+    options[:setup].each do |a_path|
+      setup_project(a_path)
     end
   end
 
@@ -46,7 +46,8 @@ class Application
     begin
       fail SupportFileExists.new(destination) if File.exist?(destination)
 
-      template_pathname = Macros4Cuke::RootDir + 'templates/use_macros4cuke.erb'
+      template_pathname =
+        Macros4Cuke::RootDir + 'templates/use_macros4cuke.erb'
       template = File.read(template_pathname)
 
 
@@ -62,6 +63,7 @@ class Application
       # Write file contents to file in binary mode in order to avoid eol
       # consisting of CRLF
       File.open(destination, 'wb') { |theFile| theFile.write(file_text) }
+
     rescue Macros4Cuke::CmdLineError => exc
       $stderr.puts exc.message
       exit

data/lib/macros4cuke/cli/cmd-line.rb

@@ -114,7 +114,7 @@ EOS
   def validated_feature_path(theProjectPath)
     dirs = [theProjectPath, 'features', 'support']
     feature_path = dirs.reduce(Pathname.getwd) do |path, dir_name|
-      path = path + dir_name
+      path += dir_name
       unless path.exist?
         fail DirectoryNotFound.new(path.relative_path_from(Pathname.getwd))
       end

data/lib/macros4cuke/coll-walker-factory.rb

@@ -103,7 +103,7 @@ class CollWalkerFactory
   end
 
 
-    # Generate an on_section event
+  # Generate an on_section event
   def emit_on_section(current_node, nesting_level, backlog)
     backlog.unshift(StringNode.new(:on_section_end, nil))
     add_children(current_node.children, backlog)

data/lib/macros4cuke/constants.rb

@@ -3,7 +3,7 @@
 
 module Macros4Cuke # Module used as a namespace
   # The version number of the gem.
-  Version = '0.5.03'
+  Version = '0.5.06'
 
   # Brief description of the gem.
   Description = 'Add your own macro-steps to Cucumber scenarios'
@@ -11,8 +11,8 @@ module Macros4Cuke # Module used as a namespace
   # Constant Macros4Cuke::RootDir contains the absolute path of Macro4Cuke's
   # root directory. Note: it also ends with a slash character.
   unless defined?(RootDir)
-  # The initialisation of constant RootDir is guarded in order
-  # to avoid multiple initialisation (not allowed for constants)
+    # The initialisation of constant RootDir is guarded in order
+    # to avoid multiple initialisation (not allowed for constants)
 
     # The root folder of Macros4Cuke.
     RootDir = begin

data/lib/macros4cuke/formatter/all-notifications.rb

@@ -21,7 +21,7 @@ module Formatter
     :on_placeholder,
     :on_section,
     :on_section_end
-    ]
+  ]
 
 end # module
 

data/lib/macros4cuke/formatter/to-gherkin.rb

@@ -28,9 +28,9 @@ class ToGherkin
     return [:on_collection, :on_step, :on_step_end, :on_phrase, :on_source]
   end
 
-  def on_collection(aLevel, aMacroCollection)
+  def on_collection(_, _)
     io.print "# Feature file generated by Macro4Cuke #{Macros4Cuke::Version}"
-    io.puts  " on #{Time.now.strftime('%d/%m/%Y %H:%M:%S')}"
+    io.puts " on #{Time.now.strftime('%d/%m/%Y %H:%M:%S')}"
     io.puts ''
     io.puts 'Feature: the set of macro-step definitions'
     io.puts "#{indentation(1)}As a feature file writer"
@@ -38,12 +38,12 @@ class ToGherkin
     io.puts ''
   end
 
-  def on_step(aLevel, aMacroStep)
+  def on_step(aLevel, _)
     @step_count += 1
     io.puts "#{indentation(aLevel)}Scenario: Macro #{step_count}"
   end
 
-  def on_step_end(aLevel)
+  def on_step_end(_)
     io.puts ''
   end
 

data/lib/macros4cuke/formatter/to-null.rb

@@ -21,59 +21,59 @@ class ToNull
     return Formatter::AllNotifications
   end
 
-  def on_collection(aLevel, aMacroCollection)
+  def on_collection(_, _)
     ; # Do nothing
   end
 
-  def on_collection_end(aLevel)
+  def on_collection_end(_)
     ; # Do nothing
   end
 
-  def on_step(aLevel, aMacroStep)
+  def on_step(_, _)
     ; # Do nothing
   end
 
-  def on_step_end(aLevel)
+  def on_step_end(_)
     ; # Do nothing
   end
 
-  def on_phrase(aLevel, aPhraseText, useTable)
+  def on_phrase(_, _, _)
     ; # Do nothing
   end
 
-  def on_renderer(aLevel, aRenderer)
+  def on_renderer(_, _)
     ; # Do nothing
   end
 
-  def on_renderer_end(aLevel)
+  def on_renderer_end(_)
     ; # Do nothing
   end
 
-  def on_source(aLevel, aSourceText)
+  def on_source(_, _)
     ; # Do nothing
   end
 
-  def on_static_text(aLevel, aText)
+  def on_static_text(_, _)
     ; # Do nothing
   end
 
-  def on_comment(aLevel, aComment)
+  def on_comment(_, _)
     ; # Do nothing
   end
 
-  def on_eol(aLevel)
+  def on_eol(_)
     ; # Do nothing
   end
 
-  def on_placeholder(aLevel, aPlaceHolderName)
+  def on_placeholder(_, _)
     ; # Do nothing
   end
 
-  def on_section(aLevel, aSectionName)
+  def on_section(_, _)
     ; # Do Nothing
   end
 
-  def on_section_end(aLevel)
+  def on_section_end(_)
     ; # Do Nothing
   end
 

data/lib/macros4cuke/formatter/to-trace.rb

@@ -26,7 +26,7 @@ class ToTrace
     return Formatter::AllNotifications
   end
 
-  def on_collection(aLevel, aMacroCollection)
+  def on_collection(aLevel, _)
     trace_event(aLevel, __method__)
   end
 
@@ -34,7 +34,7 @@ class ToTrace
     trace_event(aLevel, __method__)
   end
 
-  def on_step(aLevel, aMacroStep)
+  def on_step(aLevel, _)
     trace_event(aLevel, __method__)
   end
 
@@ -42,11 +42,11 @@ class ToTrace
     trace_event(aLevel, __method__)
   end
 
-  def on_phrase(aLevel, aPhraseText, useTable)
+  def on_phrase(aLevel, _,  _)
     trace_event(aLevel, __method__)
   end
 
-  def on_renderer(aLevel, aRenderer)
+  def on_renderer(aLevel, _)
     trace_event(aLevel, __method__)
   end
 
@@ -54,15 +54,15 @@ class ToTrace
     trace_event(aLevel, __method__)
   end
 
-  def on_source(aLevel, aSourceText)
+  def on_source(aLevel, _)
     trace_event(aLevel, __method__)
   end
 
-  def on_static_text(aLevel, aStaticText)
+  def on_static_text(aLevel, _)
     trace_event(aLevel, __method__)
   end
 
-  def on_comment(aLevel, aComment)
+  def on_comment(aLevel, _)
     trace_event(aLevel, __method__)
   end
 
@@ -70,11 +70,11 @@ class ToTrace
     trace_event(aLevel, __method__)
   end
 
-  def on_placeholder(aLevel, aPlaceHolderName)
+  def on_placeholder(aLevel, _)
     trace_event(aLevel, __method__)
   end
 
-  def on_section(aLevel, aSectionName)
+  def on_section(aLevel, _)
     trace_event(aLevel, __method__)
   end
 

data/lib/macros4cuke/formatting-service.rb

@@ -1,5 +1,5 @@
 # File: formatting-service.rb
-# Purpose: Implementation of the WalkEventPublisher class.
+# Purpose: Implementation of the FormattingService class.
 
 require_relative 'exceptions'
 require_relative 'coll-walker-factory'
@@ -39,9 +39,9 @@ class FormattingService
 
     # Check that each event from the event list the formatter is known.
     supported_events.each do |event|
-      unless Formatter::AllNotifications.include? event
-        fail(UnknownFormattingEvent.new(aFormatter, event))
-      end
+      next if Formatter::AllNotifications.include? event
+      
+      fail(UnknownFormattingEvent.new(aFormatter, event))
     end
 
     formatters << aFormatter
@@ -58,11 +58,11 @@ class FormattingService
       # Notify each formatter of the visit event.
       formatters.each do |fmt|
         accepted_notifications = fmt.implements
-        if accepted_notifications.include? msg
-          # Assumption: all nil argument(s) are at the end
-          arg_vector = visit_event[2..-1].reject { |an_arg| an_arg.nil? }
-          fmt.send(msg, nesting_level, *arg_vector)
-        end
+        next unless accepted_notifications.include? msg
+        
+        # Assumption: all nil argument(s) are at the end
+        arg_vector = visit_event[2..-1].reject { |an_arg| an_arg.nil? }
+        fmt.send(msg, nesting_level, *arg_vector)
       end
     end
   end

data/lib/macros4cuke/macro-step.rb

@@ -145,7 +145,7 @@ class MacroStep
       rawData.each do |a_row|
         (a_key, value) = validate_row(a_row, macro_parameters)
         if macro_parameters.include? a_key
-          if macro_parameters[a_key].kind_of?(Array)
+          if macro_parameters[a_key].is_a?(Array)
             macro_parameters[a_key] << value
           else
             macro_parameters[a_key] = [macro_parameters[a_key], value]
@@ -206,18 +206,17 @@ class MacroStep
   def validate_phrase_args(thePhraseArgs, substepsVars)
     # Error when the phrase names an argument that never occurs in the substeps
     thePhraseArgs.each do |phrase_arg|
-      unless substepsVars.include? phrase_arg
-        fail(UselessPhraseArgument.new(phrase_arg))
-      end
+      next if substepsVars.include? phrase_arg
+      fail(UselessPhraseArgument.new(phrase_arg))
     end
     # Error when a substep has an argument that never appears in the phrase
     # and the macro-step does not use data table.
     unless use_table?
       substepsVars.each do |substep_arg|
-        unless thePhraseArgs.include?(substep_arg) ||
+        next if thePhraseArgs.include?(substep_arg) ||
         BuiltinParameters.include?(substep_arg)
-          fail(UnreachableSubstepArgument.new(substep_arg))
-        end
+        
+        fail(UnreachableSubstepArgument.new(substep_arg))
       end
     end
 

data/lib/macros4cuke/templating/comment.rb

@@ -30,7 +30,7 @@ class Comment
   # Cucumber::RbSupport::RbWorld#steps complains when it sees a comment.
   # This method has the same signature as the {Engine#render} method.
   # @return [String] Empty string ("as is")
-  def render(aContextObject, theLocals)
+  def render(_, _)
     return ''
   end
 end # class

data/lib/macros4cuke/templating/engine.rb

@@ -4,6 +4,9 @@
 require 'strscan' # Use the StringScanner for lexical analysis.
 require_relative '../exceptions' # Load the custom exception classes.
 
+require_relative 'static-text'
+require_relative 'eo-line'
+require_relative 'comment'
 require_relative 'template-element'
 require_relative 'placeholder'
 require_relative 'section'  # Load the Section and ConditionalSection
@@ -16,76 +19,6 @@ module Macros4Cuke # Module used as a namespace
 # used internally in Macros4Cuke.
 module Templating
 
-# Class used internally by the template engine.
-# Represents a static piece of text from a template.
-# A static text is a text that is reproduced verbatim
-# when rendering a template.
-class StaticText
-  # The static text extracted from the original template.
-  attr_reader(:source)
-
-
-  # @param aSourceText [String] A piece of text extracted
-  #   from the template that must be rendered verbatim.
-  def initialize(aSourceText)
-    @source = aSourceText
-  end
-
-  public
-
-  # Render the static text.
-  # This method has the same signature as the {Engine#render} method.
-  # @return [String] Static text is returned verbatim ("as is")
-  def render(aContextObject, theLocals)
-    return source
-  end
-end # class
-
-
-# Class used internally by the template engine.
-# Represents a comment from a template.
-# A static text is a text that is reproduced verbatim
-# when rendering a template.
-class Comment
-  # The comment as extracted from the original template.
-  attr_reader(:source)
-
-
-  # @param aSourceText [String] A piece of text extracted
-  #   from the template that must be rendered verbatim.
-  def initialize(aSourceText)
-    @source = aSourceText
-  end
-
-  public
-
-  # Render the comment.
-  # Comments are rendered as empty text. This is necessary because
-  # Cucumber::RbSupport::RbWorld#steps complains when it sees a comment.
-  # This method has the same signature as the {Engine#render} method.
-  # @return [String] Empty string ("as is")
-  def render(aContextObject, theLocals)
-    return ''
-  end
-end # class
-
-
-# Class used internally by the template engine.
-# Represents an end of line that must be rendered as such.
-class EOLine
-
-  public
-
-  # Render an end of line.
-  # This method has the same signature as the {Engine#render} method.
-  # @return [String] An end of line marker. Its exact value is OS-dependent.
-  def render(aContextObject, theLocals)
-    return "\n"
-  end
-end # class
-
-
-
 # A very simple implementation of a templating engine.
 # Earlier versions of Macros4Cuke relied on the logic-less
 # Mustache template engine.
@@ -168,7 +101,7 @@ class Engine
             subResult.concat(element.variables)
 
           else
-            # Do nothing
+          # Do nothing
         end
       end
 
@@ -213,7 +146,7 @@ class Engine
   def self.identify_parse_error(aTextLine)
     # Unsuccessful scanning: we typically have improperly balanced chevrons.
     # We will analyze the opening and closing chevrons...
-     # First: replace escaped chevron(s)
+    # First: replace escaped chevron(s)
     no_escaped = aTextLine.gsub(/\\[<>]/, '--')
 
     # var. equals count_of(<) -  count_of(>): can only be 0 or temporarily 1
@@ -243,9 +176,9 @@ class Engine
       line_items = self.class.parse(line)
       line_items.each do |(kind, text)|
         # A tag text cannot be empty nor blank
-        if (kind == :dynamic) && text.strip.empty?
-          fail(EmptyArgumentError.new(line.strip))
-        end
+        next if (kind != :dynamic) || !text.strip.empty?
+        
+        fail(EmptyArgumentError.new(line.strip))
       end
 
       line_items

data/lib/macros4cuke/templating/eo-line.rb

@@ -18,7 +18,7 @@ class EOLine
   # Render an end of line.
   # This method has the same signature as the {Engine#render} method.
   # @return [String] An end of line marker. Its exact value is OS-dependent.
-  def render(aContextObject, theLocals)
+  def render(_, _)
     return "\n"
   end
 end # class

data/lib/macros4cuke/templating/section.rb

@@ -42,7 +42,7 @@ class Section  < UnaryElement
         when Section
           subResult.concat(a_child.variables)
         else
-          # Do nothing
+        # Do nothing
       end
     end
 
@@ -54,7 +54,7 @@ class Section  < UnaryElement
   # This method has the same signature as the {Engine#render} method.
   # @return [String] The text value assigned to the placeholder.
   #   Returns an empty string when no value is assigned to the placeholder.
-  def render(aContextObject, theLocals)
+  def render(_, _)
     msg = "Method Section.#{__method__} must be implemented in subclass."
     fail(NotImplementedError, msg)
   end

data/lib/macros4cuke/templating/static-text.rb

@@ -28,7 +28,7 @@ class StaticText
   # Render the static text.
   # This method has the same signature as the {Engine#render} method.
   # @return [String] Static text is returned verbatim ("as is")
-  def render(aContextObject, theLocals)
+  def render(_, _)
     return source
   end
 end # class

data/spec/macros4cuke/application_spec.rb

@@ -75,7 +75,7 @@ describe Application do
       file_name = 'use_macros4cuke.rb'
       
       subject.run!(%w(--setup ./test_dir))
-      expect(File.exist?(file_path + '/' + file_name)).to be_true
+      expect(File.exist?(file_path + '/' + file_name)).to be true
       
       File.delete(file_path + '/' + file_name)
       delete_dirs(file_path)
@@ -87,14 +87,14 @@ describe Application do
       file_path = '/test_dir/features/support'
       file_name = 'use_macros4cuke.rb'
       args = %w(--setup ./test_dir)
-      my_dir = File.dirname(__FILE__)
+      mydir = File.dirname(__FILE__)
       
       expect { subject.run!(args) }.not_to raise_error
       
       hijack_stderr
       err_msg = <<-MSG_END
 Error in command-line:
-The file '#{my_dir}/test_dir/features/support/use_macros4cuke.rb' already exists.
+The file '#{mydir}/test_dir/features/support/use_macros4cuke.rb' already exists.
 MSG_END
 
       expect { subject.run!(args) }.to raise_error(SystemExit)

data/spec/macros4cuke/cli/cmd-line_spec.rb

@@ -152,7 +152,7 @@ END_MESSAGE
       restore_stderr
     end
    
-    it "should complain when project to setup does'nt exist" do
+    it "should complain when project to setup doesn't exist" do
       hijack_stderr
       err_msg =  <<-END_MESSAGE
 Error in command-line:

data/spec/macros4cuke/coll-walker-factory_spec.rb

@@ -20,7 +20,7 @@ describe CollWalkerFactory do
   end
 
   after(:all) do
-  # Clear the collection to prevent interference between spec files
+    # Clear the collection to prevent interference between spec files
     macro_coll.clear
   end
 
@@ -165,7 +165,7 @@ describe CollWalkerFactory do
       second_step = macro_coll.macro_steps.values[1]
       substep_chunks = second_step.renderer.representation.dup
       substep_chunks.map! do |ck|
-        if ck.kind_of?(Templating::Section)
+        if ck.is_a?(Templating::Section)
           [ck, ck.children, ck].flatten
         else
           ck
@@ -241,7 +241,7 @@ describe CollWalkerFactory do
         actual = subject.next
         expect(actual[0]).to eq(event[0])
         expect(actual[1]).to eq(event[1])
-        unless event[2].nil?
+        if event[2]
           expected_obj = substep_chunks[i + 1]
           expect(actual[2]).to eq(expected_obj.send(event[2]))
         end
@@ -256,7 +256,7 @@ describe CollWalkerFactory do
       first_step.renderer.representation.insert(2, :not_a_valid_element)
       err_type = Macros4Cuke::InternalError
       err_msg = "Don't know how to format a Symbol."
-      expect { subject.each { |x| } }.to raise_error(err_type, err_msg)
+      expect { subject.each { |_| } }.to raise_error(err_type, err_msg)
     end
 
   end # context

data/spec/macros4cuke/formatter/to-gherkin_spec.rb

@@ -29,7 +29,7 @@ describe ToGherkin do
   end
 
   after(:all) do
-  # Clear the collection to prevent interference between spec files
+    # Clear the collection to prevent interference between spec files
     macro_coll.clear
   end
 

data/spec/macros4cuke/formatter/to-null_spec.rb

@@ -23,7 +23,7 @@ describe ToNull do
   end
 
   after(:all) do
-  # Clear the collection to prevent interference between spec files
+    # Clear the collection to prevent interference between spec files
     macro_coll.clear
   end
 

data/spec/macros4cuke/formatter/to-trace_spec.rb

@@ -26,7 +26,7 @@ describe ToTrace do
   end
 
   after(:all) do
-  # Clear the collection to prevent interference between spec files
+    # Clear the collection to prevent interference between spec files
     macro_coll.clear
   end
 

data/spec/macros4cuke/formatting-service_spec.rb

@@ -23,7 +23,7 @@ describe FormattingService do
   end
 
   after(:all) do
-  # Clear the collection to prevent interference between spec files
+    # Clear the collection to prevent interference between spec files
     macro_coll.clear
   end
 
@@ -34,7 +34,7 @@ describe FormattingService do
     end
 
     it 'has no formatter at start' do
-      expect(subject).to have(0).formatters
+      expect(subject.formatters).to be_empty
     end
 
   end # context
@@ -43,23 +43,23 @@ describe FormattingService do
   context 'Provided services:' do
     it 'should know its registered formatter(s)' do
       formatter1 = double('fake_one')
-      formatter1.should_receive(:implements).once.and_return([:on_collection])
+      expect(formatter1).to receive(:implements).once.and_return([:on_collection])
       subject.register(formatter1)
-      expect(subject).to have(1).formatters
+      expect(subject.formatters.size).to eq(1)
 
       formatter2 = double('fake_two')
-      formatter2.should_receive(:implements).once.and_return([:on_step])
+      expect(formatter2).to receive(:implements).once.and_return([:on_step])
       subject.register(formatter2)
-      expect(subject).to have(2).formatters
+      expect(subject.formatters.size).to eq(2)
 
       expect(subject.formatters).to eq([formatter1, formatter2])
     end
 
     it "should complain when a formatter doesn't implement notifications" do
       formatter1 = double('formatter')
-      formatter1.should_receive(:implements).once.and_return([])
+      expect(formatter1).to receive(:implements).once.and_return([])
       err_type = Macros4Cuke::NoFormattingEventForFormatter
-      err_msg = 'Formatter RSpec::Mocks::Mock does not'\
+      err_msg = 'Formatter RSpec::Mocks::Double does not'\
       ' support any formatting event.'
       expect { subject.register(formatter1) }.to raise_error(err_type, err_msg)
     end
@@ -73,9 +73,9 @@ describe FormattingService do
         :on_step_end
       ]
       formatter = double('formatter')
-      formatter.should_receive(:implements).once.and_return(notifications)
+      expect(formatter).to receive(:implements).once.and_return(notifications)
       err_type = Macros4Cuke::UnknownFormattingEvent
-      err_msg = "Formatter RSpec::Mocks::Mock uses\
+      err_msg = "Formatter RSpec::Mocks::Double uses\
  the unknown formatting event 'non_standard'."
       expect { subject.register(formatter) }.to raise_error(err_type, err_msg)
     end
@@ -89,28 +89,28 @@ describe FormattingService do
         :on_step,
         :on_step_end
       ]
-      formatter1.should_receive(:implements)
+      expect(formatter1).to receive(:implements)
         .at_least(69).times
         .and_return(supported_notifications)
       subject.register(formatter1)
 
       # Test the notifications send to the formatter
-      formatter1.should_receive(:on_collection).once do |level, coll|
+      expect(formatter1).to receive(:on_collection).once do |level, coll|
         expect(level).to eq(0)
         expect(coll).to eq(macro_coll)
       end
 
-      formatter1.should_receive(:on_step).twice do |level, a_step|
+      expect(formatter1).to receive(:on_step).twice do |level, a_step|
         expect(level).to eq(1)
         expect(macro_coll.macro_steps.values).to include(a_step)
       end
 
-      formatter1.should_receive(:on_step_end).twice do |level, arg|
+      expect(formatter1).to receive(:on_step_end).twice do |level, arg|
         expect(level).to eq(1)
         expect(arg).to be_nil
       end
 
-      formatter1.should_receive(:on_collection_end).once do |level, arg|
+      expect(formatter1).to receive(:on_collection_end).once do |level, arg|
         expect(level).to eq(0)
         expect(arg).to be_nil
       end
@@ -120,7 +120,7 @@ describe FormattingService do
     it 'should support multiple formatters' do
       formatter1 = double('formatter')
       supported_notifications = [:on_collection]
-      formatter1.should_receive(:implements)
+      expect(formatter1).to receive(:implements)
         .at_least(69 * 3).times
         .and_return(supported_notifications)
 
@@ -128,7 +128,7 @@ describe FormattingService do
       3.times { subject.register(formatter1) }
 
       # ... then the collection is formatted three times
-      formatter1.should_receive(:on_collection).at_least(3).times
+      expect(formatter1).to receive(:on_collection).at_least(3).times
       subject.start!(macro_coll)
     end
   end # context

data/spec/macros4cuke/macro-collection_spec.rb

@@ -39,7 +39,7 @@ SNIPPET
       phrase = '[enter my credentials]'
       args = [phrase, sample_substeps, true]
       expect { singleton.add_macro(*args) }.not_to raise_error
-      expect(singleton).to have(1).macro_steps
+      expect(singleton.macro_steps.size).to eq(1)
 
       # Error case: inserting another macro with same phrase.
       msg = "A macro-step with phrase '[enter my credentials]' already exists."

data/spec/macros4cuke/macro-step_spec.rb

@@ -72,7 +72,7 @@ SNIPPET
 
   context 'Provided services:' do
 
-    let(:phrase_instance) { %Q(enter my credentials as "nobody") }
+    let(:phrase_instance) { 'enter my credentials as "nobody"' }
     it 'should render the substeps' do
       text = subject.expand(phrase_instance, [ %w(password no-secret) ])
       expectation = <<-SNIPPET
@@ -101,7 +101,7 @@ SNIPPET
     end
 
     it 'should un-escape the double-quotes for phrase arguments' do
-      specific_phrase = %q(enter my credentials as "quotable\"")
+      specific_phrase = 'enter my credentials as "quotable\""'
       text = subject.expand(specific_phrase, [ %w(password no-secret) ])
       expectation = <<-SNIPPET
   Given I landed in the homepage
@@ -126,7 +126,7 @@ SNIPPET
 
     it 'should complain when argument gets a value from phrase and table' do
       # Error case: there is no macro argument called <unknown>
-      phrase = %Q(enter my credentials as "nobody")
+      phrase = 'enter my credentials as "nobody"'
       msg = "The macro argument 'userid' has value 'nobody' and 'someone'."
       args = [ %w(userid someone), %w(password no-secret) ]
       expect { subject.expand(phrase, args) }.to raise_error(

data/spec/macros4cuke/templating/engine_spec.rb

@@ -65,7 +65,7 @@ SNIPPET
 
       # Expectation: an array with one couple:
       # [:static, the source text]
-      expect(result).to have(1).items
+      expect(result.size).to eq(1)
       expect(result[0]).to eq([:static, sample_text])
     end
 
@@ -75,7 +75,7 @@ SNIPPET
 
       # Expectation: an array with one couple:
       # [:static, the source text]
-      expect(result).to have(1).items
+      expect(result.size).to eq(1)
       expect(result[0]).to eq([:dynamic, strip_chevrons(sample_text)])
     end
 
@@ -85,7 +85,7 @@ SNIPPET
 
       # Expectation: an array with two couples:
       # [dynamic, 'some_tag'][:static, some text]
-      expect(result).to have(2).items
+      expect(result.size).to eq(2)
       expect(result[0]).to eq([:dynamic, 'some_tag'])
       expect(result[1]).to eq([:static,  'some text'])
     end
@@ -96,7 +96,7 @@ SNIPPET
 
       # Expectation: an array with two couples:
       # [:static, some text] [dynamic, 'some_tag']
-      expect(result).to have(2).items
+      expect(result.size).to eq(2)
       expect(result[0]).to eq([:static,  'some text'])
       expect(result[1]).to eq([:dynamic, 'some_tag'])
     end
@@ -106,7 +106,7 @@ SNIPPET
       result = Engine.parse(sample_text)
 
       # Expectation: an array with three couples:
-      expect(result).to have(3).items
+      expect(result.size).to eq(3)
       expect(result[0]).to eq([:static,  'begin '])
       expect(result[1]).to eq([:dynamic, 'some_tag'])
       expect(result[2]).to eq([:static,  ' end'])
@@ -117,19 +117,19 @@ SNIPPET
       result = Engine.parse(sample_text)
 
       # Expectation: an array with items couples:
-      expect(result).to have(5).items
-      expect(result[0]).to eq([:static ,  'begin '])
+      expect(result.size).to eq(5)
+      expect(result[0]).to eq([:static,  'begin '])
       expect(result[1]).to eq([:dynamic, 'some_tag'])
-      expect(result[2]).to eq([:static , 'middle'])
+      expect(result[2]).to eq([:static, 'middle'])
       expect(result[3]).to eq([:dynamic, 'another_tag'])
-      expect(result[4]).to eq([:static,  ' end'])
+      expect(result[4]).to eq([:static, ' end'])
 
       # Case: two consecutive tags
       sample_text = 'begin <some_tag><another_tag> end'
       result = Engine.parse(sample_text)
 
       # Expectation: an array with four couples:
-      expect(result).to have(4).items
+      expect(result.size).to eq(4)
       expect(result[0]).to eq([:static,  'begin '])
       expect(result[1]).to eq([:dynamic, 'some_tag'])
       expect(result[2]).to eq([:dynamic, 'another_tag'])
@@ -141,7 +141,7 @@ SNIPPET
       result = Engine.parse(sample_text)
 
       # Expectation: an array with one couple: [:static, the source text]
-      expect(result).to have(1).items
+      expect(result.size).to eq(1)
       expect(result[0]).to eq([:static, sample_text])
     end
 
@@ -150,7 +150,7 @@ SNIPPET
       result = Engine.parse(sample_text)
 
       # Expectation: an array with three couples:
-      expect(result).to have(3).items
+      expect(result.size).to eq(3)
       expect(result[0]).to eq([:static,  'begin '])
       expect(result[1]).to eq([:dynamic, 'some_\<\\>weird\>_tag'])
       expect(result[2]).to eq([:static,  ' end'])
@@ -163,14 +163,14 @@ SNIPPET
         StandardError, error_message)
     end
 
-    it  'should complain if a text misses an opening chevron' do
+    it 'should complain if a text misses an opening chevron' do
       sample_text = 'begin <some_tag> > end'
       error_message = "Missing opening chevron '<'."
       expect { Engine.parse(sample_text) }.to raise_error(
         StandardError, error_message)
     end
 
-    it  'should complain if a text has nested opening chevrons' do
+    it 'should complain if a text has nested opening chevrons' do
       sample_text = 'begin <<some_tag> > end'
       error_message = "Nested opening chevron '<'."
       expect { Engine.parse(sample_text) }.to raise_error(
@@ -309,7 +309,7 @@ SNIPPET
 
       locals = {
         'firstname' => 'Anon',
-        'lastname' => 'Eemoos' ,
+        'lastname' => 'Eemoos',
         'birthdate' => '1976-04-21'
       }
       rendered_text = instance.render(Object.new, locals)

data/spec/macros4cuke/templating/section_spec.rb

@@ -36,7 +36,7 @@ describe Section do
     end
 
     it 'should have no child at start' do
-       expect(subject).to have(0).children
+       expect(subject.children).to be_empty
     end
 
   end # context

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macros4cuke
 version: !ruby/object:Gem::Version
-  version: 0.5.03
+  version: 0.5.06
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +156,7 @@ files:
 - features/README.md
 - features/step_definitions/demo_steps.rb
 - features/support/env.rb
+- features/support/my_formatter.rb
 - features/support/use_macros4cuke.rb
 - spec/macros4cuke/application_spec.rb
 - spec/macros4cuke/cli/cmd-line_spec.rb