chef-apply 0.3.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8432ce2435f3453da3c0116efc43e17455aaebb30c5331bcccbc5c5ef04a892
-  data.tar.gz: 5fa3d67786d2b42d5b151a620a6ea09bceeaeed41a9ed2162ef2547e7ebfc306
+  metadata.gz: 67da1832dc2cff37ca34e9e6cd98a740915779c88ff2367096676c6204d6f390
+  data.tar.gz: 8febd165b01039b41427ba7406c209436ece3ac6dc8e93ab4fbfbd1a186e994e
 SHA512:
-  metadata.gz: 463a17c1c86f2c8567c1cd9e77e327c4cf5aadb693098a16370f501b0fe9d700d84d2c9bdf8c9b4b3ee043361127eab4d1bf33d028e43bf0e39a5bf779650467
-  data.tar.gz: c23857b502bacbf571f024423f916fa835ff631ff38fa783a750a00b19a5437f4362c02cf2bc33de5eb9e559a04c4812a4df5784a7d22c3ed1fc735d7f431323
+  metadata.gz: 20a22779d89a97deed72a0e36fe93ebe489b2004368a5e87e4b5e69c668238e5747af817bf99d4d628c7ca583f91887c810441be9e5326068f6b89809f48a7b2
+  data.tar.gz: d7d32da1d04bfb11b7fcd4e886bfe57fdb8517d0c6d3c21243a5a0279a969c324d2c4ac77536bf8c589ebb3c11aeabb0b3fe2ee2d308dff53add6fb6cbde8e32

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    chef-apply (0.3.0)
+    chef-apply (0.3.3)
       chef (>= 15.0)
-      chef-dk (>= 4.0)
+      chef-cli (>= 1.0.3)
       chef-telemetry
       license-acceptance (~> 1.0, >= 1.0.11)
       mixlib-cli
@@ -33,11 +33,11 @@ GEM
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
     byebug (11.0.1)
-    chef (15.0.300)
+    chef (15.1.36)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.0.300)
+      chef-config (= 15.1.36)
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
@@ -50,7 +50,7 @@ GEM
       license-acceptance (~> 1.0, >= 1.0.5)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (~> 2.1)
-      mixlib-cli (>= 1.7, < 3.0)
+      mixlib-cli (>= 2.1.1, < 3.0)
       mixlib-log (>= 2.0.3, < 4.0)
       mixlib-shellout (>= 2.4, < 4.0)
       net-sftp (~> 2.1, >= 2.1.2)
@@ -63,13 +63,7 @@ GEM
       train-core (~> 2.0, >= 2.0.12)
       tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
-    chef-config (15.0.300)
-      addressable
-      fuzzyurl
-      mixlib-config (>= 2.2.12, < 4.0)
-      mixlib-shellout (>= 2.0, < 4.0)
-      tomlrb (~> 1.2)
-    chef-dk (4.0.60)
+    chef-cli (1.0.3)
       addressable (>= 2.3.5, < 2.6)
       chef (~> 15.0)
       cookbook-omnifetch (~> 0.5)
@@ -81,6 +75,12 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
       paint (~> 1.0)
       solve (> 2.0, < 5.0)
+    chef-config (15.1.36)
+      addressable
+      fuzzyurl
+      mixlib-config (>= 2.2.12, < 4.0)
+      mixlib-shellout (>= 2.0, < 4.0)
+      tomlrb (~> 1.2)
     chef-telemetry (0.1.8)
       chef-config
       concurrent-ruby (~> 1.0)
@@ -97,20 +97,20 @@ GEM
     citrus (3.0.2)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
-    cookbook-omnifetch (0.8.1)
+    cookbook-omnifetch (0.9.0)
       mixlib-archive (>= 0.4, < 2.0)
     debug_inspector (0.0.3)
     declarative (0.0.10)
     declarative-option (0.1.0)
     diff-lcs (1.3)
-    docile (1.3.1)
+    docile (1.3.2)
     docker-api (1.34.2)
       excon (>= 0.47.0)
       multi_json
-    domain_name (0.5.20180417)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     ed25519 (1.2.4)
-    equatable (0.5.0)
+    equatable (0.6.1)
     erubis (2.7.0)
     excon (0.64.0)
     faraday (0.15.4)
@@ -119,7 +119,7 @@ GEM
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
     ffi (1.11.1)
-    ffi-libarchive (0.4.6)
+    ffi-libarchive (0.4.10)
       ffi (~> 1.0)
     ffi-yajl (2.3.1)
       libyajl2 (~> 1.2)
@@ -159,11 +159,11 @@ GEM
     inifile (3.0.0)
     iniparse (1.4.4)
     ipaddress (0.8.3)
-    jaro_winkler (1.5.2)
+    jaro_winkler (1.5.3)
     json (2.2.0)
     jwt (2.2.1)
     libyajl2 (1.2.0)
-    license-acceptance (1.0.12)
+    license-acceptance (1.0.13)
       pastel (~> 0.7)
       tomlrb (~> 1.2)
       tty-box (~> 0.3)
@@ -181,7 +181,7 @@ GEM
     mixlib-archive (1.0.1)
       mixlib-log
     mixlib-authentication (2.1.1)
-    mixlib-cli (2.0.6)
+    mixlib-cli (2.1.1)
     mixlib-config (3.0.1)
       tomlrb
     mixlib-install (3.11.18)
@@ -189,7 +189,7 @@ GEM
       mixlib-versioning
       thor
     mixlib-log (3.0.1)
-    mixlib-shellout (2.4.4)
+    mixlib-shellout (3.0.4)
     mixlib-versioning (1.2.7)
     molinillo (0.6.6)
     ms_rest (0.7.4)
@@ -216,7 +216,7 @@ GEM
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     nori (2.6.0)
-    ohai (15.0.35)
+    ohai (15.1.5)
       chef-config (>= 12.8, < 16)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -233,9 +233,9 @@ GEM
     parallel (1.17.0)
     parser (2.6.3.0)
       ast (~> 2.4.0)
-    pastel (0.7.2)
-      equatable (~> 0.5.0)
-      tty-color (~> 0.4.0)
+    pastel (0.7.3)
+      equatable (~> 0.6)
+      tty-color (~> 0.5)
     plist (3.5.0)
     powerpack (0.1.2)
     proxifier (1.0.3)
@@ -248,7 +248,7 @@ GEM
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (3.1.0)
+    public_suffix (3.1.1)
     r18n-core (3.2.0)
     r18n-desktop (3.2.0)
       r18n-core (= 3.2.0)
@@ -266,15 +266,15 @@ GEM
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+    rspec-support (3.8.2)
     rubocop (0.62.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -313,7 +313,7 @@ GEM
     toml-rb (1.1.2)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.2.8)
-    train (2.1.7)
+    train (2.1.13)
       azure_graph_rbac (~> 0.16)
       azure_mgmt_key_vault (~> 0.17)
       azure_mgmt_resources (~> 0.15)
@@ -327,7 +327,7 @@ GEM
       net-ssh (>= 2.9, < 6.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    train-core (2.1.7)
+    train-core (2.1.13)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 3.0)
@@ -338,7 +338,7 @@ GEM
       pastel (~> 0.7.2)
       strings (~> 0.1.4)
       tty-cursor (~> 0.6.0)
-    tty-color (0.4.3)
+    tty-color (0.5.0)
     tty-cursor (0.6.1)
     tty-prompt (0.18.1)
       necromancer (~> 0.4.0)
@@ -376,7 +376,7 @@ GEM
       winrm (~> 2.0)
     wisper (2.0.0)
     wmi-lite (1.0.2)
-    yard (0.9.19)
+    yard (0.9.20)
 
 PLATFORMS
   ruby

data/chef-apply.gemspec

@@ -52,7 +52,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "pastel" # A color library
   spec.add_dependency "tty-spinner" # Pretty output for status updates in the CLI
   spec.add_dependency "chef", ">= 15.0" # Needed to load cookbooks
-  spec.add_dependency "chef-dk", ">= 4.0"
+  spec.add_dependency "chef-cli", ">= 1.0.3 " # Policyfile
   spec.add_dependency "chef-telemetry"
   spec.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.11"
 

data/lib/chef_apply/action/generate_local_policy.rb

@@ -32,24 +32,24 @@ module ChefApply::Action
       exporter.run
       @archive_file_location = exporter.archive_file_location
       notify(:success)
-    rescue ChefDK::PolicyfileInstallError => e
+    rescue ChefCLI::PolicyfileInstallError => e
       raise PolicyfileInstallError.new(e)
     end
 
     def exporter
-      require "chef-dk/policyfile_services/export_repo"
+      require "chef-cli/policyfile_services/export_repo"
       @exporter ||=
-        ChefDK::PolicyfileServices::ExportRepo.new(policyfile: @cookbook.policyfile_lock_path,
+        ChefCLI::PolicyfileServices::ExportRepo.new(policyfile: @cookbook.policyfile_lock_path,
                                                    root_dir: @cookbook.path,
                                                    export_dir: @cookbook.export_path,
                                                    archive: true, force: true)
     end
 
     def installer
-      require "chef-dk/policyfile_services/install"
-      require "chef-dk/ui"
+      require "chef-cli/policyfile_services/install"
+      require "chef-cli/ui"
       @installer ||=
-        ChefDK::PolicyfileServices::Install.new(ui: ChefDK::UI.null(), root_dir: @cookbook.path)
+        ChefCLI::PolicyfileServices::Install.new(ui: ChefCLI::UI.null(), root_dir: @cookbook.path)
     end
 
   end

data/lib/chef_apply/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefApply
-  VERSION = "0.3.0".freeze
+  VERSION = "0.3.3".freeze
 end

data/spec/unit/action/generate_local_policy_spec.rb

@@ -16,9 +16,9 @@
 #
 require "spec_helper"
 require "chef_apply/action/generate_local_policy"
-require "chef-dk/policyfile_services/install"
-require "chef-dk/ui"
-require "chef-dk/policyfile_services/export_repo"
+require "chef-cli/policyfile_services/install"
+require "chef-cli/ui"
+require "chef-cli/policyfile_services/export_repo"
 
 RSpec.describe ChefApply::Action::GenerateLocalPolicy do
   subject { ChefApply::Action::GenerateLocalPolicy.new(cookbook: cookbook) }
@@ -30,11 +30,11 @@ RSpec.describe ChefApply::Action::GenerateLocalPolicy do
   end
 
   let(:installer_double) do
-    instance_double(ChefDK::PolicyfileServices::Install, run: :ok)
+    instance_double(ChefCLI::PolicyfileServices::Install, run: :ok)
   end
 
   let(:exporter_double) do
-    instance_double(ChefDK::PolicyfileServices::ExportRepo,
+    instance_double(ChefCLI::PolicyfileServices::ExportRepo,
                     archive_file_location: "/path/to/export",
                     run: :ok)
   end
@@ -62,7 +62,7 @@ RSpec.describe ChefApply::Action::GenerateLocalPolicy do
     context "when PolicyfileServices raises an error" do
       it "reraises as PolicyfileInstallError" do
         expect(subject).to receive(:installer).and_return installer_double
-        expect(installer_double).to receive(:run).and_raise(ChefDK::PolicyfileInstallError.new("", nil))
+        expect(installer_double).to receive(:run).and_raise(ChefCLI::PolicyfileInstallError.new("", nil))
         expect { subject.perform_action }.to raise_error(ChefApply::Action::PolicyfileInstallError)
       end
     end
@@ -72,7 +72,7 @@ RSpec.describe ChefApply::Action::GenerateLocalPolicy do
 
       # There is an issue with policyfile generation where, if we have a cookbook with too long
       # of a name or directory name the policyfile will not generate. This is because the tar
-      # library that ChefDK uses comes from the Rubygems package and is meant for packaging
+      # library that ChefCLI uses comes from the Rubygems package and is meant for packaging
       # gems up, so it can impose a 100 character limit. We attempt to solve this by ensuring
       # that the paths/names we generate with `TempCookbook` are short.
       #
@@ -80,7 +80,7 @@ RSpec.describe ChefApply::Action::GenerateLocalPolicy do
       # 2018-05-18 mp addendum: this cna take upwards of 15s to run on ci nodes, pending
       # for now since it's not testing any Chef Apply functionality.
       xit "fails to create when there is a long path name" do
-        err = ChefDK::PolicyfileExportRepoError
+        err = ChefCLI::PolicyfileExportRepoError
         expect { subject.perform_action }.to raise_error(err) do |e|
           expect(e.cause.class).to eq(Gem::Package::TooLongFileName)
           expect(e.cause.message).to match(/should be 100 or less/)
@@ -92,7 +92,7 @@ RSpec.describe ChefApply::Action::GenerateLocalPolicy do
   describe "#exporter" do
 
     it "returns a correctly constructed ExportRepo" do
-      expect(ChefDK::PolicyfileServices::ExportRepo).to receive(:new)
+      expect(ChefCLI::PolicyfileServices::ExportRepo).to receive(:new)
         .with(policyfile: cookbook.policyfile_lock_path,
               root_dir: cookbook.path,
               export_dir:  cookbook.export_path,
@@ -104,8 +104,8 @@ RSpec.describe ChefApply::Action::GenerateLocalPolicy do
 
   describe "#installer" do
     it "returns a correctly constructed Install service" do
-      expect(ChefDK::PolicyfileServices::Install).to receive(:new)
-        .with(ui: ChefDK::UI, root_dir: cookbook.path)
+      expect(ChefCLI::PolicyfileServices::Install).to receive(:new)
+        .with(ui: ChefCLI::UI, root_dir: cookbook.path)
         .and_return(installer_double)
       expect(subject.installer).to eq installer_double
     end

data/spec/unit/cli_spec.rb

@@ -23,9 +23,7 @@ require "chef_apply/telemeter/sender"
 require "chef_apply/ui/terminal"
 require "chef_apply/action/generate_temp_cookbook"
 
-require "chef-dk/ui"
-require "chef-dk/policyfile_services/export_repo"
-require "chef-dk/policyfile_services/install"
+require "chef-cli/ui"
 
 RSpec.describe ChefApply::CLI do
   subject { ChefApply::CLI.new(argv) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-apply
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -151,19 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '15.0'
 - !ruby/object:Gem::Dependency
-  name: chef-dk
+  name: chef-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: chef-telemetry
   requirement: !ruby/object:Gem::Requirement