chef-apply 0.5.3 → 0.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3249228c66633761ae1d2718070c68d1c85042f07dfc08da7ae098ca262eddc7
-  data.tar.gz: 80488b02ac0b76192debcec1e97416e96d746db66a6f65d531f224abe1cde4d8
+  metadata.gz: 40e1ef3f302762a273ab6fcdf15f0102bf0de5199d20cd22df2125a237551ab5
+  data.tar.gz: f65616505eed1c2afd0393b45709ad683c8372903790408a6c1020003122487a
 SHA512:
-  metadata.gz: e9fa8938dc3276b6204c21ca28073eb3f36b58735d750b0ad67bbe0c36401dbfde64a70f7110c29127d2c376ce075ff8a3c97150381e7390ef898fa5ffbb53a1
-  data.tar.gz: 04f2afd5b1a3210c86fb7aebf8bca351528458595fa277d72ca56c61e2bb80252029c5daa377cf8f5f083f4b2e5542a6ccf7125d9b2ea30131ef288e81c02381
+  metadata.gz: 72f59e61c72e8f8f470b392344e382193a2e51d977d9f9a8687ff9fa86563e2fdfe512bbd2d12d8fb418f5734b229a92b6947fc9a587e10df7630456d0229a47
+  data.tar.gz: ed03fd5cb7b9cbf2af42cf987a55e2821d8098989ee067f105a6af28413ab50d782c1824e8a5f2e79f43f54063b46a80b20a8b9597a081acded5a13044010317

data/Gemfile

@@ -19,7 +19,7 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
-  gem "chefstyle", "1.3.2"
+  gem "chefstyle", "1.7.2"
   gem "rake", ">= 10.1.0"
   gem "rspec", "~> 3.0"
   gem "simplecov"

data/bin/chef-run

@@ -20,4 +20,4 @@ require "chef_apply/startup"
 
 # Perform initialization tasks then hand off control to
 # CLI to run the command.
-ChefApply::Startup.new(ARGV).run
+ChefApply::Startup.new(ARGV).run(enforce_license: true)

data/chef-apply.gemspec

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "chef_apply/version"
 
@@ -54,5 +54,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "chef-telemetry", ">= 1.0.2"
   spec.add_dependency "license-acceptance", ">= 1.0.11", "< 3"
 
-  spec.post_install_message = File.read(File.expand_path("../warning.txt", __FILE__))
+  spec.post_install_message = File.read(File.expand_path("warning.txt", __dir__))
 end

data/i18n/en.yml

@@ -28,7 +28,7 @@ cli:
     enabled=false
 
     For more information about what we data gather and additional opt-out
-    options, visit https://chef.sh/docs/chef-workstation/privacy/
+    options, visit https://docs.chef.io/workstation/privacy/
 
   description: |
     Chef Run is a tool to execute ad-hoc tasks using Chef.
@@ -113,6 +113,7 @@ cli:
                            cookbook is found we run the default recipe.
                         3. This behaves similarly to 'cookbook name' above, but it also allows
                            you to specify which recipe to use from the cookbook.
+                           Usage: cookbookname::recipename
   error:
     bad_config_file: |
 

data/i18n/errors/en.yml

@@ -146,7 +146,7 @@ errors:
       For more information, please consult the documentation
       for this resource:
 
-        https://docs.chef.io/resource_reference.html
+        https://docs.chef.io/resources/
 
   CHEFCCR004:
     text: |
@@ -157,7 +157,7 @@ errors:
       Please consult the documentation for properties
       supported by your resource and their valid values:
 
-        https://docs.chef.io/resource_reference.html
+        https://docs.chef.io/resources/
 
   CHEFCCR005:
     text: |
@@ -165,7 +165,7 @@ errors:
 
       Please consult the documentation for a list of valid resources:
 
-        https://docs.chef.io/resource_reference.html
+        https://docs.chef.io/resources/
 
   CHEFCCR006:
     text: |
@@ -174,7 +174,7 @@ errors:
       Please consult the documentation for %2 for a list of
       valid properties:
 
-        https://docs.chef.io/resource_reference.html
+        https://docs.chef.io/resources/
 
   CHEFCCR099:
     text: |
@@ -246,7 +246,7 @@ errors:
 
       Additional instructions can be found in the troubleshooting documentation:
 
-      https://www.chef.sh/docs/chef-workstation/troubleshooting/#error-code-cheftrn007
+      https://docs.chef.io/workstation/troubleshooting/#cheftrn007
 
   CHEFTRN999:
     text: |

data/lib/chef_apply/action/generate_local_policy.rb

@@ -53,6 +53,7 @@ module ChefApply::Action
     end
 
   end
+
   class PolicyfileInstallError < ChefApply::Error
     def initialize(cause_err); super("CHEFPOLICY001", cause_err.message); end
   end

data/lib/chef_apply/cli.rb

@@ -63,14 +63,14 @@ module ChefApply
       super()
     end
 
-    def run
+    def run(enforce_license: false)
       # Perform a timing and capture of the run. Individual methods and actions may perform
       # nested Chef::Telemeter.timed_*_capture or Chef::Telemeter.capture calls in their operation, and
       # they will be captured in the same telemetry session.
 
       Chef::Telemeter.timed_run_capture([:redacted]) do
         begin
-          perform_run
+          perform_run(enforce_license: enforce_license)
         rescue Exception => e
           @rc = handle_run_error(e)
         end
@@ -100,14 +100,14 @@ module ChefApply
       end
     end
 
-    def perform_run
+    def perform_run(enforce_license: false)
       parse_options(@argv)
       if @argv.empty? || parsed_options[:help]
         show_help
       elsif parsed_options[:version]
         show_version
       else
-        check_license_acceptance
+        check_license_acceptance if enforce_license
         validate_params(cli_arguments)
         target_hosts = resolve_targets(cli_arguments.shift, parsed_options)
         render_cookbook_setup(cli_arguments)

data/lib/chef_apply/cli/validation.rb

@@ -76,6 +76,8 @@ module ChefApply
           value.to_i
         when /^\d+\.\d*$/, /^\d*\.\d+$/
           value.to_f
+        when /^[:].+$/
+          value.split(":").last.to_sym
         when /true/i
           true
         when /false/i

data/lib/chef_apply/startup.rb

@@ -33,7 +33,7 @@ module ChefApply
       init_terminal
     end
 
-    def run
+    def run(enforce_license: false)
       # This component is not supported in ChefDK; an exception will be raised
       # if running in that context.
       verify_not_in_chefdk
@@ -62,7 +62,7 @@ module ChefApply
       start_telemeter_upload
 
       # Launch the actual Chef Apply behavior
-      start_chef_apply
+      start_chef_apply(enforce_license: enforce_license)
 
     # NOTE: Because these exceptions occur outside of the
     #       CLI handling, they won't be tracked in telemtry.
@@ -194,24 +194,26 @@ module ChefApply
       Chef::Log.level = ChefApply::Log.level
     end
 
-    def start_chef_apply
+    def start_chef_apply(enforce_license: false)
       require_relative "cli"
-      ChefApply::CLI.new(@argv).run
+      ChefApply::CLI.new(@argv).run(enforce_license: enforce_license)
     end
 
     private
 
     def script_path
-      File.expand_path File.dirname(__FILE__)
+      __dir__
     end
 
     class ConfigPathNotProvided < StandardError; end
+
     class ConfigPathInvalid < StandardError
       attr_reader :path
       def initialize(path)
         @path = path
       end
     end
+
     class UnsupportedInstallation < StandardError; end
   end
 end

data/lib/chef_apply/target_host.rb

@@ -323,7 +323,9 @@ module ChefApply
         super(*(Array(init_params).flatten))
       end
     end
+
     class ChefNotInstalled < StandardError; end
+
     class UnsupportedTargetOS < ChefApply::ErrorNoLogs
       def initialize(os_name); super("CHEFTARG001", os_name); end
     end

data/lib/chef_apply/ui/error_printer.rb

@@ -16,7 +16,7 @@
 #
 
 require "train/errors"
-require "pastel"
+require "pastel" unless defined?(Pastel)
 require_relative "../error"
 require_relative "../config"
 require_relative "../text"

data/lib/chef_apply/ui/plain_text_header.rb

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require "thread"
 require_relative "plain_text_element"
 
 module ChefApply

data/lib/chef_apply/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefApply
-  VERSION = "0.5.3".freeze
+  VERSION = "0.5.16".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-apply
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.16
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -287,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: The ad-hoc execution tool for the Chef ecosystem.