chef-apply 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47763f0152ecf082b519b5e8f19aee5616d37bbf96693b0751e74f51632be7f8
-  data.tar.gz: 55feba8903fa01cab32672129689d34ead1e005750db15505cd5fbae9ab54366
+  metadata.gz: 3452a6c94fdf5d7605ec66ca32cc4a08127a4ff7eb9c471e7aff1748b68c66a5
+  data.tar.gz: d2d7543d20acaa3f03311f6ef9c68f80bb216c8056c36371618adbbfb7281cc9
 SHA512:
-  metadata.gz: 16ce92eeadd92a96cf00a56d4c2faaa551fef3b442eee4ba54cda7f81671f8af876090611e59f2ece3b7ded1ec04f29bb56baa1f6e183c5db2bfc919915703c5
-  data.tar.gz: de6f1bd15e8e62c54332089364cfe1a3c9989e903403913667fa77ebd15af96479654ed279c6c4ce04d345864a50a2ad9c844481f8f7771b4a59d3b26d266f6a
+  metadata.gz: cd7642f35d6a960c4f461afac548807bbffe395ef2d6e8d922938f5a6c3045c01ede76ed35b70fde10aa0faf19fc4ae333597b3f9c795888aa8cb53119367af0
+  data.tar.gz: 48765499c4ccf446475cdc80f8f078a5398c22e1244f364ebb51177a8cffbfd443ae8dae85b3cbe62f1f1b024ca201281c024acf85ff479e3ac68285f8e59070

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    chef-apply (0.2.2)
+    chef-apply (0.2.4)
       chef (>= 14.0)
       chef-dk (>= 3.0)
       chef-telemetry
@@ -21,13 +21,13 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
-    aws-sdk (2.11.153)
-      aws-sdk-resources (= 2.11.153)
-    aws-sdk-core (2.11.153)
+    aws-sdk (2.11.178)
+      aws-sdk-resources (= 2.11.178)
+    aws-sdk-core (2.11.178)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.153)
-      aws-sdk-core (= 2.11.153)
+    aws-sdk-resources (2.11.178)
+      aws-sdk-core (= 2.11.178)
     aws-sigv4 (1.0.3)
     azure_graph_rbac (0.17.0)
       ms_rest_azure (~> 0.11.0)
@@ -39,10 +39,10 @@ GEM
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
     byebug (10.0.2)
-    chef (14.3.37)
+    chef (14.7.17)
       addressable
       bundler (>= 1.10)
-      chef-config (= 14.3.37)
+      chef-config (= 14.7.17)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -50,12 +50,11 @@ GEM
       ffi-yajl (~> 2.2)
       highline (~> 1.6, >= 1.6.9)
       iniparse (~> 1.4)
-      iso8601 (~> 0.9.1)
       mixlib-archive (~> 0.4)
       mixlib-authentication (~> 2.1)
       mixlib-cli (~> 1.7)
       mixlib-log (~> 2.0, >= 2.0.3)
-      mixlib-shellout (~> 2.0)
+      mixlib-shellout (~> 2.4)
       net-sftp (~> 2.1, >= 2.1.2)
       net-ssh (~> 4.2)
       net-ssh-multi (~> 1.2, >= 1.2.1)
@@ -70,13 +69,13 @@ GEM
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef-config (14.3.37)
+    chef-config (14.7.17)
       addressable
       fuzzyurl
       mixlib-config (>= 2.2.12, < 3.0)
       mixlib-shellout (~> 2.0)
       tomlrb (~> 1.2)
-    chef-dk (3.3.23)
+    chef-dk (3.5.13)
       addressable (>= 2.3.5, < 2.6)
       chef (~> 14.0)
       chef-provisioning (~> 2.0)
@@ -103,20 +102,20 @@ GEM
       concurrent-ruby (~> 1.0)
       ffi-yajl (~> 2.2)
       http (~> 2.2)
-    chef-zero (14.0.6)
+    chef-zero (14.0.11)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (~> 2.0)
-      rack (~> 2.0)
+      rack (~> 2.0, >= 2.0.6)
       uuidtools (~> 2.1)
-    cheffish (14.0.1)
+    cheffish (14.0.4)
       chef-zero (~> 14.0)
       net-ssh
-    chefstyle (0.10.0)
+    chefstyle (0.11.0)
       rubocop (= 0.55.0)
     citrus (3.0.2)
     coderay (1.1.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.3)
     cookbook-omnifetch (0.8.0)
       mixlib-archive (~> 0.4)
     debug_inspector (0.0.3)
@@ -132,7 +131,7 @@ GEM
     equatable (0.5.0)
     erubis (2.7.0)
     excon (0.62.0)
-    faraday (0.15.3)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
@@ -175,7 +174,6 @@ GEM
     inifile (3.0.0)
     iniparse (1.4.4)
     ipaddress (0.8.3)
-    iso8601 (0.9.1)
     jmespath (1.4.0)
     json (2.1.0)
     jwt (2.1.0)
@@ -185,11 +183,11 @@ GEM
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     memoist (0.16.0)
-    method_source (0.9.0)
+    method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
-    minitar (0.6.1)
+    minitar (0.7)
     mixlib-archive (0.4.18)
       mixlib-log
     mixlib-authentication (2.1.1)
@@ -242,7 +240,7 @@ GEM
     os (1.0.0)
     paint (1.0.1)
     parallel (1.12.1)
-    parser (2.5.1.2)
+    parser (2.5.3.0)
       ast (~> 2.4.0)
     pastel (0.7.2)
       equatable (~> 0.5.0)
@@ -250,20 +248,20 @@ GEM
     plist (3.4.0)
     powerpack (0.1.2)
     proxifier (1.0.3)
-    pry (0.11.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
-    pry-stack_explorer (0.4.9.2)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
     public_suffix (3.0.3)
-    r18n-core (3.1.2)
-    r18n-desktop (3.1.2)
-      r18n-core (= 3.1.2)
-    rack (2.0.5)
+    r18n-core (3.2.0)
+    r18n-desktop (3.2.0)
+      r18n-core (= 3.2.0)
+    rack (2.0.6)
     rainbow (3.0.0)
     rake (12.3.1)
     representable (3.0.4)
@@ -297,7 +295,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
+    ruby-progressbar (1.10.0)
     rubyntlm (0.6.2)
     rubyzip (1.2.2)
     semverse (2.0.0)
@@ -320,19 +318,19 @@ GEM
     solve (4.0.0)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 3.0)
-    specinfra (2.76.2)
+    specinfra (2.76.3)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
       sfl
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    thor (0.20.0)
+    thor (0.20.3)
     timeliness (0.3.8)
     toml-rb (1.1.2)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.2.7)
-    train (1.5.4)
+    train (1.5.6)
       aws-sdk (~> 2)
       azure_graph_rbac (~> 0.16)
       azure_mgmt_key_vault (~> 0.17)
@@ -392,4 +390,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.16.6
+   1.17.1

data/Rakefile

@@ -17,7 +17,7 @@
 
 require "bundler/gem_tasks"
 
-task :default => [:spec, :style]
+task default: [:spec, :style]
 
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
@@ -29,4 +29,4 @@ RuboCop::RakeTask.new(:chefstyle) do |t|
   t.options = %w{--display-cop-names}
 end
 
-task :style => :chefstyle
+task style: :chefstyle

data/lib/chef_apply/action/base.rb

@@ -63,8 +63,8 @@ module ChefApply
         delete_folder: {
           windows: "Remove-Item -Recurse -Force –Path",
           other: "rm -rf",
-        }
-      }
+        },
+      }.freeze
 
       # TODO - I'd like to consider PATH_MAPPING in action::base
       #        to platform subclasses/mixins for target_host.  This way our 'target host'

data/lib/chef_apply/action/generate_temp_cookbook.rb

@@ -24,11 +24,11 @@ module ChefApply::Action
     attr_reader :generated_cookbook
 
     def self.from_options(opts)
-      if opts.has_key?(:recipe_spec)
+      if opts.key?(:recipe_spec)
         GenerateCookbookFromRecipe.new(opts)
-      elsif opts.has_key?(:resource_name) &&
-          opts.has_key?(:resource_type) &&
-          opts.has_key?(:resource_properties)
+      elsif opts.key?(:resource_name) &&
+          opts.key?(:resource_type) &&
+          opts.key?(:resource_properties)
         GenerateCookbookFromResource.new(opts)
       else
         raise MissingOptions.new(opts)

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

@@ -74,7 +74,7 @@ module ChefApply::Action::InstallChef
         product_name: "chef",
         product_version: :latest,
         channel: :stable,
-        platform_version_compatibility_mode: true
+        platform_version_compatibility_mode: true,
       }
       case platform.name
       when /windows/

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

@@ -25,7 +25,7 @@ module ChefApply::Action::InstallChef
         product_name: "chef",
         channel: :stable,
         shell_type: :ps1,
-        version: "13"
+        version: "13",
       })
       target_host.run_command! installer.install_command
     end

data/lib/chef_apply/action/reporter.rb

@@ -28,7 +28,7 @@ module ChefApply
         Chef::Log.info("Creating run report")
       end
 
-      #ensure start time and end time are output in the json properly in the event activesupport happens to be on the system
+      # ensure start time and end time are output in the json properly in the event activesupport happens to be on the system
       run_data = data
       run_data[:start_time] = run_data[:start_time].to_s
       run_data[:end_time] = run_data[:end_time].to_s

data/lib/chef_apply/cli.rb

@@ -1,5 +1,5 @@
 #
-#p
+# p
 # Copyright:: Copyright (c) 2018 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
@@ -137,10 +137,12 @@ module ChefApply
         @temp_cookbook = generate_temp_cookbook(arguments, reporter)
       end
       UI::Terminal.render_job("...", job)
+      handle_failed_job(job)
       job = UI::Terminal::Job.new("", nil) do |reporter|
         @archive_file_location = generate_local_policy(reporter)
       end
       UI::Terminal.render_job("...", job)
+      handle_failed_job(job)
     end
 
     def render_converge(target_hosts)
@@ -154,7 +156,7 @@ module ChefApply
       end
       header = TS.converge.header(target_hosts.length, temp_cookbook.descriptor, temp_cookbook.from)
       UI::Terminal.render_parallel_jobs(header, jobs)
-      handle_job_failures(jobs)
+      handle_failed_jobs(jobs)
     end
 
     # Accepts a target_host and establishes the connection to that host
@@ -286,7 +288,7 @@ module ChefApply
     # job to avoid interrupting other jobs in process.  This function
     # collects them and raises directly (in the case of just one job in the list)
     # or raises a MultiJobFailure (when more than one job was being run)
-    def handle_job_failures(jobs)
+    def handle_failed_jobs(jobs)
       failed_jobs = jobs.select { |j| !j.exception.nil? }
       return if failed_jobs.empty?
       if jobs.length == 1
@@ -297,6 +299,10 @@ module ChefApply
       raise ChefApply::MultiJobFailure.new(failed_jobs)
     end
 
+    def handle_failed_job(job)
+      raise job.exception unless job.exception.nil?
+    end
+
     # A handler for common action messages
     def handle_message(message, data, reporter)
       if message == :error # data[0] = exception

data/lib/chef_apply/cli/validation.rb

@@ -21,7 +21,7 @@ module ChefApply
   class CLI
     module Validation
       PROPERTY_MATCHER = /^([a-zA-Z0-9_]+)=(.+)$/
-      CB_MATCHER = '[\w\-]+'
+      CB_MATCHER = '[\w\-]+'.freeze
 
       # The first param is always hostname. Then we either have
       # 1. A recipe designation

data/lib/chef_apply/config.rb

@@ -25,7 +25,7 @@ require "chef-config/workstation_config_loader"
 module ChefApply
   class Config
     WS_BASE_PATH = File.join(Dir.home, ".chef-workstation/")
-    SUPPORTED_PROTOCOLS = %w{ssh winrm}
+    SUPPORTED_PROTOCOLS = %w{ssh winrm}.freeze
 
     class << self
       @custom_location = nil

data/lib/chef_apply/minimum_chef_version.rb

@@ -23,13 +23,13 @@ module ChefApply
     CONSTRAINTS = {
       windows: {
         13 => Gem::Version.new("13.10.4"),
-        14 => Gem::Version.new("14.4.22")
+        14 => Gem::Version.new("14.4.22"),
       },
       linux: {
         13 => Gem::Version.new("13.10.4"),
-        14 => Gem::Version.new("14.1.1")
-      }
-    }
+        14 => Gem::Version.new("14.1.1"),
+      },
+    }.freeze
 
     def self.check!(target, check_only)
       begin

data/lib/chef_apply/target_host.rb

@@ -24,7 +24,7 @@ module ChefApply
     # These values may exist in .ssh/config but will be ignored by train
     # in favor of its defaults unless we specify them explicitly.
     # See #apply_ssh_config
-    SSH_CONFIG_OVERRIDE_KEYS = [:user, :port, :proxy]
+    SSH_CONFIG_OVERRIDE_KEYS = [:user, :port, :proxy].freeze
 
     def self.instance_for_url(target, opts = {})
       opts = { target: @url }
@@ -52,13 +52,13 @@ module ChefApply
                           connection_retries: 2,
                           connection_retry_sleep: 0.15,
                           logger: ChefApply::Log }
-      if opts_in.has_key? :ssl
+      if opts_in.key? :ssl
         connection_opts[:ssl] = opts_in[:ssl]
         connection_opts[:self_signed] = (opts_in[:ssl_verify] === false ? true : false)
       end
 
       [:sudo_password, :sudo, :sudo_command, :password, :user].each do |key|
-        connection_opts[key] = opts_in[key] if opts_in.has_key? key
+        connection_opts[key] = opts_in[key] if opts_in.key? key
       end
 
       Train.target_config(connection_opts)
@@ -73,7 +73,7 @@ module ChefApply
       # been explicitly given.
       host_cfg = ssh_config_for_host(config[:host])
       SSH_CONFIG_OVERRIDE_KEYS.each do |key|
-        if host_cfg.has_key?(key) && opts_in[key].nil?
+        if host_cfg.key?(key) && opts_in[key].nil?
           config[key] = host_cfg[key]
         end
       end
@@ -166,8 +166,8 @@ module ChefApply
       #        on a virtualbox windows vm:
       #        (over winrm) Get-WmiObject Win32_Product | Where {$_.Name -match 'Chef Client'}
       windows: "c:\\opscode\\chef\\version-manifest.json",
-      linux: "/opt/chef/version-manifest.json"
-    }
+      linux: "/opt/chef/version-manifest.json",
+    }.freeze
 
     def get_chef_version_manifest
       path = MANIFEST_PATHS[base_os()]
@@ -207,7 +207,7 @@ module ChefApply
       "(Join-Path $parent $name);" +
       "$tmp.FullName"
 
-    MKTMP_LINUX_CMD = "d=$(mktemp -d -p${TMPDIR:-/tmp} chef_XXXXXX); echo $d"
+    MKTMP_LINUX_CMD = "d=$(mktemp -d -p${TMPDIR:-/tmp} chef_XXXXXX); echo $d".freeze
 
     # Create temporary dir and return the path.
     # This will also set ownership to the connecting user instead of default of

data/lib/chef_apply/telemeter.rb

@@ -33,7 +33,7 @@ module ChefApply
   # a main 'timed_capture', and it would be good to see ordering within nested calls.
   class Telemeter
     include Singleton
-    DEFAULT_INSTALLATION_GUID = "00000000-0000-0000-0000-000000000000"
+    DEFAULT_INSTALLATION_GUID = "00000000-0000-0000-0000-000000000000".freeze
 
     class << self
       extend Forwardable
@@ -102,8 +102,8 @@ module ChefApply
           installation_id: installation_id,
           run_timestamp: run_timestamp,
           host_platform: host_platform,
-          event_data: data
-        }
+          event_data: data,
+        },
       }
     end
 

data/lib/chef_apply/temp_cookbook.rb

@@ -95,7 +95,7 @@ module ChefApply
         {
           name: m.name,
           recipe_name: File.basename(existing_recipe_path, File.extname(existing_recipe_path)),
-          path: File.expand_path(File.join(metadata, "../"))
+          path: File.expand_path(File.join(metadata, "../")),
         }
       else
         nil

data/lib/chef_apply/text/error_translation.rb

@@ -18,7 +18,7 @@
 module ChefApply
   module Text
     class ErrorTranslation
-      ATTRIBUTES = :decorations, :header, :footer, :stack, :log
+      ATTRIBUTES = [:decorations, :header, :footer, :stack, :log].freeze
       attr_reader :message, *ATTRIBUTES
 
       def initialize(id, params: [])

data/lib/chef_apply/ui/error_printer.rb

@@ -33,7 +33,7 @@ module ChefApply::UI
       ChefApply::Text.errors
     end
 
-    DEFAULT_ERROR_NO = "CHEFINT001"
+    DEFAULT_ERROR_NO = "CHEFINT001".freeze
 
     def self.show_error(e)
       # Name is misleading - it's unwrapping but also doing further

data/lib/chef_apply/ui/plain_text_element.rb

@@ -32,7 +32,7 @@ module ChefApply
         # Some of this is particular to our usage -
         # prefix does not cause a text update, but does
         # change the prefix for future messages.
-        if params.has_key?(:prefix)
+        if params.key?(:prefix)
           @format = @orig_format.gsub(":prefix", params[:prefix])
           return
         end

data/lib/chef_apply/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefApply
-  VERSION = "0.2.2"
+  VERSION = "0.2.4".freeze
 end

data/spec/integration/spec_helper.rb

@@ -50,6 +50,6 @@ def fixture_content(name)
   # Replace $VERSION if present - this is updated automatically, so we can't include
   #                               the literal version value in the fixture without
   #                               having expeditor update it there too...
-  content.gsub("$VERSION", ChefApply::VERSION).
-    gsub("$HOME", Dir.home)
+  content.gsub("$VERSION", ChefApply::VERSION)
+    .gsub("$HOME", Dir.home)
 end

data/spec/spec_helper.rb

@@ -73,13 +73,13 @@ def assert_string_lookup(key, retval = "testvalue")
     # we need to add this individually instead of using
     # `receive_messages`, which doesn't appear to give a way to
     # guarantee ordering
-    expect(ChefApply::Text).to receive(top_level_method).
-      and_return(tmock)
+    expect(ChefApply::Text).to receive(top_level_method)
+      .and_return(tmock)
     call_seq.each do |m|
       expect(tmock).to receive(m).ordered.and_return(tmock)
     end
-    expect(tmock).to receive(terminal_method).
-      ordered.and_return(retval)
+    expect(tmock).to receive(terminal_method)
+      .ordered.and_return(retval)
     subject.call
   end
 end

data/spec/unit/action/converge_target_spec.rb

@@ -299,8 +299,8 @@ RSpec.describe ChefApply::Action::ConvergeTarget do
       let(:report_result) { double("report result", exit_status: 0, stdout: '{ "exception": "thing" }') }
       let(:exception_mapper) { double("mapper") }
       before do
-        expect(ChefApply::Errors::CCRFailureMapper).to receive(:new).
-          and_return exception_mapper
+        expect(ChefApply::Errors::CCRFailureMapper).to receive(:new)
+          .and_return exception_mapper
       end
 
       it "reports back failure and reads the remote report" do

data/spec/unit/cli/validation_spec.rb

@@ -69,7 +69,7 @@ RSpec.describe ChefApply::CLI::Validation do
         "key5" => "0777",
         "key6" => "https://some.website",
         "key7" => "num1and2digit",
-        "key_8" => "underscore"
+        "key_8" => "underscore",
       }
       expect(subject.properties_from_string(provided)).to eq(expected)
     end

data/spec/unit/cli_spec.rb

@@ -160,8 +160,8 @@ RSpec.describe ChefApply::CLI do
     let(:host) { double("TargetHost", config: {}, user: "root" ) }
     let(:reporter) { double("reporter", update: :ok, success: :ok) }
     it "invokes do_connect with correct options" do
-      expect(subject).to receive(:do_connect).
-        with(host, reporter)
+      expect(subject).to receive(:do_connect)
+        .with(host, reporter)
       subject.connect_target(host, reporter)
     end
   end

data/spec/unit/minimum_chef_version_spec.rb

@@ -28,8 +28,8 @@ RSpec.describe ChefApply::MinimumChefVersion do
   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
+        expect(target).to receive(:installed_chef_version)
+          .and_raise ChefApply::TargetHost::ChefNotInstalled.new
       end
 
       it "should return :client_not_installed" do
@@ -71,7 +71,7 @@ RSpec.describe ChefApply::MinimumChefVersion do
         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

data/spec/unit/startup_spec.rb

@@ -177,12 +177,12 @@ RSpec.describe ChefApply::Startup do
     it "touches the configuration file to create it and notifies that it has done so" do
       expected_config_path = ChefApply::Config.default_location
       expected_message = ChefApply::Text.cli.creating_config(expected_config_path)
-      expect(ChefApply::UI::Terminal).to receive(:output).
-        with(expected_message)
-      expect(ChefApply::UI::Terminal).to receive(:output).
-        with("")
-      expect(FileUtils).to receive(:touch).
-        with(expected_config_path)
+      expect(ChefApply::UI::Terminal).to receive(:output)
+        .with(expected_message)
+      expect(ChefApply::UI::Terminal).to receive(:output)
+        .with("")
+      expect(FileUtils).to receive(:touch)
+        .with(expected_config_path)
       subject.create_default_config
 
     end
@@ -192,8 +192,8 @@ RSpec.describe ChefApply::Startup do
     let(:mock_guid) { "1234" }
     it "sets up a telemetry installation id and notifies the operator that telemetry is enabled" do
       expect(SecureRandom).to receive(:uuid).and_return(mock_guid)
-      expect(File).to receive(:write).
-        with(ChefApply::Config.telemetry_installation_identifier_file, mock_guid)
+      expect(File).to receive(:write)
+        .with(ChefApply::Config.telemetry_installation_identifier_file, mock_guid)
       subject.setup_telemetry
     end
   end
@@ -303,10 +303,10 @@ RSpec.describe ChefApply::Startup do
     end
 
     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)
+      expect(ChefApply::Log).to receive(:setup)
+        .with(log_path, log_level)
+      expect(Chef::Log).to receive(:init)
+        .with(ChefApply::Log.location)
       subject.setup_logging
       expect(ChefConfig.logger).to eq(ChefApply::Log)
     end

data/spec/unit/target_host_spec.rb

@@ -145,16 +145,16 @@ RSpec.describe ChefApply::TargetHost do
     let(:expected_manifest_path) do
       {
         windows: "c:\\opscode\\chef\\version-manifest.json",
-        linux: "/opt/chef/version-manifest.json"
+        linux: "/opt/chef/version-manifest.json",
       }
     end
     let(:base_os) { :unknown }
     before do
       remote_file_mock = double("remote_file", file?: manifest_exists, content: manifest_content)
       backend_mock = double("backend")
-      expect(backend_mock).to receive(:file).
-        with(expected_manifest_path[base_os]).
-        and_return(remote_file_mock)
+      expect(backend_mock).to receive(:file)
+        .with(expected_manifest_path[base_os])
+        .and_return(remote_file_mock)
       allow(subject).to receive(:backend).and_return backend_mock
       allow(subject).to receive(:base_os).and_return base_os
     end
@@ -278,9 +278,9 @@ RSpec.describe ChefApply::TargetHost do
         let(:base_os) { :windows }
         let(:path) { "C:\\temp\\blah" }
         it "creates the temporary directory using the correct PowerShell command and returns the path" do
-          expect(subject).to receive(:run_command!).
-            with(ChefApply::TargetHost::MKTMP_WIN_CMD).
-            and_return(instance_double("result", stdout: path))
+          expect(subject).to receive(:run_command!)
+            .with(ChefApply::TargetHost::MKTMP_WIN_CMD)
+            .and_return(instance_double("result", stdout: path))
           expect(subject.mktemp()).to eq(path)
         end
       end
@@ -289,9 +289,9 @@ RSpec.describe ChefApply::TargetHost do
         let(:base_os) { :linux }
         let(:path) { "/tmp/blah" }
         it "creates the directory using a properly formed mktemp, changes ownership to connecting user, and returns the path" do
-          expect(subject).to receive(:run_command!).
-            with("bash -c '#{ChefApply::TargetHost::MKTMP_LINUX_CMD}'").
-            and_return(instance_double("result", stdout: "/tmp/blah"))
+          expect(subject).to receive(:run_command!)
+            .with("bash -c '#{ChefApply::TargetHost::MKTMP_LINUX_CMD}'")
+            .and_return(instance_double("result", stdout: "/tmp/blah"))
           expect(subject).to receive(:chown).with(path)
           expect(subject.mktemp()).to eq path
         end

data/spec/unit/target_resolver_spec.rb

@@ -340,7 +340,7 @@ RSpec.describe ChefApply::TargetResolver do
       "ssh://user@example.com" => { password: nil, url: "ssh://example.com", user: "user" },
       "ssh://user:password@example.com" => { password: "password", user: "user", url: "ssh://example.com" },
       "ssh://user:pas:sw:ord@example.com" => { password: "pas:sw:ord", user: "user", url: "ssh://example.com" },
-      "ssh://user:!@#$%^&*()|\'\";:/?><.,{}[]+=`~@example.com" => { password: "!@#$%^&*()|\'\";:/?><.,{}[]+=`~", user: "user", url: "ssh://example.com" }
+      "ssh://user:!@#$%^&*()|\'\";:/?><.,{}[]+=`~@example.com" => { password: "!@#$%^&*()|\'\";:/?><.,{}[]+=`~", user: "user", url: "ssh://example.com" },
     }.each do |values|
       it "resolves #{values[0]} to #{values[1]}" do
         expect(subject.config_for_target(values[0])).to eq values[1]
@@ -370,8 +370,8 @@ RSpec.describe ChefApply::TargetResolver do
       end
       context "and it is not valid" do
         it "raises an error" do
-          expect { subject.prefix_from_target("bad://host.com") }.
-            to raise_error(ChefApply::TargetResolver::UnsupportedProtocol)
+          expect { subject.prefix_from_target("bad://host.com") }
+            .to raise_error(ChefApply::TargetResolver::UnsupportedProtocol)
         end
       end
     end

data/spec/unit/telemeter_spec.rb

@@ -75,11 +75,11 @@ RSpec.describe ChefApply::Telemeter do
             platform: {
               name: "windows",
               version: "10.0.0",
-              architecture: "x86_64"
+              architecture: "x86_64",
             },
             hostname_sha1: Digest::SHA1.hexdigest("my_host"),
-            transport_type: "winrm"
-          }
+            transport_type: "winrm",
+          },
         }
         expect(subject).to receive(:timed_capture).with(:action, expected_data)
         subject.timed_action_capture(action) { :ok }
@@ -90,8 +90,8 @@ RSpec.describe ChefApply::Telemeter do
           expected_data = { action: "Base", target: { platform: {},
                                                       hostname_sha1: nil,
                                                       transport_type: nil } }
-          expect(subject).to receive(:timed_capture).
-            with(:action, expected_data)
+          expect(subject).to receive(:timed_capture)
+            .with(:action, expected_data)
           subject.timed_action_capture(
             ChefApply::Action::Base.new(target_host: nil)
           ) { :ok }
@@ -135,8 +135,8 @@ RSpec.describe ChefApply::Telemeter do
   context "#timed_run_capture" do
     it "invokes timed_capture with run data" do
       expected_data = { arguments: [ "arg1" ] }
-      expect(subject).to receive(:timed_capture).
-        with(:run, expected_data)
+      expect(subject).to receive(:timed_capture)
+        .with(:run, expected_data)
       subject.timed_run_capture(["arg1"])
     end
   end
@@ -182,8 +182,8 @@ RSpec.describe ChefApply::Telemeter do
           installation_id: "0000",
           run_timestamp: subject.run_timestamp,
           host_platform: host_platform,
-          event_data:  { hello: "world" }
-        }
+          event_data:  { hello: "world" },
+        },
       }
       expect(payload).to eq expected_payload
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-apply
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli