cql 1.4.0 → 1.6.0

data/testing/rspec/spec/repository_spec.rb

@@ -4,7 +4,7 @@ require "#{File.dirname(__FILE__)}/spec_helper"
 describe 'CQL::Repository' do
 
   let(:clazz) { CQL::Repository }
-  let(:seed_arguments) { @feature_fixtures_directory }
+  let(:seed_arguments) { CQL_FEATURE_FIXTURES_DIRECTORY }
 
 
   describe 'common behavior' do
@@ -19,7 +19,7 @@ describe 'CQL::Repository' do
   end
 
   it 'can use a file path as a source' do
-    expect { clazz.new(@feature_fixtures_directory) }.to_not raise_error
+    expect { clazz.new(CQL_FEATURE_FIXTURES_DIRECTORY) }.to_not raise_error
   end
 
   it 'can use a model as a source' do
@@ -33,7 +33,7 @@ describe 'CQL::Repository' do
   end
 
   it 'does not modify the repository during a query' do
-    repo = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple")
+    repo = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple")
 
     original_state = Marshal.dump(repo)
 

data/testing/rspec/spec/select_feature_dsl_spec.rb

@@ -5,7 +5,7 @@ describe "select" do
   describe "from features" do
 
     it 'should return names from features' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple")
+      gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple")
 
       result = gs.query do
         select name
@@ -17,7 +17,7 @@ describe "select" do
     end
 
     # it 'should return descriptions from features' do
-    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
+    #   gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple2")
     #
     #   result = gs.query do
     #     select description_text
@@ -28,7 +28,7 @@ describe "select" do
     # end
 
     it 'should return paths from from feature files' do
-      repo_path = "#{@feature_fixtures_directory}/scenario/simple"
+      repo_path = "#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple"
       gs = CQL::Repository.new(repo_path)
 
       result = gs.query do
@@ -43,7 +43,7 @@ describe "select" do
     end
 
     # it 'should return tags from features' do
-    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/tagged_features")
+    #   gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/tagged_features")
     #
     #   result = gs.query do
     #     select tags
@@ -58,7 +58,7 @@ describe "select" do
     #
     #
     # it 'should return multiple things from features' do
-    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/tagged_features")
+    #   gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/tagged_features")
     #
     #   result = gs.query do
     #     select name, tags
@@ -72,7 +72,7 @@ describe "select" do
     # end
 
     it 'should return things from multiple feature files' do
-      gr = CQL::Repository.new("#{@feature_fixtures_directory}/combined/b")
+      gr = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/combined/b")
 
       result = gr.query do
         select name
@@ -85,7 +85,7 @@ describe "select" do
     end
 
     it 'should return multiple features as a list of maps' do
-      gr = CQL::Repository.new("#{@feature_fixtures_directory}/combined/b")
+      gr = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/combined/b")
 
       result = gr.query do
         select name
@@ -98,7 +98,7 @@ describe "select" do
     end
 
     # it 'should return ids from features' do
-    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
+    #   gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple2")
     #
     #   result = gs.query do
     #     select raw_element

data/testing/rspec/spec/select_scen_outline_dsl_spec.rb

@@ -5,7 +5,7 @@ describe "select" do
   describe 'from scenario_outlines' do
 
     # it 'should return tags from scenario outlines' do
-    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/filters/tags2")
+    #   gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scen_outlines/filters/tags2")
     #
     #   result = gs.query do
     #     select tags
@@ -25,7 +25,7 @@ describe "select" do
     # end
     #
     # it 'should return descriptions from scenario outlines' do
-    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/multiple_examples")
+    #   gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scen_outlines/multiple_examples")
     #
     #   result = gs.query do
     #     select description_text
@@ -37,7 +37,7 @@ describe "select" do
     #
 
     it 'should return lines from scenario outlines' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
+      gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scen_outlines/basic")
 
       result = gs.query do
         select source_line
@@ -48,7 +48,7 @@ describe "select" do
     end
 
     it 'should return names from scenario outlines' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
+      gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scen_outlines/basic")
 
       result = gs.query do
         select name
@@ -59,7 +59,7 @@ describe "select" do
     end
 
     # it 'should return types from scenario outlines' do
-    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
+    #   gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scen_outlines/basic")
     #
     #   result = gs.query do
     #     select raw_element
@@ -72,7 +72,7 @@ describe "select" do
     # end
     #
     # it 'should return step lines from scenario outlines' do
-    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
+    #   gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scen_outlines/basic")
     #
     #   result = gs.query do
     #     select raw_element
@@ -85,7 +85,7 @@ describe "select" do
     # end
     #
     # it 'should return ids from scenario outlines' do
-    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
+    #   gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scen_outlines/basic")
     #
     #   result = gs.query do
     #     select raw_element
@@ -98,7 +98,7 @@ describe "select" do
     # end
     #
     # it 'should return steps from scenario outlines' do
-    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
+    #   gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scen_outlines/basic")
     #
     #   result = gs.query do
     #     select raw_element
@@ -112,7 +112,7 @@ describe "select" do
     #
     #
     # it 'should return multiple things from scenario outlines' do
-    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/multiple_examples")
+    #   gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scen_outlines/multiple_examples")
     #
     #   result = gs.query do
     #     select name, tags
@@ -124,7 +124,7 @@ describe "select" do
     # end
 
     it 'should return things from multiple feature files' do
-      gr = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/filters/tags2")
+      gr = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scen_outlines/filters/tags2")
 
       result = gr.query do
         select name
@@ -144,7 +144,7 @@ describe "select" do
     end
 
     it 'should return multiple scenario outlines as a list of maps' do
-      gr = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines")
+      gr = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scen_outlines")
 
       result = gr.query do
         select name
@@ -159,7 +159,7 @@ describe "select" do
     end
 
     # it "should return the examples from scenario outlines" do
-    #   gr = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
+    #   gr = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scen_outlines/basic")
     #   result = gr.query do
     #     select raw_element
     #     as examples
@@ -177,7 +177,7 @@ describe "select" do
     # end
 
     # it "should return multiple examples used for a single scenario outline" do
-    #   gr = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/multiple_examples")
+    #   gr = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scen_outlines/multiple_examples")
     #   result = gr.query do
     #     select raw_element
     #     as examples
@@ -204,7 +204,7 @@ describe "select" do
     # end
     #
     # it 'should return scenario outlines name and line numbers as a map' do
-    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scen_outlines/basic")
+    #   gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scen_outlines/basic")
     #   result = gs.query do
     #     select name, source_line, raw_element, raw_element, raw_element, raw_element
     #     as 'source_line' => 'line'

data/testing/rspec/spec/select_scenario_dsl_spec.rb

@@ -5,7 +5,7 @@ describe "select" do
   describe 'from scenarios' do
 
     it 'should return lines from scenarios' do
-      gr = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
+      gr = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple2")
 
       result = gr.query do
         select source_line
@@ -16,7 +16,7 @@ describe "select" do
     end
 
     it 'should return names from scenarios' do
-      gr = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
+      gr = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple2")
 
       result = gr.query do
         select name
@@ -28,7 +28,7 @@ describe "select" do
     end
 
     # it 'should return types from scenarios' do
-    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
+    #   gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple2")
     #
     #   result = gs.query do
     #     select raw_element
@@ -42,7 +42,7 @@ describe "select" do
     # end
     #
     # it 'should return step lines from scenarios' do
-    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
+    #   gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple2")
     #
     #   result = gs.query do
     #     select raw_element
@@ -58,7 +58,7 @@ describe "select" do
     # end
     #
     # it 'should return ids from scenarios' do
-    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
+    #   gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple2")
     #
     #   result = gs.query do
     #     select raw_element
@@ -74,7 +74,7 @@ describe "select" do
     # end
     #
     # it 'should return steps from scenarios' do
-    #   gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
+    #   gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple2")
     #
     #   result = gs.query do
     #     select raw_element
@@ -90,7 +90,7 @@ describe "select" do
     # end
 
     it 'should return multiple things from scenarios' do
-      gs = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
+      gs = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple2")
 
       result = gs.query do
         select name, source_line
@@ -104,7 +104,7 @@ describe "select" do
     end
 
     it 'should return things from multiple feature files' do
-      gr = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple")
+      gr = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple")
 
       result = gr.query do
         select name
@@ -118,7 +118,7 @@ describe "select" do
     end
 
     it 'should get multiple scenarios as a list of maps' do
-      gr = CQL::Repository.new("#{@feature_fixtures_directory}/scenario/simple2")
+      gr = CQL::Repository.new("#{CQL_FEATURE_FIXTURES_DIRECTORY}/scenario/simple2")
       result = gr.query do
         select source_line, name
         from scenarios

data/testing/rspec/spec/spec_helper.rb

@@ -11,32 +11,22 @@ 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"
 require "#{this_dir}/line_filterable_specs"
 require "#{this_dir}/queriable_specs"
 
-CQL_FEATURE_FIXTURES_DIRECTORY = "#{this_dir}/../../fixtures/features"
-
+require 'rubygems/mock_gem_ui'
 
-RSpec.configure do |config|
+CQL_FEATURE_FIXTURES_DIRECTORY = "#{this_dir}/../../fixtures/features"
 
-  if Gem.loaded_specs['cuke_modeler'].version.version[/^0/]
-    config.filter_run_excluding :cuke_modeler_1x => true
-  end
 
-  config.before(:all) do
-    @feature_fixtures_directory = CQL_FEATURE_FIXTURES_DIRECTORY
-  end
+RSpec.configure do |_config|
 
-  config.before(:each) do
-    # Nothing yet
-  end
+  include CQL::ModelHelper
+  include CQL::HelperMethods
 
-  config.after(:each) do
-    # Nothing yet
-  end
 end
-
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cql
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Eric Kessler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuke_modeler
@@ -17,28 +17,28 @@ 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
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   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
@@ -110,34 +110,34 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: relish
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.5'
-description: CQL is a domain specific language used for querying a Cucumber (other
+        version: 4.0.0
+description: CQL is a domain specific language used for querying a Cucumber (or other
   Gherkin based) test suite. The goal of CQL is to increase the ease with which useful
   information can be extracted from a modeled test suite and turned into summarized
   data or reports.
@@ -153,11 +153,14 @@ files:
 - lib/cql/map_reduce.rb
 - lib/cql/model_dsl.rb
 - lib/cql/queriable.rb
+- lib/cql/query.rb
+- lib/cql/repository.rb
 - lib/cql/sso_filters.rb
 - lib/cql/version.rb
 - testing/cql_test_model.rb
 - testing/cucumber/features/clauses/as_clause.feature
 - testing/cucumber/features/clauses/from_clause.feature
+- testing/cucumber/features/clauses/predefined_with_filters.feature
 - testing/cucumber/features/clauses/select_clause.feature
 - testing/cucumber/features/clauses/transform_clause.feature
 - testing/cucumber/features/clauses/with_clause.feature
@@ -168,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
@@ -218,6 +220,17 @@ 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
+- testing/rspec/spec/clauses/select_clause_spec.rb
+- testing/rspec/spec/clauses/transform_clause_spec.rb
+- testing/rspec/spec/clauses/with_clause_spec.rb
+- testing/rspec/spec/clauses/without_clause_spec.rb
+- testing/rspec/spec/cql_spec.rb
 - testing/rspec/spec/dsl_spec.rb
 - testing/rspec/spec/filter_example_spec.rb
 - testing/rspec/spec/filter_feature_dsl_spec.rb
@@ -228,6 +241,7 @@ files:
 - testing/rspec/spec/model_query_spec.rb
 - testing/rspec/spec/multiple_queries_spec.rb
 - testing/rspec/spec/name_filterable_specs.rb
+- testing/rspec/spec/predefined_filters_spec.rb
 - testing/rspec/spec/queriable_specs.rb
 - testing/rspec/spec/repository_spec.rb
 - testing/rspec/spec/select_feature_dsl_spec.rb
@@ -255,7 +269,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.7
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -263,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A gem providing functionality to query a Cucumber test suite.
@@ -271,6 +288,7 @@ test_files:
 - testing/cql_test_model.rb
 - testing/cucumber/features/clauses/as_clause.feature
 - testing/cucumber/features/clauses/from_clause.feature
+- testing/cucumber/features/clauses/predefined_with_filters.feature
 - testing/cucumber/features/clauses/select_clause.feature
 - testing/cucumber/features/clauses/transform_clause.feature
 - testing/cucumber/features/clauses/with_clause.feature
@@ -281,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
@@ -331,6 +348,17 @@ 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
+- testing/rspec/spec/clauses/select_clause_spec.rb
+- testing/rspec/spec/clauses/transform_clause_spec.rb
+- testing/rspec/spec/clauses/without_clause_spec.rb
+- testing/rspec/spec/clauses/with_clause_spec.rb
+- testing/rspec/spec/cql_spec.rb
 - testing/rspec/spec/dsl_spec.rb
 - testing/rspec/spec/filter_example_spec.rb
 - testing/rspec/spec/filter_feature_dsl_spec.rb
@@ -341,6 +369,7 @@ test_files:
 - testing/rspec/spec/model_query_spec.rb
 - testing/rspec/spec/multiple_queries_spec.rb
 - testing/rspec/spec/name_filterable_specs.rb
+- testing/rspec/spec/predefined_filters_spec.rb
 - testing/rspec/spec/queriable_specs.rb
 - testing/rspec/spec/repository_spec.rb
 - testing/rspec/spec/select_feature_dsl_spec.rb