chef-apply 0.4.16 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d36a976780a1d5877ac9e08ec5cf8b0be37c97a2f09f1f1c779fb52f16be389f
-  data.tar.gz: f49648af07150d535de6af02d6498f94e25cda5857aa64641b87fe5f95db06a4
+  metadata.gz: 3249228c66633761ae1d2718070c68d1c85042f07dfc08da7ae098ca262eddc7
+  data.tar.gz: 80488b02ac0b76192debcec1e97416e96d746db66a6f65d531f224abe1cde4d8
 SHA512:
-  metadata.gz: 7a78df43508fef4477991c32983043852610efee535a1b19a20c6b3d6a3a0cb3da9b31fc87e6292999ebaffe9a7d89b78fd34d265842c73f17de7956ee8b63e4
-  data.tar.gz: f4748470cd4356a7d647264936622b7d0f60e2337e0da93eef76d411ffe4f8174736262bb1f929b293233b69d7cf70560d8c9c8714d8d299236f1eeb8e170dfb
+  metadata.gz: e9fa8938dc3276b6204c21ca28073eb3f36b58735d750b0ad67bbe0c36401dbfde64a70f7110c29127d2c376ce075ff8a3c97150381e7390ef898fa5ffbb53a1
+  data.tar.gz: 04f2afd5b1a3210c86fb7aebf8bca351528458595fa277d72ca56c61e2bb80252029c5daa377cf8f5f083f4b2e5542a6ccf7125d9b2ea30131ef288e81c02381

data/Gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2018 Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
-  gem "chefstyle"
+  gem "chefstyle", "1.3.2"
   gem "rake", ">= 10.1.0"
   gem "rspec", "~> 3.0"
   gem "simplecov"

data/chef-apply.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.description   = "Ad-hoc management of individual nodes and devices."
   spec.homepage      = "https://github.com/chef/chef-apply"
   spec.license       = "Apache-2.0"
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.6"
 
   spec.files = %w{Rakefile LICENSE warning.txt} +
     Dir.glob("Gemfile*") + # Includes Gemfile and locks
@@ -40,24 +40,19 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "mixlib-cli" # Provides argument handling DSL for CLI applications
-  spec.add_dependency "mixlib-config", ">= 3.0.5"  # shared chef configuration library that
-                                                   # simplifies managing a configuration file
+  spec.add_dependency "mixlib-config", ">= 3.0.5" # shared chef configuration library that simplifies managing a configuration file
   spec.add_dependency "mixlib-log" # Basis for our traditional logger
   spec.add_dependency "mixlib-install" # URL resolver + install tool for chef products
-  spec.add_dependency "r18n-desktop" # easy path to message text management via
-                                     # localization gem...
-  spec.add_dependency "toml-rb" # This isn't ideal because mixlib-config uses 'tomlrb'
-                                # but that library does not support a dumper
+  spec.add_dependency "r18n-desktop" # easy path to message text management via localization gem...
+  spec.add_dependency "toml-rb" # This isn't ideal because mixlib-config uses 'tomlrb' but that library does not support a dumper
   spec.add_dependency "train-core", "~> 3.0" # remote connection management over ssh, winrm
   spec.add_dependency "train-winrm" # winrm transports were pulled out into this plugin
   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-cli", ">= 1.0.3 " # Policyfile
+  spec.add_dependency "chef", ">= 16.0" # Needed to load cookbooks
+  spec.add_dependency "chef-cli", ">= 2.0.10 " # Policyfile
   spec.add_dependency "chef-telemetry", ">= 1.0.2"
-  spec.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.11"
-
-  spec.add_development_dependency "bundler"
+  spec.add_dependency "license-acceptance", ">= 1.0.11", "< 3"
 
   spec.post_install_message = File.read(File.expand_path("../warning.txt", __FILE__))
 end

data/i18n/errors/en.yml

@@ -319,7 +319,7 @@ errors:
   CHEFVAL009:
     display: { decorations: false }
     text: |
-      File extension '%1' is unsupported. Currently recipes must be specified with a `.rb` extension.
+      File extension '%1' is unsupported. Currently recipes must be specified with a `.rb` or `.yml` extension.
 
   CHEFVAL010:
     display: { decorations: false }

data/lib/chef_apply/action/converge_target.rb

@@ -16,8 +16,8 @@
 #
 
 require_relative "base"
-require "pathname"
-require "tempfile"
+require "pathname" unless defined?(Pathname)
+require "tempfile" unless defined?(Tempfile)
 # FLAG: require "chef/util/path_helper"
 require "chef/util/path_helper"
 

data/lib/chef_apply/action/generate_temp_cookbook/recipe_lookup.rb

@@ -81,7 +81,7 @@ module ChefApply
         # Find the specified recipe or default recipe if none is specified.
         # Raise an error if recipe cannot be found.
         def find_recipe(cookbook, recipe_name = nil)
-          recipes = cookbook.recipe_filenames_by_name
+          recipes = cookbook.recipe_filenames_by_name.merge(cookbook.recipe_yml_filenames_by_name)
           if recipe_name.nil?
             default_recipe = recipes["default"]
             raise NoDefaultRecipe.new(cookbook.root_dir, cookbook.name) if default_recipe.nil?

data/lib/chef_apply/action/generate_temp_cookbook/temp_cookbook.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require "tmpdir"
-require "fileutils"
+require "tmpdir" unless defined?(Dir.mktmpdir)
+require "fileutils" unless defined?(FileUtils)
 require_relative "../../log"
 require_relative "../../error"
 require_relative "../generate_temp_cookbook"
@@ -34,7 +34,7 @@ module ChefApply
 
         def from_existing_recipe(existing_recipe_path)
           ext_name = File.extname(existing_recipe_path)
-          raise UnsupportedExtension.new(ext_name) unless ext_name == ".rb"
+          raise UnsupportedExtension.new(ext_name) unless ext_name == ".rb" || ext_name == ".yml"
 
           cb = cookbook_for_recipe(existing_recipe_path)
           if cb

data/lib/chef_apply/action/install_chef.rb

@@ -17,7 +17,7 @@
 
 require_relative "base"
 require_relative "install_chef/minimum_chef_version"
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 
 module ChefApply
   module Action

data/lib/chef_apply/cli.rb

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require "mixlib/cli"
+require "mixlib/cli" unless defined?(Mixlib::CLI)
 
 require_relative "config"
 require "chef-config/config"

data/lib/chef_apply/config.rb

@@ -16,9 +16,9 @@
 #
 
 require_relative "log"
-require "mixlib/config"
-require "fileutils"
-require "pathname"
+require "mixlib/config" unless defined?(Mixlib::Config)
+require "fileutils" unless defined?(FileUtils)
+require "pathname" unless defined?(Pathname)
 require "chef-config/config"
 require "chef-config/workstation_config_loader"
 

data/lib/chef_apply/errors/standard_error_resolver.rb

@@ -37,8 +37,8 @@ module ChefApply
 
       def self.deps
         # Avoid loading additional includes until they're needed
-        require "socket"
-        require "openssl"
+        require "socket" unless defined?(Socket)
+        require "openssl" unless defined?(OpenSSL)
       end
     end
   end

data/lib/chef_apply/file_fetcher.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require "net/http"
-require "uri"
+require "net/http" unless defined?(Net::HTTP)
+require "uri" unless defined?(URI)
 require_relative "config"
 require_relative "log"
 

data/lib/chef_apply/startup.rb

@@ -119,7 +119,7 @@ module ChefApply
     end
 
     def setup_telemetry
-      require "securerandom"
+      require "securerandom" unless defined?(SecureRandom)
       installation_id = SecureRandom.uuid
       File.write(Config.telemetry_installation_identifier_file, installation_id)
 

data/lib/chef_apply/target_host.rb

@@ -280,7 +280,7 @@ module ChefApply
     end
 
     def ssh_config_for_host(host)
-      require "net/ssh"
+      require "net/ssh" unless defined?(Net::SSH)
       Net::SSH::Config.for(host)
     end
 

data/lib/chef_apply/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefApply
-  VERSION = "0.4.16".freeze
+  VERSION = "0.5.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-apply
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.5.3
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -156,28 +156,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '15.0'
+        version: '16.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '15.0'
+        version: '16.0'
 - !ruby/object:Gem::Dependency
   name: chef-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 2.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 2.0.10
 - !ruby/object:Gem::Dependency
   name: chef-telemetry
   requirement: !ruby/object:Gem::Requirement
@@ -196,36 +196,22 @@ dependencies:
   name: license-acceptance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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'
+        version: '3'
 description: Ad-hoc management of individual nodes and devices.
 email:
 - workstation@chef.io
@@ -294,7 +280,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="