beaker 3.12.0 → 3.13.0

data/spec/beaker/subcommand/subcommand_util_spec.rb

@@ -16,6 +16,14 @@ module Beaker
         double("file")
       }
 
+      let(:store) {
+        double("store")
+      }
+
+      let(:host) {
+        double("host")
+      }
+
       describe 'reset_argv' do
         it "resets argv" do
           args = ["test1", "test2"]
@@ -30,9 +38,15 @@ module Beaker
         it "determines if we should execute the init subcommand" do
           expect(subject.execute_subcommand?("init")).to be == true
         end
+        it "does not attempt to execute intialize as a subcommand" do
+          expect(subject.execute_subcommand?("initialize")).to be == false
+        end
         it "determines if we should execute the help subcommand" do
           expect(subject.execute_subcommand?("help")).to be == true
         end
+        it "determines if we should execute the provision subcommand" do
+          expect(subject.execute_subcommand?("provision")).to be == true
+        end
         it "determines that a subcommand should not be executed" do
           expect(subject.execute_subcommand?("notasubcommand")).to be == false
         end
@@ -48,13 +62,31 @@ module Beaker
         end
       end
 
-      describe 'exit_with' do
-        it "the exit value should be false" do
+      describe 'error_with' do
+        it "the exit value should default to 1" do
+          expect(STDOUT).to receive(:puts).with("exiting").exactly(1).times
+          begin
+            subject.error_with("exiting")
+          rescue SystemExit=>e
+            expect(e.status).to eq(1)
+          end
+        end
+        it "the exit value should return specified value" do
+          expect(STDOUT).to receive(:puts).with("exiting").exactly(1).times
+          begin
+            subject.error_with("exiting", {exit_code: 3})
+          rescue SystemExit=>e
+            expect(e.status).to eq(3)
+          end
+        end
+
+        it "the exit value should default to 1 with a stack trace" do
           expect(STDOUT).to receive(:puts).with("exiting").exactly(1).times
+          expect(STDOUT).to receive(:puts).with("testing").exactly(1).times
           begin
-            subject.exit_with("exiting")
+            subject.error_with("exiting", {stack_trace: "testing"})
           rescue SystemExit=>e
-            expect(e.status).to eq(0)
+            expect(e.status).to eq(1)
           end
         end
       end
@@ -75,24 +107,21 @@ module Beaker
 
       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)
+          subject.init_hypervisor('vagrant')
         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)
+          subject.init_hypervisor('vmpooler')
         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)
+          subject.init_hypervisor('invalid')
         end
       end
 
@@ -163,9 +192,91 @@ module Beaker
           expect(file).to receive(:puts).with("require 'beaker/tasks/quick_start'").exactly(0).times
           subject.require_tasks
         end
+      end
 
+      describe "init_config" do
+        it "creates a .beaker folder and loads the config" do
+          expect(FileUtils).to receive(:mkdir_p).with(".beaker").exactly(1).times
+          expect(YAML::Store).to receive(:new).with(".beaker/config").exactly(1).times
+          subject.init_config
+        end
       end
 
+      describe "store_config" do
+        before(:each) { SubcommandUtil.class_variable_set :@@store, store} 
+
+        it "stores some values in the YAML store" do
+          options = { :hypervisor => "vmpooler", :test => "abc", :provisioned => true}
+          allow(store).to receive(:transaction).and_yield
+          expect(store).to receive(:[]=).with(:hypervisor, "vmpooler").exactly(1).times
+          expect(store).to receive(:[]=).with(:test, "abc").exactly(0).times
+          expect(store).to receive(:[]=).with(:provisioned, true).exactly(1).times
+          subject.store_config(options)
+        end
+
+        it "stores all values in the YAML store" do
+          options = { :hypervisor => "vmpooler", :provisioned => true}
+          allow(store).to receive(:transaction).and_yield
+          expect(store).to receive(:[]=).with(:hypervisor, "vmpooler").exactly(1).times
+          expect(store).to receive(:[]=).with(:provisioned, true).exactly(1).times
+          subject.store_config(options)
+        end
+
+        it "stores no values in the YAML store" do
+          options = {:test => "abc"}
+          allow(store).to receive(:transaction).and_yield
+          expect(store).to receive(:[]=).with(:hypervisor, anything).exactly(0).times
+          expect(store).to receive(:[]=).with(:provisioned, anything).exactly(0).times
+          subject.store_config(options)
+        end
+      end
+
+      describe "delete_config" do
+        before(:each) { SubcommandUtil.class_variable_set :@@store, store} 
+        it "deletes keys from the YAML store" do
+          keys = [ :hypervisor, :test, :provisioned ]
+          allow(store).to receive(:transaction).and_yield
+          expect(store).to receive(:delete).with(:hypervisor).exactly(1).times
+          expect(store).to receive(:delete).with(:test).exactly(1).times
+          expect(store).to receive(:delete).with(:provisioned).exactly(1).times
+          subject.delete_config(keys)
+        end
+      end
+
+      describe "provision" do
+        it "provisions, validates, and configures with vmpooler" do
+          options = {:validate => true, :configure => true}
+          expect(cli).to receive(:provision).and_return(true)
+          expect(cli).to receive(:preserve_hosts_file).exactly(1).times
+          allow(Beaker::CLI).to receive(:new).and_return(cli)
+          allow(cli).to receive(:parse_options).and_return(cli)
+          hypervisor = "vmpooler"
+          expect(subject).to receive(:reset_argv).with(["--hosts",".beaker/acceptance/config/default_#{hypervisor}_hosts.yaml", "--validate", true, "--configure", true]).exactly(1).times
+          subject.provision(hypervisor, options)
+        end
+
+        it "provisions and validates with vmpooler" do
+          options = {:validate => true, :configure => false }
+          expect(cli).to receive(:provision).and_return(true)
+          expect(cli).to receive(:preserve_hosts_file).exactly(1).times
+          allow(Beaker::CLI).to receive(:new).and_return(cli)
+          allow(cli).to receive(:parse_options).and_return(cli)
+          hypervisor = "vmpooler"
+          expect(subject).to receive(:reset_argv).with(["--hosts",".beaker/acceptance/config/default_#{hypervisor}_hosts.yaml", "--validate", true, "--configure", false]).exactly(1).times
+          subject.provision(hypervisor, options)
+        end
+
+        it "only provisions with vmpooler" do
+          options = {:validate => false, :configure => false }
+          expect(cli).to receive(:provision).and_return(true)
+          expect(cli).to receive(:preserve_hosts_file).exactly(1).times
+          allow(Beaker::CLI).to receive(:new).and_return(cli)
+          allow(cli).to receive(:parse_options).and_return(cli)
+          hypervisor = "vmpooler"
+          expect(subject).to receive(:reset_argv).with(["--hosts",".beaker/acceptance/config/default_#{hypervisor}_hosts.yaml", "--validate", false, "--configure", false]).exactly(1).times
+          subject.provision(hypervisor, options)
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 3.12.0
+  version: 3.13.0
 platform: ruby
 authors:
-- Puppetlabs
+- Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -388,9 +388,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
-description: Puppetlabs accceptance testing harness
+description: Puppet's accceptance testing harness
 email:
-- delivery@puppetlabs.com
+- delivery@puppet.com
 executables:
 - beaker
 extensions: []
@@ -524,6 +524,7 @@ files:
 - acceptance/tests/puppet/web_helpers_test.rb
 - acceptance/tests/puppet/with_puppet_running_on.rb
 - acceptance/tests/subcommands/init.rb
+- acceptance/tests/subcommands/provision.rb
 - beaker.gemspec
 - bin/beaker
 - docs/README.md
@@ -556,6 +557,7 @@ files:
 - docs/how_to/hypervisors/vagrant.md
 - docs/how_to/hypervisors/vagrant_hosts_file_examples.md
 - docs/how_to/hypervisors/vagrant_libvirt.md
+- docs/how_to/hypervisors/vmpooler.md
 - docs/how_to/hypervisors/vmware_fusion.md
 - docs/how_to/hypervisors/vsphere.md
 - docs/how_to/install_puppet.md
@@ -608,6 +610,7 @@ files:
 - lib/beaker/dsl/patterns.rb
 - lib/beaker/dsl/roles.rb
 - lib/beaker/dsl/structure.rb
+- lib/beaker/dsl/test_tagging.rb
 - lib/beaker/dsl/wrappers.rb
 - lib/beaker/host.rb
 - lib/beaker/host/aix.rb
@@ -713,6 +716,7 @@ files:
 - spec/beaker/dsl/outcomes_spec.rb
 - spec/beaker/dsl/roles_spec.rb
 - spec/beaker/dsl/structure_spec.rb
+- spec/beaker/dsl/test_tagging_spec.rb
 - spec/beaker/dsl/wrappers_spec.rb
 - spec/beaker/host/aix_spec.rb
 - spec/beaker/host/cisco_spec.rb
@@ -798,7 +802,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 2.2.5
+      version: 2.1.8
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='