chef-apply 0.1.18 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e4309991a02465e139c4ac2da82cf3bc9acfa164b564fa7428b80cc7122d6f4
-  data.tar.gz: c60806b1eb3ad8e93fe66b7821b5545ca407db5acecd167cbb3e5ad07d7086e4
+  metadata.gz: 8086d987312367597bbad62738f67c8b8595b44b62514e1b4e1c8526ef417c72
+  data.tar.gz: 9bab05e2fa8aeb213a120cb26bb8e822025f0a339cffced136dde7a38a8bc142
 SHA512:
-  metadata.gz: d281858ffdf9616b2cba493e364ae4d3f938abd227f9a012d5e13d5bbaa0f8433a1ea2ddf9c795fb83b85e57b97c2fee10403bce1eac6b98daaf34c7f5cfae67
-  data.tar.gz: bf94d6c3ce3834c207ef83ac887a808a2fd26f7fbfaa5d6ca5438a7f7b119bc402755cc93feac477e66a5b2379760b0726aaff50c434b8f3fdf7eeb4b4c31013
+  metadata.gz: b3e55c36d4fe20ae7e91a47332380d65fc70956c9d97d2edb602130c72889d91bad321faddd0316f26882b83e81a6edbd8fed62c1bc0333265bd9b984286279a
+  data.tar.gz: 3a07a9aa07e46c6aca8e49bab6b4e4e856173b9187c049f89154d411ea2f26da96d59d88604b0aab227527a3f80d5757527758cb409f4a0e4d3a77ab1a4edc5d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    chef-apply (0.1.18)
+    chef-apply (0.1.21)
       chef (>= 14.0)
       chef-dk (>= 3.0)
       chef-telemetry
@@ -21,16 +21,16 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
-    aws-sdk (2.11.97)
-      aws-sdk-resources (= 2.11.97)
-    aws-sdk-core (2.11.97)
+    aws-sdk (2.11.104)
+      aws-sdk-resources (= 2.11.104)
+    aws-sdk-core (2.11.104)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.97)
-      aws-sdk-core (= 2.11.97)
+    aws-sdk-resources (2.11.104)
+      aws-sdk-core (= 2.11.104)
     aws-sigv4 (1.0.3)
-    azure_mgmt_resources (0.16.0)
-      ms_rest_azure (~> 0.10.0)
+    azure_mgmt_resources (0.17.0)
+      ms_rest_azure (~> 0.11.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
@@ -119,7 +119,6 @@ GEM
     declarative (0.0.10)
     declarative-option (0.1.0)
     diff-lcs (1.3)
-    digest-crc (0.4.1)
     docile (1.3.1)
     docker-api (1.34.2)
       excon (>= 0.47.0)
@@ -145,134 +144,13 @@ GEM
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    google-cloud (0.51.1)
-      google-cloud-bigquery (~> 1.1)
-      google-cloud-bigquery-data_transfer (~> 0.1)
-      google-cloud-container (~> 0.1)
-      google-cloud-dataproc (~> 0.1)
-      google-cloud-datastore (~> 1.4)
-      google-cloud-dlp (~> 0.1)
-      google-cloud-dns (~> 0.28)
-      google-cloud-error_reporting (~> 0.30)
-      google-cloud-firestore (~> 0.21)
-      google-cloud-language (~> 0.30)
-      google-cloud-logging (~> 1.5)
-      google-cloud-monitoring (~> 0.27)
-      google-cloud-os_login (~> 0.1)
-      google-cloud-pubsub (~> 0.30)
-      google-cloud-resource_manager (~> 0.29)
-      google-cloud-spanner (~> 1.3)
-      google-cloud-speech (~> 0.29)
-      google-cloud-storage (~> 1.10)
-      google-cloud-trace (~> 0.31)
-      google-cloud-translate (~> 1.2)
-      google-cloud-video_intelligence (~> 1.0)
-      google-cloud-vision (~> 0.28)
-    google-cloud-bigquery (1.5.0)
-      concurrent-ruby (~> 1.0)
-      google-api-client (~> 0.19.8)
-      google-cloud-core (~> 1.2)
-      googleauth (~> 0.6.2)
-    google-cloud-bigquery-data_transfer (0.1.0)
-      google-gax (~> 1.0)
-    google-cloud-container (0.1.0)
-      google-gax (~> 1.0.1)
-    google-cloud-core (1.2.2)
-      google-cloud-env (~> 1.0)
-    google-cloud-dataproc (0.1.0)
-      google-gax (~> 1.0.0)
-    google-cloud-datastore (1.4.0)
-      google-cloud-core (~> 1.2)
-      google-gax (~> 1.0)
-      google-protobuf (~> 3.3)
-    google-cloud-dlp (0.4.0)
-      google-gax (~> 1.0)
-    google-cloud-dns (0.28.0)
-      google-api-client (~> 0.19.0)
-      google-cloud-core (~> 1.2)
-      googleauth (~> 0.6.2)
-      zonefile (~> 1.04)
-    google-cloud-env (1.0.2)
-      faraday (~> 0.11)
-    google-cloud-error_reporting (0.30.1)
-      google-cloud-core (~> 1.2)
-      google-gax (~> 1.0)
-      stackdriver-core (~> 1.3)
-    google-cloud-firestore (0.22.0)
-      concurrent-ruby (~> 1.0)
-      google-cloud-core (~> 1.2)
-      google-gax (~> 1.0)
-    google-cloud-language (0.30.0)
-      google-gax (~> 1.0)
-    google-cloud-logging (1.5.1)
-      google-cloud-core (~> 1.2)
-      google-gax (~> 1.0)
-      stackdriver-core (~> 1.3)
-    google-cloud-monitoring (0.28.0)
-      google-gax (~> 1.0)
-    google-cloud-os_login (0.1.0)
-      google-gax (~> 1.0.0)
-    google-cloud-pubsub (0.31.0)
-      concurrent-ruby (~> 1.0)
-      google-cloud-core (~> 1.2)
-      google-gax (~> 1.0)
-      grpc-google-iam-v1 (~> 0.6.9)
-    google-cloud-resource_manager (0.29.0)
-      google-api-client (~> 0.19.8)
-      google-cloud-core (~> 1.2)
-      googleauth (~> 0.6.2)
-    google-cloud-spanner (1.6.0)
-      concurrent-ruby (~> 1.0)
-      google-cloud-core (~> 1.2)
-      google-gax (~> 1.0)
-      grpc-google-iam-v1 (~> 0.6.9)
-    google-cloud-speech (0.30.0)
-      google-gax (~> 1.0)
-    google-cloud-storage (1.12.0)
-      digest-crc (~> 0.4)
-      google-api-client (~> 0.19.0)
-      google-cloud-core (~> 1.2)
-      googleauth (~> 0.6.2)
-    google-cloud-trace (0.33.1)
-      google-cloud-core (~> 1.2)
-      google-gax (~> 1.0)
-      stackdriver-core (~> 1.3)
-    google-cloud-translate (1.2.0)
-      faraday (~> 0.13)
-      google-cloud-core (~> 1.2)
-      googleauth (~> 0.6.2)
-    google-cloud-video_intelligence (1.0.0)
-      google-gax (~> 1.0)
-    google-cloud-vision (0.29.0)
-      google-cloud-core (~> 1.2)
-      google-gax (~> 1.0)
-    google-gax (1.0.1)
-      google-protobuf (~> 3.2)
-      googleapis-common-protos (>= 1.3.5, < 2.0)
-      googleauth (~> 0.6.2)
-      grpc (>= 1.7.2, < 2.0)
-      rly (~> 0.2.3)
-    google-protobuf (3.6.0)
-    googleapis-common-protos (1.3.7)
-      google-protobuf (~> 3.0)
-      googleapis-common-protos-types (~> 1.0)
-      grpc (~> 1.0)
-    googleapis-common-protos-types (1.0.1)
-      google-protobuf (~> 3.0)
-    googleauth (0.6.2)
+    googleauth (0.6.4)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
-      logging (~> 2.0)
       memoist (~> 0.12)
       multi_json (~> 1.11)
-      os (~> 0.9)
+      os (>= 0.9, < 2.0)
       signet (~> 0.7)
-    grpc (1.13.0)
-      google-protobuf (~> 3.1)
-      googleapis-common-protos-types (~> 1.0.0)
-    grpc-google-iam-v1 (0.6.9)
-      googleapis-common-protos (>= 1.3.1, < 2.0)
-      grpc (~> 1.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
@@ -307,25 +185,25 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     minitar (0.6.1)
-    mixlib-archive (0.4.8)
+    mixlib-archive (0.4.13)
       mixlib-log
     mixlib-authentication (2.1.1)
     mixlib-cli (1.7.0)
     mixlib-config (2.2.13)
       tomlrb
-    mixlib-install (3.11.2)
+    mixlib-install (3.11.5)
       mixlib-shellout
       mixlib-versioning
       thor
     mixlib-log (2.0.4)
     mixlib-shellout (2.4.0)
     mixlib-versioning (1.2.2)
-    molinillo (0.6.5)
+    molinillo (0.6.6)
     ms_rest (0.7.2)
       concurrent-ruby (~> 1.0)
       faraday (~> 0.9)
       timeliness (~> 0.3)
-    ms_rest_azure (0.10.8)
+    ms_rest_azure (0.11.0)
       concurrent-ruby (~> 1.0)
       faraday (~> 0.9)
       faraday-cookie_jar (~> 0.0.6)
@@ -344,19 +222,19 @@ GEM
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.2.0)
     nori (2.6.0)
-    ohai (14.3.0)
+    ohai (14.4.0)
       chef-config (>= 12.8, < 15)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
-      mixlib-cli
+      mixlib-cli (>= 1.7.0)
       mixlib-config (~> 2.0)
       mixlib-log (~> 2.0, >= 2.0.1)
       mixlib-shellout (~> 2.0)
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
-    os (0.9.6)
+    os (1.0.0)
     paint (1.0.1)
     parallel (1.12.1)
     parser (2.5.1.2)
@@ -388,23 +266,22 @@ GEM
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rly (0.2.3)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
+      rspec-support (~> 3.8.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.7.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
@@ -438,13 +315,11 @@ GEM
     solve (4.0.0)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 3.0)
-    specinfra (2.75.0)
+    specinfra (2.75.1)
       net-scp
       net-ssh (>= 2.7)
       net-telnet
       sfl
-    stackdriver-core (1.3.0)
-      google-cloud-core (~> 1.2)
     syslog-logger (1.6.8)
     systemu (2.6.5)
     thor (0.20.0)
@@ -452,12 +327,11 @@ GEM
     toml-rb (1.1.1)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.2.7)
-    train (1.4.24)
+    train (1.4.25)
       aws-sdk (~> 2)
       azure_mgmt_resources (~> 0.15)
       docker-api (~> 1.26)
       google-api-client (~> 0.19.8)
-      google-cloud (~> 0.51.1)
       googleauth (~> 0.6.2)
       inifile
       json (>= 1.8, < 3.0)
@@ -494,7 +368,6 @@ GEM
       rubyzip (~> 1.1)
       winrm (~> 2.0)
     wmi-lite (1.0.0)
-    zonefile (1.06)
 
 PLATFORMS
   ruby
@@ -512,4 +385,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.16.2
+   1.16.3

data/lib/chef_apply/action/base.rb

@@ -88,19 +88,19 @@ module ChefApply
       # Chef 13 on Linux requires full path specifiers for --config and --recipe-url while on Chef 13 and 14 on
       # Windows must use relative specifiers to prevent URI from causing an error
       # (https://github.com/chef/chef/pull/7223/files).
-      def run_chef(working_dir, config, policy)
+      def run_chef(working_dir, config_file, policy)
         case family
         when :windows
           "Set-Location -Path #{working_dir}; " +
             # We must 'wait' for chef-client to finish before changing directories and Out-Null does that
-            "chef-client -z --config #{config} --recipe-url #{policy} | Out-Null; " +
+            "chef-client -z --config #{File.join(working_dir, config_file)} --recipe-url #{File.join(working_dir, policy)} | Out-Null; " +
             # We have to leave working dir so we don't hold a lock on it, which allows us to delete this tempdir later
             "Set-Location C:/; " +
             "exit $LASTEXITCODE"
         else
           # cd is shell a builtin, so much call 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)} --recipe-url #{File.join(working_dir, policy)}'"
+          "bash -c 'cd #{working_dir}; 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/base.rb

@@ -16,15 +16,14 @@
 #
 
 require "chef_apply/action/base"
+require "chef_apply/minimum_chef_version"
 require "fileutils"
 
 module ChefApply::Action::InstallChef
   class Base < ChefApply::Action::Base
-    MIN_14_VERSION = Gem::Version.new("14.1.1")
-    MIN_13_VERSION = Gem::Version.new("13.10.0")
 
     def perform_action
-      if check_minimum_chef_version!(target_host) == :minimum_version_met
+      if ChefApply::MinimumChefVersion.check!(target_host, config[:check_only]) == :minimum_version_met
         notify(:already_installed)
       else
         perform_local_install
@@ -107,31 +106,6 @@ module ChefApply::Action::InstallChef
       remote_path
     end
 
-    def check_minimum_chef_version!(target)
-      begin
-        installed_version = target.installed_chef_version
-      rescue ChefApply::TargetHost::ChefNotInstalled
-        if config[:check_only]
-          raise ClientNotInstalled.new()
-        end
-        return :client_not_installed
-      end
-
-      case
-        when installed_version >= Gem::Version.new("14.0.0") && installed_version < MIN_14_VERSION
-          raise Client14Outdated.new(installed_version, MIN_14_VERSION)
-        when installed_version >= Gem::Version.new("13.0.0") && installed_version < MIN_13_VERSION
-          raise Client13Outdated.new(installed_version, MIN_13_VERSION, MIN_14_VERSION)
-        when installed_version < Gem::Version.new("13.0.0")
-          # If they have Chef < 13.0.0 installed we want to show them the easiest upgrade path -
-          # Chef 13 first and then Chef 14 since most customers cannot make the leap directly
-          # to 14.
-          raise Client13Outdated.new(installed_version, MIN_13_VERSION, MIN_14_VERSION)
-      end
-
-      :minimum_version_met
-    end
-
     def setup_remote_temp_path
       raise NotImplementedError
     end
@@ -140,20 +114,4 @@ module ChefApply::Action::InstallChef
       raise NotImplementedError
     end
   end
-
-  class ClientNotInstalled < ChefApply::ErrorNoLogs
-    def initialize(); super("CHEFINS002"); end
-  end
-
-  class Client13Outdated < ChefApply::ErrorNoLogs
-    def initialize(current_version, min_13_version, min_14_version)
-      super("CHEFINS003", current_version, min_13_version, min_14_version)
-    end
-  end
-
-  class Client14Outdated < ChefApply::ErrorNoLogs
-    def initialize(current_version, target_version)
-      super("CHEFINS004", current_version, target_version)
-    end
-  end
 end

data/lib/chef_apply/log.rb

@@ -22,7 +22,6 @@ module ChefApply
     extend Mixlib::Log
 
     def self.setup(location, log_level)
-      @location = location
       if location.is_a?(String)
         if location.casecmp("stdout") == 0
           location = $stdout
@@ -30,6 +29,7 @@ module ChefApply
           location = File.open(location, "w+")
         end
       end
+      @location = location
       init(location)
       Log.level = log_level
     end

data/lib/chef_apply/minimum_chef_version.rb

@@ -0,0 +1,79 @@
+#
+# 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.
+#
+
+require "chef_apply/error"
+
+module ChefApply
+  class MinimumChefVersion
+
+    CONSTRAINTS = {
+      windows: {
+        13 => Gem::Version.new("13.10.4"),
+        14 => Gem::Version.new("14.4.22")
+      },
+      linux: {
+        13 => Gem::Version.new("13.10.4"),
+        14 => Gem::Version.new("14.1.1")
+      }
+    }
+
+    def self.check!(target, check_only)
+      begin
+        installed_version = target.installed_chef_version
+      rescue ChefApply::TargetHost::ChefNotInstalled
+        if check_only
+          raise ClientNotInstalled.new()
+        end
+        return :client_not_installed
+      end
+
+      os_constraints = CONSTRAINTS[target.base_os]
+      min_14_version = os_constraints[14]
+      min_13_version = os_constraints[13]
+
+      case
+        when installed_version >= Gem::Version.new("14.0.0") && installed_version < min_14_version
+          raise Client14Outdated.new(installed_version, min_14_version)
+        when installed_version >= Gem::Version.new("13.0.0") && installed_version < min_13_version
+          raise Client13Outdated.new(installed_version, min_13_version, min_14_version)
+        when installed_version < Gem::Version.new("13.0.0")
+          # If they have Chef < 13.0.0 installed we want to show them the easiest upgrade path -
+          # Chef 13 first and then Chef 14 since most customers cannot make the leap directly
+          # to 14.
+          raise Client13Outdated.new(installed_version, min_13_version, min_14_version)
+      end
+
+      :minimum_version_met
+    end
+
+    class ClientNotInstalled < ChefApply::ErrorNoLogs
+      def initialize(); super("CHEFINS002"); end
+    end
+
+    class Client13Outdated < ChefApply::ErrorNoLogs
+      def initialize(current_version, min_13_version, min_14_version)
+        super("CHEFINS003", current_version, min_13_version, min_14_version)
+      end
+    end
+
+    class Client14Outdated < ChefApply::ErrorNoLogs
+      def initialize(current_version, target_version)
+        super("CHEFINS004", current_version, target_version)
+      end
+    end
+  end
+end

data/lib/chef_apply/startup.rb

@@ -165,7 +165,7 @@ module ChefApply
       ChefConfig.logger = ChefApply::Log
       # Setting the config isn't enough, we need to ensure the logger is initialized
       # or automatic initialization will still go to stdout
-      Chef::Log.init(ChefApply::Log)
+      Chef::Log.init(ChefApply::Log.location)
       Chef::Log.level = ChefApply::Log.level
     end
 

data/lib/chef_apply/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefApply
-  VERSION = "0.1.18"
+  VERSION = "0.1.21"
 end

data/spec/unit/action/base_spec.rb

@@ -70,7 +70,7 @@ RSpec.describe ChefApply::Action::Base do
     it "correctly returns chef run string" do
       expect(action.run_chef("a", "b", "c")).to eq(
         "Set-Location -Path a; " \
-        "chef-client -z --config b --recipe-url c | Out-Null; " \
+        "chef-client -z --config #{File.join("a", "b")} --recipe-url #{File.join("a", "c")} | Out-Null; " \
         "Set-Location C:/; " \
         "exit $LASTEXITCODE"
       )

data/spec/unit/action/install_chef/base_spec.rb

@@ -41,7 +41,8 @@ RSpec.describe ChefApply::Action::InstallChef::Base do
 
   subject(:install) do
     ChefApply::Action::InstallChef::Base.new(target_host: target_host,
-                                             reporter: reporter) end
+                                             reporter: reporter,
+                                             check_only: false) end
   before do
     target_host.connect!
     target_host.backend.mock_os(mock_opts)
@@ -50,7 +51,7 @@ RSpec.describe ChefApply::Action::InstallChef::Base do
   context "#perform_action" do
     context "when chef is already installed on target" do
       it "notifies of success and takes no further action" do
-        expect(install).to receive(:check_minimum_chef_version!).with(install.target_host)
+        expect(ChefApply::MinimumChefVersion).to receive(:check!).with(install.target_host, false)
                        .and_return(:minimum_version_met)
         expect(install).not_to receive(:perform_local_install)
         install.perform_action
@@ -59,7 +60,7 @@ RSpec.describe ChefApply::Action::InstallChef::Base do
 
     context "when chef is not already installed on target" do
       it "should invoke perform_local_install" do
-        expect(install).to receive(:check_minimum_chef_version!).with(install.target_host)
+        expect(ChefApply::MinimumChefVersion).to receive(:check!).with(install.target_host, false)
                        .and_return(:client_not_installed)
         expect(install).to receive(:perform_local_install)
         install.perform_action
@@ -164,71 +165,4 @@ RSpec.describe ChefApply::Action::InstallChef::Base do
       end
     end
   end
-
-  context "#check_minimum_chef_version!" do
-    let(:target) { install.target_host }
-    context "when chef is not already installed on target" do
-      before do
-        expect(target).to receive(:installed_chef_version).
-          and_raise ChefApply::TargetHost::ChefNotInstalled.new
-      end
-
-      it "should return :client_not_installed" do
-        actual = install.check_minimum_chef_version!(target)
-        expect(:client_not_installed).to eq(actual)
-      end
-
-      context "when config is set to check_only" do
-        after do
-          install.config.clear
-        end
-
-        it "raises ClientNotInstalled" do
-          install.config[:check_only] = true
-          expect do
-            install.check_minimum_chef_version!(target)
-          end.to raise_error(ChefApply::Action::InstallChef::ClientNotInstalled)
-        end
-      end
-    end
-
-    min_14_version = ChefApply::Action::InstallChef::Base::MIN_14_VERSION
-    min_13_version = ChefApply::Action::InstallChef::Base::MIN_13_VERSION
-    context "when chef is already installed on target at the correct minimum Chef 14 version" do
-      before do
-        expect(target).to receive(:installed_chef_version).and_return min_14_version
-      end
-      it "should return :minimum_version_met" do
-        actual = install.check_minimum_chef_version!(target)
-        expect(:minimum_version_met).to eq(actual)
-      end
-    end
-
-    context "when chef is already installed on target at the correct minimum Chef 13 version" do
-      before do
-        expect(target).to receive(:installed_chef_version).and_return min_13_version
-      end
-      it "should return :minimum_version_met" do
-        actual = install.check_minimum_chef_version!(target)
-        expect(:minimum_version_met).to eq(actual)
-      end
-    end
-
-    installed_expected = {
-      Gem::Version.new("12.1.1") => ChefApply::Action::InstallChef::Client13Outdated,
-      Gem::Version.new("13.9.0") => ChefApply::Action::InstallChef::Client13Outdated,
-      Gem::Version.new("14.1.0") => ChefApply::Action::InstallChef::Client14Outdated,
-    }
-    installed_expected.each do |installed, expected|
-      context "when chef is already installed on target at version #{installed}" do
-        before do
-          expect(target).to receive(:installed_chef_version).
-            and_return installed
-        end
-        it "notifies of failure and takes no further action" do
-          expect { install.check_minimum_chef_version!(target) }.to raise_error(expected)
-        end
-      end
-    end
-  end
 end

data/spec/unit/minimum_chef_version_spec.rb

@@ -0,0 +1,90 @@
+#
+# Copyright:: Copyright (c) 2018 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.
+#
+
+require "chef_apply/minimum_chef_version"
+require "chef_apply/target_host"
+require "spec_helper"
+
+RSpec.describe ChefApply::MinimumChefVersion do
+  let(:base_os) { :linux }
+  let(:version) { 14 }
+  let(:target) { instance_double(ChefApply::TargetHost, base_os: base_os, installed_chef_version: version) }
+  subject(:klass) { ChefApply::MinimumChefVersion }
+
+  context "#check!" do
+    context "when chef is not already installed on target" do
+      before do
+        expect(target).to receive(:installed_chef_version).
+          and_raise ChefApply::TargetHost::ChefNotInstalled.new
+      end
+
+      it "should return :client_not_installed" do
+        actual = klass.check!(target, false)
+        expect(:client_not_installed).to eq(actual)
+      end
+
+      context "when config is set to check_only" do
+        it "raises ClientNotInstalled" do
+          expect do
+            klass.check!(target, true)
+          end.to raise_error(ChefApply::MinimumChefVersion::ClientNotInstalled)
+        end
+      end
+    end
+
+    [:windows, :linux].each do |os|
+      context "on #{os}" do
+        let(:base_os) { os }
+        [13, 14].each do |major_version|
+          context "when chef is already installed at the correct minimum Chef #{major_version} version" do
+            let(:version) { ChefApply::MinimumChefVersion::CONSTRAINTS[os][major_version] }
+            it "should return :minimum_version_met" do
+              actual = klass.check!(target, false)
+              expect(:minimum_version_met).to eq(actual)
+            end
+          end
+        end
+      end
+    end
+
+    installed_expected = {
+      windows: {
+        Gem::Version.new("12.1.1") => ChefApply::MinimumChefVersion::Client13Outdated,
+        Gem::Version.new("13.9.0") => ChefApply::MinimumChefVersion::Client13Outdated,
+        Gem::Version.new("14.3.37") => ChefApply::MinimumChefVersion::Client14Outdated,
+      },
+      linux: {
+        Gem::Version.new("12.1.1") => ChefApply::MinimumChefVersion::Client13Outdated,
+        Gem::Version.new("13.9.0") => ChefApply::MinimumChefVersion::Client13Outdated,
+        Gem::Version.new("14.1.0") => ChefApply::MinimumChefVersion::Client14Outdated,
+      }
+    }
+    [:windows, :linux].each do |os|
+      context "on #{os}" do
+        let(:base_os) { os }
+        installed_expected[os].each do |installed, expected|
+          context "when chef is already installed on target at version #{installed}" do
+            let(:version) { installed }
+            it "notifies of failure and takes no further action" do
+              expect { klass.check!(target, false) }.to raise_error(expected)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/unit/startup_spec.rb

@@ -265,7 +265,7 @@ RSpec.describe ChefApply::Startup do
       expect(ChefApply::Log).to receive(:setup).
         with(log_path, log_level)
       expect(Chef::Log).to receive(:init).
-        with(ChefApply::Log)
+        with(ChefApply::Log.location)
       subject.setup_logging
       expect(ChefConfig.logger).to eq(ChefApply::Log)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-apply
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.21
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2018-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -341,6 +341,7 @@ files:
 - lib/chef_apply/errors/standard_error_resolver.rb
 - lib/chef_apply/file_fetcher.rb
 - lib/chef_apply/log.rb
+- lib/chef_apply/minimum_chef_version.rb
 - lib/chef_apply/recipe_lookup.rb
 - lib/chef_apply/startup.rb
 - lib/chef_apply/status_reporter.rb
@@ -377,6 +378,7 @@ files:
 - spec/unit/file_fetcher_spec.rb
 - spec/unit/fixtures/multi-error.out
 - spec/unit/log_spec.rb
+- spec/unit/minimum_chef_version_spec.rb
 - spec/unit/recipe_lookup_spec.rb
 - spec/unit/startup_spec.rb
 - spec/unit/target_host_spec.rb