chef-apply 0.4.13 → 0.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40458ce08a16fb6db8c58202ac973c791d653be6b32700a493779ba1ff540dd2
-  data.tar.gz: 68a27c1c83e4009fb29b2fc355091f52bb23f25ea3465069e278982db67b353f
+  metadata.gz: ad9eb2a00a65b3d1d03441680ad36f7433bc961cb794749f5985e8d87e92c0a1
+  data.tar.gz: e1ca1f8b42516ffacb87173ca9e1c4ead3220df2229dfe6e8a7cfc43b65d949c
 SHA512:
-  metadata.gz: da9d028ca6b0033430f5c8740a1f6c6317eff7331e59ad48d0e198f2fca2f905cb3ea9fa482d0c4366003028bcc5e301cc0c994adfba621ed487637a7348b50a
-  data.tar.gz: aab2c0073c5e20a56045b750044964d336b84da4d2e36085c2efc13386a24d7631d9c8fc2e75a2018189cb694f0adb3779225b5ebab70b892dfaac508e2af632
+  metadata.gz: 7bcfbccbe51d54da792dd195d13d9eebef230a746d6a5977f7f8c06d145dc988974718253d5dab5f20d83a7fa28e8f1db475537bddbed7ae4ffac263955d9d5f
+  data.tar.gz: d0ed274005ae5f8ef1339cfaf4be81cfbac102e868c5871ca42bb2f421c58fdd804e5dfacf060129a14404ba82553d0138aacc58bf858d03f44f823ce21b0563

data/i18n/errors/en.yml

@@ -257,6 +257,14 @@ errors:
       %1
 
   # CLI argument validation errors
+  #
+  CHEFVAL001:
+    display: { decorations: false }
+    text: |
+      The key file you specified does not exist or can't be read.
+
+      You provided '%1'.
+
   CHEFVAL002:
     display: { decorations: false }
     text: |

data/lib/chef_apply/action/base.rb

@@ -16,7 +16,7 @@
 #
 
 require "chef/telemeter"
-require "chef_apply/error"
+require_relative "../error"
 
 module ChefApply
   module Action

data/lib/chef_apply/action/converge_target.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "chef_apply/action/base"
+require_relative "base"
 require "pathname"
 require "tempfile"
 # FLAG: require "chef/util/path_helper"
@@ -159,7 +159,7 @@ module ChefApply::Action
     end
 
     def handle_ccr_error
-      require "chef_apply/action/converge_target/ccr_failure_mapper"
+      require_relative "converge_target/ccr_failure_mapper"
       mapper_opts = {}
       content = target_host.fetch_file_contents(chef_report_path)
       if content.nil?

data/lib/chef_apply/action/converge_target/ccr_failure_mapper.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "chef_apply/error"
+require_relative "../../error"
 
 module ChefApply
   module Action

data/lib/chef_apply/action/generate_local_policy.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require "chef_apply/action/base"
-require "chef_apply/error"
+require_relative "base"
+require_relative "../error"
 module ChefApply::Action
   class GenerateLocalPolicy < Base
     attr_reader :archive_file_location

data/lib/chef_apply/action/generate_temp_cookbook.rb

@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require "chef_apply/action/base"
-require "chef_apply/error"
+require_relative "base"
+require_relative "../error"
 module ChefApply
   module Action
     class GenerateTempCookbook < Base
@@ -35,7 +35,7 @@ module ChefApply
 
       def initialize(options)
         super(options)
-        require "chef_apply/action/generate_temp_cookbook/temp_cookbook"
+        require_relative "generate_temp_cookbook/temp_cookbook"
         @generated_cookbook ||= TempCookbook.new
       end
 
@@ -59,7 +59,7 @@ module ChefApply
           ChefApply::Log.debug("#{recipe_specifier} is a valid path to a recipe")
           recipe_path = recipe_specifier
         else
-          require "chef_apply/action/generate_temp_cookbook/recipe_lookup"
+          require_relative "generate_temp_cookbook/recipe_lookup"
           rl = RecipeLookup.new(repo_paths)
           cookbook_path_or_name, optional_recipe_name = rl.split(recipe_specifier)
           cookbook = rl.load_cookbook(cookbook_path_or_name)

data/lib/chef_apply/action/generate_temp_cookbook/recipe_lookup.rb

@@ -16,10 +16,10 @@
 #
 
 require "chef-config/config"
-require "chef_apply/config"
-require "chef_apply/error"
-require "chef_apply/log"
-require "chef_apply/action/base"
+require_relative "../../config"
+require_relative "../../error"
+require_relative "../../log"
+require_relative "../base"
 
 module ChefApply
   module Action

data/lib/chef_apply/action/generate_temp_cookbook/temp_cookbook.rb

@@ -17,9 +17,9 @@
 
 require "tmpdir"
 require "fileutils"
-require "chef_apply/log"
-require "chef_apply/error"
-require "chef_apply/action/generate_temp_cookbook"
+require_relative "../../log"
+require_relative "../../error"
+require_relative "../generate_temp_cookbook"
 module ChefApply
   module Action
     class GenerateTempCookbook

data/lib/chef_apply/action/install_chef.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require "chef_apply/action/base"
-require "chef_apply/action/install_chef/minimum_chef_version"
+require_relative "base"
+require_relative "install_chef/minimum_chef_version"
 require "fileutils"
 
 module ChefApply
@@ -104,7 +104,7 @@ module ChefApply
       end
 
       def download_to_workstation(url_path)
-        require "chef_apply/file_fetcher"
+        require_relative "../file_fetcher"
         ChefApply::FileFetcher.fetch(url_path)
       end
 

data/lib/chef_apply/action/install_chef/minimum_chef_version.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require "chef_apply/error"
-require "chef_apply/action/install_chef/minimum_chef_version"
+require_relative "../../error"
+require_relative "minimum_chef_version"
 
 module ChefApply
   module Action

data/lib/chef_apply/cli.rb

@@ -17,27 +17,27 @@
 #
 require "mixlib/cli"
 
-require "chef_apply/config"
+require_relative "config"
 require "chef-config/config"
 require "chef-config/logger"
 
-require "chef_apply/cli/validation"
-require "chef_apply/cli/options"
-require "chef_apply/cli/help"
-require "chef_apply/error"
-require "chef_apply/log"
-require "chef_apply/target_host"
-require "chef_apply/target_resolver"
-require "chef_apply/telemeter"
-require "chef_apply/ui/error_printer"
-require "chef_apply/ui/terminal"
-require "chef_apply/ui/terminal/job"
+require_relative "cli/validation"
+require_relative "cli/options"
+require_relative "cli/help"
+require_relative "error"
+require_relative "log"
+require_relative "target_host"
+require_relative "target_resolver"
+require_relative "telemeter"
+require_relative "ui/error_printer"
+require_relative "ui/terminal"
+require_relative "ui/terminal/job"
 require "license_acceptance/cli_flags/mixlib_cli"
 require "license_acceptance/acceptor"
 
-require "chef_apply/action/generate_temp_cookbook"
-require "chef_apply/action/generate_local_policy"
-require "chef_apply/action/converge_target"
+require_relative "action/generate_temp_cookbook"
+require_relative "action/generate_local_policy"
+require_relative "action/converge_target"
 
 module ChefApply
   class CLI
@@ -179,7 +179,7 @@ module ChefApply
     end
 
     def install(target_host, reporter)
-      require "chef_apply/action/install_chef"
+      require_relative "action/install_chef"
       context = TS.install_chef
       reporter.update(context.verifying)
       installer = Action::InstallChef.new(target_host: target_host, check_only: !parsed_options[:install])
@@ -282,7 +282,7 @@ module ChefApply
     end
 
     def handle_perform_error(e)
-      require "chef_apply/errors/standard_error_resolver"
+      require_relative "errors/standard_error_resolver"
       id = e.respond_to?(:id) ? e.id : e.class.to_s
       # TODO: This is currently sending host information for certain ssh errors
       #       post release we need to scrub this data. For now I'm redacting the

data/lib/chef_apply/cli/help.rb

@@ -61,7 +61,7 @@ module ChefApply
       end
 
       def show_version
-        require "chef_apply/version"
+        require_relative "../version"
         UI::Terminal.output T.version.show(ChefApply::VERSION)
       end
     end

data/lib/chef_apply/cli/options.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "chef_apply/text"
+require_relative "../text"
 
 # Moving the options into here so the cli.rb file is smaller and easier to read
 # For options that need to be merged back into the global ChefApply::Config object
@@ -64,8 +64,8 @@ module ChefApply
           description: T.identity_file,
           proc: (Proc.new do |paths|
             path = paths
-            unless File.exist?(path)
-              raise OptionValidationError.new("CHEFVAL001", self, path)
+            unless File.readable?(path)
+              raise OptionValidationError.new("CHEFVAL001", nil, path)
             end
 
             path

data/lib/chef_apply/cli/validation.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "chef_apply/error"
+require_relative "../error"
 
 module ChefApply
   class CLI

data/lib/chef_apply/config.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "chef_apply/log"
+require_relative "log"
 require "mixlib/config"
 require "fileutils"
 require "pathname"

data/lib/chef_apply/file_fetcher.rb

@@ -17,8 +17,8 @@
 
 require "net/http"
 require "uri"
-require "chef_apply/config"
-require "chef_apply/log"
+require_relative "config"
+require_relative "log"
 
 module ChefApply
   class FileFetcher

data/lib/chef_apply/startup.rb

@@ -14,10 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "chef_apply/config"
-require "chef_apply/text"
-require "chef_apply/ui/terminal"
-require "chef_apply/telemeter"
+require_relative "config"
+require_relative "text"
+require_relative "ui/terminal"
+require_relative "telemeter"
 require "chef/log"
 require "chef/config"
 module ChefApply
@@ -195,7 +195,7 @@ module ChefApply
     end
 
     def start_chef_apply
-      require "chef_apply/cli"
+      require_relative "cli"
       ChefApply::CLI.new(@argv).run
     end
 

data/lib/chef_apply/target_host.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require "chef_apply/log"
-require "chef_apply/error"
+require_relative "log"
+require_relative "error"
 require "train"
 
 module ChefApply
@@ -134,10 +134,10 @@ module ChefApply
     def mix_in_target_platform!
       case base_os
       when :linux
-        require "chef_apply/target_host/linux"
+        require_relative "target_host/linux"
         class << self; include ChefApply::TargetHost::Linux; end
       when :windows
-        require "chef_apply/target_host/windows"
+        require_relative "target_host/windows"
         class << self; include ChefApply::TargetHost::Windows; end
       when :other
         raise ChefApply::TargetHost::UnsupportedTargetOS.new(platform.name)

data/lib/chef_apply/target_resolver.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require "chef_apply/target_host"
-require "chef_apply/error"
+require_relative "target_host"
+require_relative "error"
 
 module ChefApply
   class TargetResolver

data/lib/chef_apply/telemeter.rb

@@ -18,7 +18,7 @@
 require "chef/telemeter"
 # Monkey patch the telemetry lib to respect our config.toml
 # entry for telemetry.
-require "chef_apply/telemeter/patch"
+require_relative "telemeter/patch"
 module ChefApply
   class Telemeter
     def self.timed_action_capture(action, &block)
@@ -36,5 +36,9 @@ module ChefApply
       end
       Chef::Telemeter.timed_capture(:action, { action: action.name, target: target_data }, &block)
     end
+
+    def self.capture(name, data = {}, options = {})
+      Chef::Telemeter.capture(name, data, options)
+    end
   end
 end

data/lib/chef_apply/text.rb

@@ -16,8 +16,8 @@
 #
 
 require "r18n-desktop"
-require "chef_apply/text/text_wrapper"
-require "chef_apply/text/error_translation"
+require_relative "text/text_wrapper"
+require_relative "text/error_translation"
 
 # A very thin wrapper around R18n, the idea being that we're likely to replace r18n
 # down the road and don't want to have to change all of our commands.

data/lib/chef_apply/ui/error_printer.rb

@@ -17,11 +17,11 @@
 
 require "train/errors"
 require "pastel"
-require "chef_apply/error"
-require "chef_apply/config"
-require "chef_apply/text"
-require "chef_apply/ui/terminal"
-require "chef_apply/errors/standard_error_resolver"
+require_relative "../error"
+require_relative "../config"
+require_relative "../text"
+require_relative "terminal"
+require_relative "../errors/standard_error_resolver"
 
 module ChefApply::UI
   class ErrorPrinter

data/lib/chef_apply/ui/plain_text_header.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 require "thread"
-require "chef_apply/ui/plain_text_element"
+require_relative "plain_text_element"
 
 module ChefApply
   module UI

data/lib/chef_apply/ui/terminal.rb

@@ -17,11 +17,11 @@
 
 require "tty-spinner"
 require "tty-cursor"
-require "chef_apply/status_reporter"
-require "chef_apply/config"
-require "chef_apply/log"
-require "chef_apply/ui/plain_text_element"
-require "chef_apply/ui/plain_text_header"
+require_relative "../status_reporter"
+require_relative "../config"
+require_relative "../log"
+require_relative "plain_text_element"
+require_relative "plain_text_header"
 
 module ChefApply
   module UI

data/lib/chef_apply/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefApply
-  VERSION = "0.4.13".freeze
+  VERSION = "0.4.15".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-apply
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.15
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli