beaker 1.3.1 → 1.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDU2OGQ2Yzg0Zjc2NDYyMGQwOWE5ZGViZTQwYmNjODcyYWZlN2VjOA==
+    Y2M3OTY2ZTdlMDEyYzA1YWIyMmUwN2VlMzlkYzdlNzI5MzQzNjQ1YQ==
   data.tar.gz: !binary |-
-    NmZkNDQzZjMwZTk5ZjVkNTJmZTYwZWIwMGUxNmI2ZDBkZGE3NWNhNg==
-!binary "U0hBNTEy":
+    OGQ4MTNjYWJlNDExMGI0ODliMDY1OGJkOGI0YTY0NjQzOWY2MTQ4ZQ==
+SHA512:
   metadata.gz: !binary |-
-    NjEwM2ZlN2E4NGEyMzBjZjJmZGFmMjRkMjEzNTVkODM1ODEyNjhkYmExMzdk
-    OGVmZWJkYzAxNDU2ZTRlYjQzODBmZTUxNDY3MjlhZmNlNThmOTBjZGZmOTAy
-    ZTkxNDJlZTE1ZTQ2ZTAwOTRhODZkY2I4Y2IzOWIxYzczZmQwZDA=
+    NDJmNTcwMjFjYzhjNDM4MzQ5OTY1OTdhYWNkN2IzYTI2NjIzZjZmNjEzZjky
+    ODM3YjVjMWM5ZmFmY2RhNWIyZGQxZjI4OTY4YzJmZDk1OTM3NzVjY2Q5Mjhl
+    MzYwMTlmZjkyZTQxYWNjYzQyNWUzNTQwNGY1Yjc2YjNjNTFlMWY=
   data.tar.gz: !binary |-
-    OWI0Y2UxN2M3MWRiNTQwM2QwNzQ0NmZlZWQ3ZDM0ODNjZWJlMmFlMTgzZTNi
-    Yjg3NWIwOTM0MDRlYTA3MTk2MjhlMjc1MmFhODViYmViN2M2NjQ5ZDY1ZTQ2
-    NWE1MTUyOThhN2VjYmY4OGJjMTI0MGM2ZTA0NzVhZmMwMWViNTA=
+    OTA4MDAxMjhhNTY0OTYzZjRjZjViYTNiNjlhOTZkOTUxMDZmM2YxNGVkYzYy
+    NTg2NDA2MTM4OWUzNTRjZWI1NjBlMTFiNWI3YjQyNzM2MzcwN2YwMDc1Mzg5
+    YTkwNGI1ODQ0ODMyMTdiYzY1N2ZkZWZiNzdiNzIzMmE0MTA5NjA=

data/.travis.yml

@@ -1,3 +1,6 @@
+before_install:
+  - gem update --system 2.2.1
+  - gem --version
 language: ruby
 script: "bundle exec rspec"
 notifications:

data/beaker.gemspec

@@ -1,8 +1,10 @@
 # -*- encoding: utf-8 -*-
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require 'beaker/version'
 
 Gem::Specification.new do |s|
   s.name        = "beaker"
-  s.version     = '1.3.1'
+  s.version     = Beaker::Version::STRING
   s.authors     = ["Puppetlabs"]
   s.email       = ["delivery@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/beaker"
@@ -33,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'inifile', '~> 2.0'
 
   # Optional provisioner specific support
-  s.add_runtime_dependency 'rbvmomi', '1.6' #HACK pinning to 1.6 to deal with QA-659
+  s.add_runtime_dependency 'rbvmomi', '1.8.1'
   s.add_runtime_dependency 'blimpy', '~> 0.6'
   s.add_runtime_dependency 'fission', '~> 0.4'
 

data/lib/beaker.rb

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

data/lib/beaker/cli.rb

@@ -21,9 +21,7 @@ module Beaker
         exit
       end
       if @options[:version]
-        require 'rubygems' unless defined?(Gem)
-        spec = Gem::Specification::load(GEMSPEC)
-        @logger.notify(VERSION_STRING % spec.version)
+        @logger.notify(VERSION_STRING % Beaker::Version::STRING)
         exit
       end
       @logger.info(@options.dump)

data/lib/beaker/dsl/helpers.rb

@@ -669,7 +669,7 @@ module Beaker
       #                      validation, etc.
       #
       def apply_manifest_on(host, manifest, opts = {}, &block)
-        on_options = {:stdin => manifest + "\n"}
+        on_options = {}
         on_options[:acceptable_exit_codes] = Array(opts.delete(:acceptable_exit_codes))
         args = ["--verbose"]
         args << "--parseonly" if opts[:parseonly]
@@ -714,6 +714,9 @@ module Beaker
           args << { :environment => opts[:environment]}
         end
 
+        file_path = "/tmp/apply_manifest.#{rand(1000000000).to_s}.pp"
+        create_remote_file(host, file_path, manifest + "\n")
+        args << file_path
         on host, puppet( 'apply', *args), on_options, &block
       end
 

data/lib/beaker/dsl/install_utils.rb

@@ -12,7 +12,7 @@ module Beaker
       SourcePath  = "/opt/puppet-git-repos"
 
       # A regex to know if the uri passed is pointing to a git repo
-      GitURI       = %r{^(git|https?|file)://|^git@}
+      GitURI       = %r{^(git|https?|file)://|^git@|^gitmirror@}
 
       # Github's ssh signature for cloning via ssh
       GitHubSig   = 'github.com,207.97.227.239 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=='
@@ -160,9 +160,12 @@ module Beaker
       # @api private
       def link_exists?(link)
         require "net/http"
+        require "net/https"
         require "open-uri"
         url = URI.parse(link)
-        Net::HTTP.start(url.host, url.port) do |http|
+        http = Net::HTTP.new(url.host, url.port)
+        http.use_ssl = (url.scheme == 'https')
+        http.start do |http|
           return http.head(url.request_uri).code == "200"
         end
       end
@@ -202,21 +205,29 @@ module Beaker
             end
           end
           if local
-             if not File.exists?("#{path}/#{filename}#{extension}")
-               raise "attempting installation on #{host}, #{path}/#{filename}#{extension} does not exist" 
-             end
-             scp_to host, "#{path}/#{filename}#{extension}", "#{host['working_dir']}/#{filename}#{extension}"
+            if not File.exists?("#{path}/#{filename}#{extension}")
+              raise "attempting installation on #{host}, #{path}/#{filename}#{extension} does not exist"
+            end
+            scp_to host, "#{path}/#{filename}#{extension}", "#{host['working_dir']}/#{filename}#{extension}"
+            if extension =~ /gz/
+              on host, "cd #{host['working_dir']}; gunzip #{filename}#{extension}"
+            end
+            if extension =~ /tar/
+              on host, "cd #{host['working_dir']}; tar -xvf #{filename}.tar"
+            end
           else
-             if not link_exists?("#{path}/#{filename}#{extension}")
-               raise "attempting installation on #{host}, #{path}/#{filename}#{extension} does not exist" 
-             end
-             on host, "cd #{host['working_dir']}; curl #{path}/#{filename}#{extension} -o #{filename}#{extension}"
-          end
-          if extension =~ /gz/
-            on host, "cd #{host['working_dir']}; gunzip #{filename}#{extension}"
-          end
-          if extension =~ /tar/
-            on host, "cd #{host['working_dir']}; tar -xvf #{filename}.tar"
+            if not link_exists?("#{path}/#{filename}#{extension}")
+              raise "attempting installation on #{host}, #{path}/#{filename}#{extension} does not exist"
+            end
+            gunzip = ""
+            untar = ""
+            if extension =~ /gz/
+              gunzip = "| gunzip"
+            end
+            if extension =~ /tar/
+              untar = "| tar -xvf -"
+            end
+            on host, "cd #{host['working_dir']}; curl #{path}/#{filename}#{extension} #{gunzip} #{untar}"
           end
         end
       end

data/lib/beaker/hypervisor/vagrant.rb

@@ -29,7 +29,7 @@ module Beaker
         v_file << "    v.vm.box = '#{host['box']}'\n"
         v_file << "    v.vm.box_url = '#{host['box_url']}'\n" unless host['box_url'].nil?
         v_file << "    v.vm.base_mac = '#{randmac}'\n"
-        v_file << "    v.vm.network :private_network, ip: \"#{host['ip'].to_s}\", :netmask => \"255.255.0.0\"\n"
+        v_file << "    v.vm.network :private_network, ip: \"#{host['ip'].to_s}\", :netmask => \"#{host['netmask'] ||= "255.255.0.0"}\"\n"
         v_file << "  end\n"
         @logger.debug "created Vagrantfile for VagrantHost #{host.name}"
       end
@@ -82,6 +82,23 @@ module Beaker
         @temp_files << f
     end
 
+    def get_ip_from_vagrant_file(hostname)
+      ip = ''
+      if File.file?(@vagrant_file) #we should have a vagrant file available to us for reading
+        f = File.read(@vagrant_file)
+        m = /#{hostname}.*?ip:\s*('|")\s*([^'"]+)('|")/m.match(f)
+        if m
+          ip = m[2]
+          @logger.debug("Determined existing vagrant box #{hostname} ip to be: #{ip} ")
+        else
+          raise("Unable to determine ip for vagrant box #{hostname}")
+        end
+      else
+        raise("No vagrant file found (should be located at #{@vagrant_file})")
+      end
+      ip
+    end
+
     def initialize(vagrant_hosts, options)
       require 'tempfile'
       @options = options
@@ -103,7 +120,12 @@ module Beaker
         make_vfile @vagrant_hosts
 
         vagrant_cmd("up")
+      else #set host ip of already up boxes
+        @vagrant_hosts.each do |host|
+          host[:ip] = get_ip_from_vagrant_file(host.name)
+        end
       end
+
       @logger.debug "configure vagrant boxes (set ssh-config, switch to root user, hack etc/hosts)"
       @vagrant_hosts.each do |host|
         default_user = host['user']

data/lib/beaker/version.rb

@@ -0,0 +1,5 @@
+module Beaker
+  module Version
+    STRING = '1.3.2'
+  end
+end

data/spec/beaker/dsl/helpers_spec.rb

@@ -298,26 +298,26 @@ describe ClassMixedWithDSLHelpers do
 
   describe '#apply_manifest_on' do
     it 'calls puppet' do
+      subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose').
+        with( 'apply', '--verbose', /apply_manifest.\d+.pp/ ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).
         with( 'my_host', 'puppet_command',
-              :acceptable_exit_codes => [0],
-              :stdin => "class { \"boo\": }\n" )
+              :acceptable_exit_codes => [0] )
 
       subject.apply_manifest_on( 'my_host', 'class { "boo": }')
     end
     it 'adds acceptable exit codes with :catch_failures' do
+      subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes' ).
+        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', /apply_manifest.\d+.pp/ ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).
         with( 'my_host', 'puppet_command',
-              :acceptable_exit_codes => [0,2],
-              :stdin => "class { \"boo\": }\n" )
+              :acceptable_exit_codes => [0,2] )
 
       subject.apply_manifest_on( 'my_host',
                                 'class { "boo": }',
@@ -325,14 +325,14 @@ describe ClassMixedWithDSLHelpers do
                                 :catch_failures => true )
     end
     it 'allows acceptable exit codes through :catch_failures' do
+      subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes' ).
+        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', /apply_manifest.\d+.pp/ ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).
         with( 'my_host', 'puppet_command',
-              :acceptable_exit_codes => [4,0,2],
-              :stdin => "class { \"boo\": }\n" )
+              :acceptable_exit_codes => [4,0,2] )
 
       subject.apply_manifest_on( 'my_host',
                                 'class { "boo": }',
@@ -341,15 +341,15 @@ describe ClassMixedWithDSLHelpers do
                                 :catch_failures => true )
     end
     it 'enforces a 0 exit code through :catch_changes' do
+      subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes' ).
+        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', /apply_manifest.\d+.pp/ ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).with(
         'my_host',
         'puppet_command',
-        :acceptable_exit_codes => [0],
-        :stdin                 => "class { \"boo\": }\n"
+        :acceptable_exit_codes => [0]
       )
 
       subject.apply_manifest_on(
@@ -360,15 +360,15 @@ describe ClassMixedWithDSLHelpers do
       )
     end
     it 'enforces exit codes through :expect_failures' do
+      subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes' ).
+        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', /apply_manifest.\d+.pp/ ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).with(
         'my_host',
         'puppet_command',
-        :acceptable_exit_codes => [1,4,6],
-        :stdin                 => "class { \"boo\": }\n"
+        :acceptable_exit_codes => [1,4,6]
       )
 
       subject.apply_manifest_on(
@@ -390,15 +390,15 @@ describe ClassMixedWithDSLHelpers do
       }.to raise_error ArgumentError, /catch_failures.+expect_failures/
     end
     it 'enforces added exit codes through :expect_failures' do
+      subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes' ).
+        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', /apply_manifest.\d+.pp/ ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).with(
         'my_host',
         'puppet_command',
-        :acceptable_exit_codes => [1,2,3,4,5,6],
-        :stdin                 => "class { \"boo\": }\n"
+        :acceptable_exit_codes => [1,2,3,4,5,6]
       )
 
       subject.apply_manifest_on(

data/spec/beaker/dsl/install_utils_spec.rb

@@ -166,8 +166,7 @@ describe ClassMixedWithDSLInstallUtils do
       path = unixhost['pe_dir']
       filename = "#{ unixhost['dist'] }"
       extension = '.tar'
-      subject.should_receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl #{ path }/#{ filename }#{ extension } -o #{ filename }#{ extension }" ).once
-      subject.should_receive( :on ).with( unixhost, /tar -xvf/ ).once
+      subject.should_receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl #{ path }/#{ filename }#{ extension }  | tar -xvf -" ).once
       subject.fetch_puppet( [unixhost], {} )
     end
 
@@ -180,9 +179,7 @@ describe ClassMixedWithDSLInstallUtils do
       path = unixhost['pe_dir']
       filename = "#{ unixhost['dist'] }"
       extension = '.tar.gz'
-      subject.should_receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl #{ path }/#{ filename }#{ extension } -o #{ filename }#{ extension }" ).once
-      subject.should_receive( :on ).with( unixhost, /gunzip/ ).once
-      subject.should_receive( :on ).with( unixhost, /tar -xvf/ ).once
+      subject.should_receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl #{ path }/#{ filename }#{ extension } | gunzip | tar -xvf -" ).once
       subject.fetch_puppet( [unixhost], {} )
     end
      

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -96,6 +96,34 @@ module Beaker
 
     end
 
+    describe "get_ip_from_vagrant_file" do
+      before :each do
+        FakeFS.activate!
+        vagrant.stub( :randmac ).and_return( "0123456789" )
+        vagrant.make_vfile( @hosts )
+      end
+
+      it "can find the correct ip for the provided hostname" do
+        @hosts.each do |host|
+          expect( vagrant.get_ip_from_vagrant_file(host.name) ).to be === host[:ip]
+        end
+
+      end
+
+      it "raises an error if it is unable to find an ip" do
+        expect{ vagrant.get_ip_from_vagrant_file("unknown") }.to raise_error
+
+      end
+
+      it "raises an error if no Vagrantfile is present" do
+        File.delete( vagrant.instance_variable_get( :@vagrant_file ) )
+        @hosts.each do |host|
+          expect{ vagrant.get_ip_from_vagrant_file(host.name) }.to raise_error
+        end
+      end
+
+    end
+
     describe "provisioning and cleanup" do
 
       before :each do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: blimpy
   requirement: !ruby/object:Gem::Requirement
@@ -335,6 +335,7 @@ files:
 - lib/beaker/utils/repo_control.rb
 - lib/beaker/utils/setup_helper.rb
 - lib/beaker/utils/validator.rb
+- lib/beaker/version.rb
 - spec/beaker/answers_spec.rb
 - spec/beaker/command_spec.rb
 - spec/beaker/dsl/assertions_spec.rb
@@ -407,7 +408,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Let's test Puppet!