cuke_cataloger 1.5.0 → 1.6.0

data/cuke_cataloger.gemspec

@@ -18,15 +18,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'cuke_modeler', '>= 0.2', '< 2.0'
-  spec.add_runtime_dependency 'cql', '~>1.0', '>= 1.0.1'
-  spec.add_runtime_dependency 'rake', '< 13.0'
-  spec.add_runtime_dependency 'thor', '~> 0.0'
+  spec.add_runtime_dependency 'cuke_modeler', '>= 0.2', '< 4.0'
+  spec.add_runtime_dependency 'cql', '>= 1.0.1', '< 2.0'
+  spec.add_runtime_dependency 'rake', '< 14.0'
+  spec.add_runtime_dependency 'thor', '< 2.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.5'
-  spec.add_development_dependency 'cucumber', '< 3.0'
+  spec.add_development_dependency "bundler", '< 3'
+  spec.add_development_dependency 'cucumber', '< 4.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'racatt', '~> 1.0'
   spec.add_development_dependency 'simplecov', '< 1.0'
   spec.add_development_dependency 'coveralls', '< 1.0'
+  spec.add_development_dependency 'rainbow', '< 4.0.0'
 end

data/lib/cuke_cataloger/unique_test_case_tagger.rb

@@ -14,7 +14,7 @@ module CukeCataloger
     # Where the id tag should be placed, relative to the other tags on the test
     attr_accessor :tag_location
 
-
+    # Creates a new UniqueTestCaseTagger object
     def initialize
       @file_line_increases = Hash.new(0)
       @tag_location = :adjacent
@@ -157,7 +157,7 @@ module CukeCataloger
           from features, scenarios, outlines, examples
         end.collect { |result| result['tags'] }.flatten
 
-        @existing_tags.collect! { |tag| tag.name } if Gem.loaded_specs['cuke_modeler'].version.version[/^1/]
+        @existing_tags.collect! { |tag| tag.name } unless cuke_modeler?(0)
       end
 
       test_id_tag = static_id_tag_for(test)
@@ -170,7 +170,7 @@ module CukeCataloger
     def check_for_multiple_test_id_tags(test)
       tags = test.tags
 
-      tags = tags.collect { |tag| tag.name } if Gem.loaded_specs['cuke_modeler'].version.version[/^1/]
+      tags = tags.collect { |tag| tag.name } unless cuke_modeler?(0)
 
       id_tags_found = tags.select { |tag| tag =~ @tag_pattern }
 
@@ -258,7 +258,7 @@ module CukeCataloger
 
       if id_index
         cell_value = row.cells[id_index]
-        cell_value = cell_value.value if Gem.loaded_specs['cuke_modeler'].version.version[/^1/]
+        cell_value = cell_value.value unless cuke_modeler?(0)
 
         cell_value != '' ? cell_value : nil
       end
@@ -343,7 +343,7 @@ module CukeCataloger
       File.open(file_path, 'w') { |file| file.print file_lines.join }
       @file_line_increases[file_path] += 1
 
-      if Gem.loaded_specs['cuke_modeler'].version.version[/^0/]
+      if cuke_modeler?(0)
         test.tags << tag
       else
         new_tag = CukeModeler::Tag.new
@@ -356,7 +356,7 @@ module CukeCataloger
       feature_file = test.get_ancestor(:feature_file)
       file_path = feature_file.path
       index_adjustment = @file_line_increases[file_path]
-      method_for_rows = Gem.loaded_specs['cuke_modeler'].version.version[/^0/] ? :row_elements : :rows
+      method_for_rows = cuke_modeler?(0) ? :row_elements : :rows
 
       test.examples.each do |example|
         unless has_id_parameter?(example, id_column_name)
@@ -375,7 +375,7 @@ module CukeCataloger
       feature_file = test.get_ancestor(:feature_file)
       file_path = feature_file.path
       index_adjustment = @file_line_increases[file_path]
-      method_for_rows = Gem.loaded_specs['cuke_modeler'].version.version[/^0/] ? :row_elements : :rows
+      method_for_rows = cuke_modeler?(0) ? :row_elements : :rows
 
       tag_index = fast_id_tag_for(test)[/\d+/]
 
@@ -433,7 +433,7 @@ module CukeCataloger
     def id_tag_for(thing)
       tags = thing.tags
 
-      tags = tags.collect { |tag| tag.name } unless Gem.loaded_specs['cuke_modeler'].version.version[/^0/]
+      tags = tags.collect { |tag| tag.name } unless cuke_modeler?(0)
 
       tags.select { |tag| tag =~ @tag_pattern }.first
     end
@@ -494,7 +494,7 @@ module CukeCataloger
     end
 
     def example_rows_for(example)
-      method_for_rows = Gem.loaded_specs['cuke_modeler'].version.version[/^0/] ? :row_elements : :rows
+      method_for_rows = cuke_modeler?(0) ? :row_elements : :rows
 
       rows = example.send(method_for_rows).dup
       rows.shift
@@ -503,8 +503,8 @@ module CukeCataloger
     end
 
     def add_to_results(item, issue = nil)
-      result = {:test => "#{item.get_ancestor(:feature_file).path}:#{item.source_line}", :object => item}
-      result.merge!({:problem => issue}) if issue
+      result = { :test => "#{item.get_ancestor(:feature_file).path}:#{item.source_line}", :object => item }
+      result.merge!({ :problem => issue }) if issue
 
       @results << result
     end
@@ -514,8 +514,8 @@ module CukeCataloger
       sub_ids = known_ids.select { |id| id =~ /^\d+-\d+$/ }
 
       max_primary_id = primary_ids.collect { |id| id.to_i }.max || 0
-      default_indexes = {:primary => max_primary_id + 1,
-                         :sub => {}}
+      default_indexes = { :primary => max_primary_id + 1,
+                          :sub => {} }
 
       sub_primaries = sub_ids.collect { |sub_id| sub_id[/^\d+/] }
 
@@ -560,7 +560,6 @@ module CukeCataloger
 
     # Adds an id to the given value row (which has a column for an id but no value for it)
     def fill_in_row(file_lines, line_index, row, row_id, id_column_name)
-      old_row = file_lines[line_index] # todo - Dead line of code?
       sections = file_lines[line_index].split('|', -1)
 
       replacement_index = determine_row_id_cell_index(row, id_column_name)
@@ -587,7 +586,7 @@ module CukeCataloger
     def determine_highest_tag_line(test)
       return adjacent_tag_line(test) if test.tags.empty?
 
-      method_for_tag_models = Gem.loaded_specs['cuke_modeler'].version.version[/^0/] ? :tag_elements : :tags
+      method_for_tag_models = cuke_modeler?(0) ? :tag_elements : :tags
 
       test.send(method_for_tag_models).collect { |tag_element| tag_element.source_line }.min - 1
     end
@@ -595,7 +594,7 @@ module CukeCataloger
     def determine_lowest_tag_line(test)
       return adjacent_tag_line(test) if test.tags.empty?
 
-      method_for_tag_models = Gem.loaded_specs['cuke_modeler'].version.version[/^0/] ? :tag_elements : :tags
+      method_for_tag_models = cuke_modeler?(0) ? :tag_elements : :tags
 
       test.send(method_for_tag_models).collect { |tag_element| tag_element.source_line }.max
     end
@@ -604,5 +603,13 @@ module CukeCataloger
       (test.source_line - 1)
     end
 
+    def cuke_modeler?(*versions)
+      versions.include?(cuke_modeler_major_version)
+    end
+
+    def cuke_modeler_major_version
+      Gem.loaded_specs['cuke_modeler'].version.version.match(/^(\d+)\./)[1].to_i
+    end
+
   end
 end

data/lib/cuke_cataloger/version.rb

@@ -1,4 +1,4 @@
 module CukeCataloger
   # The current version of the gem
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end

data/testing/cucumber/step_definitions/setup_steps.rb

@@ -18,12 +18,12 @@ end
 
 And(/^a start index of "([^"]*)"$/) do |index|
   @start_index ||= {:sub => {}}
-  @start_index[:primary] = index
+  @start_index[:primary] = index.to_i
 end
 
 And(/^a start index of "([^"]*)" for testcase "([^"]*)"$/) do |sub_index, parent_index|
   @start_index ||= {:sub => {}}
-  @start_index[:sub][parent_index.to_s] = sub_index
+  @start_index[:sub][parent_index.to_s] = sub_index.to_i
 end
 
 Given(/^a feature file$/) do

data/testing/cucumber/step_definitions/verification_steps.rb

@@ -1,6 +1,6 @@
 Then(/^the resulting file(?: "([^"]*)")? is:$/) do |file_index, expected_text|
   file_index ||= 1
-  file_name = @feature_files[file_index - 1]
+  file_name = @feature_files[file_index.to_i - 1]
 
   actual_text = File.read(file_name)
 

data/testing/gemfiles/cql1.gemfile

@@ -0,0 +1,40 @@
+# Older Rubies on Windows cannot securely connect to RubyGems anymore (https://github.com/rubygems/rubygems/issues/2330)
+if (RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw32/) && (RUBY_VERSION =~ /^1\./)
+  source 'http://rubygems.org'
+else
+  source 'https://rubygems.org'
+end
+
+gemspec :path => "../../"
+
+# The Coveralls gem can't handle more recent versions of the SimpleCov gem
+gem 'simplecov', '<= 0.16.1'
+
+# cuke_cataloger can play with pretty much any version of these but they all play differently with Ruby
+if RUBY_VERSION =~ /^1\.8/
+  gem 'cucumber', '< 1.3.0'
+  gem 'gherkin', '< 2.12.0'
+  gem 'mime-types', '< 2.0' # The 'mime-types' gem requires Ruby 1.9.x on/after this version
+  gem 'rainbow', '< 2.0' # Ruby 1.8.x support dropped after this version
+  gem 'rake', '< 11.0' # Rake dropped 1.8.x support after this version
+elsif RUBY_VERSION =~ /^1\./
+  gem 'cucumber', '< 2.0.0'
+  gem 'mime-types', '< 3.0.0' # The 'mime-types' gem requires Ruby 2.x on/after this version
+  gem 'rainbow', '< 3.0' # The 'rainbow' gem requires Ruby 2.x on/after this version
+  gem 'rake', '< 12.3.0' # The 'rake' gem requires Ruby 2.x on/after this version
+else
+  # Have to use this version of Cucumber in order to avoid namespace problems introduced by the `cucumber-gherkin` gem
+  gem 'cucumber', '2.2.0'
+end
+
+if RUBY_VERSION =~ /^1\./
+  gem 'cuke_modeler', '< 3.0' # The 'cuke_modeler' gem requires Ruby 2.x on/after this version
+  gem 'ffi', '< 1.9.15' # The 'ffi' gem requires Ruby 2.x on/after this version
+  gem 'tins', '< 1.7' # The 'tins' gem requires Ruby 2.x on/after this version
+  gem 'json', '< 2.0' # The 'json' gem drops pre-Ruby 2.x support on/after this version
+  gem 'term-ansicolor', '< 1.4' # The 'term-ansicolor' gem requires Ruby 2.x on/after this version
+  gem 'thor', '< 1.0' # The 'thor' gem requires Ruby 2.x on/after this version
+end
+
+# The version of CQL being tested
+gem 'cql', '~> 1.0'

data/testing/gemfiles/cuke_modeler0.gemfile

@@ -1,21 +1,35 @@
-source 'https://rubygems.org'
+# Older Rubies on Windows cannot securely connect to RubyGems anymore (https://github.com/rubygems/rubygems/issues/2330)
+if (RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw32/) && (RUBY_VERSION =~ /^1\./)
+  source 'http://rubygems.org'
+else
+  source 'https://rubygems.org'
+end
 
 gemspec :path => "../../"
 
+# The Coveralls gem can't handle more recent versions of the SimpleCov gem
+gem 'simplecov', '<= 0.16.1'
 
 # cuke_cataloger can play with pretty much any version of these but they all play differently with Ruby
 if RUBY_VERSION =~ /^1\.8/
   gem 'cucumber', '< 1.3.0'
   gem 'gherkin', '< 2.12.0'
+  gem 'mime-types', '< 2.0' # The 'mime-types' gem requires Ruby 1.9.x on/after this version
+  gem 'rainbow', '< 2.0' # Ruby 1.8.x support dropped after this version
   gem 'rake', '< 11.0' # Rake dropped 1.8.x support after this version
 elsif RUBY_VERSION =~ /^1\./
   gem 'cucumber', '< 2.0.0'
+  gem 'mime-types', '< 3.0.0' # The 'mime-types' gem requires Ruby 2.x on/after this version
+  gem 'rainbow', '< 3.0' # The 'rainbow' gem requires Ruby 2.x on/after this version
+  gem 'rake', '< 12.3.0' # The 'rake' gem requires Ruby 2.x on/after this version
 end
 
 if RUBY_VERSION =~ /^1\./
+  gem 'ffi', '< 1.9.15' # The 'ffi' gem requires Ruby 2.x on/after this version
   gem 'tins', '< 1.7' # The 'tins' gem requires Ruby 2.x on/after this version
   gem 'json', '< 2.0' # The 'json' gem drops pre-Ruby 2.x support on/after this version
   gem 'term-ansicolor', '< 1.4' # The 'term-ansicolor' gem requires Ruby 2.x on/after this version
+  gem 'thor', '< 1.0' # The 'thor' gem requires Ruby 2.x on/after this version
 end
 
 gem 'cuke_modeler', '~> 0.0'

data/testing/gemfiles/cuke_modeler1.gemfile

@@ -1,21 +1,35 @@
-source 'https://rubygems.org'
+# Older Rubies on Windows cannot securely connect to RubyGems anymore (https://github.com/rubygems/rubygems/issues/2330)
+if (RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw32/) && (RUBY_VERSION =~ /^1\./)
+  source 'http://rubygems.org'
+else
+  source 'https://rubygems.org'
+end
 
 gemspec :path => "../../"
 
+# The Coveralls gem can't handle more recent versions of the SimpleCov gem
+gem 'simplecov', '<= 0.16.1'
 
 # cuke_cataloger can play with pretty much any version of these but they all play differently with Ruby
 if RUBY_VERSION =~ /^1\.8/
   gem 'cucumber', '< 1.3.0'
   gem 'gherkin', '< 2.12.0'
+  gem 'mime-types', '< 2.0' # The 'mime-types' gem requires Ruby 1.9.x on/after this version
+  gem 'rainbow', '< 2.0' # Ruby 1.8.x support dropped after this version
   gem 'rake', '< 11.0' # Rake dropped 1.8.x support after this version
 elsif RUBY_VERSION =~ /^1\./
   gem 'cucumber', '< 2.0.0'
+  gem 'mime-types', '< 3.0.0' # The 'mime-types' gem requires Ruby 2.x on/after this version
+  gem 'rainbow', '< 3.0' # The 'rainbow' gem requires Ruby 2.x on/after this version
+  gem 'rake', '< 12.3.0' # The 'rake' gem requires Ruby 2.x on/after this version
 end
 
 if RUBY_VERSION =~ /^1\./
+  gem 'ffi', '< 1.9.15'  # The 'ffi' gem requires Ruby 2.x on/after this version
   gem 'tins', '< 1.7' # The 'tins' gem requires Ruby 2.x on/after this version
   gem 'json', '< 2.0' # The 'json' gem drops pre-Ruby 2.x support on/after this version
   gem 'term-ansicolor', '< 1.4' # The 'term-ansicolor' gem requires Ruby 2.x on/after this version
+  gem 'thor', '< 1.0' # The 'thor' gem requires Ruby 2.x on/after this version
 end
 
 gem 'cuke_modeler', '~> 1.0'

data/testing/gemfiles/cuke_modeler2.gemfile

@@ -0,0 +1,35 @@
+# Older Rubies on Windows cannot securely connect to RubyGems anymore (https://github.com/rubygems/rubygems/issues/2330)
+if (RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw32/) && (RUBY_VERSION =~ /^1\./)
+  source 'http://rubygems.org'
+else
+  source 'https://rubygems.org'
+end
+
+gemspec :path => "../../"
+
+# The Coveralls gem can't handle more recent versions of the SimpleCov gem
+gem 'simplecov', '<= 0.16.1'
+
+# cuke_cataloger can play with pretty much any version of these but they all play differently with Ruby
+if RUBY_VERSION =~ /^1\.8/
+  gem 'cucumber', '< 1.3.0'
+  gem 'gherkin', '< 2.12.0'
+  gem 'mime-types', '< 2.0' # The 'mime-types' gem requires Ruby 1.9.x on/after this version
+  gem 'rainbow', '< 2.0' # Ruby 1.8.x support dropped after this version
+  gem 'rake', '< 11.0' # Rake dropped 1.8.x support after this version
+elsif RUBY_VERSION =~ /^1\./
+  gem 'cucumber', '< 2.0.0'
+  gem 'mime-types', '< 3.0.0' # The 'mime-types' gem requires Ruby 2.x on/after this version
+  gem 'rainbow', '< 3.0' # The 'rainbow' gem requires Ruby 2.x on/after this version
+  gem 'rake', '< 12.3.0' # The 'rake' gem requires Ruby 2.x on/after this version
+end
+
+if RUBY_VERSION =~ /^1\./
+  gem 'ffi', '< 1.9.15'  # The 'ffi' gem requires Ruby 2.x on/after this version
+  gem 'tins', '< 1.7' # The 'tins' gem requires Ruby 2.x on/after this version
+  gem 'json', '< 2.0' # The 'json' gem drops pre-Ruby 2.x support on/after this version
+  gem 'term-ansicolor', '< 1.4' # The 'term-ansicolor' gem requires Ruby 2.x on/after this version
+  gem 'thor', '< 1.0' # The 'thor' gem requires Ruby 2.x on/after this version
+end
+
+gem 'cuke_modeler', '~> 2.0'

data/testing/gemfiles/cuke_modeler3.gemfile

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gemspec :path => "../../"
+
+# TODO: Go back to using the newer releases once they work on JRuby
+gem 'cucumber', '2.2.0'
+
+# The version of CukeModeler being tested
+gem 'cuke_modeler', '~> 3.0'

data/testing/gemfiles/rake10.gemfile

@@ -1,21 +1,38 @@
-source 'https://rubygems.org'
+# Older Rubies on Windows cannot securely connect to RubyGems anymore (https://github.com/rubygems/rubygems/issues/2330)
+if (RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw32/) && (RUBY_VERSION =~ /^1\./)
+  source 'http://rubygems.org'
+else
+  source 'https://rubygems.org'
+end
 
 gemspec :path => "../../"
 
+# The Coveralls gem can't handle more recent versions of the SimpleCov gem
+gem 'simplecov', '<= 0.16.1'
 
 # cuke_cataloger can play with pretty much any version of these but they all play differently with Ruby
 if RUBY_VERSION =~ /^1\.8/
   gem 'cucumber', '< 1.3.0'
   gem 'gherkin', '< 2.12.0'
+  gem 'mime-types', '< 2.0' # The 'mime-types' gem requires Ruby 1.9.x on/after this version
+  gem 'rainbow', '< 2.0' # Ruby 1.8.x support dropped after this version
 elsif RUBY_VERSION =~ /^1\./
   gem 'cucumber', '< 2.0.0'
+  gem 'mime-types', '< 3.0.0' # The 'mime-types' gem requires Ruby 2.x on/after this version
+  gem 'rainbow', '< 3.0' # The 'rainbow' gem requires Ruby 2.x on/after this version
+else
+  # Have to use this version of Cucumber in order to avoid namespace problems introduced by the `cucumber-gherkin` gem
+  gem 'cucumber', '2.2.0'
 end
 
 if RUBY_VERSION =~ /^1\./
+  gem 'cuke_modeler', '< 3.0'  # The 'cuke_modeler' gem requires Ruby 2.x on/after this version
+  gem 'ffi', '< 1.9.15'  # The 'ffi' gem requires Ruby 2.x on/after this version
   gem 'tins', '< 1.7' # The 'tins' gem requires Ruby 2.x on/after this version
   gem 'json', '< 2.0' # The 'json' gem drops pre-Ruby 2.x support on/after this version
   gem 'term-ansicolor', '< 1.4' # The 'term-ansicolor' gem requires Ruby 2.x on/after this version
+  gem 'thor', '< 1.0' # The 'thor' gem requires Ruby 2.x on/after this version
 end
 
-gem 'cuke_modeler', '< 2.0'
+# The version of Rake being tested
 gem 'rake', '~> 10.0'

data/testing/gemfiles/rake11.gemfile

@@ -1,16 +1,30 @@
-source 'https://rubygems.org'
+# Older Rubies on Windows cannot securely connect to RubyGems anymore (https://github.com/rubygems/rubygems/issues/2330)
+if (RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw32/) && (RUBY_VERSION =~ /^1\./)
+  source 'http://rubygems.org'
+else
+  source 'https://rubygems.org'
+end
 
 gemspec :path => "../../"
 
 
-# Rake 11.x does not work with Ruby 1.8.x
+# The version of Rake being tested
 gem 'rake', '~> 11.0'
 
 if RUBY_VERSION =~ /^1\./
   gem 'cucumber', '< 2.0.0'
+  gem 'cuke_modeler', '< 3.0'  # The 'cuke_modeler' gem requires Ruby 2.x on/after this version
+  gem 'ffi', '< 1.9.15'  # The 'ffi' gem requires Ruby 2.x on/after this version
   gem 'tins', '< 1.7' # The 'tins' gem requires Ruby 2.x on/after this version
   gem 'json', '< 2.0' # The 'json' gem drops pre-Ruby 2.x support on/after this version
+  gem 'mime-types', '< 3.0.0' # The 'mime-types' gem requires Ruby 2.x on/after this version
+  gem 'rainbow', '< 3.0' # The 'rainbow' gem requires Ruby 2.x on/after this version
+  gem 'rest-client', '< 2.0' # The 'rainbow' gem requires Ruby 2.x on/after this version
+  gem 'simplecov-html', '< 0.11.0' # The 'simplecov-html' gem requires Ruby 2.x on/after this version
   gem 'term-ansicolor', '< 1.4' # The 'term-ansicolor' gem requires Ruby 2.x on/after this version
+  gem 'unf_ext', '< 0.0.7.3' # The 'unf_ext' gem requires Ruby 2.x on/after this version
+  gem 'thor', '< 1.0' # The 'thor' gem requires Ruby 2.x on/after this version
+else
+  # Have to use this version of Cucumber in order to avoid namespace problems introduced by the `cucumber-gherkin` gem
+  gem 'cucumber', '2.2.0'
 end
-
-gem 'cuke_modeler', '< 2.0'

data/testing/gemfiles/rake12.gemfile

@@ -1,16 +1,35 @@
-source 'https://rubygems.org'
+# Older Rubies on Windows cannot securely connect to RubyGems anymore (https://github.com/rubygems/rubygems/issues/2330)
+if (RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw32/) && (RUBY_VERSION =~ /^1\./)
+  source 'http://rubygems.org'
+else
+  source 'https://rubygems.org'
+end
 
 gemspec :path => "../../"
 
 
 # Rake 12.x does not work with Ruby 1.8.x
-gem 'rake', '~> 12.0'
-
 if RUBY_VERSION =~ /^1\./
   gem 'cucumber', '< 2.0.0'
+  gem 'cuke_modeler', '< 3.0'  # The 'cuke_modeler' gem requires Ruby 2.x on/after this version
+  gem 'ffi', '< 1.9.15' # The 'ffi' gem requires Ruby 2.x on/after this version
+  gem 'rainbow', '< 3.0' # The 'rainbow' gem requires Ruby 2.x on/after this version
   gem 'tins', '< 1.7' # The 'tins' gem requires Ruby 2.x on/after this version
   gem 'json', '< 2.0' # The 'json' gem drops pre-Ruby 2.x support on/after this version
+  gem 'mime-types', '< 3.0.0' # The 'mime-types' gem requires Ruby 2.x on/after this version
+  gem 'rest-client', '< 2.0' # The 'rainbow' gem requires Ruby 2.x on/after this version
+  gem 'simplecov-html', '< 0.11.0' # The 'simplecov-html' gem requires Ruby 2.x on/after this version
   gem 'term-ansicolor', '< 1.4' # The 'term-ansicolor' gem requires Ruby 2.x on/after this version
+  gem 'unf_ext', '< 0.0.7.3' # The 'unf_ext' gem requires Ruby 2.x on/after this version
+  gem 'thor', '< 1.0' # The 'thor' gem requires Ruby 2.x on/after this version
+else
+  # Have to use this version of Cucumber in order to avoid namespace problems introduced by the `cucumber-gherkin` gem
+  gem 'cucumber', '2.2.0'
 end
 
-gem 'cuke_modeler', '< 2.0'
+# The version of Rake being tested
+if RUBY_VERSION =~ /^1\./
+  gem 'rake', '< 12.3.0' # The 'rake' gem requires Ruby 2.x on/after this version
+else
+  gem 'rake', '~> 12.0'
+end