chef-apply 0.3.3 → 0.4.6

data/spec/unit/action/install_chef_spec.rb

@@ -47,8 +47,8 @@ RSpec.describe ChefApply::Action::InstallChef 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(ChefApply::MinimumChefVersion).to receive(:check!).with(install.target_host, false)
-                       .and_return(:minimum_version_met)
+        expect(ChefApply::Action::InstallChef::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
       end
@@ -56,8 +56,8 @@ RSpec.describe ChefApply::Action::InstallChef do
 
     context "when chef is not already installed on target" do
       it "should invoke perform_local_install" do
-        expect(ChefApply::MinimumChefVersion).to receive(:check!).with(install.target_host, false)
-                       .and_return(:client_not_installed)
+        expect(ChefApply::Action::InstallChef::MinimumChefVersion).to receive(:check!).with(install.target_host, false)
+          .and_return(:client_not_installed)
         expect(install).to receive(:perform_local_install)
         install.perform_action
       end

data/spec/unit/cli/options_spec.rb

@@ -39,23 +39,23 @@ RSpec.describe ChefApply::CLIOptions do
   let(:klass) { ChefApply::CLIOptions::TestClass.new }
 
   it "contains the specified options" do
-    expect(klass.options.keys).to eq([
-      :version,
-      :help,
-      :config_path,
-      :identity_file,
-      :ssl,
-      :ssl_verify,
-      :protocol,
-      :user,
-      :password,
-      :cookbook_repo_paths,
-      :install,
-      :sudo,
-      :sudo_command,
-      :sudo_password,
-      :sudo_options
-    ])
+    expect(klass.options.keys).to eq(%i{
+      version
+      help
+      config_path
+      identity_file
+      ssl
+      ssl_verify
+      protocol
+      user
+      password
+      cookbook_repo_paths
+      install
+      sudo
+      sudo_command
+      sudo_password
+      sudo_options
+    })
   end
 
   it "persists certain CLI options back to the ChefApply::Config" do

data/spec/unit/cli/validation_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe ChefApply::CLI::Validation do
     it "raises an error if not enough params are specified" do
       params = [
         [],
-        %w{one}
+        %w{one},
       ]
       params.each do |p|
         expect { subject.validate_params(p) }.to raise_error(OptionValidationError) do |e|
@@ -31,7 +31,7 @@ RSpec.describe ChefApply::CLI::Validation do
     it "succeeds if the second argument looks like a cookbook name" do
       params = [
         %w{target cb},
-        %w{target cb::recipe}
+        %w{target cb::recipe},
       ]
       params.each do |p|
         expect { subject.validate_params(p) }.to_not raise_error
@@ -60,7 +60,7 @@ RSpec.describe ChefApply::CLI::Validation do
   end
   describe "#properties_from_string" do
     it "parses properties into a hash" do
-      provided = %w{key1=value key2=1 key3=true key4=FaLsE key5=0777 key6=https://some.website key7=num1and2digit key_8=underscore}
+      provided = %w{key1=value key2=1 key3=true key4=FaLsE key5=0777 key6=https://some.website key7=num1and2digit key_8=underscore key9=127.0.0.1 key10=1. key11=1.1}
       expected = {
         "key1" => "value",
         "key2" => 1,
@@ -70,6 +70,9 @@ RSpec.describe ChefApply::CLI::Validation do
         "key6" => "https://some.website",
         "key7" => "num1and2digit",
         "key_8" => "underscore",
+        "key9" => "127.0.0.1",
+        "key10" => 1.0,
+        "key11" => 1.1,
       }
       expect(subject.properties_from_string(provided)).to eq(expected)
     end

data/spec/unit/cli_spec.rb

@@ -22,6 +22,7 @@ require "chef_apply/telemeter"
 require "chef_apply/telemeter/sender"
 require "chef_apply/ui/terminal"
 require "chef_apply/action/generate_temp_cookbook"
+require "chef_apply/action/generate_temp_cookbook/temp_cookbook"
 
 require "chef-cli/ui"
 
@@ -200,7 +201,7 @@ RSpec.describe ChefApply::CLI do
     let(:action) { double("generator", generated_cookbook: temp_cookbook) }
 
     context "when a resource is provided" do
-      it "gets an action via GenerateTemporaryCookbook.from_options and executes it " do
+      it "gets an action via GenerateTempCookbook.from_options and executes it " do
         expect(ChefApply::Action::GenerateTempCookbook)
           .to receive(:from_options)
           .with(resource_type: "user",
@@ -213,7 +214,7 @@ RSpec.describe ChefApply::CLI do
 
     context "when a recipe specifier is provided" do
 
-      it "gets an action via GenerateTemporaryCookbook.from_options and executes it" do
+      it "gets an action via GenerateTempCookbook.from_options and executes it" do
         expect(ChefApply::Action::GenerateTempCookbook)
           .to receive(:from_options)
           .with(recipe_spec: "mycookbook::default", cookbook_repo_paths: "/tmp")
@@ -316,7 +317,7 @@ RSpec.describe ChefApply::CLI do
 
   describe "#render_cookbook_setup" do
     let(:reporter) { instance_double(ChefApply::StatusReporter) }
-    let(:temp_cookbook) { double(ChefApply::TempCookbook) }
+    let(:temp_cookbook) { double(ChefApply::Action::GenerateTempCookbook::TempCookbook) }
     let(:archive_file_location) { "/path/to/archive" }
     let(:args) { [] }
     # before do
@@ -345,9 +346,10 @@ RSpec.describe ChefApply::CLI do
     let(:host2) { ChefApply::TargetHost.new("ssh://host2") }
     let(:cookbook_type) { :resource } # || :recipe
     let(:temp_cookbook) do
-      instance_double(ChefApply::TempCookbook,
-                      descriptor: "resource[name]",
-                      from: "resource") end
+      instance_double(ChefApply::Action::GenerateTempCookbook::TempCookbook,
+        descriptor: "resource[name]",
+        from: "resource")
+    end
     let(:archive_file_location) { "/path/to/archive" }
 
     before do
@@ -377,8 +379,9 @@ RSpec.describe ChefApply::CLI do
     let(:reporter) { double("reporter") }
     let(:action) do
       double("ChefApply::Actions::InstallChef",
-                          upgrading?: upgrading,
-                          version_to_install: "14.0") end
+        upgrading?: upgrading,
+        version_to_install: "14.0")
+    end
 
     it "updates status, creates an InstallChef action and executes it" do
       expect(reporter)
@@ -454,7 +457,7 @@ RSpec.describe ChefApply::CLI do
           let(:upgrading) { true }
           it "reports the update correctly" do
             expect(reporter).to receive(:update).with(text_context.upgrade_success(target_host.installed_chef_version,
-                                                                                   action.version_to_install))
+              action.version_to_install))
             subject.install(target_host, reporter)
           end
         end

data/spec/unit/log_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe ChefApply::Log do
   end
 
   after do
-    Log.setup "/dev/null", :error
+    Log.setup File::NULL, :error
   end
 
   it "correctly logs to stdout" do

data/spec/unit/startup_spec.rb

@@ -25,18 +25,18 @@ RSpec.describe ChefApply::Startup do
 
   describe "#run" do
     it "performs ordered startup tasks and invokes the CLI" do
-      ordered_messages = [:verify_not_in_chefdk,
-                          :first_run_tasks,
-                          :setup_workstation_user_directories,
-                          :setup_error_handling,
-                          :load_config,
-                          :setup_logging,
-                          :start_telemeter_upload,
-                          :start_chef_apply]
+      ordered_messages = %i{verify_not_in_chefdk
+                          first_run_tasks
+                          setup_workstation_user_directories
+                          setup_error_handling
+                          load_config
+                          setup_logging
+                          start_telemeter_upload
+                          start_chef_apply}
       ordered_messages.each do |msg|
         expect(subject).to receive(msg).ordered
       end
-      subject.run()
+      subject.run
     end
 
     context "when errors happen" do
@@ -304,9 +304,8 @@ RSpec.describe ChefApply::Startup do
 
     it "sets up the logging for ChefApply and Chef" do
       expect(ChefApply::Log).to receive(:setup)
-        .with(log_path, log_level)
-      expect(Chef::Log).to receive(:init)
-        .with(ChefApply::Log.location)
+        .with(ChefApply::Config.log.location, log_level)
+      expect(Chef::Log).to receive(:init).with(ChefApply::Log.stream)
       subject.setup_logging
       expect(ChefConfig.logger).to eq(ChefApply::Log)
     end

data/spec/unit/target_host/windows_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe ChefApply::TargetHost::Windows do
       expect(subject).to receive(:run_command!)
         .with(ChefApply::TargetHost::Windows::MKTEMP_COMMAND)
         .and_return(instance_double("result", stdout: path))
-      expect(subject.make_temp_dir()).to eq(path)
+      expect(subject.make_temp_dir).to eq(path)
     end
   end
 

data/spec/unit/target_host_spec.rb

@@ -221,7 +221,8 @@ RSpec.describe ChefApply::TargetHost do
     let(:path_is_file) { true }
     let(:remote_file_mock) do
       double("remote_file", exist?: path_exists,
-                                    file?: path_is_file, content: sample_content) end
+                                    file?: path_is_file, content: sample_content)
+    end
     before do
       expect(subject).to receive(:backend).and_return backend_mock
       expect(backend_mock).to receive(:file).with(path).and_return remote_file_mock
@@ -281,7 +282,7 @@ RSpec.describe ChefApply::TargetHost do
     it "creates the temp directory and changes ownership" do
       expect(subject).to receive(:make_temp_dir).and_return("/tmp/dir")
       expect(subject).to receive(:chown).with("/tmp/dir", subject.user)
-      subject.temp_dir()
+      subject.temp_dir
     end
   end
 

data/spec/unit/telemeter_spec.rb

@@ -62,11 +62,11 @@ RSpec.describe ChefApply::Telemeter do
     context "when a valid target_host is present" do
       it "invokes timed_capture with action and valid target data" do
         target = instance_double("TargetHost",
-                                 base_os: "windows",
-                                 version: "10.0.0",
-                                 architecture: "x86_64",
-                                 hostname: "My_Host",
-                                 transport_type: "winrm")
+          base_os: "windows",
+          version: "10.0.0",
+          architecture: "x86_64",
+          hostname: "My_Host",
+          transport_type: "winrm")
         action = instance_double("Action::Base", name: "test_action",
                                                  target_host: target)
         expected_data = {

data/spec/unit/text/error_translation_spec.rb

@@ -31,7 +31,8 @@ RSpec.describe ChefApply::Text::ErrorTranslation do
 
   let(:error_table) do
     { display_defaults: display_defaults,
-      TESTERROR: test_error } end
+      TESTERROR: test_error }
+  end
 
   let(:test_error_text) { "This is a test error" }
   let(:test_error) { {} }
@@ -39,11 +40,13 @@ RSpec.describe ChefApply::Text::ErrorTranslation do
   subject { ChefApply::Text::ErrorTranslation }
   let(:error_mock) do
     double("R18n::Translated",
-                            text: test_error_text ) end
+      text: test_error_text )
+  end
   let(:translation_mock) do
     double("R18n::Translated",
-                                 TESTERROR: error_mock,
-                                 text: test_error_text ) end
+      TESTERROR: error_mock,
+      text: test_error_text )
+  end
   before do
     # Mock out the R18n portion - our methods care only that the key exists, and
     # the test focus is on the display metadata.
@@ -67,7 +70,8 @@ RSpec.describe ChefApply::Text::ErrorTranslation do
   context "when all display attributes are specified" do
     let(:test_error) do
       { display: { decorations: false, header: false,
-                   footer: false, stack: true, log: true } } end
+                   footer: false, stack: true, log: true } }
+    end
     it "sets display attributes to specified values with no defaults" do
       translation = subject.new("TESTERROR")
       expect(translation.decorations).to be false
@@ -97,8 +101,8 @@ RSpec.describe ChefApply::Text::ErrorTranslation do
     it "raises InvalidDisplayAttributes when invalid attributes are specified" do
       expect { subject.new("TESTERROR") }
         .to raise_error(ChefApply::Text::ErrorTranslation::InvalidDisplayAttributes) do |e|
-        expect(e.invalid_attrs).to eq({ bad_value: true })
-      end
+          expect(e.invalid_attrs).to eq({ bad_value: true })
+        end
 
     end
   end

data/spec/unit/ui/error_printer_spec.rb

@@ -34,12 +34,11 @@ RSpec.describe ChefApply::UI::ErrorPrinter do
   let(:show_header) { true }
   let(:translation_mock) do
     instance_double("ChefApply::Errors::ErrorTranslation",
-                    footer: show_footer,
-                    log: show_log,
-                    stack: show_stack,
-                    header: show_header,
-                    decorations: has_decorations
-                   )
+      footer: show_footer,
+      log: show_log,
+      stack: show_stack,
+      header: show_header,
+      decorations: has_decorations)
   end
   subject { ChefApply::UI::ErrorPrinter.new(wrapped_exception, nil) }
 
@@ -188,7 +187,7 @@ RSpec.describe ChefApply::UI::ErrorPrinter do
 
     let(:orig_args) { %w{test} }
     it "formats and saves the backtrace" do
-      expect(inst).to receive(:add_backtrace_header).with(anything(), orig_args)
+      expect(inst).to receive(:add_backtrace_header).with(anything, orig_args)
       expect(inst).to receive(:add_formatted_backtrace)
       expect(inst).to receive(:save_backtrace)
       ChefApply::UI::ErrorPrinter.write_backtrace(wrapped_exception, orig_args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-apply
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.6
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2019-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -96,6 +96,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: train
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: train-winrm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,7 +235,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -232,9 +245,13 @@ files:
 - lib/chef_apply.rb
 - lib/chef_apply/action/base.rb
 - lib/chef_apply/action/converge_target.rb
+- lib/chef_apply/action/converge_target/ccr_failure_mapper.rb
 - lib/chef_apply/action/generate_local_policy.rb
 - lib/chef_apply/action/generate_temp_cookbook.rb
+- lib/chef_apply/action/generate_temp_cookbook/recipe_lookup.rb
+- lib/chef_apply/action/generate_temp_cookbook/temp_cookbook.rb
 - lib/chef_apply/action/install_chef.rb
+- lib/chef_apply/action/install_chef/minimum_chef_version.rb
 - lib/chef_apply/action/reporter.rb
 - lib/chef_apply/cli.rb
 - lib/chef_apply/cli/help.rb
@@ -242,12 +259,9 @@ files:
 - lib/chef_apply/cli/validation.rb
 - lib/chef_apply/config.rb
 - lib/chef_apply/error.rb
-- lib/chef_apply/errors/ccr_failure_mapper.rb
 - 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
 - lib/chef_apply/target_host.rb
@@ -257,7 +271,6 @@ files:
 - lib/chef_apply/telemeter.rb
 - lib/chef_apply/telemeter/patch.rb
 - lib/chef_apply/telemeter/sender.rb
-- lib/chef_apply/temp_cookbook.rb
 - lib/chef_apply/text.rb
 - lib/chef_apply/text/error_translation.rb
 - lib/chef_apply/text/text_wrapper.rb
@@ -275,20 +288,21 @@ files:
 - spec/spec_helper.rb
 - spec/support/matchers/output_to_terminal.rb
 - spec/unit/action/base_spec.rb
+- spec/unit/action/converge_target/ccr_failure_mapper_spec.rb
 - spec/unit/action/converge_target_spec.rb
 - spec/unit/action/generate_local_policy_spec.rb
+- spec/unit/action/generate_temp_cookbook/recipe_lookup_spec.rb
+- spec/unit/action/generate_temp_cookbook/temp_cookbook_spec.rb
 - spec/unit/action/generate_temp_cookbook_spec.rb
+- spec/unit/action/install_chef/minimum_chef_version_spec.rb
 - spec/unit/action/install_chef_spec.rb
 - spec/unit/cli/options_spec.rb
 - spec/unit/cli/validation_spec.rb
 - spec/unit/cli_spec.rb
 - spec/unit/config_spec.rb
-- spec/unit/errors/ccr_failure_mapper_spec.rb
 - 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/linux_spec.rb
 - spec/unit/target_host/windows_spec.rb
@@ -296,7 +310,6 @@ files:
 - spec/unit/target_resolver_spec.rb
 - spec/unit/telemeter/sender_spec.rb
 - spec/unit/telemeter_spec.rb
-- spec/unit/temp_cookbook_spec.rb
 - spec/unit/text/error_translation_spec.rb
 - spec/unit/ui/error_printer_spec.rb
 - spec/unit/ui/terminal_spec.rb