chef-apply 0.5.16 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40e1ef3f302762a273ab6fcdf15f0102bf0de5199d20cd22df2125a237551ab5
-  data.tar.gz: f65616505eed1c2afd0393b45709ad683c8372903790408a6c1020003122487a
+  metadata.gz: 5f30291abd4af8458afefb7462bce10d03a063fe81b97eebd51d531cb3f143b9
+  data.tar.gz: 999fe608ed0c409c242079e43de8f19a9498b5310a262b632de2594175803c63
 SHA512:
-  metadata.gz: 72f59e61c72e8f8f470b392344e382193a2e51d977d9f9a8687ff9fa86563e2fdfe512bbd2d12d8fb418f5734b229a92b6947fc9a587e10df7630456d0229a47
-  data.tar.gz: ed03fd5cb7b9cbf2af42cf987a55e2821d8098989ee067f105a6af28413ab50d782c1824e8a5f2e79f43f54063b46a80b20a8b9597a081acded5a13044010317
+  metadata.gz: 35be39538674afbaa34893e1231e34c5ddedc6b5ca13c251a2cb3e75790ed41a332d3ca04f130bc9c18cdf563f45d12aa003f290bb88f1cd555d228cabd3e987
+  data.tar.gz: 5438e35ec7367378afcc841bcca6e3e57f35b98cc0153ab67d9d8515321d4c65a69c5214fcbacaa8a8d89dfe13d2fcce4fb40f3acdfb6ddcfa6ff8f1de01cc9f

data/Gemfile

@@ -19,18 +19,12 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
-  gem "chefstyle", "1.7.2"
+  gem "chefstyle", "2.0.7"
   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/chef-apply.gemspec

@@ -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.6"
+  spec.required_ruby_version = ">= 2.7"
 
   spec.files = %w{Rakefile LICENSE warning.txt} +
     Dir.glob("Gemfile*") + # Includes Gemfile and locks

data/i18n/en.yml

@@ -17,21 +17,14 @@
 
 cli:
   telemetry_enabled: |
-    Telemetry has been enabled by default for this beta release
-    of chef-run. The anonymous data we gather is used to
-    determine how we can impove your chef-run experience.
+    Telemetry is enabled by default in chef-run. The anonymous data we gather
+    is used to determine how we can impove your chef-run experience.
 
-    To disable it, add the following entry to
-    %1:
-
-    [telemetry]
-    enabled=false
-
-    For more information about what we data gather and additional opt-out
-    options, visit https://docs.chef.io/workstation/privacy/
+    For more information about what we data gather and opt-out options,
+    visit https://docs.chef.io/workstation/privacy/
 
   description: |
-    Chef Run is a tool to execute ad-hoc tasks using Chef.
+    Chef Run is a tool to execute ad-hoc tasks using Chef Infra.
   creating_config: "Creating config file in %1."
   default_config_location: "Location of config file. Default: %1"
   identity_file: "SSH identity file to use when connecting. Keys loaded into ssh-agent will also be used."
@@ -44,9 +37,9 @@ cli:
       Current default: %1
   cookbook_repo_paths: "Comma separated list of cookbook repository paths."
   install_description: |
-    Install Chef client on the target host(s) if it is not installed.
+    Install Chef Infra Client on the target host(s) if it is not installed.
     This defaults to enabled - the installation will be performed
-    if there is no Chef client on the target(s).
+    if there is no Chef Infra Client on the target(s).
   user_description: |
     Username to use for authentication to the target(s). The same
     username will be used for all targets.
@@ -102,7 +95,7 @@ cli:
                         in the form:
 
                         ssh://[USERNAME]@example.com[:PORT]
-      <RESOURCE>        A Chef resource, such as 'user' or 'package'
+      <RESOURCE>        A Chef Infra resource, such as 'user' or 'package'
       <RESOURCE_NAME>   The name, usually used to specify what 'thing' to set up with
                         the resource. For example, given resource 'user', 'name' would be
                         the name of the user you wanted to create.
@@ -179,16 +172,16 @@ status:
     exporting:  Generating local policyfile... exporting...
     success: Generating local policyfile... exporting... done!
   install_chef:
-    checking_for_client: Checking for Chef client.
-    verifying: Verifying Chef client installation.
-    downloading: Downloading Chef client installer into local cache.
-    uploading: Uploading Chef client installer to target.
-    installing: Installing Chef client version %1.
-    upgrading: Upgrading Chef client from version %1 to %2.
-    already_present: Chef client version %1 already installed on target.
-    install_success: Successfully installed Chef client version %1
-    upgrade_success: Successfully upgraded Chef client from version %1 to %2.
-    failure: "An error occurred while installing Chef client: %1"
+    checking_for_client: Checking for Chef Infra Client.
+    verifying: Verifying Chef Infra Client installation.
+    downloading: Downloading Chef Infra Client installer into local cache.
+    uploading: Uploading Chef Infra Client installer to target.
+    installing: Installing Chef Infra Client version %1.
+    upgrading: Upgrading Chef Infra Client from version %1 to %2.
+    already_present: Chef Infra Client version %1 already installed on target.
+    install_success: Successfully installed Chef Infra Client version %1
+    upgrade_success: Successfully upgraded Chef Infra Client from version %1 to %2.
+    failure: "An error occurred while installing Chef Infra Client: %1"
   converge:
     header: !!pl
       1: Applying %2 from %3 to target.

data/i18n/errors/en.yml

@@ -71,8 +71,8 @@ errors:
     text: |
       The target does not have chef-client installed.
 
-      This command is powered by the Chef client.  In order to make use of it
-      on this node, the Chef client must be installed first.
+      This command is powered by the Chef Infra Client.  In order to make use of it
+      on this node, the Chef Infra Client must be installed first.
 
       Re-running this command without the '--no-install' flag will
       automatically perform the installation.
@@ -91,12 +91,12 @@ errors:
 
   CHEFINS003:
     text: |
-      The target has an older version of Chef client installed.
+      The target has an older version of Chef Infra Client installed.
 
       The target has version %1 installed, but this command
       requires a minimum version of %2.
 
-      Please upgrade the Chef client on this node to version %2 or later.
+      Please upgrade the Chef Infra Client on this node to version %2 or later.
 
 # Local errors trying to create policy to send to target
   CHEFPOLICY001:
@@ -240,7 +240,7 @@ errors:
 
       Try...
       - Provide a password with "--password PASSWORD"
-      - Provide a key with "-identity-file PATH/TO/FILE"
+      - Provide a key with "--identity-file PATH/TO/FILE"
       - Enable ssh-agent and add keys
       - Add a host entry to your ssh configuration
 

data/lib/chef_apply/action/base.rb

@@ -41,15 +41,15 @@ module ChefApply
       def run(&block)
         @notification_handler = block
         Telemeter.timed_action_capture(self) do
-          begin
-            perform_action
-          rescue StandardError => e
-            # Give the caller a chance to clean up - if an exception is
-            # raised it'll otherwise get routed through the executing thread,
-            # providing no means of feedback for the caller's current task.
-            notify(:error, e)
-            @error = e
-          end
+
+          perform_action
+        rescue StandardError => e
+          # Give the caller a chance to clean up - if an exception is
+          # raised it'll otherwise get routed through the executing thread,
+          # providing no means of feedback for the caller's current task.
+          notify(:error, e)
+          @error = e
+
         end
         # Raise outside the block to ensure that the telemetry cpature completes
         raise @error unless @error.nil?

data/lib/chef_apply/action/converge_target.rb

@@ -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/install_chef.rb

@@ -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"

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

@@ -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

@@ -69,11 +69,11 @@ module ChefApply
       # they will be captured in the same telemetry session.
 
       Chef::Telemeter.timed_run_capture([:redacted]) do
-        begin
-          perform_run(enforce_license: enforce_license)
-        rescue Exception => e
-          @rc = handle_run_error(e)
-        end
+
+        perform_run(enforce_license: enforce_license)
+      rescue Exception => e
+        @rc = handle_run_error(e)
+
       end
     rescue => e # can occur if exception thrown in error handling
       @rc = handle_run_error(e)

data/lib/chef_apply/file_fetcher.rb

@@ -44,25 +44,25 @@ module ChefApply
         file = open(temp_path, "wb")
         ChefApply::Log.debug "Downloading: #{temp_path}"
         Net::HTTP.start(url.host) do |http|
-          begin
-            http.request_get(url.path) do |resp|
-              resp.read_body do |segment|
-                file.write(segment)
-              end
-            end
-          rescue e
-            @error = true
-            raise
-          ensure
-            file.close
-            # If any failures occurred, don't risk keeping
-            # an incomplete download that we'll see as 'cached'
-            if @error
-              FileUtils.rm_f(temp_path)
-            else
-              FileUtils.mv(temp_path, local_path)
+
+          http.request_get(url.path) do |resp|
+            resp.read_body do |segment|
+              file.write(segment)
             end
           end
+        rescue e
+          @error = true
+          raise
+        ensure
+          file.close
+          # If any failures occurred, don't risk keeping
+          # an incomplete download that we'll see as 'cached'
+          if @error
+            FileUtils.rm_f(temp_path)
+          else
+            FileUtils.mv(temp_path, local_path)
+          end
+
         end
       end
     end

data/lib/chef_apply/target_host.rb

@@ -139,6 +139,9 @@ module ChefApply
       when :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

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-apply
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.7.1
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -251,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
@@ -280,7 +281,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="