mixlib-install 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4893a11fa816d4a5f41a23ba5fc240581814e01c
-  data.tar.gz: b63a27ed56a22506d8d239e94fdaa5996a86d316
+  metadata.gz: 2f03663421a576ba891fc10027bb6c121ac2b145
+  data.tar.gz: d79251c618528630ffcfe1e7423d0ef8e9b5b8dc
 SHA512:
-  metadata.gz: 4e4fa265d321456e0eb32c805680965ba28b1022794863bdf4a8d2e82cb2bb86e2ebd567b1a909925255ad94b070623db658c49bb498b63d4d6c4ec2049b4eab
-  data.tar.gz: aff7a8bdfa4fd774209e0cca484304eddcae3e3af35ca55e41f50b1826a64781470486b73cdf2c312148f49a0246f4ccbc51e0a99e34d735e490caad11fc3fa7
+  metadata.gz: b4a64cceb274f80740dd2a6200e7fff526ec070dc9cb4c5763ad8d623d364890b128e7be7bb68ae2acd19ee63415aee5e6fe5d5c2da88adc6809fc7247e12f82
+  data.tar.gz: 173618c2e2edf623300c6d7020c7eb365cb0bde55659f7cd5120c89bfd162f55b4c599d3cd38f9d36df0c9d83b05cdc881e75271130a2c0fffdd60cd08bb6aff

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 sudo: false
+
 addons:
   apt:
     sources:
@@ -10,18 +11,21 @@ addons:
       - unzip
       - ssh
 
-install:
-  - echo "skip bundle install"
+matrix:
+  include:
+  - rvm: 2.2.5
+    env: CHEF_ACCEPTANCE=false
+  - rvm: 2.3.0
+    env: CHEF_ACCEPTANCE=true
 
 before_script:
   - ci/before-script.sh
-  # set chefdk as default environment
-  - eval "$(/opt/chefdk/bin/chef shell-init bash)"
   # put terraform on PATH
   - export PATH="$PWD/bin:$PATH"
 
 script:
-  - ci/script.sh
+  - bundle exec rake travis:ci
+  - ci/run-acceptance-tests.sh
 
 env:
   global:

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [2.1.6]
+- Add `User-Agent` headers to all download requests
+- CLI UX improvements
+- Add basic architecture validation
+
 ## [2.1.5]
 - Add `install_path` properties to the products inside PRODUCT_MATRIX.
 

data/Rakefile

@@ -1,32 +1,25 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-task default: :test
-
-desc "Run specs"
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = "spec/**/*_spec.rb"
-end
-
-begin
-  require "chefstyle"
-  require "rubocop/rake_task"
-  RuboCop::RakeTask.new(:style) do |task|
-    task.options += ["--display-cop-names", "--no-color"]
+[:unit, :functional].each do |type|
+  RSpec::Core::RakeTask.new(type) do |t|
+    t.pattern = "spec/#{type}/**/*_spec.rb"
+    t.rspec_opts = [].tap do |a|
+      a.push("--color")
+      a.push("--format progress")
+    end.join(" ")
   end
-rescue LoadError
-  puts "chefstyle/rubocop is not available.  gem install chefstyle to do style checking."
 end
 
-desc "Run all tests"
-task test: [:style, :spec]
-
-desc "Run tests for Travis CI"
-task ci: [:style, :spec, :functional]
+require "chefstyle"
+require "rubocop/rake_task"
+RuboCop::RakeTask.new(:chefstyle) do |task|
+  task.options << "--display-cop-names"
+end
 
-desc "Run functional"
-task "functional" do
-  system("bundle exec rspec functional")
+namespace :travis do
+  desc "Run tests on Travis CI"
+  task ci: %w{chefstyle unit functional}
 end
 
 desc "Render product matrix documentation"
@@ -55,3 +48,5 @@ task :console do
   ARGV.clear
   IRB.start
 end
+
+task default: %w{travis:ci}

data/acceptance/Gemfile

@@ -1,4 +1,6 @@
 source "https://rubygems.org"
 
 gem "mixlib-install", path: "../"
+gem "chef"
 gem "chef-acceptance", github: "chef/chef-acceptance"
+gem "inspec"

data/acceptance/powershell_install_ps1/inspec/verify.rb

@@ -1,3 +1,3 @@
-describe package("chef") do
+describe package("Chef Client v12*") do
   it { should be_installed }
 end

data/ci/before-script.sh

@@ -2,23 +2,6 @@
 
 set -evx
 
-# undo travis gem and bundler config
-for ruby_env_var in _ORIGINAL_GEM_PATH \
-                    BUNDLE_BIN_PATH \
-                    BUNDLE_GEMFILE \
-                    GEM_HOME \
-                    GEM_PATH \
-                    GEM_ROOT \
-                    RUBYLIB \
-                    RUBYOPT \
-                    RUBY_ENGINE \
-                    RUBY_ROOT \
-                    RUBY_VERSION
-
-do
-  unset $ruby_env_var
-done
-
 # Don't run acceptance tests on forks. The decryption keys are not available.
 if [ "${TRAVIS_REPO_SLUG}" = "chef/mixlib-install" ]; then
 

data/ci/run-acceptance-tests.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -evx
+
+# Don't run acceptance tests on forks. The decryption keys are not available.
+if [ "${CHEF_ACCEPTANCE}" = "true" ] && [ "${TRAVIS_REPO_SLUG}" = "chef/mixlib-install" ]; then
+  # setup acceptance tests
+  cd acceptance
+  export BUNDLE_GEMFILE=$PWD/Gemfile
+  bundle install
+  # run acceptances tests and force cleanup
+  bundle exec chef-acceptance test --force-destroy
+fi

data/lib/mixlib/install/backend/package_router.rb

@@ -20,6 +20,7 @@ require "json"
 require "mixlib/install/artifact_info"
 require "mixlib/install/backend/base"
 require "mixlib/install/product"
+require "mixlib/install/util"
 require "net/http"
 
 module Mixlib
@@ -156,19 +157,9 @@ Can not find any builds for #{options.product_name} in #{endpoint}.
         end
 
         def create_http_request(full_path)
-          require "mixlib/install/version"
-
           request = Net::HTTP::Get.new(full_path)
 
-          user_agents = ["mixlib-install/#{Mixlib::Install::VERSION}"]
-
-          if options.user_agent_headers
-            options.user_agent_headers.each do |header|
-              user_agents << header
-            end
-          end
-
-          request.add_field("User-Agent", user_agents.join(" "))
+          request.add_field("User-Agent", Util.user_agent_string(options.user_agent_headers))
 
           request
         end

data/lib/mixlib/install/cli.rb

@@ -20,7 +20,8 @@ module Mixlib
       desc "download PRODUCT_NAME", "download an artifact"
       option :channel,
         default: :stable,
-        aliases: ["-c"]
+        aliases: ["-c"],
+        enum: Mixlib::Install::Options::SUPPORTED_CHANNELS.map(&:to_s)
       option :version,
         default: :latest,
         aliases: ["-v"]
@@ -32,7 +33,9 @@ module Mixlib
       option :platform_version,
         aliases: ["-l"]
       option :architecture,
-        aliases: ["-a"]
+        default: "x86_64",
+        aliases: ["-a"],
+        enum: Mixlib::Install::Options::SUPPORTED_ARCHITECTURES.map(&:to_s)
       option :url,
         desc: "Print download URL without downloading the file",
         type: :boolean
@@ -96,13 +99,11 @@ module Mixlib
         desc: "Write script to file",
         aliases: ["-o"]
       option :type,
-        desc: "Install script type: #{Mixlib::Install::Options::SUPPORTED_SHELL_TYPES.join(", ")}",
+        desc: "Install script type",
         aliases: ["-t"],
-        default: "sh"
+        default: "sh",
+        enum: Mixlib::Install::Options::SUPPORTED_SHELL_TYPES.map(&:to_s)
       def install_script
-        if !Mixlib::Install::Options::SUPPORTED_SHELL_TYPES.include? options[:type].to_sym
-          abort "type must be one of: #{Mixlib::Install::Options::SUPPORTED_SHELL_TYPES.join(", ")}"
-        end
         context = {}
         context[:base_url] = options[:endpoint] if options[:endpoint]
         script = eval("Mixlib::Install.install_#{options[:type]}(context)")

data/lib/mixlib/install/generator/base.rb

@@ -17,6 +17,7 @@
 
 require "erb"
 require "ostruct"
+require "mixlib/install/util"
 
 module Mixlib
   class Install
@@ -47,6 +48,7 @@ module Mixlib
           if File.exist? "#{script_path}.erb"
             # Default values to use incase they are not set in the context
             context[:base_url] ||= "https://omnitruck.chef.io"
+            context[:user_agent_string] = Util.user_agent_string(context[:user_agent_headers])
 
             context_object = OpenStruct.new(context).instance_eval { binding }
             ERB.new(File.read("#{script_path}.erb")).result(context_object)

data/lib/mixlib/install/generator/bourne.rb

@@ -23,7 +23,7 @@ module Mixlib
       class Bourne < Base
         def self.install_sh(context)
           install_command = []
-          install_command << get_script("helpers.sh")
+          install_command << get_script("helpers.sh", context)
           install_command << get_script("script_cli_parameters.sh")
           install_command << get_script("platform_detection.sh")
           install_command << get_script("fetch_metadata.sh", context)
@@ -42,7 +42,7 @@ module Mixlib
 
         def install_command
           install_command = []
-          install_command << get_script("helpers.sh")
+          install_command << get_script("helpers.sh", user_agent_headers: options.user_agent_headers)
           install_command << render_variables
           install_command << get_script("platform_detection.sh")
           install_command << get_script("fetch_metadata.sh")

data/lib/mixlib/install/generator/bourne/scripts/{helpers.sh → helpers.sh.erb}

@@ -115,7 +115,7 @@ capture_tmp_stderr() {
 # do_wget URL FILENAME
 do_wget() {
   echo "trying wget..."
-  wget -O "$2" "$1" 2>$tmp_dir/stderr
+  wget --user-agent="User-Agent: <%= user_agent_string %>" -O "$2" "$1" 2>$tmp_dir/stderr
   rc=$?
   # check for 404
   grep "ERROR 404" $tmp_dir/stderr 2>&1 >/dev/null
@@ -136,7 +136,7 @@ do_wget() {
 # do_curl URL FILENAME
 do_curl() {
   echo "trying curl..."
-  curl --retry 5 -sL -D $tmp_dir/stderr "$1" > "$2"
+  curl -A "User-Agent: <%= user_agent_string %>" --retry 5 -sL -D $tmp_dir/stderr "$1" > "$2"
   rc=$?
   # check for 404
   grep "404 Not Found" $tmp_dir/stderr 2>&1 >/dev/null
@@ -157,7 +157,7 @@ do_curl() {
 # do_fetch URL FILENAME
 do_fetch() {
   echo "trying fetch..."
-  fetch -o "$2" "$1" 2>$tmp_dir/stderr
+  fetch --user-agent="User-Agent: <%= user_agent_string %>" -o "$2" "$1" 2>$tmp_dir/stderr
   # check for bad return status
   test $? -ne 0 && return 1
   return 0
@@ -187,7 +187,7 @@ do_perl() {
 # do_python URL FILENAME
 do_python() {
   echo "trying python..."
-  python -c "import sys,urllib2 ; sys.stdout.write(urllib2.urlopen(sys.argv[1]).read())" "$1" > "$2" 2>$tmp_dir/stderr
+  python -c "import sys,urllib2; sys.stdout.write(urllib2.urlopen(urllib2.Request(sys.argv[1], headers={ 'User-Agent': '<%= user_agent_string %>' })).read())" "$1" > "$2" 2>$tmp_dir/stderr
   rc=$?
   # check for 404
   grep "HTTP Error 404" $tmp_dir/stderr 2>&1 >/dev/null

data/lib/mixlib/install/generator/powershell.rb

@@ -23,7 +23,7 @@ module Mixlib
       class PowerShell < Base
         def self.install_ps1(context)
           install_project_module = []
-          install_project_module << get_script("helpers.ps1")
+          install_project_module << get_script("helpers.ps1", context)
           install_project_module << get_script("get_project_metadata.ps1", context)
           install_project_module << get_script("install_project.ps1")
 
@@ -45,7 +45,7 @@ module Mixlib
 
         def install_command
           install_project_module = []
-          install_project_module << get_script("helpers.ps1")
+          install_project_module << get_script("helpers.ps1", user_agent_headers: options.user_agent_headers)
           install_project_module << get_script("get_project_metadata.ps1")
           install_project_module << get_script("install_project.ps1")
           install_command = []

data/lib/mixlib/install/generator/powershell/scripts/{helpers.ps1 → helpers.ps1.erb}

@@ -64,6 +64,7 @@ function Get-WebContentOnFullNet {
 
   $proxy = New-Object -TypeName System.Net.WebProxy
   $wc = new-object System.Net.WebClient
+  $wc.Headers.Add("user-agent", "<%= user_agent_string %>")
   $proxy.Address = $env:http_proxy
   $wc.Proxy = $proxy
 
@@ -80,6 +81,7 @@ function Get-WebContentOnCore {
 
   $handler = New-Object System.Net.Http.HttpClientHandler
   $client = New-Object System.Net.Http.HttpClient($handler)
+  $client.DefaultRequestHeaders.UserAgent.ParseAdd("<%= user_agent_string %>")
   $client.Timeout = New-Object System.TimeSpan(0, 30, 0)
   $cancelTokenSource = [System.Threading.CancellationTokenSource]::new()
   $responseMsg = $client.GetAsync([System.Uri]::new($uri), $cancelTokenSource.Token)

data/lib/mixlib/install/options.rb

@@ -26,9 +26,25 @@ module Mixlib
 
       attr_reader :options
 
-      SUPPORTED_CHANNELS = [:stable, :current, :unstable]
+      SUPPORTED_ARCHITECTURES = %w{
+        i386
+        powerpc
+        ppc64
+        ppc64le
+        s390x
+        sparc
+        x86_64
+      }
+      SUPPORTED_CHANNELS = [
+        :stable,
+        :current,
+        :unstable,
+      ]
       SUPPORTED_PRODUCT_NAMES = PRODUCT_MATRIX.products
-      SUPPORTED_SHELL_TYPES = [:ps1, :sh]
+      SUPPORTED_SHELL_TYPES = [
+        :ps1,
+        :sh,
+      ]
       SUPPORTED_OPTIONS = [
         :architecture,
         :channel,
@@ -55,6 +71,7 @@ module Mixlib
       def validate_options!
         errors = []
 
+        errors << validate_architecture
         errors << validate_product_names
         errors << validate_channels
         errors << validate_shell_type
@@ -107,6 +124,15 @@ module Mixlib
         }
       end
 
+      def validate_architecture
+        unless architecture.nil? || SUPPORTED_ARCHITECTURES.include?(architecture)
+          <<-EOS
+Unknown architecture #{architecture}.
+Must be one of: #{SUPPORTED_ARCHITECTURES.join(", ")}
+          EOS
+        end
+      end
+
       def validate_product_names
         unless SUPPORTED_PRODUCT_NAMES.include? product_name
           <<-EOS

data/lib/mixlib/install/util.rb

@@ -118,6 +118,17 @@ module Mixlib
           "sh -c '\n#{cmd}\n'"
         end
 
+        # Build the user-agent string
+        #
+        # @param name [Array] headers
+        # @return [String] generated user-agent string
+        def user_agent_string(headers)
+          require "mixlib/install/version"
+          user_agents = %W{mixlib-install/#{Mixlib::Install::VERSION}}
+          user_agents << headers
+          # Ensure that if the default user agent is aleady set it doesn't get duplicated
+          user_agents.flatten.compact.uniq.join(" ")
+        end
       end
     end
   end

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "2.1.5"
+    VERSION = "2.1.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory
@@ -260,9 +260,7 @@ files:
 - bin/mixlib-install
 - ci/before-script.sh
 - ci/es-infrastructure.pem.enc
-- ci/script.sh
-- functional/cli_spec.rb
-- functional/spec_helper.rb
+- ci/run-acceptance-tests.sh
 - lib/mixlib/install.rb
 - lib/mixlib/install/artifact_info.rb
 - lib/mixlib/install/backend.rb
@@ -274,13 +272,13 @@ files:
 - lib/mixlib/install/generator/bourne.rb
 - lib/mixlib/install/generator/bourne/scripts/fetch_metadata.sh.erb
 - lib/mixlib/install/generator/bourne/scripts/fetch_package.sh
-- lib/mixlib/install/generator/bourne/scripts/helpers.sh
+- lib/mixlib/install/generator/bourne/scripts/helpers.sh.erb
 - lib/mixlib/install/generator/bourne/scripts/install_package.sh
 - lib/mixlib/install/generator/bourne/scripts/platform_detection.sh
 - lib/mixlib/install/generator/bourne/scripts/script_cli_parameters.sh
 - lib/mixlib/install/generator/powershell.rb
 - lib/mixlib/install/generator/powershell/scripts/get_project_metadata.ps1.erb
-- lib/mixlib/install/generator/powershell/scripts/helpers.ps1
+- lib/mixlib/install/generator/powershell/scripts/helpers.ps1.erb
 - lib/mixlib/install/generator/powershell/scripts/install_project.ps1
 - lib/mixlib/install/generator/powershell/scripts/platform_detection.ps1
 - lib/mixlib/install/options.rb
@@ -311,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A mixin to help with omnitruck installs

data/ci/script.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -evx
-
-# run unit tests
-/opt/chefdk/embedded/bin/bundle install && /opt/chefdk/bin/chef exec rake ci
-
-# Don't run acceptance tests on forks. The decryption keys are not available.
-if [ "${TRAVIS_REPO_SLUG}" = "chef/mixlib-install" ]; then
-  # setup acceptance tests
-  cd acceptance && export BUNDLE_GEMFILE=$PWD/Gemfile && /opt/chefdk/embedded/bin/bundle install && export APPBUNDLER_ALLOW_RVM=true
-  # run acceptances tests and force cleanup
-  /opt/chefdk/embedded/bin/bundle exec chef-acceptance test --force-destroy
-fi

data/functional/cli_spec.rb

@@ -1,192 +0,0 @@
-#
-# Copyright:: Copyright (c) 2016 Chef, 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_relative "./spec_helper"
-require "mixlib/install/cli"
-
-describe "mixlib-install executable", :type => :aruba do
-  let(:args) { nil }
-
-  before(:all) do
-    puts "
-    ****************************************
-      TESTS ARE SLOW - DOWNLOADS PACKAGES.
-    ****************************************
-
-"
-  end
-
-  before(:each) { run("bin/mixlib-install #{command} #{args}") }
-
-  describe "version command" do
-    let(:command) { "version" }
-
-    it "prints the mixlib-install version" do
-      require "mixlib/install/version"
-      expect(last_command_started).to have_output Mixlib::Install::VERSION
-    end
-  end
-
-  describe "list-versions command" do
-    let(:command) { "list-versions" }
-
-    context "with valid args" do
-      let(:args) { "chef stable" }
-
-      it "prints the versions" do
-        expect(last_command_started).to have_output /12.0.3/
-      end
-    end
-
-    context "with invalid args" do
-      let(:args) { "foo bar" }
-
-      it "returns error message" do
-        expect(last_command_started).to have_output /Unknown product name foo/
-        expect(last_command_started).to have_output /Unknown channel bar/
-      end
-    end
-  end
-
-  describe "install-script command" do
-    let(:command) { "install-script" }
-
-    context "with no args" do
-      it "returns shell script to stdout" do
-        expect(last_command_started).to have_output /end of install_package.sh/
-      end
-    end
-
-    context "with ps1 type" do
-      let(:args) { "-t ps1" }
-
-      it "returns powershell script to stdout" do
-        expect(last_command_started).to have_output /export-modulemember -function 'Install-Project','Get-ProjectMetadata' -alias 'install'/
-      end
-    end
-
-    context "with invalid type" do
-      let(:args) { "-t foo" }
-
-      it "errors an error" do
-        expect(last_command_started).to have_output /type must be one of/
-      end
-    end
-
-    context "with alternate endpoint" do
-      let(:args) { "--endpoint https://omnitruck-custom.chef.io" }
-
-      it "contains the new endpoint" do
-        expect(last_command_started).to have_output /https:\/\/omnitruck-custom.chef.io/
-      end
-    end
-
-    context "with output option" do
-      let(:args) { "-o script.sh" }
-
-      it "writes to a file" do
-        expect("script.sh").to be_an_existing_file
-      end
-    end
-  end
-
-  describe "download command" do
-    let(:command) { "download" }
-
-    context "without args" do
-      it "exits with required args error" do
-        expect(last_command_started).to have_output /"mixlib-install #{command}" was called with no arguments/
-      end
-    end
-
-    context "with chef product" do
-      let(:args) { "chef" }
-
-      it "downloads a chef artifact" do
-        expect(last_command_started).to have_output /Download saved to/
-      end
-    end
-
-    context "with url flag" do
-      let(:args) { "chef --url" }
-
-      it "outputs the url" do
-        expect(last_command_started).to have_output /https:\/\/packages.chef.io\/files\/stable\/chef/
-      end
-    end
-
-    context "with attributes arg" do
-      let(:args) { "chef --url --attributes" }
-
-      it "outputs the attributes" do
-        expect(last_command_started).to have_output /"license": "Apache-2.0"/
-      end
-    end
-
-    context "with platform arg" do
-      let(:args) { "chef -p ubuntu" }
-
-      it "fails with missing args error" do
-        expect(last_command_started).to have_output /Must provide platform version and architecture when specifying a platform/
-      end
-    end
-
-    context "with valid platform version and architecture" do
-      let(:args) { "chef -p ubuntu -l 14.04 -a x86_64 --attributes" }
-      let(:latest_version) { Mixlib::Install.available_versions("chef", "stable").last }
-      let(:filename) { "chef_#{latest_version}-1_amd64.deb" }
-
-      it "has the correct artifact" do
-        require "digest"
-        sha256 = Digest::SHA256.hexdigest("./tmp/aruba/#{filename}")
-        expect(last_command_started).to have_output /sha256/
-      end
-    end
-
-    context "with invalid platform version and architecture" do
-      let(:args) { "chef -p ubuntu -l 99.99 -a x86_64" }
-
-      it "returns no results" do
-        expect(last_command_started).to have_output /No results found./
-      end
-    end
-
-    context "with specified version" do
-      let(:args) { "chef -v 12.0.3 " }
-
-      it "returns the correct artifact" do
-        expect(last_command_started).to have_output /chef[-_]12.0.3-1/
-      end
-    end
-
-    context "with specified channel" do
-      let(:args) { "chef -c current " }
-
-      it "returns the correct artifact" do
-        expect(last_command_started).to have_output /files\/current\/chef/
-      end
-    end
-
-    context "with specified directory" do
-      let(:args) { "chef -d mydir " }
-
-      it "downloads to dir" do
-        expect(last_command_started).to have_output /Download saved to .*mydir\/chef/
-      end
-    end
-  end
-end

data/functional/spec_helper.rb

@@ -1,16 +0,0 @@
-require "aruba/rspec"
-
-Aruba.configure do |config|
-  config.exit_timeout                          = 120
-  config.io_wait_timeout                       = 2
-  config.activate_announcer_on_command_failure = [:stderr, :stdout, :command]
-end
-
-RSpec.configure do |config|
-  config.filter_run focus: true
-  config.run_all_when_everything_filtered = true
-
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
-  end
-end