beaker 3.7.0 → 3.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmUyMTFlZTE2NmY5N2U0NTEzNzc1ZDVmNjBjYzY1OWI5NWRmOTc5Yg==
+    N2JkMGY5N2Y2NGU1YWU2NmZhZTJhZjdkNDkyMGZkODk2N2ExMGE2MA==
   data.tar.gz: !binary |-
-    NjllMDQyODRjZjM2YTZiM2ZiMmM5ZTc4NWJkZTliNjliMGI4ZmU0Mw==
+    YzY5ZGQ4NjQ4YzNlOWE0NDk5ZDRkMWMwMWU0ZGE0MzgwODYxZDFiZg==
 SHA512:
   metadata.gz: !binary |-
-    NGNiNTg1MWQzZTIwNmNhMGQwNmNmMzlkNWRlNjU5OTRlMzBmMmYzMGRkMDkz
-    NDMzZTRmNzk1ZTdhMmVhZTg5ODIwOTg4NmMwZTJlZDUyOTMxNDcwZmE3MjJi
-    YWU1NzVhMjRlZDA3ZTcwYTdkMDJhYTBmM2UzNGI5NjBjODY3ZjM=
+    MDdmMjA2ZWFlZTkyMGI2YjMwZTIzM2ZhNGQwZWZiMzEwMGU0OGZkMDliNTJi
+    MTYyNGM0OGMxYjdkNDBkOTdmZmI4NWY0MzdhYTJkMDFlNzFlMDhlMDdkMDc0
+    NjczMjkyM2U2MzFhNTQ5NjdmMjc5M2NiMmE3MTBiMDc0OWM0YTM=
   data.tar.gz: !binary |-
-    OGVjNmEzMjQ0OWYwM2M0NDk2NWEzY2Q4N2ZhMGUxNmYxOGNhNGVjMmYyYTdj
-    Nzg4ZGFjZmRiMTIzYTZlYjVlZmY2ZTdkNTU4NjM2Yjk3Zjc4OTQ0ZTc0YTdl
-    NWUwYjc0NTZhNTg4NTdkZTMyNmQ4ZmJlMThmODFhNmIwYWQ3OWM=
+    ZjgwMTliODVjYjFmYjk3M2MzMWFkYzhmMDRmYmFlMGExNWE3MDMwMTM3MmYy
+    MDQ5ZTcwYmY1ZWE2NzhkNjEzZDUxOGEzMTMzNjczYjIwNmY0YjM5ZDkyZDE2
+    ZjQ5N2VhN2ZjMmVkMGNjOWJiNTUxNmM5YjA4MzUzY2UzMDFmNTQ=

data/acceptance/pre_suite/puppet_pkg/install.rb

@@ -1,7 +1,9 @@
 # the version is required on windows
 # all versions are required for osx
 install_puppet({
-  :version        => '3.8.7',
-  :facter_version => '2.1.0',
-  :hiera_version  => '1.3.4',
+  :version        => ENV['BEAKER_PUPPET_VERSION'] || '4.8.0',
+  :puppet_agent_version => ENV['BEAKER_PUPPET_AGENT_VERSION'] || '1.8.0'
 })
+
+on(master, puppet('resource user puppet ensure=present'))
+on(master, puppet('resource group puppet ensure=present'))

data/acceptance/tests/puppet/with_puppet_running_on.rb

@@ -1,30 +1,26 @@
-test_name 'with_puppet_running_on' do
-
-  with_puppet_running_on(master, {}) do
-    puppet_service = master['puppetservice']
-    on(master, puppet("resource service #{puppet_service}")).stdout do |result|
-      assert_match(/running/,result,'did not find puppet service/master running')
+test_name 'skip_test in with_puppet_running_on' do
+  assert_raises SkipTest do
+    with_puppet_running_on(master, {}) do
+      skip_test 'skip rest'
+      assert(false)
     end
   end
-
 end
 
-test_name 'skip_test in with_puppet_running_on' do
-
-  with_puppet_running_on(master, {}) do
-    skip_test 'skip rest'
-    assert(false)
+test_name 'pending_test in with_puppet_running_on' do
+  assert_raises PendingTest do
+    with_puppet_running_on(master, {}) do
+      pending_test 'pending appendix prepended'
+      assert(false)
+    end
   end
-
 end
 
-test_name 'pending_test in with_puppet_running_on' do
-
-  with_puppet_running_on(master, {}) do
-    pending_test 'pending appendix prepended'
-    assert(false)
+test_name 'fail_test in with_puppet_running_on' do
+  assert_raises FailTest do
+    with_puppet_running_on(master, {}) do
+      fail_test 'fail_test message'
+      assert(false)
+    end
   end
-
 end
-
-# TODO: no idea how to test fail_test in here

data/beaker.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry', '~> 0.10'
 
   # Documentation dependencies
-  s.add_development_dependency 'yard'
+  s.add_development_dependency 'yard', '< 0.9.6'
 
   # Run time dependencies
   s.add_runtime_dependency 'minitest', '~> 5.4'
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rsync', '~> 1.0.9'
   s.add_runtime_dependency 'open_uri_redirections', '~> 0.2.1'
   s.add_runtime_dependency 'in-parallel', '~> 0.1'
+  s.add_runtime_dependency 'thor', '0.19.1'
 
   # Run time dependencies that are Beaker libraries
   s.add_runtime_dependency 'stringify-hash', '~> 0.0'

data/bin/beaker

@@ -3,7 +3,11 @@
 require 'rubygems' unless defined?(Gem)
 require 'beaker'
 
-Beaker::CLI.new.execute!
-puts "Beaker completed successfully, thanks."
+if Beaker::Subcommands::SubcommandUtil.execute_subcommand?(ARGV[0])
+  Beaker::Subcommand.start(ARGV)
+else
+  Beaker::CLI.new.execute!
+  puts "Beaker completed successfully, thanks."
+end
 
 exit 0

data/lib/beaker.rb

@@ -1,7 +1,7 @@
 require 'rubygems' unless defined?(Gem)
 module Beaker
 
-  %w( version platform test_suite result command options network_manager cli perf logger_junit ).each do |lib|
+  %w( version platform test_suite result command options network_manager cli perf logger_junit subcommand ).each do |lib|
     begin
       require "beaker/#{lib}"
     rescue LoadError

data/lib/beaker/cli.rb

@@ -27,19 +27,16 @@ module Beaker
         @execute = false
         return
       end
+
       if @options[:beaker_version_print]
         @logger.notify(beaker_version_string)
         @execute = false
         return
       end
 
-      if Beaker::Shared::SubcommandsUtil::write_config?
-        @options.dump_to_file(Beaker::Shared::SubcommandsUtil::CONFIG_PATH)
-      else
-        @logger.info("Beaker!")
-        @logger.info(beaker_version_string)
-        @logger.info(@options.dump)
-      end
+      @logger.info("Beaker!")
+      @logger.info(beaker_version_string)
+      @logger.info(@options.dump)
 
       if @options[:parse_only]
         @execute = false

data/lib/beaker/host_prebuilt_steps.rb

@@ -336,7 +336,16 @@ module Beaker
           host.exec(Command.new('cp -r .ssh /cygdrive/c/Users/Administrator/.'))
           host.exec(Command.new('chown -R Administrator /cygdrive/c/Users/Administrator/.ssh'))
         elsif host['platform'] =~ /windows/ and not host.is_cygwin?
-          host.exec(Command.new("if exist .ssh (xcopy .ssh C:\\Users\\Administrator\\.ssh /s /e)"))
+          # from https://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/xcopy.mspx?mfr=true:
+          #    /i : If Source is a directory or contains wildcards and Destination
+          #      does not exist, xcopy assumes destination specifies a directory
+          #      name and creates a new directory. Then, xcopy copies all specified
+          #      files into the new directory. By default, xcopy prompts you to
+          #      specify whether Destination is a file or a directory.
+          #
+          #    /y : Suppresses prompting to confirm that you want to overwrite an
+          #      existing destination file.
+          host.exec(Command.new("if exist .ssh (xcopy .ssh C:\\Users\\Administrator\\.ssh /s /e /y /i)"))
         elsif host['platform'] =~ /osx/
           host.exec(Command.new('sudo cp -r .ssh /var/root/.'), {:pty => true})
         elsif host['platform'] =~ /freebsd/

data/lib/beaker/shared.rb

@@ -1,4 +1,4 @@
-[ 'repetition', 'error_handler', 'host_manager', 'timed', 'semvar', 'options_resolver', 'subcommands_util' ].each do |lib|
+[ 'repetition', 'error_handler', 'host_manager', 'timed', 'semvar', 'options_resolver'].each do |lib|
   require "beaker/shared/#{lib}"
 end
 module Beaker
@@ -9,7 +9,6 @@ module Beaker
     include Beaker::Shared::Timed
     include Beaker::Shared::Semvar
     include Beaker::Shared::OptionsResolver
-    include Beaker::Shared::SubcommandsUtil
   end
 end
 include Beaker::Shared

data/lib/beaker/subcommand.rb

@@ -0,0 +1,20 @@
+require "thor"
+require "fileutils"
+require "beaker/subcommands/subcommand_util"
+
+module Beaker
+  class Subcommand < Thor
+    SubcommandUtil = Beaker::Subcommands::SubcommandUtil
+
+    desc "init", "Initialises the beaker test environment configuration"
+    option :hypervisor, :type => :string, :required => true
+    long_desc <<-LONGDESC
+      Initialises a beaker environment configuration
+    LONGDESC
+    def init()
+      SubcommandUtil.verify_init_args(options)
+      SubcommandUtil.require_tasks()
+      SubcommandUtil.init_hypervisor(options)
+    end
+  end
+end

data/lib/beaker/subcommands/subcommand_util.rb

@@ -0,0 +1,114 @@
+require 'rake'
+
+module Beaker
+  module Subcommands
+    # Methods used in execution of Subcommands
+    # - should we execute a subcommand?
+    # - reset ARGV
+    # - execute Beaker
+    # - update a rakefile to require beaker quickstart tasks
+    # - initialise a rake application
+    # - execute a rake task
+    # - execute the vagrant quickstart task
+    # - execute the vmpooler quickstart task
+    # - exit with a specific message
+    # - verify that the init subcommand has the correct arguments
+    # - execute the quick start task for the specified hypervisor
+    module SubcommandUtil
+      BEAKER_REQUIRE = "require 'beaker/tasks/quick_start'"
+      HYPERVISORS = ["vagrant", "vmpooler"]
+
+      # Check if the first argument to the beaker execution is a subcommand
+      # @return [Boolean] true if argv[0] is "help" or a method defined in the Subcommands class, false otherwise
+      def self.execute_subcommand?(arg0)
+        return false if arg0.nil?
+        (Beaker::Subcommand.instance_methods(false) << :help).include? arg0.to_sym
+      end
+
+      # Reset ARGV to contain the arguments determined by a specific subcommand
+      # @param [Array<String>] args the arguments determined by a specific subcommand
+      def self.reset_argv(args)
+        ARGV.clear
+        args.each do |arg|
+          ARGV << arg
+        end
+      end
+
+      # Update ARGV and call Beaker
+      # @param [Array<String>] args the arguments determined by a specific subcommand
+      def self.execute_beaker(*args)
+        reset_argv(args)
+        Beaker::CLI.new.execute!
+      end
+
+      # Determines what Rakefile to use
+      # @return [String] the name of the rakefile to use
+      def self.determine_rake_file()
+        rake_app.find_rakefile_location() ? rake_app.find_rakefile_location()[0] : "Rakefile"
+      end
+
+      # Check for the presence of a Rakefile containing the require of the
+      # quick start tasks
+      def self.require_tasks()
+        rake_file = determine_rake_file()
+        unless File.readlines(rake_file).grep(/#{BEAKER_REQUIRE}/).any?
+          File.open(rake_file, "a+") { |f| f.puts(BEAKER_REQUIRE) }
+        end
+      end
+
+      # Initialises a rake application
+      # @return [Object] a rake application
+      def self.rake_app()
+        unless @rake_app
+          ARGV.clear
+          @rake_app = Rake.application
+          @rake_app.init
+        end
+        @rake_app
+      end
+
+      # Clear ARGV and execute a Rake task
+      # @param [String] task the rake task to execute
+      def self.execute_rake_task(task)
+        rake_app.load_rakefile()
+        rake_app.invoke_task(task)
+      end
+
+      # Execute the quick start task for vagrant
+      def self.init_vagrant()
+        execute_rake_task("beaker_quickstart:gen_hosts[vagrant]")
+      end
+
+      # Execute the quick start task for vmpooler
+      def self.init_vmpooler()
+        execute_rake_task("beaker_quickstart:gen_hosts[vmpooler]")
+      end
+
+      # Print a message to the console and exit with 0
+      # @param [String] msg the message to print
+      def self.exit_with(msg)
+        puts msg
+        exit(0)
+      end
+
+      # Verify that a valid hypervisor has been specified
+      # @param [Array<Object>] options the options we want to query
+      def self.verify_init_args(options)
+        unless HYPERVISORS.include?(options[:hypervisor])
+          exit_with("Invalid hypervisor. Currently supported hypervisors are: #{HYPERVISORS.join(', ')}")
+        end
+      end
+
+      # Call the quick start task for the specified hypervisor
+      # @param [Array<Object>] options the options we want to query
+      def self.init_hypervisor(options)
+        case options[:hypervisor]
+        when "vagrant"
+          init_vagrant
+        when "vmpooler"
+          init_vmpooler
+        end
+      end
+    end
+  end
+end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '3.7.0'
+    STRING = '3.8.0'
   end
 end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -498,6 +498,18 @@ describe Beaker do
 
   end
 
+  context "copy_ssh_to_root" do
+    subject { dummy_class.new }
+
+    it "can copy ssh to root in windows hosts with no cygwin" do
+      host = make_host( 'testhost', { :platform => 'windows', :is_cygwin => false })
+      expect( Beaker::Command ).to receive( :new ).with( "if exist .ssh (xcopy .ssh C:\\Users\\Administrator\\.ssh /s /e /y /i)" ).once
+
+      subject.copy_ssh_to_root(host, options)
+    end
+
+  end
+
   context "package_proxy" do
 
     subject { dummy_class.new }

data/spec/beaker/subcommand/subcommand_util_spec.rb

@@ -0,0 +1,203 @@
+require 'spec_helper'
+
+module Beaker
+  module Subcommands
+    describe SubcommandUtil do
+
+      let(:cli) {
+        double("cli")
+      }
+
+      let(:rake) {
+        double("rake")
+      }
+
+      let(:file) {
+        double("file")
+      }
+
+      describe 'reset_argv' do
+        it "resets argv" do
+          args = ["test1", "test2"]
+          expect(ARGV).to receive(:clear).exactly(1).times
+          subject.reset_argv(args)
+          expect(ARGV[0]).to eq(args[0])
+          expect(ARGV[1]).to eq(args[1])
+        end
+      end
+
+      describe 'execute_subcommand' do
+        it "determines if we should execute the init subcommand" do
+          expect(subject.execute_subcommand?("init")).to be == true
+        end
+        it "determines if we should execute the help subcommand" do
+          expect(subject.execute_subcommand?("help")).to be == true
+        end
+        it "determines that a subcommand should not be executed" do
+          expect(subject.execute_subcommand?("notasubcommand")).to be == false
+        end
+      end
+
+      describe 'execute_beaker' do
+        it "executes beaker with arguments" do
+          allow(cli).to receive(:execute!).and_return(true)
+          allow(Beaker::CLI).to receive(:new).and_return(cli)
+          expect(subject).to receive(:reset_argv).exactly(1).times
+          expect(cli).to receive(:execute!).exactly(1).times
+          subject.execute_beaker(['args'])
+        end
+      end
+
+      describe 'exit_with' do
+        it "the exit value should be false" do
+          expect(STDOUT).to receive(:puts).with("exiting").exactly(1).times
+          begin
+            subject.exit_with("exiting")
+          rescue SystemExit=>e
+            expect(e.status).to eq(0)
+          end
+        end
+      end
+
+      describe 'init_vmpooler' do
+        it "executes the vmpooler quick task" do
+          expect(subject).to receive(:execute_rake_task).with("beaker_quickstart:gen_hosts[vmpooler]").exactly(1).times
+          subject.init_vmpooler
+        end
+      end
+
+      describe 'init_vagrant' do
+        it "executes the vmpooler quick task" do
+          expect(subject).to receive(:execute_rake_task).with("beaker_quickstart:gen_hosts[vagrant]").exactly(1).times
+          subject.init_vagrant
+        end
+      end
+
+      describe 'init_hypervisor' do
+        it "calls init_vagrant" do
+          options = {:hypervisor => "vagrant"}
+          expect(subject).to receive(:init_vagrant).with(no_args).exactly(1).times
+          expect(subject).to receive(:init_vmpooler).with(no_args).exactly(0).times
+          subject.init_hypervisor(options)
+        end
+
+        it "calls init_vmpooler" do
+          options = {:hypervisor => "vmpooler"}
+          expect(subject).to receive(:init_vagrant).with(no_args).exactly(0).times
+          expect(subject).to receive(:init_vmpooler).with(no_args).exactly(1).times
+          subject.init_hypervisor(options)
+        end
+
+        it "fails to call init for a hypervisor" do
+          options = {:hypervisor => "invalid"}
+          expect(subject).to receive(:init_vagrant).with(no_args).exactly(0).times
+          expect(subject).to receive(:init_vmpooler).with(no_args).exactly(0).times
+          subject.init_hypervisor(options)
+        end
+      end
+
+      describe 'execute_rake_task' do
+
+        it "executes the rake task" do
+          allow(Rake).to receive(:application).and_return(rake)
+          expect(ARGV).to receive(:clear).exactly(1).times
+          expect(rake).to receive(:init).and_return(true).exactly(1).times
+          expect(rake).to receive(:load_rakefile).and_return(true).exactly(1).times
+          expect(rake).to receive(:invoke_task).with("mytask").exactly(1).times
+          subject.execute_rake_task("mytask")
+        end
+      end
+
+      describe 'verify_init_args' do
+        it "verfy the init args are valid for a vagrant run" do
+          options = {:hypervisor => "vagrant"}
+          expect(subject).to receive(:exit_with).exactly(0).times
+          subject.verify_init_args(options)
+        end
+
+        it "verfy the init args are valid for a vmpooler run" do
+          options = {:hypervisor => "vmpooler"}
+          expect(subject).to receive(:exit_with).exactly(0).times
+          subject.verify_init_args(options)
+        end
+
+        it "verify the init args are invalid for an init run" do
+          options = {}
+          expect(STDOUT).to receive(:puts).with("Invalid hypervisor. Currently supported hypervisors are: #{Beaker::Subcommands::SubcommandUtil::HYPERVISORS.join(', ')}").exactly(1).times
+          begin
+            subject.verify_init_args(options)
+          rescue SystemExit=>e
+            expect(e.status).to eq(0)
+          end
+        end
+
+        it "verify the init args are invalid for a vmpooler run" do
+          options = {:hypervisor => "thisshouldfail"}
+          expect(STDOUT).to receive(:puts).with("Invalid hypervisor. Currently supported hypervisors are: #{Beaker::Subcommands::SubcommandUtil::HYPERVISORS.join(', ')}").exactly(1).times
+          begin
+            subject.verify_init_args(options)
+          rescue SystemExit=>e
+            expect(e.status).to eq(0)
+          end
+        end
+      end
+
+      describe "determine_rake_file" do
+
+        it "uses Rakefile if no rakefile exists" do
+          allow(subject).to receive(:rake_app).and_return(rake)
+          allow(rake).to receive(:find_rakefile_location).and_return(nil)
+          expect subject.determine_rake_file == "Rakefile"
+        end
+
+        it "uses Rakefile if Rakefile exists" do
+          allow(subject).to receive(:rake_app).and_return(rake)
+          allow(rake).to receive(:find_rakefile_location).and_return("Rakefile")
+          expect subject.determine_rake_file == "Rakefile"
+        end
+
+        it "uses rakefile if rakefile exists" do
+          allow(subject).to receive(:rake_app).and_return(rake)
+          allow(rake).to receive(:find_rakefile_location).and_return("rakefile")
+          expect subject.determine_rake_file == "rakefile"
+        end
+
+        it "uses Rakefile.rb if Rakefile.rb exists" do
+          allow(subject).to receive(:rake_app).and_return(rake)
+          allow(rake).to receive(:find_rakefile_location).and_return("Rakefile.rb")
+          expect subject.determine_rake_file == "Rakefile.rb"
+        end
+
+        it "uses rakefile.rb if rakefile.rb exists" do
+          allow(subject).to receive(:rake_app).and_return(rake)
+          allow(rake).to receive(:find_rakefile_location).and_return("rakefile.rb")
+          expect subject.determine_rake_file == "rakefile.rb"
+        end
+      end
+
+      describe "require_tasks" do
+        it "appends the require if it isn't contained in the Rakefile" do
+          allow(subject).to receive(:determine_rake_file).and_return("Rakefile")
+          allow(File).to receive(:readlines).with("Rakefile").and_return([""])
+          allow(File).to receive(:open).with("Rakefile", "a+").and_yield(file)
+          allow(File).to receive(:puts).with("require 'beaker/tasks/quick_start'").and_return(true)
+          expect(File).to receive(:open).with("Rakefile", "a+").and_yield(file).exactly(1).times
+          expect(file).to receive(:puts).with("require 'beaker/tasks/quick_start'").exactly(1).times
+          subject.require_tasks
+        end
+
+        it "does't append the require if it is contained in the Rakefile" do
+          allow(subject).to receive(:determine_rake_file).and_return("Rakefile")
+          allow(File).to receive(:readlines).with("Rakefile").and_return(["require 'beaker/tasks/quick_start'"])
+          allow(File).to receive(:open).with("Rakefile", "a+").and_yield(file)
+          allow(File).to receive(:puts).with("require 'beaker/tasks/quick_start'").and_return(true)
+          expect(File).to receive(:open).with("Rakefile", "a+").and_yield(file).exactly(0).times
+          expect(file).to receive(:puts).with("require 'beaker/tasks/quick_start'").exactly(0).times
+          subject.require_tasks
+        end
+
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.8.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-28 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -98,16 +98,16 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: stringify-hash
   requirement: !ruby/object:Gem::Requirement
@@ -675,9 +689,10 @@ files:
 - lib/beaker/shared/options_resolver.rb
 - lib/beaker/shared/repetition.rb
 - lib/beaker/shared/semvar.rb
-- lib/beaker/shared/subcommands_util.rb
 - lib/beaker/shared/timed.rb
 - lib/beaker/ssh_connection.rb
+- lib/beaker/subcommand.rb
+- lib/beaker/subcommands/subcommand_util.rb
 - lib/beaker/tasks/quick_start.rb
 - lib/beaker/tasks/rake_task.rb
 - lib/beaker/tasks/test.rb
@@ -763,8 +778,8 @@ files:
 - spec/beaker/shared/options_resolver_spec.rb
 - spec/beaker/shared/repetition_spec.rb
 - spec/beaker/shared/semvar_spec.rb
-- spec/beaker/shared/subcommands_util_spec.rb
 - spec/beaker/ssh_connection_spec.rb
+- spec/beaker/subcommand/subcommand_util_spec.rb
 - spec/beaker/test_case_spec.rb
 - spec/beaker/test_suite_spec.rb
 - spec/helpers.rb

data/lib/beaker/shared/subcommands_util.rb

@@ -1,37 +0,0 @@
-module Beaker
-  module Shared
-    # Methods used in execution of Subcommands
-    # - should we write the config?
-    # - reset ARGV 
-    # - execute Beaker
-    module SubcommandsUtil
-      CONFIG_PATH = ".beaker/config"
-    
-      @@write_config = false
-
-      def self.write_config=( val )
-        @@write_config = val
-      end
-      
-      def self.write_config?
-        @@write_config
-      end
-      
-      # Reset ARGV to contain the arguments determined by a specific subcommand
-      # @param [Array<String>] args the arguments determined by a specific subcommand
-      def reset_argv(args)
-        ARGV.clear
-        args.each do |arg|
-          ARGV << arg
-        end
-      end
-
-      # Update ARGV and call Beaker
-      # @param [Array<String>] args the arguments determined by a specific subcommand
-      def execute_beaker(*args)
-        reset_argv(args)
-        Beaker::CLI.new.execute! 
-      end
-    end
-  end
-end

data/spec/beaker/shared/subcommands_util_spec.rb

@@ -1,33 +0,0 @@
-require 'spec_helper'
-
-module Beaker
-  module Shared
-    describe SubcommandsUtil do
-
-      let(:cli) {
-        double("cli")
-      }
-
-      describe 'reset_argv' do
-        it "resets argv" do
-          args = ["test1", "test2"]
-          expect(ARGV).to receive(:clear).exactly(1).times
-          subject.reset_argv(args)
-          expect(ARGV[0]).to eq(args[0])
-          expect(ARGV[1]).to eq(args[1])
-        end
-      end
-
-      describe 'execute_beaker' do
-        it "executes beaker with arguments" do
-          allow(cli).to receive(:execute!).and_return(true)
-          allow(Beaker::CLI).to receive(:new).and_return(cli)
-          expect(subject).to receive(:reset_argv).exactly(1).times
-          expect(cli).to receive(:execute!).exactly(1).times
-          subject.execute_beaker(['args'])
-        end
-      end
-
-    end
-  end
-end