chef-cli 2.0.0 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a332f5ef78a94ff791b922851caaa215aa6e405d0527c86bfce99700b8e24ac6
-  data.tar.gz: 691ba55cbd141be7d1fa47008ca2683ba3d9be29993ea0a9f04a87b598aeb4fa
+  metadata.gz: 7ebc60c7c08e91010059db01bc99774da3a071cb08320ed2cedd0f3faec80efa
+  data.tar.gz: '08b56a1c62d520a03198a1c7e5dbbff004d967571945eb0049f665a7379e5e96'
 SHA512:
-  metadata.gz: 9371a1c03deded16d223414d60688cb1dfeabbd40491b41bcc821e8d99b83ef716ad405b19121a25568df0a7bafd3f552500626e004ed8385603d11f2972618c
-  data.tar.gz: '092c102be465ef8212c25fcd6df21ec372e6e743c389422308e43ce877c2a1c08c8a3d1205a7013f6d17c2aafc2240bc116f13c72b7fdb761c99f49ebe017537'
+  metadata.gz: fff531a5e154a54d3bc751ae067abfcf2febeae073d9ba22739fc814089fb3d019259ea7a4d04c71967b44c698543cadeefe0c5d0bc9fa51a2fc1541430ba9fd
+  data.tar.gz: 3bec22ca55b7f1c04e38695b5a1f26c4e308c996c613bf008fd17a66ec0bae8576ef9716f35cd126cad65b43d4b58436fb265c2df797edc5f9ad3694d5d09b57

data/Gemfile

@@ -27,9 +27,3 @@ group :development do
   gem "pry-stack_explorer"
   gem "rb-readline"
 end
-
-instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
-
-# If you want to load debugging tools into the bundle exec sandbox,
-# add these additional dependencies into Gemfile.local
-eval_gemfile(__FILE__ + ".local") if File.exist?(__FILE__ + ".local")

data/chef-cli.gemspec

@@ -45,9 +45,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency "minitar", "~> 0.6"
   gem.add_dependency "chef", ">= 14.0"
   gem.add_dependency "solve", "< 5.0", "> 2.0"
-  gem.add_dependency "addressable", ">= 2.3.5", "< 2.6"
+  gem.add_dependency "addressable", ">= 2.3.5", "< 2.8"
   gem.add_dependency "cookbook-omnifetch", "~> 0.5"
   gem.add_dependency "diff-lcs", "~> 1.0"
-  gem.add_dependency "paint", "~> 1.0"
+  gem.add_dependency "paint", ">= 1", "< 3"
   gem.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.11"
 end

data/lib/chef-cli/cli.rb

@@ -34,9 +34,9 @@ module ChefCLI
 
     banner(<<~BANNER)
       Usage:
-          chef -h/--help
-          chef -v/--version
-          chef command [arguments...] [options...]
+          #{ChefCLI::Dist::EXEC} -h/--help
+          #{ChefCLI::Dist::EXEC} -v/--version
+          #{ChefCLI::Dist::EXEC} command [arguments...] [options...]
     BANNER
 
     option :version,
@@ -105,9 +105,9 @@ module ChefCLI
 
     def show_version_via_version_manifest
       msg("#{ChefCLI::Dist::PRODUCT} version: #{manifest_field("build_version")}")
-      { "#{ChefCLI::Dist::INFRA_CLIENT_PRODUCT}": "chef",
+      { "#{ChefCLI::Dist::INFRA_CLIENT_PRODUCT}": "#{ChefCLI::Dist::INFRA_CLIENT_GEM}",
         "#{ChefCLI::Dist::INSPEC_PRODUCT}": "#{ChefCLI::Dist::INSPEC_CLI}",
-        "Chef CLI": "chef-cli",
+        "#{ChefCLI::Dist::CLI_PRODUCT}": "#{ChefCLI::Dist::CLI_GEM}",
         "Test Kitchen": "test-kitchen",
         "Cookstyle": "cookstyle",
       }.each do |name, gem|

data/lib/chef-cli/command/describe_cookbook.rb

@@ -87,7 +87,7 @@ module ChefCLI
         remaining_args = parse_options(params)
         if remaining_args.size != 1
           ui.err(opt_parser)
-          return false
+          false
         else
           @cookbook_path = File.expand_path(remaining_args.first)
           true

data/lib/chef-cli/command/generator_commands/policyfile.rb

@@ -76,7 +76,7 @@ module ChefCLI
             if chef_repo_mode?
               err("ERROR: You must give a policy name when generating a policy in a chef-repo.")
               @params_valid = false
-              return false
+              false
             else
               use_default_policy_settings
             end
@@ -85,7 +85,7 @@ module ChefCLI
           else
             @params_valid = false
             err("ERROR: too many arguments")
-            return false
+            false
           end
         end
 

data/lib/chef-cli/command/install.rb

@@ -110,7 +110,7 @@ module ChefCLI
         remaining_args = parse_options(params)
         if remaining_args.size > 1
           ui.err(opt_parser)
-          return false
+          false
         else
           @policyfile_relative_path = remaining_args.first
           true

data/lib/chef-cli/dist.rb

@@ -4,6 +4,11 @@ module ChefCLI
 
     # The full marketing name of the product
     PRODUCT = "Chef Workstation".freeze
+    PRODUCT_PKG_HOME = "chef-workstation".freeze
+
+    # the name of the chef-cli gem
+    CLI_PRODUCT = "Chef CLI".freeze
+    CLI_GEM = "chef-cli".freeze
 
     # the name of the overall infra product
     INFRA_PRODUCT = "Chef Infra".freeze
@@ -14,6 +19,9 @@ module ChefCLI
     # The client's alias (chef-client)
     INFRA_CLIENT_CLI = "chef-client".freeze
 
+    # The client's gem
+    INFRA_CLIENT_GEM = "chef".freeze
+
     INSPEC_PRODUCT = "Chef InSpec".freeze
     INSPEC_CLI = "inspec".freeze
 

data/lib/chef-cli/helpers.rb

@@ -141,9 +141,9 @@ module ChefCLI
 
     def default_package_home
       if Chef::Platform.windows?
-        File.join(ENV["LOCALAPPDATA"], "chef-workstation")
+        File.join(ENV["LOCALAPPDATA"], "#{ChefCLI::Dist::PRODUCT_PKG_HOME}")
       else
-        File.expand_path("~/.chef-workstation")
+        File.expand_path("~/.#{ChefCLI::Dist::PRODUCT_PKG_HOME}")
       end
     end
 

data/lib/chef-cli/policyfile/cookbook_location_specification.rb

@@ -125,7 +125,8 @@ module ChefCLI
 
       def cookbook_has_recipe?(recipe_name)
         expected_path = cookbook_path.join("recipes/#{recipe_name}.rb")
-        expected_path.exist?
+        expected_path_yml = cookbook_path.join("recipes/#{recipe_name}.yml")
+        expected_path.exist? || expected_path_yml.exist?
       end
 
       def cached_cookbook

data/lib/chef-cli/policyfile/lock_fetcher_mixin.rb

@@ -24,9 +24,9 @@ module ChefCLI
         expected_id = source_options[:policy_revision_id]
         if expected_id
           if included_id.eql?(expected_id) # are they the same?
-            return
+            nil
           elsif included_id[0, 10].eql?(expected_id) # did they use the 10 char substring
-            return
+            nil
           else
             raise ChefCLI::InvalidLockfile, "Expected policy_revision_id '#{expected_id}' does not match included_policy '#{included_id}'."
           end

data/lib/chef-cli/policyfile/uploader.rb

@@ -79,7 +79,7 @@ module ChefCLI
 
       def data_bag_create
         http_client.post("data", { "name" => COMPAT_MODE_DATA_BAG_NAME })
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         raise e unless e.response.code == "409"
       end
 
@@ -214,7 +214,7 @@ module ChefCLI
 
       def upload_lockfile_as_data_bag_item(policy_id, data_item)
         http_client.put("data/#{COMPAT_MODE_DATA_BAG_NAME}/#{policy_id}", data_item)
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         raise e unless e.response.code == "404"
 
         http_client.post("data/#{COMPAT_MODE_DATA_BAG_NAME}", data_item)

data/lib/chef-cli/policyfile_services/export_repo.rb

@@ -44,12 +44,14 @@ module ChefCLI
       attr_reader :storage_config
       attr_reader :root_dir
       attr_reader :export_dir
+      attr_reader :ui
 
       def initialize(policyfile: nil, export_dir: nil, root_dir: nil, archive: false, force: false)
         @root_dir = root_dir
         @export_dir = File.expand_path(export_dir)
         @archive = archive
         @force_export = force
+        @ui = UI.new
 
         @policy_data = nil
         @policyfile_lock = nil
@@ -162,6 +164,9 @@ module ChefCLI
         FileUtils.mkdir(export_path) unless File.directory?(export_path)
         copy_unignored_cookbook_files(lock, export_path)
         FileUtils.rm_f(metadata_rb_path)
+        if lock.cookbook_version.nil?
+          ui.msg "Unable to get the cookbook version/metadata for #{lock}"
+        end
         metadata = lock.cookbook_version.metadata
 
         metadata_json_path = File.join(export_path, "metadata.json")

data/lib/chef-cli/policyfile_services/install.rb

@@ -147,8 +147,10 @@ module ChefCLI
       end
 
       def prepare_constraints_for_policies
+        # Ensure we recompute policies from their (possibly updated) source
         Policyfile::LockApplier
           .new(policyfile_lock, policyfile_compiler)
+          .with_unlocked_policies(:all)
           .apply!
       end
 

data/lib/chef-cli/policyfile_services/rm_policy.rb

@@ -134,7 +134,7 @@ module ChefCLI
       def fetch_policy_revision_data
         @policy_revision_data = http_client.get("/policies/#{policy_name}")
         @policy_exists = true
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         raise unless e.response.code == "404"
 
         @policy_exists = false

data/lib/chef-cli/policyfile_services/update_attributes.rb

@@ -102,7 +102,9 @@ module ChefCLI
       end
 
       def prepare_constraints
+        # Ensure we recompute policies from their (possibly updated) source
         Policyfile::LockApplier.new(policyfile_lock, policyfile_compiler)
+          .with_unlocked_policies(:all)
           .apply!
       end
     end

data/lib/chef-cli/skeletons/code_generator/files/default/build_cookbook/README.md

@@ -101,7 +101,7 @@ cd .delivery/build_cookbook
 kitchen converge
 ```
 
-This will take awhile because it will now pass on the first VM, and then create the second VM. We should have warned you this was a good time for a coffee break.
+This will take a while because it will now pass on the first VM and then create the second VM. We should have warned you this was a good time for a coffee break.
 
 ```
 Recipe: test::default
@@ -115,7 +115,7 @@ Recipe: test::default
 Running handlers:
 Running handlers complete
 Chef Infra Client finished, 3/32 resources updated in 54.665445968 seconds
-Finished converging <default-centos-71> (1m26.83s).
+Finished converging <default-centos-8> (1m26.83s).
 ```
 
 Victory is ours! Our verify phase passed on the build nodes.
@@ -129,7 +129,7 @@ delivery review
 
 ## FAQ
 
-### Why don't I just run rspec and foodcritic/cookstyle on my local system?
+### Why don't I just run rspec and cookstyle on my local system?
 
 An objection to the Test Kitchen approach is that it is much faster to run the unit, lint, and syntax commands for the project on the local system. That is totally true, and also totally valid. Do that for the really fast feedback loop. However, the dance we do with Test Kitchen brings a much higher degree of confidence in the changes we're making, that everything will run on the build nodes in Chef Workflow. We strongly encourage this approach before actually pushing the changes to Workflow.
 

data/lib/chef-cli/skeletons/code_generator/files/default/build_cookbook/kitchen.yml

@@ -12,7 +12,7 @@ provisioner:
 
 platforms:
   - name: ubuntu-18.04
-  - name: centos-7
+  - name: centos-8
 
 suites:
   - name: default

data/lib/chef-cli/skeletons/code_generator/files/default/chefignore

@@ -30,6 +30,7 @@ mkmf.log
 REVISION
 TAGS*
 tmtags
+.vscode
 
 ## COMPILED ##
 ##############
@@ -97,7 +98,7 @@ Gemfile.lock
 Policyfile.rb
 Policyfile.lock.json
 
-# Cookbooks #
+# Documentation #
 #############
 CHANGELOG*
 CONTRIBUTING*

data/lib/chef-cli/skeletons/code_generator/files/default/cookbook_readmes/README-policy.md

@@ -1,4 +1,4 @@
-This directory typically contains Chef cookbooks. This repository was
+This directory typically contains Chef Infra cookbooks. This repository was
 generated with the '--policy-only' option, which means you have chosen
 to use a workflow where each cookbook is treated as an independent
 software project. As a result, any cookbooks present in this directory

data/lib/chef-cli/skeletons/code_generator/files/default/cookbook_readmes/README.md

@@ -1,4 +1,4 @@
-This directory contains the cookbooks used to configure systems in your infrastructure with Chef - an example basic cookbook called `example` has been automatically created for you.
+This directory contains the cookbooks used to configure systems in your infrastructure with Chef Infra - an example basic cookbook called `example` has been automatically created for you.
 
 Knife needs to be configured to know where the cookbooks are located with the `cookbook_path` setting. If this is not set, then several cookbook operations will fail to work properly.
 
@@ -23,7 +23,7 @@ cookbook_email     "cookbooks@example.com"
 cookbook_license   "apachev2"
 ```
 
-Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3", or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the the comments in those files.
+Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3", or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the comments in those files.
 
 Create new cookbooks in this directory with Chef.
 

data/lib/chef-cli/skeletons/code_generator/files/default/repo/cookbooks/example/README.md

@@ -4,11 +4,11 @@ An example cookbook
 
 ## Requirements
 
-### Platforms:
+### Platforms
 
 _No platforms defined_
 
-### Cookbooks:
+### Cookbooks
 
 _No dependencies defined_
 

data/lib/chef-cli/skeletons/code_generator/recipes/build_cookbook.rb

@@ -11,13 +11,13 @@ directory dot_delivery_dir
 
 cookbook_file config_json do
   source 'delivery-config.json'
-  not_if { File.exist?(config_json) }
+  not_if { ::File.exist?(config_json) }
 end
 
 # Adding the delivery local-mode config
 cookbook_file project_toml do
   source 'delivery-project.toml'
-  not_if { File.exist?(project_toml) }
+  not_if { ::File.exist?(project_toml) }
 end
 
 generator_desc('Ensuring correct Workflow (Delivery) build cookbook content')

data/lib/chef-cli/skeletons/code_generator/recipes/cookbook.rb

@@ -129,7 +129,7 @@ unless context.enable_workflow
   # Adding the delivery local-mode config
   cookbook_file "#{cookbook_dir}/.delivery/project.toml" do
     source 'delivery-project.toml'
-    not_if { File.exist?("#{cookbook_dir}/.delivery/project.toml") }
+    not_if { ::File.exist?("#{cookbook_dir}/.delivery/project.toml") }
   end
 end
 

data/lib/chef-cli/skeletons/code_generator/recipes/repo.rb

@@ -60,7 +60,7 @@ if context.have_git
     execute('initialize-git') do
       command('git init .')
       cwd repo_dir
-      not_if { File.exist?("#{repo_dir}/.gitignore") }
+      not_if { ::File.exist?("#{repo_dir}/.gitignore") }
     end
   end
   template "#{repo_dir}/.gitignore" do

data/lib/chef-cli/skeletons/code_generator/templates/default/kitchen.yml.erb

@@ -26,7 +26,7 @@ verifier:
 
 platforms:
   - name: ubuntu-18.04
-  - name: centos-7
+  - name: centos-8
 
 suites:
   - name: default

data/lib/chef-cli/skeletons/code_generator/templates/default/kitchen_dokken.yml.erb

@@ -21,9 +21,9 @@ platforms:
       intermediate_instructions:
         - RUN /usr/bin/apt-get update
 
-  - name: centos-7
+  - name: centos-8
     driver:
-      image: dokken/centos-7
+      image: dokken/centos-8
       pid_one_command: /usr/lib/systemd/systemd
 
 suites:

data/lib/chef-cli/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb

@@ -22,7 +22,7 @@ verifier:
 
 platforms:
   - name: ubuntu-18.04
-  - name: centos-7
+  - name: centos-8
 
 suites:
   - name: default

data/lib/chef-cli/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefCLI
-  VERSION = "2.0.0".freeze
+  VERSION = "2.0.10".freeze
 end

data/spec/unit/command/generator_commands/cookbook_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2019 Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2020 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -269,7 +269,7 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
               # Cookbook:: build_cookbook
               # Recipe:: publish
               #
-              # Copyright:: 2019, The Authors, All Rights Reserved.
+              # Copyright:: #{DateTime.now.year}, The Authors, All Rights Reserved.
 
               include_recipe 'delivery-truck::publish'
             CONFIG_DOT_JSON
@@ -580,7 +580,7 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
 
             platforms:
               - name: ubuntu-18.04
-              - name: centos-7
+              - name: centos-8
 
             suites:
               - name: default
@@ -667,7 +667,7 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
 
             platforms:
               - name: ubuntu-18.04
-              - name: centos-7
+              - name: centos-8
 
             suites:
               - name: default

data/spec/unit/command/generator_commands/repo_spec.rb

@@ -231,7 +231,7 @@ describe ChefCLI::Command::GeneratorCommands::Repo do
             let(:argv) { ["new_repo", "--policy-only" ] }
 
             it "tells you whats up" do
-              expect(file_contents).to match(/This directory typically contains Chef cookbooks/)
+              expect(file_contents).to match(/This directory typically contains Chef Infra cookbooks/)
             end
           end
         end

data/spec/unit/policyfile/cookbook_location_specification_spec.rb

@@ -143,13 +143,18 @@ describe ChefCLI::Policyfile::CookbookLocationSpecification do
       allow(cookbook_location_spec).to receive(:cookbook_path).and_return(cookbook_path)
 
       default_recipe_path = install_path.join("recipes/default.rb")
+      default_yml_recipe_path = install_path.join("recipes/default.yml")
       nope_recipe_path = install_path.join("recipes/nope.rb")
+      nope_yml_recipe_path = install_path.join("recipes/nope.yml")
 
       expect(cookbook_path).to receive(:join).with("recipes/default.rb").and_return(default_recipe_path)
+      expect(cookbook_path).to receive(:join).with("recipes/default.yml").and_return(default_yml_recipe_path)
       expect(cookbook_path).to receive(:join).with("recipes/nope.rb").and_return(nope_recipe_path)
+      expect(cookbook_path).to receive(:join).with("recipes/nope.yml").and_return(nope_yml_recipe_path)
 
       expect(default_recipe_path).to receive(:exist?).and_return(true)
       expect(nope_recipe_path).to receive(:exist?).and_return(false)
+      expect(nope_yml_recipe_path).to receive(:exist?).and_return(false)
 
       expect(cookbook_location_spec.cookbook_has_recipe?("default")).to be(true)
       expect(cookbook_location_spec.cookbook_has_recipe?("nope")).to be(false)

data/spec/unit/policyfile/uploader_spec.rb

@@ -319,14 +319,14 @@ describe ChefCLI::Policyfile::Uploader do
 
       it "does not error when the 'policyfiles' data bag exists" do
         response = double("Net::HTTP response", code: "409")
-        error = Net::HTTPServerException.new("conflict", response)
+        error = Net::HTTPClientException.new("conflict", response)
         expect(http_client).to receive(:post).with("data", { "name" => "policyfiles" }).and_raise(error)
         expect { uploader.data_bag_create }.to_not raise_error
       end
 
       it "uploads the policyfile as a data bag item" do
         response = double("Net::HTTP response", code: "404")
-        error = Net::HTTPServerException.new("Not Found", response)
+        error = Net::HTTPClientException.new("Not Found", response)
         expect(http_client).to receive(:put)
           .with("data/policyfiles/example-unit-test", policyfile_as_data_bag_item)
           .and_raise(error)

data/spec/unit/policyfile_lock_build_spec.rb

@@ -22,7 +22,7 @@ require "shared/fixture_cookbook_checksums"
 require "chef-cli/policyfile/storage_config"
 require "chef-cli/policyfile_lock.rb"
 
-describe ChefCLI::PolicyfileLock, "building a lockfile" do
+describe ChefCLI::PolicyfileLock, "building a lockfile", :skip_on_windows do
 
   include_context "fixture cookbooks checksums"
 

data/spec/unit/policyfile_services/clean_policies_spec.rb

@@ -211,6 +211,8 @@ describe ChefCLI::PolicyfileServices::CleanPolicies do
           end
 
           it "deletes what it can, then raises an error" do
+            # Ruby 2.6 deprecated HTTPServerException but the errors are still initialized using it, so
+            # this will continue to print that out until they remove HTTPServerException
             expected_message = <<~ERROR
               Failed to delete some policy revisions:
               - appserver (4444444444444444444444444444444444444444444444444444444444444444): Net::HTTPServerException 403 \"Unauthorized\"

data/spec/unit/policyfile_services/update_attributes_spec.rb

@@ -176,7 +176,7 @@ describe ChefCLI::PolicyfileServices::UpdateAttributes do
           expect(ChefCLI::Policyfile::LockApplier).to receive(:new).with(
             update_attrs_service.policyfile_lock, update_attrs_service.policyfile_compiler
           ).and_return(lock_applier)
-          expect(lock_applier).not_to receive(:with_unlocked_policies)
+          expect(lock_applier).to receive(:with_unlocked_policies).with(:all).and_return(lock_applier)
           expect(lock_applier).to receive(:apply!)
 
           update_attrs_service.run

data/spec/unit/service_exception_inspectors/http_spec.rb

@@ -64,7 +64,7 @@ describe ChefCLI::ServiceExceptionInspectors::HTTP do
   end
 
   let(:exception) do
-    Net::HTTPServerException.new(message, response).tap { |e| e.chef_rest_request = request }
+    Net::HTTPClientException.new(message, response).tap { |e| e.chef_rest_request = request }
   end
 
   subject(:inspector) { described_class.new(exception) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.10
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -127,7 +127,7 @@ dependencies:
         version: 2.3.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ dependencies:
         version: 2.3.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: cookbook-omnifetch
   requirement: !ruby/object:Gem::Requirement
@@ -170,16 +170,22 @@ dependencies:
   name: paint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: license-acceptance
   requirement: !ruby/object:Gem::Requirement