chef-apply 0.4.13 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40458ce08a16fb6db8c58202ac973c791d653be6b32700a493779ba1ff540dd2
-  data.tar.gz: 68a27c1c83e4009fb29b2fc355091f52bb23f25ea3465069e278982db67b353f
+  metadata.gz: b787c2d47fe3b153a3c8e46613bb62f13b6346a8efad7ae1efe8ece667b3c53c
+  data.tar.gz: 398bd9ad985fff7b688ce12983c195daadd93048f226834a7463f141c5f71675
 SHA512:
-  metadata.gz: da9d028ca6b0033430f5c8740a1f6c6317eff7331e59ad48d0e198f2fca2f905cb3ea9fa482d0c4366003028bcc5e301cc0c994adfba621ed487637a7348b50a
-  data.tar.gz: aab2c0073c5e20a56045b750044964d336b84da4d2e36085c2efc13386a24d7631d9c8fc2e75a2018189cb694f0adb3779225b5ebab70b892dfaac508e2af632
+  metadata.gz: c70ecbd0e62ae60c3fc6e7d9e19e72f44aefa5325f83218f495e6cd42abc5bc7809b76b1a1bf2c06f47375be2f85ad0e4d7bd51a637c6210cc87b9237864e0d7
+  data.tar.gz: 6564f0e408919ac1ae2b1e611feeb9bd7517117d1a3a2e33240a973ec3bca0ea4577650e2b0c20fc7ae71229965fad38879b1429425bf9ff84f48f0ee16ea5ec

data/Gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2018 Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,18 +19,12 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
-  gem "chefstyle"
+  gem "chefstyle", "1.7.4"
   gem "rake", ">= 10.1.0"
   gem "rspec", "~> 3.0"
   gem "simplecov"
 end
 
-group :docs do
-  gem "yard"
-  gem "redcarpet"
-  gem "github-markup"
-end
-
 group :debug do
   gem "pry"
   gem "pry-byebug"

data/Rakefile

@@ -24,13 +24,6 @@ rescue LoadError
   puts "chefstyle gem is not installed. bundle install first to make sure all dependencies are installed."
 end
 
-begin
-  require "yard"
-  YARD::Rake::YardocTask.new(:docs)
-rescue LoadError
-  puts "yard is not available. bundle install first to make sure all dependencies are installed."
-end
-
 task :console do
   require "irb"
   require "irb/completion"

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"
 
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.description   = "Ad-hoc management of individual nodes and devices."
   spec.homepage      = "https://github.com/chef/chef-apply"
   spec.license       = "Apache-2.0"
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.6"
 
   spec.files = %w{Rakefile LICENSE warning.txt} +
     Dir.glob("Gemfile*") + # Includes Gemfile and locks
@@ -40,24 +40,19 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "mixlib-cli" # Provides argument handling DSL for CLI applications
-  spec.add_dependency "mixlib-config", ">= 3.0.5"  # shared chef configuration library that
-                                                   # simplifies managing a configuration file
+  spec.add_dependency "mixlib-config", ">= 3.0.5" # shared chef configuration library that simplifies managing a configuration file
   spec.add_dependency "mixlib-log" # Basis for our traditional logger
   spec.add_dependency "mixlib-install" # URL resolver + install tool for chef products
-  spec.add_dependency "r18n-desktop" # easy path to message text management via
-                                     # localization gem...
-  spec.add_dependency "toml-rb" # This isn't ideal because mixlib-config uses 'tomlrb'
-                                # but that library does not support a dumper
+  spec.add_dependency "r18n-desktop" # easy path to message text management via localization gem...
+  spec.add_dependency "toml-rb" # This isn't ideal because mixlib-config uses 'tomlrb' but that library does not support a dumper
   spec.add_dependency "train-core", "~> 3.0" # remote connection management over ssh, winrm
   spec.add_dependency "train-winrm" # winrm transports were pulled out into this plugin
   spec.add_dependency "pastel" # A color library
   spec.add_dependency "tty-spinner" # Pretty output for status updates in the CLI
-  spec.add_dependency "chef", ">= 15.0" # Needed to load cookbooks
-  spec.add_dependency "chef-cli", ">= 1.0.3 " # Policyfile
+  spec.add_dependency "chef", ">= 16.0" # Needed to load cookbooks
+  spec.add_dependency "chef-cli", ">= 2.0.10 " # Policyfile
   spec.add_dependency "chef-telemetry", ">= 1.0.2"
-  spec.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.11"
+  spec.add_dependency "license-acceptance", ">= 1.0.11", "< 3"
 
-  spec.add_development_dependency "bundler"
-
-  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

@@ -25,10 +25,10 @@ cli:
     %1:
 
     [telemetry]
-    enable=false
+    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: |
@@ -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: |
@@ -311,7 +319,7 @@ errors:
   CHEFVAL009:
     display: { decorations: false }
     text: |
-      File extension '%1' is unsupported. Currently recipes must be specified with a `.rb` extension.
+      File extension '%1' is unsupported. Currently recipes must be specified with a `.rb` or `.yml` extension.
 
   CHEFVAL010:
     display: { decorations: false }

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,9 +15,9 @@
 # limitations under the License.
 #
 
-require "chef_apply/action/base"
-require "pathname"
-require "tempfile"
+require_relative "base"
+require "pathname" unless defined?(Pathname)
+require "tempfile" unless defined?(Tempfile)
 # FLAG: require "chef/util/path_helper"
 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?
@@ -198,7 +198,7 @@ module ChefApply::Action
       else
         # cd is shell a builtin, so we'll invoke bash. This also means all commands are executed
         # with sudo (as long as we are hardcoding our sudo use)
-        "bash -c 'cd #{working_dir}; chef-client -z --config #{File.join(working_dir, config_file)} --recipe-url #{File.join(working_dir, policy)}'"
+        "bash -c 'cd #{working_dir}; /opt/chef/bin/chef-client -z --config #{File.join(working_dir, config_file)} --recipe-url #{File.join(working_dir, policy)}'"
       end
     end
 

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
@@ -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/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
@@ -81,7 +81,7 @@ module ChefApply
         # Find the specified recipe or default recipe if none is specified.
         # Raise an error if recipe cannot be found.
         def find_recipe(cookbook, recipe_name = nil)
-          recipes = cookbook.recipe_filenames_by_name
+          recipes = cookbook.recipe_filenames_by_name.merge(cookbook.recipe_yml_filenames_by_name)
           if recipe_name.nil?
             default_recipe = recipes["default"]
             raise NoDefaultRecipe.new(cookbook.root_dir, cookbook.name) if default_recipe.nil?

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

@@ -15,11 +15,11 @@
 # limitations under the License.
 #
 
-require "tmpdir"
-require "fileutils"
-require "chef_apply/log"
-require "chef_apply/error"
-require "chef_apply/action/generate_temp_cookbook"
+require "tmpdir" unless defined?(Dir.mktmpdir)
+require "fileutils" unless defined?(FileUtils)
+require_relative "../../log"
+require_relative "../../error"
+require_relative "../generate_temp_cookbook"
 module ChefApply
   module Action
     class GenerateTempCookbook
@@ -34,7 +34,7 @@ module ChefApply
 
         def from_existing_recipe(existing_recipe_path)
           ext_name = File.extname(existing_recipe_path)
-          raise UnsupportedExtension.new(ext_name) unless ext_name == ".rb"
+          raise UnsupportedExtension.new(ext_name) unless ext_name == ".rb" || ext_name == ".yml"
 
           cb = cookbook_for_recipe(existing_recipe_path)
           if cb

data/lib/chef_apply/action/install_chef.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require "chef_apply/action/base"
-require "chef_apply/action/install_chef/minimum_chef_version"
-require "fileutils"
+require_relative "base"
+require_relative "install_chef/minimum_chef_version"
+require "fileutils" unless defined?(FileUtils)
 
 module ChefApply
   module Action
@@ -86,6 +86,12 @@ module ChefApply
           platform_version_compatibility_mode: true,
         }
         case platform.name
+        when /mac_os_x/
+          if platform.release.to_i >= 17
+            opts[:platform_version] = "10.13"
+          else
+            raise NotImplementedError
+          end
         when /windows/
           opts[:platform] = "windows"
         when "redhat", "centos"
@@ -104,7 +110,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
@@ -32,6 +32,10 @@ module ChefApply
             13 => Gem::Version.new("13.10.4"),
             14 => Gem::Version.new("14.1.1"),
           },
+          macos: {
+            13 => Gem::Version.new("13.10.4"),
+            14 => Gem::Version.new("14.1.1"),
+          },
         }.freeze
 
         def self.check!(target, check_only)

data/lib/chef_apply/cli.rb

@@ -15,29 +15,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require "mixlib/cli"
+require "mixlib/cli" unless defined?(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
@@ -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)
@@ -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
@@ -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/config.rb

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
 
-require "chef_apply/log"
-require "mixlib/config"
-require "fileutils"
-require "pathname"
+require_relative "log"
+require "mixlib/config" unless defined?(Mixlib::Config)
+require "fileutils" unless defined?(FileUtils)
+require "pathname" unless defined?(Pathname)
 require "chef-config/config"
 require "chef-config/workstation_config_loader"
 
@@ -109,8 +109,8 @@ module ChefApply
     # in their local configuration to ensure that dev usage
     # doesn't skew customer telemetry.
     config_context :telemetry do
-      default(:dev, false)
-      default(:enable, true)
+      default(:dev_mode, false)
+      default(:enabled, true)
     end
 
     config_context :log do

data/lib/chef_apply/errors/standard_error_resolver.rb

@@ -37,8 +37,8 @@ module ChefApply
 
       def self.deps
         # Avoid loading additional includes until they're needed
-        require "socket"
-        require "openssl"
+        require "socket" unless defined?(Socket)
+        require "openssl" unless defined?(OpenSSL)
       end
     end
   end

data/lib/chef_apply/file_fetcher.rb

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
 
-require "net/http"
-require "uri"
-require "chef_apply/config"
-require "chef_apply/log"
+require "net/http" unless defined?(Net::HTTP)
+require "uri" unless defined?(URI)
+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
@@ -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.
@@ -119,7 +119,7 @@ module ChefApply
     end
 
     def setup_telemetry
-      require "securerandom"
+      require "securerandom" unless defined?(SecureRandom)
       installation_id = SecureRandom.uuid
       File.write(Config.telemetry_installation_identifier_file, installation_id)
 
@@ -132,7 +132,7 @@ module ChefApply
     def start_telemeter_upload
       cfg = {
         enabled: Config.telemetry[:enabled],
-        dev: Config.telemetry[:dev_mode],
+        dev_mode: Config.telemetry[:dev_mode],
         payload_dir: Config.telemetry_path,
         installation_identifier_file: Config.telemetry_installation_identifier_file,
         session_file: Config.telemetry_session_file,
@@ -194,24 +194,26 @@ module ChefApply
       Chef::Log.level = ChefApply::Log.level
     end
 
-    def start_chef_apply
-      require "chef_apply/cli"
-      ChefApply::CLI.new(@argv).run
+    def start_chef_apply(enforce_license: false)
+      require_relative "cli"
+      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

@@ -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,11 +134,14 @@ 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 :macos
+        require_relative "target_host/macos"
+        class << self; include ChefApply::TargetHost::MacOS; end
       when :other
         raise ChefApply::TargetHost::UnsupportedTargetOS.new(platform.name)
       end
@@ -169,6 +172,8 @@ module ChefApply
         :windows
       elsif platform.linux?
         :linux
+      elsif platform.darwin?
+        :macos
       else
         :other
       end
@@ -280,7 +285,7 @@ module ChefApply
     end
 
     def ssh_config_for_host(host)
-      require "net/ssh"
+      require "net/ssh" unless defined?(Net::SSH)
       Net::SSH::Config.for(host)
     end
 
@@ -323,7 +328,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/target_host/macos.rb

@@ -0,0 +1,69 @@
+#
+# Copyright:: Copyright (c) 2017 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module ChefApply
+  class TargetHost
+    module MacOS
+      def omnibus_manifest_path
+        # TODO - if habitat install on target, this won't work
+        # Note that we can't use File::Join, because that will render for the
+        # CURRENT platform - not the platform of the target.
+        "/opt/chef/version-manifest.json"
+      end
+
+      def mkdir(path)
+        run_command!("mkdir -p #{path}")
+      end
+
+      def chown(path, owner)
+        owner ||= user
+        run_command!("chown #{owner} '#{path}'")
+        nil
+      end
+
+      def install_package(remote_path)
+        install_cmd = <<-EOS
+        hdiutil detach "/Volumes/chef_software" >/dev/null 2>&1 || true
+        hdiutil attach #{remote_path} -mountpoint "/Volumes/chef_software"
+        cd / && sudo /usr/sbin/installer -pkg `sudo find "/Volumes/chef_software" -name \\*.pkg` -target /
+        EOS
+        run_command!(install_cmd)
+        nil
+      end
+
+      def del_file(path)
+        run_command!("rm -rf #{path}")
+      end
+
+      def del_dir(path)
+        del_file(path)
+      end
+
+      def make_temp_dir
+        installer_dir = "/tmp/chef-installer"
+        run_command!("mkdir -p #{installer_dir}")
+        run_command!("chmod 777 #{installer_dir}")
+        installer_dir
+      end
+
+      def ws_cache_path
+        "/var/chef-workstation"
+      end
+
+    end
+  end
+end

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

@@ -16,12 +16,12 @@
 #
 
 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 "pastel" unless defined?(Pastel)
+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

@@ -14,8 +14,7 @@
 # See the License for the specific language governing permissions and
 # 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.6.0".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.6.0
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2021-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -156,28 +156,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '15.0'
+        version: '16.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '15.0'
+        version: '16.0'
 - !ruby/object:Gem::Dependency
   name: chef-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 2.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 2.0.10
 - !ruby/object:Gem::Dependency
   name: chef-telemetry
   requirement: !ruby/object:Gem::Requirement
@@ -196,36 +196,22 @@ dependencies:
   name: license-acceptance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 description: Ad-hoc management of individual nodes and devices.
 email:
 - workstation@chef.io
@@ -265,6 +251,7 @@ files:
 - lib/chef_apply/status_reporter.rb
 - lib/chef_apply/target_host.rb
 - lib/chef_apply/target_host/linux.rb
+- lib/chef_apply/target_host/macos.rb
 - lib/chef_apply/target_host/windows.rb
 - lib/chef_apply/target_resolver.rb
 - lib/chef_apply/telemeter.rb
@@ -294,14 +281,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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.