chef-apply 0.4.6 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79e301aab0d20ec072e87597869b55d24958945f0fb1cfa774841929cb5eaa80
-  data.tar.gz: e34804469b8ed16dfc9729f3229abc60d0714358146f04ca3a494a70dcef6a96
+  metadata.gz: a188a9cccc61b37402d6850df1ffa3020d123b88b71d04788e14487f2f0e28b9
+  data.tar.gz: a9f619cb737762fd8c8e06c6152e714708c91b51e4a4de8cd373c20b81ccdb32
 SHA512:
-  metadata.gz: 251203d054f4ee1c8319b4b12e40a2778008f603e79530750875686facc0b2a8ec72e40425a1f643e91187882224b04af6a0c6d36698f7d341a35e104ed2c036
-  data.tar.gz: 107872f223933ca095df7e46afbf22f1260c05339531fb8c51c2e54007203e63f4e4ea4089f30abd75e2a20bd09bd1d4e56d44d21fb278e5e36e04d5db655ff7
+  metadata.gz: a790c11592c8e5e6d2abf3456513913cf9e0438a71dc74fb31946d3278ed1f167cb136d781d890db054cb2200794bc83cb3a9f3ed656e6e1d8d6e4624397403a
+  data.tar.gz: 24442c737983071f465757df9da2231c99dda4bbbfb0ab2999e60c1910e3c49bfb2cbaa4312bc091d46bf5998fa8483a9755c534edc0b8329f2a7e792046f042

data/Gemfile

@@ -17,7 +17,7 @@
 
 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"
@@ -37,9 +37,3 @@ group :debug do
   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/chef-apply.gemspec

@@ -31,10 +31,10 @@ Gem::Specification.new do |spec|
   spec.license       = "Apache-2.0"
   spec.required_ruby_version = ">= 2.5.0"
 
-  spec.files = %w{Rakefile LICENSE README.md warning.txt} +
+  spec.files = %w{Rakefile LICENSE warning.txt} +
     Dir.glob("Gemfile*") + # Includes Gemfile and locks
     Dir.glob("*.gemspec") +
-    Dir.glob("{bin,i18n,lib,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
+    Dir.glob("{bin,i18n,lib}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
   spec.bindir        = "bin"
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
@@ -48,7 +48,7 @@ Gem::Specification.new do |spec|
                                      # 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", "~> 3.0" # remote connection management over ssh, winrm
+  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

data/lib/chef_apply/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefApply
-  VERSION = "0.4.6".freeze
+  VERSION = "0.4.9".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-apply
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.9
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-04 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: train
+  name: train-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -236,7 +236,6 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - LICENSE
-- README.md
 - Rakefile
 - bin/chef-run
 - chef-apply.gemspec
@@ -280,40 +279,6 @@ files:
 - lib/chef_apply/ui/terminal.rb
 - lib/chef_apply/ui/terminal/job.rb
 - lib/chef_apply/version.rb
-- spec/fixtures/custom_config.toml
-- spec/integration/chef-run_spec.rb
-- spec/integration/fixtures/chef_help.out
-- spec/integration/fixtures/chef_version.out
-- spec/integration/spec_helper.rb
-- 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/file_fetcher_spec.rb
-- spec/unit/fixtures/multi-error.out
-- spec/unit/log_spec.rb
-- spec/unit/startup_spec.rb
-- spec/unit/target_host/linux_spec.rb
-- spec/unit/target_host/windows_spec.rb
-- spec/unit/target_host_spec.rb
-- spec/unit/target_resolver_spec.rb
-- spec/unit/telemeter/sender_spec.rb
-- spec/unit/telemeter_spec.rb
-- spec/unit/text/error_translation_spec.rb
-- spec/unit/ui/error_printer_spec.rb
-- spec/unit/ui/terminal_spec.rb
-- spec/unit/version_spec.rb
 - warning.txt
 homepage: https://github.com/chef/chef-apply
 licenses:

data/README.md

@@ -1,62 +0,0 @@
-# Chef Apply
-[![Gem Version](https://badge.fury.io/rb/chef-apply.svg)](https://badge.fury.io/rb/chef-apply)
-
-The ad-hoc execution tool for the Chef ecosystem.
-
-**Umbrella Project**: [Workstation](https://github.com/chef/chef-oss-practices/blob/master/projects/chef-workstation.md)
-
-* **[Project State](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md):** Active
-* **Issues [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md):** 14 days
-* **Pull Request [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md):** 14 days
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'chef-apply'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install chef-apply
-
-
-## Contributing/Development
-
-Please read our [Community Contributions Guidelines](https://docs.chef.io/community_contributions.html), and ensure you are signing all your commits with DCO sign-off.
-
-The general development process is:
-
-1. Fork this repo and clone it to your workstation.
-2. Create a feature branch for your change.
-3. Write code and tests.
-4. Push your feature branch to GitHub and open a pull request against master.
-
-Once your repository is set up, you can start working on the code. We do utilize RSpec for test driven development, so you'll need to get a development environment running. Follow the above procedure ("Installing from Git") to get your local copy of the source running.
-
-# License
-
-|                      |                                          |
-|:---------------------|:-----------------------------------------|
-| **Copyright:**       | Copyright 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.
-```
-

data/spec/fixtures/custom_config.toml

@@ -1,2 +0,0 @@
-[telemetry]
-dev = true

data/spec/integration/chef-run_spec.rb

@@ -1,41 +0,0 @@
-#
-# 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 "spec_helper"
-require "integration/spec_helper"
-require "chef_apply/cli"
-require "chef_apply/version"
-
-RSpec.describe "chef_appl" do
-  context "help output" do
-    context "at the top level" do
-      ["-h", "--help", ""].each do |arg|
-        it "#{arg} displays correct help" do
-          expect { run_cli_with(arg) }.to output(fixture_content("chef_help")).to_stdout
-        end
-      end
-    end
-  end
-
-  context "version output" do
-    ["-v", "--version"].each do |arg|
-      it "#{arg} displays correct version" do
-        expect { run_cli_with(arg) }.to output(fixture_content("chef_version")).to_stdout
-      end
-    end
-  end
-end

data/spec/integration/fixtures/chef_help.out

@@ -1,70 +0,0 @@
-Chef Run is a tool to execute ad-hoc tasks using Chef.
-
-chef-run <TARGET[S]> <RESOURCE> <RESOURCE_NAME> [PROPERTIES] [FLAGS]
-
-  Runs a single <RESOURCE> on the specified <TARGET[S]>.
-  [PROPERTIES] should be specified as key=value.
-
-  For example:
-
-    chef-run web01 service nginx action=restart
-    chef-run web01,web02 service nginx action=restart
-    chef-run web0[1:2] service nginx action=restart
-
-chef-run <TARGET[S]> <RECIPE> [FLAGS]
-
-  Runs a single recipe located at <RECIPE> on the specified <TARGET[S]>.
-
-  For example:
-
-    chef-run web01 path/to/cookbook/recipe.rb
-    chef-run web01,web02 path/to/cookbook
-    chef-run web0[1:2] cookbook_name
-    chef-run web01 cookbook_name::recipe_name
-
-ARGUMENTS:
-  <TARGET[S]>       The hosts or IPs to target. Can also be an SSH or WinRM URLs
-                    in the form:
-
-                    ssh://[USERNAME]@example.com[:PORT]
-  <RESOURCE>        A Chef resource, such as 'user' or 'package'
-  <RESOURCE_NAME>   The name, usually used to specify what 'thing' to set up with
-                    the resource. For example, given resource 'user', 'name' would be
-                    the name of the user you wanted to create.
-  <RECIPE>          The recipe to converge. This can be provided as one of:
-                    1. Full path to a recipe file
-                    2. Cookbook name. First we check the working directory for this
-                       cookbook, then we check in the chef repository path. If a
-                       cookbook is found we run the default recipe.
-                    3. This behaves similarly to 'cookbook name' above, but it also allows
-                       you to specify which recipe to use from the cookbook.
-
-FLAGS:
-        --chef-license ACCEPTANCE      Accept the license for this product and any contained products ('accept', 'accept-no-persist', or 'accept-silent')
-    -c, --config PATH                  Location of config file. Default: $HOME/.chef-workstation/config.toml
-        --cookbook-repo-paths PATH     Comma separated list of cookbook repository paths.
-    -h, --help                         Show help and usage for `chef-run`
-    -i, --identity-file PATH           SSH identity file to use when connecting. Keys loaded into ssh-agent will also be used.
-        --[no-]install                 Install Chef client on the target host(s) if it is not installed.
-                                       This defaults to enabled - the installation will be performed
-                                       if there is no Chef client on the target(s).
-        --password <PASSWORD>          Password to use for authentication to the target(s). The same
-                                       password will be used for all targets.
-    -p, --protocol <PROTOCOL>          The protocol to use for connecting to targets.
-                                       The default is 'ssh', and it can be changed in config.toml by
-                                       setting 'connection.default_protocol' to a supported option.
-        --[no-]ssl                     Use SSL for WinRM. Current default: false
-        --[no-]ssl-verify              Verify peer certificate when using SSL for WinRM
-                                       Use --ssl-no-verify when using SSL for WinRM and
-                                       the remote host is using a self-signed certificate.
-                                       Current default: true
-        --[no-]sudo                    Whether to use root permissions on the target. Default: true
-        --sudo-command <COMMAND>       Command to use for administrative/root access. Defaults to 'sudo'.
-        --sudo-options 'OPTIONS...'    Options to use with the sudo command. If there are multiple flags,
-                                       quote them. For example: --sudo-options '-H -P -s'
-        --sudo-password <PASSWORD>     Password to use with the sudo command.  This must be provided if
-                                       password is required for sudo on the target(s). The same sudo password
-                                       will be used for all targets.
-        --user <USER>                  Username to use for authentication to the target(s). The same
-                                       username will be used for all targets.
-    -v, --version                      Show the current version of Chef Run.

data/spec/integration/fixtures/chef_version.out

@@ -1 +0,0 @@
-chef-run: $VERSION

data/spec/integration/spec_helper.rb

@@ -1,55 +0,0 @@
-#
-# 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 "chef_apply/startup"
-require "chef_apply/version"
-
-# Create the chef configuration directory and touch the config
-# file.
-# this makes sure our output doesn't include
-# an extra line telling us that it's created,
-# causing the first integration test to execute to fail on
-# CI.
-# TODO this is not ideal... let's look at
-# testing the output correctly in both cases,
-# possible forcing a specific test that will also create
-# the directory to run first.
-dir = File.join(Dir.home, ".chef-workstation")
-conf = File.join(dir, "config.toml")
-FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
-FileUtils.touch(conf) unless File.exist?(conf)
-
-# Simple wrapper that runs the CLI and prevents it
-# from aborting all tests with a SystemExit.
-# We could shell out, but this will run a little faster as we
-# accumulate more things to test - and will work better to get
-# accurate simplecov coverage reporting.
-# usage:
-#   expect {run_with_cli("blah")}.to output("blah").to_stdout
-def run_cli_with(args)
-  ChefApply::Startup.new(args.split(" ")).run
-rescue SystemExit
-end
-
-def fixture_content(name)
-  content = File.read(File.join("spec/integration/fixtures", "#{name}.out"))
-  # 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)
-end

data/spec/spec_helper.rb

@@ -1,154 +0,0 @@
-#
-# 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/setup"
-require "simplecov"
-require "rspec/expectations"
-require "support/matchers/output_to_terminal"
-
-# class << Kernel
-#   alias :_require :require
-#   def require(*args)
-#
-#     show = false
-#     args.each do |a|
-#       if a =~ /chef_apply.*/
-#         show = true
-#         break
-#       end
-#     end
-#
-#     $stderr.puts "from #{File.basename(caller[1])}: require: %s" % [args.inspect] if show
-#     _require(*args)
-#   end
-#
-#   alias :_load :load
-#   def load(*args)
-#     show = false
-#     args.each do |a|
-#       if a =~ /chef_apply.*/
-#         show = true
-#         break
-#       end
-#     end
-#     $stderr.puts "from #{File.basename(caller[1])}: load: %s" % [args.inspect] if show
-#     _load(*args)
-#   end
-#
-# end
-#
-# module Kernel
-#   def require(*args)
-#     Kernel.require(*args)
-#   end
-#   def load(*args)
-#     Kernel.load(*args)
-#   end
-# end
-
-RemoteExecResult = Struct.new(:exit_status, :stdout, :stderr)
-
-class ChefApply::MockReporter
-  def update(msg); ChefApply::UI::Terminal.output msg; end
-
-  def success(msg); ChefApply::UI::Terminal.output "SUCCESS: #{msg}"; end
-
-  def error(msg); ChefApply::UI::Terminal.output "FAILURE: #{msg}"; end
-end
-
-RSpec::Matchers.define :exit_with_code do |expected_code|
-  actual_code = nil
-  match do |block|
-    begin
-      block.call
-    rescue SystemExit => e
-      actual_code = e.status
-    end
-    actual_code && actual_code == expected_code
-  end
-
-  failure_message do |block|
-    result = actual.nil? ? " did not call exit" : " called exit(#{actual_code})"
-    "expected exit(#{expected_code}) but it #{result}."
-  end
-
-  failure_message_when_negated do |block|
-    "expected exit(#{expected_code}) but it did."
-  end
-
-  description do
-    "expect exit(#{expected_code})"
-  end
-
-  supports_block_expectations do
-    true
-  end
-end
-# TODO would read better to make this a custom matcher.
-# Simulates a recursive string lookup on the Text object
-#
-# assert_string_lookup("tree.tree.tree.leaf", "a returned string")
-# TODO this can be more cleanly expressed as a custom matcher...
-def assert_string_lookup(key, retval = "testvalue")
-  it "should look up string #{key}" do
-    top_level_method, *call_seq = key.split(".")
-    terminal_method = call_seq.pop
-    tmock = double
-    # Because ordering is important
-    # (eg calling errors.hello is different from hello.errors),
-    # 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)
-    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)
-    subject.call
-  end
-end
-
-RSpec.configure do |config|
-  # Enable flags like --only-failures and --next-failure
-  config.example_status_persistence_file_path = ".rspec_status"
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-
-  # Disable RSpec exposing methods globally on `Module` and `main`
-  config.disable_monkey_patching!
-
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
-  end
-
-  config.mock_with :rspec do |mocks|
-    mocks.verify_partial_doubles = true
-  end
-
-  config.before(:all) do
-    ChefApply::Log.setup File::NULL, :error
-    ChefApply::UI::Terminal.init(File.open(File::NULL, "w"))
-  end
-end
-
-if ENV["CIRCLE_ARTIFACTS"]
-  dir = File.join(ENV["CIRCLE_ARTIFACTS"], "coverage")
-  SimpleCov.coverage_dir(dir)
-end
-SimpleCov.start