chef-apply 0.2.8 → 0.2.13

data/spec/unit/ui/error_printer_spec.rb

@@ -24,7 +24,7 @@ require "chef_apply/target_host"
 RSpec.describe ChefApply::UI::ErrorPrinter do
 
   let(:orig_exception) { StandardError.new("test") }
-  let(:target_host) { ChefApply::TargetHost.instance_for_url("mock://localhost") }
+  let(:target_host) { ChefApply::TargetHost.mock_instance("mock://localhost") }
   let(:wrapped_exception) { ChefApply::WrappedError.new(orig_exception, target_host) }
 
   let(:show_footer) { true }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-apply
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.13
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -178,6 +178,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: license-acceptance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.11
+  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
@@ -327,9 +347,6 @@ files:
 - lib/chef_apply/action/generate_local_policy.rb
 - lib/chef_apply/action/generate_temp_cookbook.rb
 - lib/chef_apply/action/install_chef.rb
-- lib/chef_apply/action/install_chef/base.rb
-- lib/chef_apply/action/install_chef/linux.rb
-- lib/chef_apply/action/install_chef/windows.rb
 - lib/chef_apply/action/reporter.rb
 - lib/chef_apply/cli.rb
 - lib/chef_apply/cli/help.rb
@@ -346,6 +363,8 @@ files:
 - lib/chef_apply/startup.rb
 - lib/chef_apply/status_reporter.rb
 - lib/chef_apply/target_host.rb
+- lib/chef_apply/target_host/linux.rb
+- lib/chef_apply/target_host/windows.rb
 - lib/chef_apply/target_resolver.rb
 - lib/chef_apply/telemeter.rb
 - lib/chef_apply/telemeter/patch.rb
@@ -371,7 +390,6 @@ files:
 - spec/unit/action/converge_target_spec.rb
 - spec/unit/action/generate_local_policy_spec.rb
 - spec/unit/action/generate_temp_cookbook_spec.rb
-- spec/unit/action/install_chef/base_spec.rb
 - spec/unit/action/install_chef_spec.rb
 - spec/unit/cli/options_spec.rb
 - spec/unit/cli/validation_spec.rb
@@ -384,6 +402,8 @@ files:
 - spec/unit/minimum_chef_version_spec.rb
 - spec/unit/recipe_lookup_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
@@ -416,8 +436,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The ad-hoc execution tool for the Chef ecosystem.

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

@@ -1,117 +0,0 @@
-#
-# Copyright:: Copyright (c) 2017 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/action/base"
-require "chef_apply/minimum_chef_version"
-require "fileutils"
-
-module ChefApply::Action::InstallChef
-  class Base < ChefApply::Action::Base
-
-    def perform_action
-      if ChefApply::MinimumChefVersion.check!(target_host, config[:check_only]) == :minimum_version_met
-        notify(:already_installed)
-      else
-        perform_local_install
-      end
-    end
-
-    def name
-      # We have subclasses - so this'll take the qualified name
-      # eg InstallChef::Windows, etc
-      self.class.name.split("::")[-2..-1].join("::")
-    end
-
-    def upgrading?
-      @upgrading
-    end
-
-    def perform_local_install
-      package = lookup_artifact()
-      notify(:downloading)
-      local_path = download_to_workstation(package.url)
-      notify(:uploading)
-      remote_path = upload_to_target(local_path)
-      notify(:installing)
-      install_chef_to_target(remote_path)
-      notify(:install_complete)
-    end
-
-    def perform_remote_install
-      raise NotImplementedError
-    end
-
-    def lookup_artifact
-      return @artifact_info if @artifact_info
-      require "mixlib/install"
-      c = train_to_mixlib(target_host.platform)
-      Mixlib::Install.new(c).artifact_info
-    end
-
-    def version_to_install
-      lookup_artifact.version
-    end
-
-    def train_to_mixlib(platform)
-      opts = {
-        platform_version: platform.release,
-        platform: platform.name,
-        architecture: platform.arch,
-        product_name: "chef",
-        product_version: :latest,
-        channel: :stable,
-        platform_version_compatibility_mode: true,
-      }
-      case platform.name
-      when /windows/
-        opts[:platform] = "windows"
-      when "redhat", "centos"
-        opts[:platform] = "el"
-      when "suse"
-        opts[:platform] = "sles"
-      when "amazon"
-        opts[:platform] = "el"
-        if platform.release.to_i > 2010 # legacy Amazon version 1
-          opts[:platform_version] = "6"
-        else
-          opts[:platform_version] = "7"
-        end
-      end
-      opts
-    end
-
-    def download_to_workstation(url_path)
-      require "chef_apply/file_fetcher"
-      ChefApply::FileFetcher.fetch(url_path)
-    end
-
-    def upload_to_target(local_path)
-      installer_dir = setup_remote_temp_path()
-      remote_path = File.join(installer_dir, File.basename(local_path))
-      target_host.upload_file(local_path, remote_path)
-      remote_path
-    end
-
-    def setup_remote_temp_path
-      raise NotImplementedError
-    end
-
-    def install_chef_to_target(remote_path)
-      raise NotImplementedError
-    end
-  end
-end

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

@@ -1,37 +0,0 @@
-#
-# Copyright:: Copyright (c) 2017 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.
-#
-
-module ChefApply::Action::InstallChef
-  class Linux < ChefApply::Action::InstallChef::Base
-    def install_chef_to_target(remote_path)
-      install_cmd = case File.extname(remote_path)
-                    when ".rpm"
-                      "rpm -Uvh #{remote_path}"
-                    when ".deb"
-                      "dpkg -i #{remote_path}"
-                    end
-      target_host.run_command!(install_cmd)
-      nil
-    end
-
-    def setup_remote_temp_path
-      installer_dir = "/tmp/chef-installer"
-      target_host.mkdir(installer_dir)
-      installer_dir
-    end
-  end
-end

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

@@ -1,54 +0,0 @@
-#
-# Copyright:: Copyright (c) 2017 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.
-#
-
-module ChefApply::Action::InstallChef
-  class Windows < ChefApply::Action::InstallChef::Base
-
-    def perform_remote_install
-      require "mixlib/install"
-      installer = Mixlib::Install.new({
-        platform: "windows",
-        product_name: "chef",
-        channel: :stable,
-        shell_type: :ps1,
-        version: "13",
-      })
-      target_host.run_command! installer.install_command
-    end
-
-    # TODO: These methods are implemented, but are currently
-    # not runnable - see explanation in InstallChef::Base
-    def install_chef_to_target(remote_path)
-      # While powershell does not mind the mixed path separators \ and /,
-      # 'cmd.exe' definitely does - so we'll make the path cmd-friendly
-      # before running the command
-      cmd = "cmd /c msiexec /package #{remote_path.tr("/", "\\")} /quiet"
-      target_host.run_command!(cmd)
-    end
-
-    def setup_remote_temp_path
-      return @temppath if @temppath
-
-      r = target_host.run_command!("Write-Host -NoNewline $env:TEMP")
-      temppath = "#{r.stdout}\\chef-installer"
-
-      # Failure here is acceptable - the dir could already exist
-      target_host.run_command("New-Item -ItemType Directory -Force -Path #{temppath}")
-      @temppath = temppath
-    end
-  end
-end

data/spec/unit/action/install_chef/base_spec.rb

@@ -1,168 +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 "chef_apply/action/install_chef"
-require "chef_apply/target_host"
-
-RSpec.describe ChefApply::Action::InstallChef::Base do
-  let(:mock_os_name) { "mock" }
-  let(:mock_os_family) { "mock" }
-  let(:mock_os_release ) { "unknown" }
-  let(:mock_opts) do
-    {
-      name: mock_os_name,
-      family: mock_os_family,
-      release: mock_os_release,
-      arch: "x86_64",
-    }
-  end
-  let(:target_host) do
-    ChefApply::TargetHost.new("mock://user1:password1@localhost")
-  end
-
-  let(:reporter) do
-    ChefApply::MockReporter.new
-  end
-
-  subject(:install) do
-    ChefApply::Action::InstallChef::Base.new(target_host: target_host,
-                                             reporter: reporter,
-                                             check_only: false) end
-  before do
-    target_host.connect!
-    target_host.backend.mock_os(mock_opts)
-  end
-
-  context "#perform_action" do
-    context "when chef is already installed on target" do
-      it "notifies of success and takes no further action" do
-        expect(ChefApply::MinimumChefVersion).to receive(:check!).with(install.target_host, false)
-                       .and_return(:minimum_version_met)
-        expect(install).not_to receive(:perform_local_install)
-        install.perform_action
-      end
-    end
-
-    context "when chef is not already installed on target" do
-      it "should invoke perform_local_install" do
-        expect(ChefApply::MinimumChefVersion).to receive(:check!).with(install.target_host, false)
-                       .and_return(:client_not_installed)
-        expect(install).to receive(:perform_local_install)
-        install.perform_action
-      end
-    end
-  end
-
-  context "#perform_local_install" do
-    let(:artifact) { double("artifact") }
-    let(:package_url) { "https://chef.io/download/package/here" }
-    before do
-      allow(artifact).to receive(:url).and_return package_url
-    end
-
-    it "performs the steps necessary to perform an installation" do
-      expect(install).to receive(:lookup_artifact).and_return artifact
-      expect(install).to receive(:download_to_workstation).with(package_url) .and_return "/local/path"
-      expect(install).to receive(:upload_to_target).with("/local/path").and_return("/remote/path")
-      expect(install).to receive(:install_chef_to_target).with("/remote/path")
-
-      install.perform_local_install
-    end
-  end
-
-  context "#train_to_mixlib" do
-    let(:platform) { double }
-    before do
-      allow(platform).to receive(:release).and_return "1234"
-      allow(platform).to receive(:name).and_return "beos"
-      allow(platform).to receive(:arch).and_return "ppc"
-    end
-
-    context "when any flavor of windows" do
-      before do
-        allow(platform).to receive(:name).and_return "windows_10_pro_n"
-      end
-
-      it "sets platform name to 'windows'" do
-        mixlib_info = install.train_to_mixlib(platform)
-        expect(mixlib_info[:platform]).to eq "windows"
-      end
-    end
-
-    context "when redhat" do
-      before do
-        allow(platform).to receive(:name).and_return "redhat"
-      end
-
-      it "sets platform name to 'el'" do
-        mixlib_info = install.train_to_mixlib(platform)
-        expect(mixlib_info[:platform]).to eq "el"
-      end
-    end
-
-    context "when centos" do
-      before do
-        allow(platform).to receive(:name).and_return "centos"
-      end
-
-      it "sets platform name to 'el'" do
-        mixlib_info = install.train_to_mixlib(platform)
-        expect(mixlib_info[:platform]).to eq "el"
-      end
-    end
-
-    context "when suse" do
-      before do
-        allow(platform).to receive(:name).and_return "suse"
-      end
-
-      it "sets platform name to 'sles'" do
-        mixlib_info = install.train_to_mixlib(platform)
-        expect(mixlib_info[:platform]).to eq "sles"
-      end
-    end
-    context "when amazon" do
-      before do
-        allow(platform).to receive(:name).and_return "amazon"
-      end
-
-      context "when amazon linux 1.x" do
-        before do
-          allow(platform).to receive(:release).and_return "2017.09"
-        end
-
-        it "sets platform name to 'amazon' and plaform_version to '6'" do
-          mixlib_info = install.train_to_mixlib(platform)
-          expect(mixlib_info[:platform]).to eq "el"
-          expect(mixlib_info[:platform_version]).to eq "6"
-        end
-      end
-      context "when amazon linux 2.x" do
-        before do
-          allow(platform).to receive(:release).and_return "2"
-        end
-
-        it "sets platform name to 'amazon' and plaform_version to '7'" do
-          mixlib_info = install.train_to_mixlib(platform)
-          expect(mixlib_info[:platform]).to eq "el"
-          expect(mixlib_info[:platform_version]).to eq "7"
-        end
-      end
-    end
-  end
-end