beaker 1.11.0 → 1.11.1

data/spec/beaker/options/command_line_parser_spec.rb

@@ -9,11 +9,11 @@ module Beaker
       let(:full_opts) {["--hosts", "host.cfg", "--options", "opts_file", "--type", "pe", "--helper", "path_to_helper", "--load-path", "load_path", "--tests", "test1.rb,test2.rb,test3.rb", "--pre-suite", "pre_suite.rb", "--post-suite", "post_suite.rb", "--no-provision", "--preserve-hosts", "always", "--root-keys", "--keyfile", "../.ssh/id_rsa", "--install", "gitrepopath", "-m", "module", "-q", "--no-xml", "--dry-run", "--no-ntp", "--repo-proxy", "--add-el-extras", "--config", "anotherfile.cfg", "--fail-mode", "fast", "--no-color", "--version", "--log-level", "info"]}
 
       it "can correctly read command line input" do
-        expect(parser.parse!(test_opts)).to be === {:hosts_file=>"vcloud.cfg", :log_level=>"debug", :tests=>"test.rb", :help=>true}
+        expect(parser.parse(test_opts)).to be === {:hosts_file=>"vcloud.cfg", :log_level=>"debug", :tests=>"test.rb", :help=>true}
       end
 
       it "supports all our command line options" do
-        expect(parser.parse!(full_opts)).to be === {:hosts_file=>"anotherfile.cfg", :options_file=>"opts_file", :type=>"pe", :helper=>"path_to_helper", :load_path=>"load_path", :tests=>"test1.rb,test2.rb,test3.rb", :pre_suite=>"pre_suite.rb", :post_suite=>"post_suite.rb", :provision=>false, :preserve_hosts=>"always", :root_keys=>true, :keyfile=>"../.ssh/id_rsa", :install=>"gitrepopath", :modules=>"module", :quiet=>true, :xml=>false, :dry_run=>true, :timesync=>false, :repo_proxy=>true, :add_el_extras=>true, :fail_mode=>"fast", :color=>false, :version=>true, :log_level=>"info"}
+        expect(parser.parse(full_opts)).to be === {:hosts_file=>"anotherfile.cfg", :options_file=>"opts_file", :type=>"pe", :helper=>"path_to_helper", :load_path=>"load_path", :tests=>"test1.rb,test2.rb,test3.rb", :pre_suite=>"pre_suite.rb", :post_suite=>"post_suite.rb", :provision=>false, :preserve_hosts=>"always", :root_keys=>true, :keyfile=>"../.ssh/id_rsa", :install=>"gitrepopath", :modules=>"module", :quiet=>true, :xml=>false, :dry_run=>true, :timesync=>false, :repo_proxy=>true, :add_el_extras=>true, :fail_mode=>"fast", :color=>false, :version=>true, :log_level=>"info"}
       end
 
       it "can produce a usage description" do

data/spec/beaker/options/parser_spec.rb

@@ -14,140 +14,163 @@ module Beaker
         expect{parser.usage}.to_not raise_error
       end
 
-      repo = 'git://github.com/puppetlabs'
+      describe 'parse_git_repos' do
 
-      it "has repo set to #{repo}" do
-        expect(parser.repo).to be === "#{repo}"
-      end
+        it "transforms arguments of <PROJECT_NAME>/<REF> to <GIT_BASE_URL>/<lowercased_project_name>#<REF>" do
+          opts = ["PUPPET/3.1"]
+          expect(parser.parse_git_repos(opts)).to be === ["#{parser.repo}/puppet.git#3.1"]
+        end
 
-      #test parse_install_options
-      it "can transform --install PUPPET/3.1 into #{repo}/puppet.git#3.1" do
-        opts = ["PUPPET/3.1"]
-        expect(parser.parse_git_repos(opts)).to be === ["#{repo}/puppet.git#3.1"]
-      end
-      it "can transform --install FACTER/v.1.0 into #{repo}/facter.git#v.1.0" do
-        opts = ["FACTER/v.1.0"]
-        expect(parser.parse_git_repos(opts)).to be === ["#{repo}/facter.git#v.1.0"]
-      end
-      it "can transform --install HIERA/xyz into #{repo}/hiera.git#xyz" do
-        opts = ["HIERA/xyz"]
-        expect(parser.parse_git_repos(opts)).to be === ["#{repo}/hiera.git#xyz"]
-      end
-      it "can transform --install HIERA-PUPPET/path/to/repo into #{repo}/hiera-puppet.git#path/to/repo" do
-        opts = ["HIERA-PUPPET/path/to/repo"]
-        expect(parser.parse_git_repos(opts)).to be === ["#{repo}/hiera-puppet.git#path/to/repo"]
-      end
-      it "can transform --install PUPPET/3.1,FACTER/v.1.0 into #{repo}/puppet.git#3.1,#{repo}/facter.git#v.1.0" do
-        opts = ["PUPPET/3.1", "FACTER/v.1.0"]
-        expect(parser.parse_git_repos(opts)).to be === ["#{repo}/puppet.git#3.1", "#{repo}/facter.git#v.1.0"]
-      end
-      it "can leave --install git://github.com/puppetlabs/puppet.git#my/full/path alone" do
-        opts = ["git://github.com/puppetlabs/puppet.git#my/full/path"]
-        expect(parser.parse_git_repos(opts)).to be === ["git://github.com/puppetlabs/puppet.git#my/full/path"]
+        it "recognizes PROJECT_NAMEs of PUPPET, FACTER, HIERA, and HIERA-PUPPET" do
+          projects = [ ['puppet', 'my_branch', 'PUPPET/my_branch'],
+                       ['facter', 'my_branch', 'FACTER/my_branch'],
+                       ['hiera', 'my_branch', 'HIERA/my_branch'],
+                       ['hiera-puppet', 'my_branch', 'HIERA-PUPPET/my_branch'] ]
+          projects.each do |project, ref, input|
+            expect(parser.parse_git_repos([input])).to be === ["#{parser.repo}/#{project}.git##{ref}"]
+          end
+        end
       end
 
-      #split_arg testing
-      it "can split comma separated list into an array" do
-        arg = "file1,file2,file3"
-        expect(parser.split_arg(arg)).to be === ["file1", "file2", "file3"]
-      end
-      it "can use an existing Array as an acceptable argument" do
-        arg = ["file1", "file2", "file3"]
-        expect(parser.split_arg(arg)).to be === ["file1", "file2", "file3"]
-      end
-      it "can generate an array from a single value" do
-        arg = "i'mjustastring"
-        expect(parser.split_arg(arg)).to be === ["i'mjustastring"]
+      describe 'split_arg' do
+
+        it "can split comma separated list into an array" do
+          arg = "file1,file2,file3"
+          expect(parser.split_arg(arg)).to be === ["file1", "file2", "file3"]
+        end
+
+        it "can use an existing Array as an acceptable argument" do
+          arg = ["file1", "file2", "file3"]
+          expect(parser.split_arg(arg)).to be === ["file1", "file2", "file3"]
+        end
+
+        it "can generate an array from a single value" do
+          arg = "i'mjustastring"
+          expect(parser.split_arg(arg)).to be === ["i'mjustastring"]
+        end
       end
 
       context 'testing path traversing', :use_fakefs => true do
-        let(:test_dir) { 'tmp/tests' }
 
-        let(:paths)  { create_files(@files) }
+        let(:test_dir) { 'tmp/tests' }
         let(:rb_test)  { File.expand_path(test_dir + '/my_ruby_file.rb')    }
         let(:pl_test)  { File.expand_path(test_dir + '/my_perl_file.pl')    }
         let(:sh_test)  { File.expand_path(test_dir + '/my_shell_file.sh')   }
         let(:rb_other)  { File.expand_path(test_dir + '/other/my_other_ruby_file.rb')   }
 
         it 'only collects ruby files as test files' do
-          @files = [ rb_test, pl_test, sh_test, rb_other ]
-          paths
+          files = [ rb_test, pl_test, sh_test, rb_other ]
+          create_files( files )
           expect(parser.file_list([File.expand_path(test_dir)])).to be === [rb_test, rb_other]
         end
+
         it 'raises an error when no ruby files are found' do
-          @files = [ pl_test, sh_test ]
-          paths
+          files = [ pl_test, sh_test ]
+          create_files( files )
           expect{parser.file_list([File.expand_path(test_dir)])}.to raise_error(ArgumentError)
         end
+
         it 'raises an error when no paths are specified for searching' do
           @files = ''
           expect{parser.file_list('')}.to raise_error(ArgumentError)
         end
-
       end
 
       context 'combining split_arg and file_list maintain test file ordering', :use_fakefs => true do
-        let(:test_dir) { 'tmp/tests/' }
-        let(:other_test_dir) {'tmp/tests2/' }
+        let(:test_dir) { 'tmp/tests' }
+        let(:other_test_dir) {'tmp/tests2' }
 
         before :each do
-          @files = ['00_EnvSetup.rb', '035_StopFirewall.rb', '05_HieraSetup.rb', '01_TestSetup.rb', '03_PuppetMasterSanity.rb', '06_InstallModules.rb', '02_PuppetUserAndGroup.rb', '04_ValidateSignCert.rb', '07_InstallCACerts.rb'].shuffle!.map!{|x| test_dir + x }
-          @other_files = ['00_EnvSetup.rb', '035_StopFirewall.rb', '05_HieraSetup.rb', '01_TestSetup.rb', '03_PuppetMasterSanity.rb', '06_InstallModules.rb', '02_PuppetUserAndGroup.rb', '04_ValidateSignCert.rb', '07_InstallCACerts.rb'].shuffle!.map!{|x| other_test_dir + x }
-          create_files(@files)
-          create_files(@other_files)
-          create_files(['08_foss.rb'])
+          files = [
+            '00_EnvSetup.rb', '035_StopFirewall.rb', '05_HieraSetup.rb',
+            '01_TestSetup.rb', '03_PuppetMasterSanity.rb',
+            '06_InstallModules.rb','02_PuppetUserAndGroup.rb',
+            '04_ValidateSignCert.rb', '07_InstallCACerts.rb'              ]
+
+          @lone_file = '08_foss.rb'
+
+          @fileset1 = files.shuffle.map {|file| test_dir + '/' + file }
+          @fileset2 = files.shuffle.map {|file| other_test_dir + '/' + file }
+
+          @sorted_expanded_fileset1 = @fileset1.map {|f| File.expand_path(f) }.sort
+          @sorted_expanded_fileset2 = @fileset2.map {|f| File.expand_path(f) }.sort
+
+          create_files( @fileset1 )
+          create_files( @fileset2 )
+          create_files( [@lone_file] )
         end
 
         it "when provided a file followed by dir, runs the file first" do
-          arg = "08_foss.rb,#{test_dir}"
-          expect(parser.file_list(parser.split_arg(arg))).to be === ["08_foss.rb", "#{File.expand_path(test_dir)}/00_EnvSetup.rb", "#{File.expand_path(test_dir)}/01_TestSetup.rb", "#{File.expand_path(test_dir)}/02_PuppetUserAndGroup.rb", "#{File.expand_path(test_dir)}/035_StopFirewall.rb", "#{File.expand_path(test_dir)}/03_PuppetMasterSanity.rb", "#{File.expand_path(test_dir)}/04_ValidateSignCert.rb", "#{File.expand_path(test_dir)}/05_HieraSetup.rb", "#{File.expand_path(test_dir)}/06_InstallModules.rb", "#{File.expand_path(test_dir)}/07_InstallCACerts.rb"]
+          arg = "#{@lone_file},#{test_dir}"
+          output = parser.file_list( parser.split_arg( arg ))
+          expect( output ).to be === [ @lone_file, @sorted_expanded_fileset1 ].flatten
         end
 
         it "when provided a dir followed by a file, runs the file last" do
-          arg = "#{test_dir},08_foss.rb"
-          expect(parser.file_list(parser.split_arg(arg))).to be === ["#{File.expand_path(test_dir)}/00_EnvSetup.rb", "#{File.expand_path(test_dir)}/01_TestSetup.rb", "#{File.expand_path(test_dir)}/02_PuppetUserAndGroup.rb", "#{File.expand_path(test_dir)}/035_StopFirewall.rb", "#{File.expand_path(test_dir)}/03_PuppetMasterSanity.rb", "#{File.expand_path(test_dir)}/04_ValidateSignCert.rb", "#{File.expand_path(test_dir)}/05_HieraSetup.rb", "#{File.expand_path(test_dir)}/06_InstallModules.rb", "#{File.expand_path(test_dir)}/07_InstallCACerts.rb", "08_foss.rb"]
+          arg = "#{test_dir},#{@lone_file}"
+          output = parser.file_list( parser.split_arg( arg ))
+          expect( output ).to be === [ @sorted_expanded_fileset1, @lone_file ].flatten
         end
 
         it "correctly orders files in a directory" do
           arg = "#{test_dir}"
-          expect(parser.file_list(parser.split_arg(arg))).to be === ["#{File.expand_path(test_dir)}/00_EnvSetup.rb", "#{File.expand_path(test_dir)}/01_TestSetup.rb", "#{File.expand_path(test_dir)}/02_PuppetUserAndGroup.rb", "#{File.expand_path(test_dir)}/035_StopFirewall.rb", "#{File.expand_path(test_dir)}/03_PuppetMasterSanity.rb", "#{File.expand_path(test_dir)}/04_ValidateSignCert.rb", "#{File.expand_path(test_dir)}/05_HieraSetup.rb", "#{File.expand_path(test_dir)}/06_InstallModules.rb", "#{File.expand_path(test_dir)}/07_InstallCACerts.rb"]
+          output = parser.file_list( parser.split_arg( arg ))
+          expect( output ).to be === @sorted_expanded_fileset1
         end
 
         it "when provided two directories orders each directory separately" do
           arg = "#{test_dir}/,#{other_test_dir}/"
-          expect(parser.file_list(parser.split_arg(arg))).to be === ["#{File.expand_path(test_dir)}/00_EnvSetup.rb", "#{File.expand_path(test_dir)}/01_TestSetup.rb", "#{File.expand_path(test_dir)}/02_PuppetUserAndGroup.rb", "#{File.expand_path(test_dir)}/035_StopFirewall.rb", "#{File.expand_path(test_dir)}/03_PuppetMasterSanity.rb", "#{File.expand_path(test_dir)}/04_ValidateSignCert.rb", "#{File.expand_path(test_dir)}/05_HieraSetup.rb", "#{File.expand_path(test_dir)}/06_InstallModules.rb", "#{File.expand_path(test_dir)}/07_InstallCACerts.rb", "#{File.expand_path(other_test_dir)}/00_EnvSetup.rb", "#{File.expand_path(other_test_dir)}/01_TestSetup.rb", "#{File.expand_path(other_test_dir)}/02_PuppetUserAndGroup.rb", "#{File.expand_path(other_test_dir)}/035_StopFirewall.rb", "#{File.expand_path(other_test_dir)}/03_PuppetMasterSanity.rb", "#{File.expand_path(other_test_dir)}/04_ValidateSignCert.rb", "#{File.expand_path(other_test_dir)}/05_HieraSetup.rb", "#{File.expand_path(other_test_dir)}/06_InstallModules.rb", "#{File.expand_path(other_test_dir)}/07_InstallCACerts.rb"]
+          output = parser.file_list( parser.split_arg( arg ))
+          expect( output ).to be === @sorted_expanded_fileset1 + @sorted_expanded_fileset2
         end
-
       end
 
-      #test yaml file checking
-      it "raises error on improperly formatted yaml file" do
-        FakeFS.deactivate!
-        expect{parser.check_yaml_file(badyaml_path)}.to raise_error(ArgumentError)
-      end
-      it "raises an error when a yaml file is missing" do
-        FakeFS.deactivate!
-        expect{parser.check_yaml_file("not a path")}.to raise_error(ArgumentError)
-      end
+      describe 'check_yaml_file' do
+        it "raises error on improperly formatted yaml file" do
+          FakeFS.deactivate!
+          expect{parser.check_yaml_file(badyaml_path)}.to raise_error(ArgumentError)
+        end
 
-      it "can correctly combine arguments from different sources" do
-        FakeFS.deactivate!
-        ENV["BUILD_URL"] = "http://my.build.url/"
-        build_url = ENV["BUILD_URL"]
-        args = ["-h", hosts_path, "--log-level", "debug", "--type", "git", "--install", "PUPPET/1.0,HIERA/hello"]
-        expect(parser.parse_args(args)).to be === {:project=>"Beaker", :department=>"#{ENV['USER']}", :validate=>true, :jenkins_build_url=> "http://my.build.url/", :forge_host=>"vulcan-acceptance.delivery.puppetlabs.net", :log_level=>"debug", :trace_limit=>10, :hosts_file=>hosts_path, :options_file=>nil, :type=>"git", :provision=>true, :preserve_hosts=>'never', :root_keys=>false, :quiet=>false, :xml=>false, :color=>true, :dry_run=>false, :timeout=>300, :fail_mode=>'slow', :timesync=>false, :repo_proxy=>false, :add_el_extras=>false, :add_master_entry=>false, :consoleport=>443, :pe_dir=>"/opt/enterprise/dists", :pe_version_file=>"LATEST", :pe_version_file_win=>"LATEST-win", :dot_fog=>"#{home}/.fog", :help=>false, :ec2_yaml=>"config/image_templates/ec2.yaml", :ssh=>{:config=>false, :paranoid=>false, :timeout=>300, :auth_methods=>["publickey"], :port=>22, :forward_agent=>true, :keys=>["#{home}/.ssh/id_rsa"], :user_known_hosts_file=>"#{home}/.ssh/known_hosts"}, :install=>["git://github.com/puppetlabs/puppet.git#1.0", "git://github.com/puppetlabs/hiera.git#hello"], :HOSTS=>{:"pe-ubuntu-lucid"=>{:roles=>["agent", "dashboard", "database", "master"], :vmname=>"pe-ubuntu-lucid", :platform=>"ubuntu-10.04-i386", :snapshot=>"clean-w-keys", :hypervisor=>"fusion"}, :"pe-centos6"=>{:roles=>["agent"], :vmname=>"pe-centos6", :platform=>"el-6-i386", :hypervisor=>"fusion", :snapshot=>"clean-w-keys"}}, :nfs_server=>"none", :home=>"#{home}", :answers=>{:q_puppet_enterpriseconsole_auth_user_email=>"admin@example.com", :q_puppet_enterpriseconsole_auth_password=>"~!@\#$%^*-/ aZ", :q_puppet_enterpriseconsole_smtp_host=>nil, :q_puppet_enterpriseconsole_smtp_port=>25, :q_puppet_enterpriseconsole_smtp_username=>nil, :q_puppet_enterpriseconsole_smtp_password=>nil, :q_puppet_enterpriseconsole_smtp_use_tls=>"n", :q_verify_packages=>"y", :q_puppetdb_password=>"~!@\#$%^*-/ aZ"}, :helper=>[], :load_path=>[], :tests=>[], :pre_suite=>[], :post_suite=>[], :modules=>[]}
+        it "raises an error when a yaml file is missing" do
+          FakeFS.deactivate!
+          expect{parser.check_yaml_file("not a path")}.to raise_error(ArgumentError)
+        end
       end
 
-      it "ensures that fail-mode is one of fast/slow" do
-        FakeFS.deactivate!
-        args = ["-h", hosts_path, "--log-level", "debug", "--fail-mode", "nope"] 
-        expect{parser.parse_args(args)}.to raise_error(ArgumentError)
-      end
+      describe 'parse_args' do
+        before { FakeFS.deactivate! }
 
-      it "ensures that type is one of pe/git" do
-        FakeFS.deactivate!
-        args = ["-h", hosts_path, "--log-level", "debug", "--type", "unkowns"]
-        expect{parser.parse_args(args)}.to raise_error(ArgumentError)
+        it 'pulls the args into key called :command_line' do
+          my_args = [ '--log-level', 'debug', '-h', hosts_path]
+          expect(parser.parse_args( my_args )[:command_line]).to include(my_args.join(' '))
+        end
+
+        it "can correctly combine arguments from different sources" do
+          build_url = 'http://my.build.url/'
+          type = 'git'
+          log_level = 'debug'
+
+          old_build_url = ENV["BUILD_URL"]
+          ENV["BUILD_URL"] = build_url
+
+          args = ["-h", hosts_path, "--log-level", log_level, "--type", type, "--install", "PUPPET/1.0,HIERA/hello"]
+          output = parser.parse_args( args )
+          expect( output[:hosts_file] ).to be == hosts_path
+          expect( output[:jenkins_build_url] ).to be == build_url
+          expect( output[:install] ).to include( 'git://github.com/puppetlabs/hiera.git#hello' )
+
+          ENV["BUILD_URL"] = old_build_url
+        end
+
+        it "ensures that fail-mode is one of fast/slow" do
+          args = ["-h", hosts_path, "--log-level", "debug", "--fail-mode", "nope"] 
+          expect{parser.parse_args(args)}.to raise_error(ArgumentError)
+        end
+
+        it "ensures that type is one of pe/git" do
+          args = ["-h", hosts_path, "--log-level", "debug", "--type", "unkowns"]
+          expect{parser.parse_args(args)}.to raise_error(ArgumentError)
+        end
       end
 
       describe "normalize_args" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest