chef-apply 0.5.16 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40e1ef3f302762a273ab6fcdf15f0102bf0de5199d20cd22df2125a237551ab5
-  data.tar.gz: f65616505eed1c2afd0393b45709ad683c8372903790408a6c1020003122487a
+  metadata.gz: b787c2d47fe3b153a3c8e46613bb62f13b6346a8efad7ae1efe8ece667b3c53c
+  data.tar.gz: 398bd9ad985fff7b688ce12983c195daadd93048f226834a7463f141c5f71675
 SHA512:
-  metadata.gz: 72f59e61c72e8f8f470b392344e382193a2e51d977d9f9a8687ff9fa86563e2fdfe512bbd2d12d8fb418f5734b229a92b6947fc9a587e10df7630456d0229a47
-  data.tar.gz: ed03fd5cb7b9cbf2af42cf987a55e2821d8098989ee067f105a6af28413ab50d782c1824e8a5f2e79f43f54063b46a80b20a8b9597a081acded5a13044010317
+  metadata.gz: c70ecbd0e62ae60c3fc6e7d9e19e72f44aefa5325f83218f495e6cd42abc5bc7809b76b1a1bf2c06f47375be2f85ad0e4d7bd51a637c6210cc87b9237864e0d7
+  data.tar.gz: 6564f0e408919ac1ae2b1e611feeb9bd7517117d1a3a2e33240a973ec3bca0ea4577650e2b0c20fc7ae71229965fad38879b1429425bf9ff84f48f0ee16ea5ec

data/Gemfile

@@ -19,18 +19,12 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
-  gem "chefstyle", "1.7.2"
+  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/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/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.6.0".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.6.0
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-04-04 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