beaker 3.37.0 → 4.0.0

data/lib/beaker/host/unix/group.rb

@@ -19,6 +19,7 @@ module Unix::Group
       fail_test "failed to get group #{name}" unless result.stdout =~ /^#{name}:.*:[0-9]+:/
 
       yield result if block_given?
+      result
     end
   end
 

data/lib/beaker/host/unix/user.rb

@@ -19,6 +19,7 @@ module Unix::User
       fail_test "failed to get user #{name}" unless result.stdout =~  /^#{name}:/
 
       yield result if block_given?
+      result
     end
   end
 

data/lib/beaker/host/windows/file.rb

@@ -1,11 +1,11 @@
 module Windows::File
   include Beaker::CommandFactory
 
-  def tmpfile(name)
+  def tmpfile(name = '')
     execute("cygpath -m $(mktemp -t #{name}.XXXXXX)")
   end
 
-  def tmpdir(name)
+  def tmpdir(name = '')
     execute("cygpath -m $(mktemp -td #{name}.XXXXXX)")
   end
 
@@ -15,6 +15,36 @@ module Windows::File
     tmp_path.gsub(/\n/, '') + '\\TEMP'
   end
 
+  # (see {Beaker::Host::Unix::File#chown})
+  # @note Cygwin's `chown` implementation does not support
+  #   windows-, DOS-, or mixed-style paths, only UNIX/POSIX-style.
+  #   This method simply wraps the normal Host#chown call with
+  #   a call to cygpath to sanitize input.
+  def chown(user, path, recursive=false)
+    cygpath = execute("cygpath -u #{path}")
+    super(user, cygpath, recursive)
+  end
+
+  # (see {Beaker::Host::Unix::File#chgrp})
+  # @note Cygwin's `chgrp` implementation does not support
+  #   windows-, DOS-, or mixed-style paths, only UNIX/POSIX-style.
+  #   This method simply wraps the normal Host#chgrp call with
+  #   a call to cygpath to sanitize input.
+  def chgrp(group, path, recursive=false)
+    cygpath = execute("cygpath -u #{path}")
+    super(group, cygpath, recursive)
+  end
+
+  # (see {Beaker::Host::Unix::File#ls_ld})
+  # @note Cygwin's `ls_ld` implementation does not support
+  #   windows-, DOS-, or mixed-style paths, only UNIX/POSIX-style.
+  #   This method simply wraps the normal Host#ls_ld call with
+  #   a call to cygpath to sanitize input.
+  def ls_ld(path)
+    cygpath = execute("cygpath -u #{path}")
+    super(cygpath)
+  end
+
   # Updates a file path for use with SCP, depending on the SSH Server
   #
   # @note This will fail with an SSH server that is not OpenSSL or BitVise.

data/lib/beaker/host/windows/group.rb

@@ -19,6 +19,7 @@ module Windows::Group
       fail_test "failed to get group #{name}" if result.exit_code != 0
 
       yield result if block_given?
+      result
     end
   end
 

data/lib/beaker/host/windows/user.rb

@@ -19,6 +19,7 @@ module Windows::User
       fail_test "failed to get user #{name}" if result.exit_code != 0
 
       yield result if block_given?
+      result
     end
   end
 

data/lib/beaker/host_prebuilt_steps.rb

@@ -573,10 +573,6 @@ module Beaker
           logger.debug(skip_msg)
         end
 
-        # REMOVE POST BEAKER 3: backwards compatability, do some setup based upon the global type
-        # this is the worst and i hate it
-        Class.new.extend(Beaker::DSL).configure_type_defaults_on(host)
-
         if skip_msg.nil?
           #close the host to re-establish the connection with the new sshd settings
           host.close

data/lib/beaker/hypervisor.rb

@@ -28,11 +28,7 @@ module Beaker
           Beaker::Hypervisor
         else
           # Custom hypervisor
-          begin
-            require "beaker/hypervisor/#{type}"
-          rescue LoadError
-            raise "Invalid hypervisor: #{type}"
-          end
+          require "beaker/hypervisor/#{type}"
           Beaker.const_get(type.split('_').collect(&:capitalize).join)
         end
 

data/lib/beaker/result.rb

@@ -47,6 +47,10 @@ module Beaker
     def exit_code_in?(range)
       range.include?(@exit_code)
     end
+
+    def success?
+      exit_code == 0
+    end
   end
 
   class NullResult < Result

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '3.37.0'
+    STRING = '4.0.0'
   end
 end

data/spec/beaker/dsl/helpers/host_helpers_spec.rb

@@ -352,57 +352,6 @@ describe ClassMixedWithDSLHelpers do
     end
   end
 
-  describe '#create_tmpdir_on' do
-    let(:host) { {'user' => 'puppet'} }
-    let(:result) { double.as_null_object }
-
-    before :each do
-      allow(host).to receive(:result).and_return(result)
-      allow(result).to receive(:exit_code).and_return(0)
-      allow(result).to receive(:stdout).and_return('puppet')
-    end
-
-    context 'with no user argument' do
-
-      context 'with no path name argument' do
-        it 'executes chown once' do
-          expect(subject).to receive(:on).with(host, /^getent passwd puppet/).and_return(result)
-          expect(host).to receive(:tmpdir).with(/\/tmp\/beaker.*/)
-          expect(subject).to receive(:on).with(host, /chown puppet.puppet.*/)
-          subject.create_tmpdir_on(host, '/tmp/beaker')
-        end
-      end
-
-      context 'with path name argument' do
-        it 'executes chown once' do
-          expect(subject).to receive(:on).with(host, /^getent passwd puppet/).and_return(result)
-          expect(host).to receive(:tmpdir).with(/\/tmp\/bogus.*/).and_return("/tmp/bogus")
-          expect(subject).to receive(:on).with(host, /chown puppet.puppet \/tmp\/bogus.*/)
-          subject.create_tmpdir_on(host, "/tmp/bogus")
-        end
-      end
-    end
-
-    context 'with an valid user argument' do
-      it 'executes chown once' do
-        expect(subject).to receive(:on).with(host, /^getent passwd curiousgeorge/).and_return(result)
-        expect(host).to receive(:tmpdir).with(/\/tmp\/bogus.*/).and_return("/tmp/bogus")
-        expect(subject).to receive(:on).with(host, /chown curiousgeorge.curiousgeorge \/tmp\/bogus.*/)
-        subject.create_tmpdir_on(host, "/tmp/bogus", "curiousgeorge")
-      end
-    end
-
-    context 'with a invalid user argument' do
-      it 'executes chown once' do
-        allow(result).to receive(:exit_code).and_return(1)
-        expect(subject).to receive(:on).with(host, /^getent passwd curiousgeorge/).and_return(result)
-        expect{
-          subject.create_tmpdir_on(host, "/tmp/bogus", "curiousgeorge")
-        }.to raise_error(RuntimeError, /User curiousgeorge does not exist on/)
-      end
-    end
-  end
-
   describe '#run_script_on' do
     it 'scps the script to a tmpdir and executes it on host(s)' do
       expect( subject ).to receive( :scp_to )
@@ -420,4 +369,18 @@ describe ClassMixedWithDSLHelpers do
       subject.run_script( '/tmp/test.sh' )
     end
   end
+
+  describe '#install_package' do
+    it 'delegates to Host#install_package with arguments on the passed Host' do
+      expect( host ).to receive( :install_package ).with( 'pkg_name', '', '1.2.3' )
+      subject.install_package( host, 'pkg_name', '1.2.3' )
+    end
+  end
+
+  describe '#uninstall_package' do
+    it 'delegates to Host#uninstall_package on the passed Host' do
+      expect( host ).to receive( :uninstall_package ).with( 'pkg_name' )
+      subject.uninstall_package( host, 'pkg_name' )
+    end
+  end
 end

data/spec/beaker/dsl/wrappers_spec.rb

@@ -5,43 +5,6 @@ class ClassMixedWithDSLWrappers
 end
 
 describe ClassMixedWithDSLWrappers do
-  let(:opts)       { {'ENV' => { :HOME => "/"}, :cmdexe => true } }
-  let(:empty_opts) { {'ENV' => {}, :cmdexe => true } }
-
-  describe '#facter' do
-    it 'should split out the options and pass "facter" as first arg to Command' do
-      expect( Beaker::Command ).to receive( :new ).
-        with('facter', [ '-p' ], empty_opts)
-      subject.facter( '-p' )
-    end
-  end
-
-  describe '#cfacter' do
-    it 'should split out the options and pass "cfacter" as first arg to Command' do
-      expect( Beaker::Command ).to receive( :new ).
-        with('cfacter', [ '-p' ], empty_opts)
-      subject.cfacter( '-p' )
-    end
-  end
-
-  describe '#hiera' do
-    it 'should split out the options and pass "hiera" as first arg to Command' do
-      expect( Beaker::Command ).to receive( :new ).
-        with('hiera', [ '-p' ], empty_opts)
-      subject.hiera( '-p' )
-    end
-  end
-
-  describe '#puppet' do
-    it 'should split out the options and pass "puppet <blank>" to Command' do
-      merged_opts = opts
-      merged_opts[:server] = 'master'
-      expect( Beaker::Command ).to receive( :new ).
-        with('puppet agent', [ '-tv' ], merged_opts)
-      subject.puppet( 'agent', '-tv', :server => 'master', 'ENV' => {:HOME => '/'})
-    end
-  end
-
   describe '#host_command' do
     it 'delegates to HostCommand.new' do
       expect( Beaker::HostCommand ).to receive( :new ).with( 'blah' )
@@ -49,15 +12,6 @@ describe ClassMixedWithDSLWrappers do
     end
   end
 
-  describe 'deprecated puppet wrappers' do
-    %w( resource doc kick cert apply master agent filebucket ).each do |sub|
-      it "#{sub} delegates the proper info to #puppet" do
-        expect( subject ).to receive( :puppet ).with( sub, 'blah' )
-        subject.send( "puppet_#{sub}", 'blah')
-      end
-    end
-  end
-
   describe '#powershell' do
     it 'should pass "powershell.exe <args> -Command <command>" to Command' do
       command = subject.powershell("Set-Content -path 'fu.txt' -value 'fu'")

data/spec/beaker/host/mac/user_spec.rb

@@ -32,6 +32,9 @@ EOS
 #{puppet2}
 EOS
   end
+  let( :etc_passwd_line ) do
+    "puppet1:*:67:234::0:0:puppet1:/Users/puppet1:/bin/sh"
+  end
   let( :command )  { 'ls' }
   let( :host ) { double.as_null_object }
   let( :result ) { Beaker::Result.new( host, command ) }
@@ -63,17 +66,11 @@ EOS
       expect { subject.user_get(user_name) }.to raise_error(MiniTest::Assertion, "failed to get user #{user_name}")
     end
 
-    it 'parses mac dscacheutil output into /etc/passwd format correctly' do
-      result.stdout = puppet1
-      expect( subject ).to receive( :execute ).and_yield(result)
-      expect( subject.user_get('puppet1') ).to be === "puppet1:*:67:234:puppet1:/Users/puppet1:/bin/bash"
-    end
-
     it 'yields correctly with the result object' do
-      result.stdout = puppet1
+      result.stdout = etc_passwd_line
       expect( subject ).to receive( :execute ).and_yield(result)
       subject.user_get('puppet1') do |result|
-        expect( result.stdout ).to be === puppet1
+        expect( result.stdout ).to be === etc_passwd_line
       end
     end
 

data/spec/beaker/host/unix/exec_spec.rb

@@ -82,7 +82,7 @@ module Beaker
           it "calls the correct commands for #{platform}" do
             opts['platform'] = platform
             expect(instance).to receive(:exec).twice
-            expect(instance).to receive(:create_tmpdir_on).and_return(directory)
+            expect(instance).to receive(:tmpdir).and_return(directory)
             expect(Beaker::Command).to receive(:new).with(ssh_move)
             expect(Beaker::Command).to receive(:new).with(ssh_command)
             expect(instance).to receive(:ssh_service_restart)

data/spec/beaker/host/unix/file_spec.rb

@@ -165,5 +165,44 @@ module Beaker
         expect( text ).to match( /basedir\=default/ )
       end
     end
+
+    describe '#chown' do
+      let (:user) { 'someuser' }
+      let (:path) { '/path/to/chown/on' }
+
+      it 'calls the system method' do
+        expect( instance ).to receive( :execute ).with( "chown #{user} #{path}" ).and_return( 0 )
+        expect( instance.chown( user, path ) ).to be === 0
+      end
+
+      it 'passes -R if recursive' do
+        expect( instance ).to receive( :execute ).with( "chown \-R #{user} #{path}" )
+        instance.chown( user, path, true )
+      end
+    end
+
+    describe '#chgrp' do
+      let (:group) { 'somegroup' }
+      let (:path) { '/path/to/chgrp/on' }
+
+      it 'calls the system method' do
+        expect( instance ).to receive( :execute ).with( "chgrp #{group} #{path}" ).and_return( 0 )
+        expect( instance.chgrp( group, path ) ).to be === 0
+      end
+
+      it 'passes -R if recursive' do
+        expect( instance ).to receive( :execute ).with( "chgrp \-R #{group} #{path}" )
+        instance.chgrp( group, path, true )
+      end
+    end
+
+    describe '#ls_ld' do
+      let (:path) { '/path/to/ls_ld' }
+
+      it 'calls the system method' do
+        expect( instance ).to receive( :execute ).with( "ls -ld #{path}" ).and_return( 0 )
+        expect( instance.ls_ld( path ) ).to be === 0
+      end
+    end
   end
 end

data/spec/beaker/host/windows/file_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+module Beaker
+  describe Windows::File do
+    let (:user) { 'someuser' }
+    let (:group) { 'somegroup' }
+    let (:path) { 'C:\Foo\Bar' }
+    let (:newpath) { '/Foo/Bar' }
+    let(:host)    { make_host( 'name', { :platform => 'windows' } ) }
+
+
+    describe '#chown' do
+      it 'calls cygpath first' do
+        expect( host ).to receive( :execute ).with( "cygpath -u #{path}" )
+        expect( host ).to receive( :execute ).with( /chown/ )
+
+        host.chown( user, path )
+      end
+
+      it 'passes cleaned path to super' do
+        allow_any_instance_of( Windows::Host ).to receive( :execute ).with( /cygpath/ ).and_return( newpath )
+        expect_any_instance_of( Unix::Host ).to receive( :chown ).with( user, newpath , true)
+
+        host.chown( user, path, true )
+      end
+    end
+
+    describe '#chgrp' do
+      it 'calls cygpath first' do
+        expect( host ).to receive( :execute ).with( "cygpath -u #{path}" ).and_return( path )
+        expect( host ).to receive( :execute ).with( "chgrp #{group} #{path}" )
+
+        host.chgrp( group, path )
+      end
+
+      it 'passes cleaned path to super' do
+        allow_any_instance_of( Windows::Host ).to receive( :execute ).with( /cygpath/ ).and_return( newpath )
+        expect_any_instance_of( Unix::Host ).to receive( :chgrp ).with( group, newpath , true)
+
+        host.chgrp( group, path, true )
+      end
+    end
+
+    describe '#ls_ld' do
+      let(:result) { Beaker::Result.new(host, 'ls') }
+
+      it 'calls cygpath first' do
+        expect( host ).to receive( :execute ).with( "cygpath -u #{path}" ).and_return( path )
+        expect( host ).to receive( :execute ).with( "ls -ld #{path}" )
+
+        host.ls_ld( path )
+      end
+    end
+  end
+end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -598,93 +598,48 @@ describe Beaker do
   context "set_env" do
     subject { dummy_class.new }
 
-    it "permits user environments on an OS X 10.10 host" do
-      test_host_ssh_permit_user_environment('osx-10.10')
-    end
-
-    it "permits user environments on an OS X 10.11 host" do
-      test_host_ssh_permit_user_environment('osx-10.11')
-    end
-
-    it "permits user environments on an OS X 10.12 host" do
-      test_host_ssh_permit_user_environment('osx-10.12')
-    end
-
-    it "permits user environments on an OS X 10.13 host" do
-      test_host_ssh_permit_user_environment('osx-10.13')
-    end
-
-    it "permits user environments on an ssh-based linux host" do
-      test_host_ssh_permit_user_environment('ubuntu')
-    end
-
-    it "permits user environments on an sshd-based linux host" do
-      test_host_ssh_permit_user_environment('eos')
-    end
-
-    it "permits user environments on an sles host" do
-      test_host_ssh_permit_user_environment('sles')
-    end
-
-    it "permits user environments on a solaris host" do
-      test_host_ssh_permit_user_environment('solaris')
-    end
-
-    it "permits user environments on an aix host" do
-      test_host_ssh_permit_user_environment('aix')
-    end
-
-    it "permits user environments on a FreeBSD host" do
-      test_host_ssh_permit_user_environment('freebsd')
-    end
-
-    it "permits user environments on a windows host" do
-      test_host_ssh_permit_user_environment('windows')
-    end
-
-
     it "sets user ssh environment on an OS X 10.10 host" do
-      test_host_ssh_set_user_environment('osx-10.10')
+      test_host_ssh_calls('osx-10.10')
     end
 
     it "sets user ssh environment on an OS X 10.11 host" do
-      test_host_ssh_set_user_environment('osx-10.11')
+      test_host_ssh_calls('osx-10.11')
     end
 
     it "sets user ssh environment on an OS X 10.12 host" do
-      test_host_ssh_set_user_environment('osx-10.12')
+      test_host_ssh_calls('osx-10.12')
     end
 
     it "sets user ssh environment on an OS X 10.13 host" do
-      test_host_ssh_set_user_environment('osx-10.13')
+      test_host_ssh_calls('osx-10.13')
     end
 
     it "sets user ssh environment on an ssh-based linux host" do
-      test_host_ssh_set_user_environment('ubuntu')
+      test_host_ssh_calls('ubuntu')
     end
 
     it "sets user ssh environment on an sshd-based linux host" do
-      test_host_ssh_set_user_environment('eos')
+      test_host_ssh_calls('eos')
     end
 
     it "sets user ssh environment on an sles host" do
-      test_host_ssh_set_user_environment('sles')
+      test_host_ssh_calls('sles')
     end
 
     it "sets user ssh environment on a solaris host" do
-      test_host_ssh_set_user_environment('solaris')
+      test_host_ssh_calls('solaris')
     end
 
     it "sets user ssh environment on an aix host" do
-      test_host_ssh_set_user_environment('aix')
+      test_host_ssh_calls('aix')
     end
 
     it "sets user ssh environment on a FreeBSD host" do
-      test_host_ssh_set_user_environment('freebsd')
+      test_host_ssh_calls('freebsd')
     end
 
     it "sets user ssh environment on a windows host" do
-      test_host_ssh_set_user_environment('windows')
+      test_host_ssh_calls('windows')
     end
 
     it "skips an f5 host correctly" do
@@ -733,15 +688,7 @@ describe Beaker do
       subject.set_env(host, options.merge( opts ))
     end
 
-    def test_host_ssh_permit_user_environment(platform_name)
-      test_host_ssh_calls(platform_name, :ssh_permit_user_environment)
-    end
-
-    def test_host_ssh_set_user_environment(platform_name)
-      test_host_ssh_calls(platform_name, :ssh_set_user_environment)
-    end
-
-    def test_host_ssh_calls(platform_name, method_call_sym)
+    def test_host_ssh_calls(platform_name)
       host = make_host('name', {
           :platform     => platform_name,
           :ssh_env_file => 'ssh_env_file',
@@ -752,9 +699,11 @@ describe Beaker do
         :env2_key => :env2_value
       }
 
-      allow( host ).to receive( :skip_set_env? ).and_return(nil )
+      allow( host ).to receive( :skip_set_env? ).and_return( nil )
       expect( subject ).to receive( :construct_env ).and_return( opts )
-      expect( host ).to receive( method_call_sym )
+
+      expect( host ).to receive( :ssh_permit_user_environment )
+      expect( host ).to receive( :ssh_set_user_environment )
 
       subject.set_env(host, options.merge( opts ))
     end