chef-apply 0.2.13 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07ef8ad757564bff3e3578079d19bbb8b50ec44e3f58ac627046a54b9b26e92e
-  data.tar.gz: 26cd6927e33f4c97f1809518c69455517570983b4f493c6fe99af8ebd43b2952
+  metadata.gz: a8432ce2435f3453da3c0116efc43e17455aaebb30c5331bcccbc5c5ef04a892
+  data.tar.gz: 5fa3d67786d2b42d5b151a620a6ea09bceeaeed41a9ed2162ef2547e7ebfc306
 SHA512:
-  metadata.gz: 38c85c8f263f8d0c6a1546bc1d6ad96cdd6d4ca4ab2bc94dd6dad26b2d8ab1c52a740fbae0384a846d668a4c52cda165966534f9c49d87e22e49cefd0ee2727e
-  data.tar.gz: 82c8fad2e537f69bd539c757522e5aee9315d727391233538b3870eff4b2302fc93a4240ca9c04d801320f97472e999029e59d5650855b367ec616cde7e4bfff
+  metadata.gz: 463a17c1c86f2c8567c1cd9e77e327c4cf5aadb693098a16370f501b0fe9d700d84d2c9bdf8c9b4b3ee043361127eab4d1bf33d028e43bf0e39a5bf779650467
+  data.tar.gz: c23857b502bacbf571f024423f916fa835ff631ff38fa783a750a00b19a5437f4362c02cf2bc33de5eb9e559a04c4812a4df5784a7d22c3ed1fc735d7f431323

data/Gemfile

@@ -17,3 +17,29 @@
 
 source "https://rubygems.org"
 gemspec
+# NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
+group :development do
+  gem "chefstyle"
+  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"
+  gem "pry-stack_explorer"
+  gem "rb-readline"
+end
+
+instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
+
+# If you want to load debugging tools into the bundle exec sandbox,
+# add these additional dependencies into Gemfile.local
+eval_gemfile(__FILE__ + ".local") if File.exist?(__FILE__ + ".local")

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    chef-apply (0.2.13)
-      chef (>= 14.0)
-      chef-dk (>= 3.0)
+    chef-apply (0.3.0)
+      chef (>= 15.0)
+      chef-dk (>= 4.0)
       chef-telemetry
       license-acceptance (~> 1.0, >= 1.0.11)
       mixlib-cli
@@ -26,70 +26,61 @@ GEM
       ms_rest_azure (~> 0.11.0)
     azure_mgmt_key_vault (0.17.4)
       ms_rest_azure (~> 0.11.0)
-    azure_mgmt_resources (0.17.4)
-      ms_rest_azure (~> 0.11.0)
+    azure_mgmt_resources (0.17.5)
+      ms_rest_azure (~> 0.11.1)
+    bcrypt_pbkdf (1.0.1)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
     byebug (11.0.1)
-    chef (14.12.9)
+    chef (15.0.300)
       addressable
+      bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 14.12.9)
-      chef-zero (>= 13.0)
+      chef-config (= 15.0.300)
+      chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
+      ed25519 (~> 1.2)
       erubis (~> 2.7)
       ffi (~> 1.9, >= 1.9.25)
+      ffi-libarchive
       ffi-yajl (~> 2.2)
-      highline (~> 1.6, >= 1.6.9)
+      highline (>= 1.6.9, < 2)
       iniparse (~> 1.4)
+      license-acceptance (~> 1.0, >= 1.0.5)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (~> 2.1)
       mixlib-cli (>= 1.7, < 3.0)
       mixlib-log (>= 2.0.3, < 4.0)
       mixlib-shellout (>= 2.4, < 4.0)
       net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (~> 4.2)
+      net-ssh (>= 4.2, < 6)
       net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 14.0)
+      ohai (~> 15.0)
       plist (~> 3.2)
       proxifier (~> 1.0)
-      rspec-core (~> 3.5)
-      rspec-expectations (~> 3.5)
-      rspec-mocks (~> 3.5)
-      rspec_junit_formatter (~> 0.2.0)
-      serverspec (~> 2.7)
-      specinfra (~> 2.10)
       syslog-logger (~> 1.6)
+      train-core (~> 2.0, >= 2.0.12)
+      tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
-    chef-config (14.12.9)
+    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 (3.8.14)
+    chef-dk (4.0.60)
       addressable (>= 2.3.5, < 2.6)
-      chef (~> 14.0)
-      chef-provisioning (~> 2.0)
+      chef (~> 15.0)
       cookbook-omnifetch (~> 0.5)
       diff-lcs (~> 1.0)
       ffi-yajl (>= 1.0, < 3.0)
+      license-acceptance (~> 1.0, >= 1.0.11)
       minitar (~> 0.6)
-      mixlib-cli (~> 1.7)
-      mixlib-shellout (~> 2.0)
+      mixlib-cli (>= 1.7, < 3.0)
+      mixlib-shellout (>= 2.0, < 4.0)
       paint (~> 1.0)
       solve (> 2.0, < 5.0)
-    chef-provisioning (2.7.6)
-      cheffish (>= 4.0, < 15.0)
-      inifile (>= 2.0.2)
-      mixlib-install (>= 1.0)
-      net-scp (~> 1.0)
-      net-ssh (>= 2.9, < 5.0)
-      net-ssh-gateway (> 1.2, < 3.0)
-      winrm (~> 2.0)
-      winrm-elevated (~> 1.0)
-      winrm-fs (~> 1.0)
     chef-telemetry (0.1.8)
       chef-config
       concurrent-ruby (~> 1.0)
@@ -101,9 +92,6 @@ GEM
       mixlib-log (>= 2.0, < 4.0)
       rack (~> 2.0, >= 2.0.6)
       uuidtools (~> 2.1)
-    cheffish (14.0.4)
-      chef-zero (~> 14.0)
-      net-ssh
     chefstyle (0.12.0)
       rubocop (= 0.62.0)
     citrus (3.0.2)
@@ -121,6 +109,7 @@ GEM
       multi_json
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
+    ed25519 (1.2.4)
     equatable (0.5.0)
     erubis (2.7.0)
     excon (0.64.0)
@@ -129,10 +118,13 @@ GEM
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
-    ffi (1.10.0)
+    ffi (1.11.1)
+    ffi-libarchive (0.4.6)
+      ffi (~> 1.0)
     ffi-yajl (2.3.1)
       libyajl2 (~> 1.2)
     fuzzyurl (0.9.0)
+    github-markup (3.0.4)
     google-api-client (0.23.9)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.5, < 0.7.0)
@@ -169,9 +161,9 @@ GEM
     ipaddress (0.8.3)
     jaro_winkler (1.5.2)
     json (2.2.0)
-    jwt (2.1.0)
+    jwt (2.2.1)
     libyajl2 (1.2.0)
-    license-acceptance (1.0.11)
+    license-acceptance (1.0.12)
       pastel (~> 0.7)
       tomlrb (~> 1.2)
       tty-box (~> 0.3)
@@ -189,7 +181,7 @@ GEM
     mixlib-archive (1.0.1)
       mixlib-log
     mixlib-authentication (2.1.1)
-    mixlib-cli (1.7.0)
+    mixlib-cli (2.0.6)
     mixlib-config (3.0.1)
       tomlrb
     mixlib-install (3.11.18)
@@ -213,20 +205,19 @@ GEM
     multi_json (1.13.1)
     multipart-post (2.1.1)
     necromancer (0.4.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
+    net-scp (2.0.0)
+      net-ssh (>= 2.6.5, < 6.0.0)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (4.2.0)
+    net-ssh (5.2.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    net-telnet (0.1.1)
     nori (2.6.0)
-    ohai (14.8.12)
-      chef-config (>= 12.8, < 15)
+    ohai (15.0.35)
+      chef-config (>= 12.8, < 16)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
@@ -257,13 +248,15 @@ GEM
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (3.0.3)
+    public_suffix (3.1.0)
     r18n-core (3.2.0)
     r18n-desktop (3.2.0)
       r18n-core (= 3.2.0)
     rack (2.0.7)
     rainbow (3.0.0)
     rake (12.3.2)
+    rb-readline (0.5.5)
+    redcarpet (3.4.0)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
@@ -278,16 +271,10 @@ GEM
     rspec-expectations (3.8.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-its (1.3.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
     rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
       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)
     rubocop (0.62.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -296,16 +283,10 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.4.0)
-    ruby-progressbar (1.10.0)
+    ruby-progressbar (1.10.1)
     rubyntlm (0.6.2)
-    rubyzip (1.2.2)
+    rubyzip (1.2.3)
     semverse (3.0.0)
-    serverspec (2.41.3)
-      multi_json
-      rspec (~> 3.0)
-      rspec-its
-      specinfra (~> 2.72)
-    sfl (2.3)
     signet (0.11.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
@@ -319,11 +300,6 @@ GEM
     solve (4.0.2)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 4.0)
-    specinfra (2.77.2)
-      net-scp
-      net-ssh (>= 2.7)
-      net-telnet (= 0.1.1)
-      sfl
     strings (0.1.4)
       strings-ansi (~> 0.1.0)
       unicode-display_width (~> 1.4.0)
@@ -337,7 +313,7 @@ GEM
     toml-rb (1.1.2)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.2.8)
-    train (2.1.2)
+    train (2.1.7)
       azure_graph_rbac (~> 0.16)
       azure_mgmt_key_vault (~> 0.17)
       azure_mgmt_resources (~> 0.15)
@@ -351,6 +327,13 @@ GEM
       net-ssh (>= 2.9, < 6.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
+    train-core (2.1.7)
+      json (>= 1.8, < 3.0)
+      mixlib-shellout (>= 2.0, < 4.0)
+      net-scp (>= 1.2, < 3.0)
+      net-ssh (>= 2.9, < 6.0)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
     tty-box (0.3.0)
       pastel (~> 0.7.2)
       strings (~> 0.1.4)
@@ -386,9 +369,6 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.1.1)
-      winrm (~> 2.0)
-      winrm-fs (~> 1.0)
     winrm-fs (1.3.2)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
@@ -396,6 +376,7 @@ GEM
       winrm (~> 2.0)
     wisper (2.0.0)
     wmi-lite (1.0.2)
+    yard (0.9.19)
 
 PLATFORMS
   ruby
@@ -404,13 +385,16 @@ DEPENDENCIES
   bundler
   chef-apply!
   chefstyle
+  github-markup
   pry
   pry-byebug
   pry-stack_explorer
-  rake
-  rspec
-  rspec_junit_formatter
+  rake (>= 10.1.0)
+  rb-readline
+  redcarpet
+  rspec (~> 3.0)
   simplecov
+  yard
 
 BUNDLED WITH
    1.17.3

data/Rakefile

@@ -1,32 +1,42 @@
-#
-# 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 "bundler/gem_tasks"
 
-task default: [:spec, :style]
+begin
+  require "rspec/core/rake_task"
+
+  RSpec::Core::RakeTask.new do |t|
+    t.pattern = "spec/**/*_spec.rb"
+  end
+rescue LoadError
+  desc "rspec is not installed, this task is disabled"
+  task :spec do
+    abort "rspec is not installed. bundle install first to make sure all dependencies are installed."
+  end
+end
+
+begin
+  require "chefstyle"
+  require "rubocop/rake_task"
+  desc "Run Chefstyle tests"
+  RuboCop::RakeTask.new(:style) do |task|
+    task.options += ["--display-cop-names", "--no-color"]
+  end
+rescue LoadError
+  puts "chefstyle gem is not installed. bundle install first to make sure all dependencies are installed."
+end
 
-require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new(:spec)
+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
 
-require "chefstyle"
-require "rubocop/rake_task"
-desc "Run Chef Ruby style checks"
-RuboCop::RakeTask.new(:chefstyle) do |t|
-  t.options = %w{--display-cop-names}
+task :console do
+  require "irb"
+  require "irb/completion"
+  require "chef_apply"
+  ARGV.clear
+  IRB.start
 end
 
-task style: :chefstyle
+task default: [:style, :spec]

data/chef-apply.gemspec

@@ -51,20 +51,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "train" # remote connection management over ssh, winrm
   spec.add_dependency "pastel" # A color library
   spec.add_dependency "tty-spinner" # Pretty output for status updates in the CLI
-  spec.add_dependency "chef", ">= 14.0" # Needed to load cookbooks
-  spec.add_dependency "chef-dk", ">= 3.0"
+  spec.add_dependency "chef", ">= 15.0" # Needed to load cookbooks
+  spec.add_dependency "chef-dk", ">= 4.0"
   spec.add_dependency "chef-telemetry"
   spec.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.11"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "pry-stack_explorer"
-  spec.add_development_dependency "rspec_junit_formatter"
-  spec.add_development_dependency "chefstyle"
 
   spec.post_install_message = File.read(File.expand_path("../warning.txt", __FILE__))
 end

data/lib/chef_apply/recipe_lookup.rb

@@ -58,7 +58,7 @@ module ChefApply
         # Second, is there a cookbook in their local repository that matches?
         require "chef/cookbook_loader"
         cb_loader = Chef::CookbookLoader.new(cookbook_repo_paths)
-        cb_loader.load_cookbooks_without_shadow_warning
+        cb_loader.load_cookbooks
 
         begin
           cookbook = cb_loader[cookbook_name]

data/lib/chef_apply/version.rb

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

data/spec/unit/recipe_lookup_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe ChefApply::RecipeLookup do
   VL = Chef::Cookbook::CookbookVersionLoader
   let(:version_loader) { instance_double(VL) }
   let(:cookbook_version) { instance_double(Chef::CookbookVersion, root_dir: "dir", name: "name") }
-  let(:cookbook_loader) { instance_double(Chef::CookbookLoader, load_cookbooks_without_shadow_warning: nil) }
+  let(:cookbook_loader) { instance_double(Chef::CookbookLoader, load_cookbooks: nil) }
 
   describe "#split" do
     it "splits a customer provided specifier into a cookbook part and possible recipe part" do

data/warning.txt

@@ -1,3 +1,3 @@
 Chef Apply is not meant to be installed as a gem. It is meant to be installed
-as part of the Chef Workstation omnibus package. Please download and install
+as part of the Chef Workstation package. Please download and install
 that from https://downloads.chef.io/chef-workstation/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-apply
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.3.0
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-16 00:00:00.000000000 Z
+date: 2019-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -142,28 +142,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '15.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '15.0'
 - !ruby/object:Gem::Dependency
   name: chef-dk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: chef-telemetry
   requirement: !ruby/object:Gem::Requirement
@@ -212,118 +212,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-stack_explorer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: chefstyle
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Ad-hoc management of individual nodes and devices.
 email:
 - workstation@chef.io
@@ -420,7 +308,7 @@ licenses:
 metadata: {}
 post_install_message: |
   Chef Apply is not meant to be installed as a gem. It is meant to be installed
-  as part of the Chef Workstation omnibus package. Please download and install
+  as part of the Chef Workstation package. Please download and install
   that from https://downloads.chef.io/chef-workstation/
 rdoc_options: []
 require_paths: