cql 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e2ede22500087bd23e0fa23013c227997688d6689bf56f39b2586a2b355d215
-  data.tar.gz: 4f19858e121c952b4acd0446d1d3658053914c0cea0ec94611e0b9fdb8343812
+  metadata.gz: 2cef04f054cecd8e489f46daa063be8ac02360c53f5d7d8fe8e551ce337e5d34
+  data.tar.gz: 6714fecd35d662a966cb82f9bda4a43e308b38597834a53d03c337fe9ad1d75d
 SHA512:
-  metadata.gz: aa034bbfab89ca066255c714953a80494e2c5bf38fd4fcfae873707ea175f49d6f5584c63c7abc6f2ab51c82518e832a12b9f5079d98581d68e4bf8fa71ca8f4
-  data.tar.gz: 6dcfa7d2993c2f0ffadce2836bd0a6a5eaec73c2030a67c217cae376a0f133275533ef3d495283fbd6206cf7e2f59f9360fc0a3e5b40a99088894b447628e5ec
+  metadata.gz: 5779cca5eef6d487d88fc9089bc4374b03ccea619443f333490217fbf2b747288b7f297078d8c148969bc53c50c00ea5fa4d0f876473cb9e22afe70bbfbbe795
+  data.tar.gz: 4def191c2d3dd5ee166980dde04f3f05599614797d015ca242574a467dcdb1a6bab05c3b6648e70c50d5a66f8b960da6f1790cd44117ec699ee7902b040a3909

data/lib/cql/version.rb

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

data/testing/gemfiles/cuke_modeler0.gemfile

@@ -24,6 +24,13 @@ end
 
 if RUBY_VERSION =~ /^2\.[23456789]/
   gem 'test-unit'
+  # Cucumber 4.x uses the `cucumber-gherkin` gem, which is incompatible with
+  # the `gherkin` gem, upon which the `cuke_modeler` gem depends
+  gem 'cucumber', '< 4.0'
+
+  # The oldest versions of the `cuke_modeler` gem did not properly limit their dependencies
+  # and CukeModeler 0.x can not handle a higher Gherkin 5.x+
+  gem 'gherkin', '< 5.0'
 end
 
 

data/testing/gemfiles/cuke_modeler1.gemfile

@@ -24,6 +24,9 @@ end
 
 if RUBY_VERSION =~ /^2\.[23456789]/
   gem 'test-unit'
+  # Cucumber 4.x uses the `cucumber-gherkin` gem, which is incompatible with
+  # the `gherkin` gem, upon which the `cuke_modeler` gem depends
+  gem 'cucumber', '< 4.0'
 end
 
 

data/testing/gemfiles/cuke_modeler2.gemfile

@@ -0,0 +1,33 @@
+source 'https://rubygems.org'
+
+gemspec :path => "../../"
+
+
+# cql 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 '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' # Requires Ruby 2.x on/after this version
+  gem 'rake', '< 12.3.0' # Requires Ruby 2.x on/after this version
+end
+
+if RUBY_VERSION =~ /^1\./
+  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 'unf_ext', '< 0.0.7.3' # Requires Ruby 2.x on/after this version
+end
+
+if RUBY_VERSION =~ /^2\.[23456789]/
+  gem 'test-unit'
+  # Cucumber 4.x uses the `cucumber-gherkin` gem, which is incompatible with
+  # the `gherkin` gem, upon which the `cuke_modeler` gem depends
+  gem 'cucumber', '< 4.0'
+end
+
+
+gem 'cuke_modeler', '~> 2.0'

data/testing/gemfiles/cuke_modeler3.gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gemspec :path => "../../"
+
+# Cueumber 4.x doesn't work on all JRubies and this is the only earlier version
+# that is compatible with the `cucumber-gherkin` gem, upon which CukeModler 3.x depends
+gem 'cucumber', '2.2.0'
+
+# The version of CukeModeler being tested
+gem 'cuke_modeler', '~> 3.0'

data/testing/helper_methods.rb

@@ -0,0 +1,13 @@
+module CQL
+  module HelperMethods
+
+    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/testing/model_helper.rb

@@ -9,7 +9,7 @@ module CQL
           when model.is_a?(CukeModeler::Feature)
             file_model = CukeModeler::FeatureFile.new
 
-            if Gem.loaded_specs['cuke_modeler'].version.version[/^0/]
+            if cuke_modeler?(0)
               file_model.features = [model]
             else
               file_model.feature = model

data/testing/rspec/spec/model_query_spec.rb

@@ -1,7 +1,7 @@
 require "#{File.dirname(__FILE__)}/spec_helper"
 
 
-describe 'a query enhanced model', :cuke_modeler_1x => true do
+describe 'a query enhanced model', :unless => cuke_modeler?(0) do
 
   let(:clazz) { CukeModeler::Model }
   let(:model) { clazz.new }

data/testing/rspec/spec/spec_helper.rb

@@ -12,6 +12,7 @@ require "#{this_dir}/../../../lib/cql/model_dsl"
 
 require "#{this_dir}/../../cql_test_model"
 require "#{this_dir}/../../model_helper"
+require "#{this_dir}/../../helper_methods"
 require "#{this_dir}/tag_filterable_specs"
 require "#{this_dir}/name_filterable_specs"
 require "#{this_dir}/line_count_filterable_specs"
@@ -23,12 +24,9 @@ require 'rubygems/mock_gem_ui'
 CQL_FEATURE_FIXTURES_DIRECTORY = "#{this_dir}/../../fixtures/features"
 
 
-RSpec.configure do |config|
+RSpec.configure do |_config|
 
   include CQL::ModelHelper
-
-  if Gem.loaded_specs['cuke_modeler'].version.version[/^0/]
-    config.filter_run_excluding :cuke_modeler_1x => true
-  end
+  include CQL::HelperMethods
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cql
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Eric Kessler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-20 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuke_modeler
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +171,6 @@ files:
 - testing/cucumber/step_definitions/setup_steps.rb
 - testing/cucumber/step_definitions/verification_steps.rb
 - testing/cucumber/support/env.rb
-- testing/cucumber/support/transforms.rb
 - testing/fixtures/features/combined/a/f1_4_scenarios_5_so.feature
 - testing/fixtures/features/combined/a/f2_7_scenarios_2_so.feature
 - testing/fixtures/features/combined/a/f3_2_scenarios_3_so.feature
@@ -221,6 +220,9 @@ files:
 - testing/fixtures/features/scenario/tags3/simple.feature
 - testing/gemfiles/cuke_modeler0.gemfile
 - testing/gemfiles/cuke_modeler1.gemfile
+- testing/gemfiles/cuke_modeler2.gemfile
+- testing/gemfiles/cuke_modeler3.gemfile
+- testing/helper_methods.rb
 - testing/model_helper.rb
 - testing/rspec/spec/clauses/as_clause_spec.rb
 - testing/rspec/spec/clauses/from_clause_spec.rb
@@ -297,7 +299,6 @@ test_files:
 - testing/cucumber/step_definitions/setup_steps.rb
 - testing/cucumber/step_definitions/verification_steps.rb
 - testing/cucumber/support/env.rb
-- testing/cucumber/support/transforms.rb
 - testing/fixtures/features/combined/a/f1_4_scenarios_5_so.feature
 - testing/fixtures/features/combined/a/f2_7_scenarios_2_so.feature
 - testing/fixtures/features/combined/a/f3_2_scenarios_3_so.feature
@@ -347,6 +348,9 @@ test_files:
 - testing/fixtures/features/scen_outlines/name_filter/name.feature
 - testing/gemfiles/cuke_modeler0.gemfile
 - testing/gemfiles/cuke_modeler1.gemfile
+- testing/gemfiles/cuke_modeler2.gemfile
+- testing/gemfiles/cuke_modeler3.gemfile
+- testing/helper_methods.rb
 - testing/model_helper.rb
 - testing/rspec/spec/clauses/as_clause_spec.rb
 - testing/rspec/spec/clauses/from_clause_spec.rb

data/testing/cucumber/support/transforms.rb

@@ -1,3 +0,0 @@
-Transform /^(-?\d+)$/ do |number|
-  number.to_i
-end