cukedep 0.1.11 → 0.2.00

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjAwNWNhNzFkYjlkMDJlMTk4ZGViNGI0ZmI0YWYwNjIxOWJlYzNlYg==
-  data.tar.gz: !binary |-
-    ZDI4ZWY5MzM3NDM3NDFmOTNmZWM4MDIyNjI2ZDFjYjdiNmMzMGZkOA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YWQ5MTk1ZjU4MGI0NmVmOTBiMzA3Yjk1MjBlYTM5MzZmMTM3NGU0YTdhMWY0
-    MjcxMDY3NzM2MWFlMTY1MjYwNTE5N2Y0N2YxMmYyNjU1YjUyYjBjYmUzYmFk
-    OTU3ZWUyMTRkYjc0NDVhOGYxOTNiOWRiNWI0NzBiNDVkYWFmOTU=
-  data.tar.gz: !binary |-
-    ZjFlODk3YmFjYTdmZjhmZmI4ODFkZjlhMjE2ODYzNzliYzljNzU0YTFhMzZi
-    ZWNhOTU2MmQ4MWY3MzExZjYzNDc0MWIwYWU5MzgwY2MxZWNiMjFmNDNmNDgz
-    ODBjOGQzMzU2MzE5NzA1ZWNiYTk1YTE2MzYyNjI0YTc5OWFlN2M=
+SHA1:
+  metadata.gz: 1813f9ae8e497b82bfc4926b223a5ec8ab77924b
+  data.tar.gz: b23e1ee17b0487827f416950d0f647ad94818679
+SHA512:
+  metadata.gz: 2d74c075fd475de69fe58b0ef0640449aae3a61c620f23e20e82ecfd650f5cd467130839ec74aab8a7d4c6d9c24aa2902c3c86e38ae42f937b00ea50dc6a6848
+  data.tar.gz: 09f150a25d72717c1d3f2be7e3245898605d89c6547ce3c4b78a99a7109f5dff84bd411e48d1cf53067286df59b8c3b0d4276db7c01928a340563e098c1dd1ec

data/.ruby-version

@@ -1 +1 @@
-1.9.3
+2.2.0

data/.travis.yml

@@ -1,22 +1,22 @@
 language: ruby
 rvm:
-  - ruby-head
-  - 2.2.0
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3
+  - 2.5.0
+  - 2.4.2
+  - 2.3.5
+  - 2.2.8
   - jruby-head
-  - jruby-19mode
-  
+  - jruby-9.1.9.0
+  - ruby-head  
+
 matrix:
   allow_failures:
     - rvm: jruby-head
     - rvm: ruby-head
-  
+
 gemfile:
   - Gemfile
-  
+
 # whitelist
-branches:  
+branches:
   only:
     - master

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.2.00 / 2018-05-21
+Version number bumped.
+* [CHANGE] Version numbers in dependencies
+* [CHANGE] Code re-formatted to please Rubocop 0.55.0
+* [FIX] Fixed code breaking changes caused by 'gherkin 4.+'
+
 ### 0.1.11 / 2015-06-18
 * [CHANGE] Code re-formatted to please Rubocop 0.32.0
 * [FIX] File `.rubocop.yml`: disable some cop settings that were too loud.

data/Gemfile

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 # Prevent Bundler to load the dependencies from our .gemspec file
 
-gem 'gherkin', ['>=' '1.0.24']
-gem 'cucumber', ['>= 0.7.0']
-gem 'rake', ['>= 0.8.0' ]
+gem 'cucumber', ['>= 3.1.0']
+gem 'gherkin', ['>=5.0.0']
+gem 'rake', ['>= 11.0.0']
 
 group :development do
-  gem 'rspec', '>= 3.0.0'
-  gem 'simplecov', '>= 0.5.0'
+  gem 'rspec', '>= 3.6.0'
+  gem 'simplecov', '>= 0.10.0'
 end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013, 2014 Dimitri Geshef
+Copyright (c) 2013-2018 Dimitri Geshef
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -125,5 +125,5 @@ While feature `bar` may start like this:
 
 Copyright
 ---------
-Copyright (c) 2013, 2014, Dimitri Geshef. 
+Copyright (c) 2013-2018, Dimitri Geshef. 
 __Cukedep__ is released under the MIT License see [LICENSE.txt](https://github.com/famished-tiger/Cukedep/blob/master/LICENSE.txt) for details.

data/Rakefile

@@ -1,30 +1,30 @@
-require 'rubygems'
-require_relative './lib/cukedep/constants'
-
-namespace :gem do
-  desc 'Push the gem to rubygems.org'
-  task :push do
-    system("gem push cukedep-#{Cukedep::Version}.gem")
-  end
-end # namespace
-
-# Testing-specific tasks
-
-
-# RSpec as testing tool
-require 'rspec/core/rake_task'
-desc 'Run RSpec'
-RSpec::Core::RakeTask.new do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-end
-
-
-# Combine RSpec tests
-desc 'Run tests, with RSpec'
-task test: [:spec]
-
-
-# Default rake task
-task default: :test
-
-# End of file
+require 'rubygems'
+require_relative './lib/cukedep/constants'
+
+namespace :gem do
+  desc 'Push the gem to rubygems.org'
+  task :push do
+    system("gem push cukedep-#{Cukedep::Version}.gem")
+  end
+end # namespace
+
+# Testing-specific tasks
+
+
+# RSpec as testing tool
+require 'rspec/core/rake_task'
+desc 'Run RSpec'
+RSpec::Core::RakeTask.new do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+end
+
+
+# Combine RSpec tests
+desc 'Run tests, with RSpec'
+task test: [:spec]
+
+
+# Default rake task
+task default: :test
+
+# End of file

data/bin/cukedep

@@ -1,15 +1,15 @@
-#!/usr/bin/env ruby
-# File: cukedep
-# The 'executable' of the Cukedep utility.
-
-mydir = File.dirname(__FILE__)
-lib_dir = mydir + '/../lib'
-$LOAD_PATH.unshift lib_dir unless $LOAD_PATH.include?(lib_dir)
-
-require 'cukedep' # Load the Cukedep::Application class	
-
-# The application's entry point
-app = Cukedep::Application.new
-app.run!(ARGV)
-
-# End of file
+#!/usr/bin/env ruby
+# File: cukedep
+# The 'executable' of the Cukedep utility.
+
+mydir = File.dirname(__FILE__)
+lib_dir = mydir + '/../lib'
+$LOAD_PATH.unshift lib_dir unless $LOAD_PATH.include?(lib_dir)
+
+require 'cukedep' # Load the Cukedep::Application class
+
+# The application's entry point
+app = Cukedep::Application.new
+app.run!(ARGV)
+
+# End of file

data/lib/cukedep/application.rb

@@ -1,112 +1,105 @@
-# File: application.rb
-
-
-require_relative 'cli/cmd-line'
-require_relative 'config'
-require_relative 'gherkin-listener'
-require_relative 'gherkin-facade'
-require_relative 'feature-model'
-
-module Cukedep # Module used as a namespace
-  # Runner for the Cukedep application.
-  class Application
-    attr_reader(:proj_dir)
-    
-    public
-
-    # Entry point for the application object.
-    def run!(theCmdLineArgs)
-      options = options_from(theCmdLineArgs)
-      create_default_cfg if options[:setup]
-      config = Config.load_cfg(Cukedep::YMLFilename)
-
-      # Complain if no project dir is specified
-      if config.proj_dir.nil? || config.proj_dir.empty?
-        if options[:project]
-          @proj_dir = options[:project]
-        else
-          msg_p1 = "No project dir specified in '#{Cukedep::YMLFilename}'"
-          msg_p2 = ' nor via --project option.'
-          fail(StandardError, msg_p1 + msg_p2)
-        end
-      else
-        @proj_dir = config.proj_dir
-      end
-
-      feature_files = parse_features(config.feature_encoding)
-      
-      model = FeatureModel.new(feature_files)
-      generate_files(model, config)
-
-      return if options[:dryrun]
-      rake_cmd = 'rake -f cukedep.rake'
-      system(rake_cmd)
-    end
-
-    protected
-
-    # Retrieve the user-entered command-line options
-    def options_from(theCmdLineArgs)
-      cli = CLI::CmdLine.new
-      cli.parse!(theCmdLineArgs.dup)
-    end
-
-
-    # Create a local copy of the .cukedep.yml file, then
-    # stop the application.
-    def create_default_cfg()
-      if File.exist?(Cukedep::YMLFilename)
-        puts "OK to overwrite file #{Cukedep::YMLFilename}."
-        puts '(Y/N)?'
-        answer = $stdin.gets
-        exit if answer =~ /^\s*[Nn]\s*$/
-      end
-      Config.default.write(Cukedep::YMLFilename)
-
-      exit
-    end
-    
-
-    # # Read the .cukedep.yml file in the current working directory
-    # def load_cfg()
-    #   if File.exist?(Cukedep::YMLFilename)
-    #     YAML.load_file(Cukedep::YMLFilename)
-    #    else
-    #      Config.default
-    #    end
-    # end
-
-
-    # Parse the feature files (with the specified external encoding)
-    def parse_features(external_encoding)
-      # Create a Gherkin listener
-      listener = Cukedep::GherkinListener.new
-      
-      # Parse the feature files in work directory
-      is_verbose = true
-      gherkin_facade = GherkinFacade.new(is_verbose, external_encoding)
-      gherkin_facade.parse_features(listener, ['*.feature'])
-
-      return listener.feature_files
-    end
-
-
-    def generate_files(aModel, aConfig)
-      # Sort the feature files by dependency order.
-      aModel.sort_features_by_dep
-      
-      puts "\nGenerating:"
-      
-      # Generate CSV files detailing the feature to identifier mapping
-      # and vise versa
-      # TODO: replace hard-coded names by value from config
-      feature2id_report = aConfig.feature2id.name
-      id2feature_report = aConfig.id2feature.name
-      aModel.mapping_reports(feature2id_report, id2feature_report, true)
-      aModel.draw_dependency_graph(aConfig.graph_file.name, true)
-      aModel.generate_rake_tasks(aConfig.rake_file, proj_dir)
-    end
-  end # class
-end # module
-
-# End of file
+# File: application.rb
+
+require_relative 'cli/cmd-line'
+require_relative 'config'
+require_relative 'gherkin-listener'
+require_relative 'gherkin-facade'
+require_relative 'feature-model'
+
+module Cukedep # Module used as a namespace
+  # Runner for the Cukedep application.
+  class Application
+    attr_reader(:proj_dir)
+
+    # Entry point for the application object.
+    def run!(theCmdLineArgs)
+      options = options_from(theCmdLineArgs)
+      create_default_cfg if options[:setup]
+      config = Config.load_cfg(Cukedep::YMLFilename)
+
+      # Complain if no project dir is specified
+      if config.proj_dir.nil? || config.proj_dir.empty?
+        if options[:project]
+          @proj_dir = options[:project]
+        else
+          msg_p1 = "No project dir specified in '#{Cukedep::YMLFilename}'"
+          msg_p2 = ' nor via --project option.'
+          raise StandardError, msg_p1 + msg_p2
+        end
+      else
+        @proj_dir = config.proj_dir
+      end
+
+      feature_files = parse_features(config.feature_encoding)
+
+      model = FeatureModel.new(feature_files)
+      generate_files(model, config)
+
+      return if options[:dryrun]
+      rake_cmd = 'rake -f cukedep.rake'
+      system(rake_cmd)
+    end
+
+    protected
+
+    # Retrieve the user-entered command-line options
+    def options_from(theCmdLineArgs)
+      cli = CLI::CmdLine.new
+      cli.parse!(theCmdLineArgs.dup)
+    end
+
+    # Create a local copy of the .cukedep.yml file, then
+    # stop the application.
+    def create_default_cfg
+      if File.exist?(Cukedep::YMLFilename)
+        puts "OK to overwrite file #{Cukedep::YMLFilename}."
+        puts '(Y/N)?'
+        answer = $stdin.gets
+        exit if answer =~ /^\s*[Nn]\s*$/
+      end
+      Config.default.write(Cukedep::YMLFilename)
+
+      exit
+    end
+
+    # # Read the .cukedep.yml file in the current working directory
+    # def load_cfg()
+    #   if File.exist?(Cukedep::YMLFilename)
+    #     YAML.load_file(Cukedep::YMLFilename)
+    #    else
+    #      Config.default
+    #    end
+    # end
+
+    # Parse the feature files (with the specified external encoding)
+    def parse_features(external_encoding)
+      # Create a Gherkin listener
+      listener = Cukedep::GherkinListener.new
+
+      # Parse the feature files in work directory
+      is_verbose = true
+      gherkin_facade = GherkinFacade.new(is_verbose, external_encoding)
+      gherkin_facade.parse_features(listener, ['*.feature'])
+
+      return listener.feature_files
+    end
+
+    def generate_files(aModel, aConfig)
+      # Sort the feature files by dependency order.
+      aModel.sort_features_by_dep
+
+      puts "\nGenerating:"
+
+      # Generate CSV files detailing the feature to identifier mapping
+      # and vise versa
+      # TODO: replace hard-coded names by value from config
+      feature2id_report = aConfig.feature2id.name
+      id2feature_report = aConfig.id2feature.name
+      aModel.mapping_reports(feature2id_report, id2feature_report, true)
+      aModel.draw_dependency_graph(aConfig.graph_file.name, true)
+      aModel.generate_rake_tasks(aConfig.rake_file, proj_dir)
+    end
+  end # class
+end # module
+
+# End of file

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

@@ -22,14 +22,14 @@ class CmdLine
   attr_reader(:parser)
 
   # Constructor.
-  def initialize()
+  def initialize
     @options = {}
 
     @parser = OptionParser.new do |opts|
-      opts.banner = <<-EOS
+      opts.banner = <<-HELP
 Usage: cukedep [options]
 The command-line options are:
-EOS
+HELP
 
       # No argument.  Check
       dry_txt1 = 'Check the feature file dependencies'
@@ -64,34 +64,32 @@ EOS
     end
   end
 
-  public
-
   # Perform the command-line parsing
   def parse!(theCmdLineArgs)
     begin
-      parser.parse!(theCmdLineArgs)    
+      parser.parse!(theCmdLineArgs)
     rescue OptionParser::MissingArgument => exc
       err_msg = ''
       exc.args.each do |arg|
         err_msg << "No argument provided with command line option: #{arg}\n"
       end
       err_msg << 'To see the command-line syntax, do:\ncukedep --help'
-      raise(StandardError, err_msg)
+      raise StandardError, err_msg
     end
 
     # Some options stop the application
     exit if options[:version] || options[:help]
-    
+
     return options
   end
 
   private
-  
+
   def validated_project(theProjectPath)
     unless Dir.exist?(theProjectPath)
-      fail StandardError, "Cannot find the directory '#{theProjectPath}'."
+      raise StandardError, "Cannot find the directory '#{theProjectPath}'."
     end
-    
+
     # If current dir is /features and project dir is parent of it
     # then we have an error
     current_path = Pathname.getwd
@@ -99,10 +97,10 @@ EOS
       if current_path.parent == Pathname.new(theProjectPath)
         msg_prefix = "Don't place original feature file in 'features'"
         msg_suffix = ' subdir of project dir.'
-        fail StandardError, msg_prefix + msg_suffix
+        raise StandardError, msg_prefix + msg_suffix
       end
     end
-    
+
 
     return theProjectPath
   end

data/lib/cukedep/config.rb

@@ -1,89 +1,85 @@
-# File: config.rb
-
-require 'yaml'
-require_relative 'file-action'
-
-module Cukedep # Module used as a namespace
-  FileMetaData = Struct.new(:name)
-
-  Config = Struct.new(
-    :feature_encoding, # The character encoding of feature files
-    :proj_dir,    # The directory of the cucumber project
-    :feature2id,  # Meta-data about the feature => feature id report
-    :id2feature,  # Meta-data about the feature id => feature report
-    :graph_file,  # Meta-data about the dependency graph file
-    :rake_file,   # Name of the output rake file
-    :cucumber_args, # Command-line syntax to use for the cucumber application
-    # File actions triggered at Cucumber invocation events
-    :before_all_f_actions,
-    :before_each_f_actions,
-    :after_each_f_actions,
-    :after_all_f_actions
-  )
-
-  # Re-open the class for further customisation
-  # Configuration object for the Cukedep application.
-  class Config
-    # Factory method. Build a config object with default settings.
-    def self.default()
-      instance = Config.new(
-        'UTF-8',
-        nil,
-        FileMetaData.new('feature2id.csv'),
-        FileMetaData.new('feature2id.csv'),
-        FileMetaData.new('dependencies.dot'),
-        'cukedep.rake',
-        []
-      )
-
-      file_action_attrs.each do |attr|
-        instance[attr] = empty_action_triplet
-      end
-
-      return instance
-    end
-
-
-    # Read the YAML file with specified name from the current working directory.
-    # If that file does not exist, then return an instance with default values.
-    def self.load_cfg(filename)
-      # TODO: validation
-      instance = File.exist?(filename) ? YAML.load_file(filename) : default
-
-      return instance
-    end
-
-
-    # Save the Config object to a YAML file.
-    def write(filename)
-      File.open(filename, 'w') { |f| YAML.dump(self, f) }
-    end
-
-
-    # Purpose: get the list of attributes referencing
-    # a file action triplet.
-    def self.file_action_attrs()
-      return [
-        :before_all_f_actions,
-        :before_each_f_actions,
-        :after_each_f_actions,
-        :after_all_f_actions
-      ]
-    end
-
-
-    # Return Hash config for a no-op action triplet.
-    def self.empty_action_triplet()
-      {
-        save_patterns: [],
-        save_subdir: '',
-        delete_patterns: [],
-        delete_subdir: '',
-        copy_patterns: [],
-        copy_subdir: ''
-      }
-    end
-  end # class
-end # module
-
-# End of file
+# File: config.rb
+
+require 'yaml'
+require_relative 'file-action'
+
+module Cukedep # Module used as a namespace
+  FileMetaData = Struct.new(:name)
+
+  Config = Struct.new(
+    :feature_encoding, # The character encoding of feature files
+    :proj_dir,    # The directory of the cucumber project
+    :feature2id,  # Meta-data about the feature => feature id report
+    :id2feature,  # Meta-data about the feature id => feature report
+    :graph_file,  # Meta-data about the dependency graph file
+    :rake_file,   # Name of the output rake file
+    :cucumber_args, # Command-line syntax to use for the cucumber application
+    # File actions triggered at Cucumber invocation events
+    :before_all_f_actions,
+    :before_each_f_actions,
+    :after_each_f_actions,
+    :after_all_f_actions
+  )
+
+  # Re-open the class for further customisation
+  # Configuration object for the Cukedep application.
+  class Config
+    # Factory method. Build a config object with default settings.
+    def self.default
+      instance = Config.new(
+        'UTF-8',
+        nil,
+        FileMetaData.new('feature2id.csv'),
+        FileMetaData.new('feature2id.csv'),
+        FileMetaData.new('dependencies.dot'),
+        'cukedep.rake',
+        []
+      )
+
+      file_action_attrs.each do |attr|
+        instance[attr] = empty_action_triplet
+      end
+
+      return instance
+    end
+
+    # Read the YAML file with specified name from the current working directory.
+    # If that file does not exist, then return an instance with default values.
+    def self.load_cfg(filename)
+      # TODO: validation
+      instance = File.exist?(filename) ? YAML.load_file(filename) : default
+
+      return instance
+    end
+
+    # Save the Config object to a YAML file.
+    def write(filename)
+      File.open(filename, 'w') { |f| YAML.dump(self, f) }
+    end
+
+    # Purpose: get the list of attributes referencing
+    # a file action triplet.
+    def self.file_action_attrs
+      return %I[
+        before_all_f_actions
+        before_each_f_actions
+        after_each_f_actions
+        after_all_f_actions
+      ]
+    end
+
+    # Return Hash config for a no-op action triplet.
+    def self.empty_action_triplet
+      {
+        save_patterns: [],
+        save_subdir: '',
+        delete_patterns: [],
+        delete_subdir: '',
+        copy_patterns: [],
+        copy_subdir: ''
+      }
+    end
+  end # class
+end # module
+
+# End of file