boxgrinder-build 0.10.0 → 0.10.1

data/rubygem-boxgrinder-build.spec

@@ -5,7 +5,7 @@
 
 Summary: A tool for creating appliances from simple plain text files
 Name: rubygem-%{gemname}
-Version: 0.10.0
+Version: 0.10.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
@@ -13,14 +13,14 @@ URL: http://boxgrinder.org/
 Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
 
 Requires: ruby(abi) = %{rubyabi}
-Requires: rubygem(boxgrinder-core) >= 0.3.0
+Requires: rubygem(boxgrinder-core) >= 0.3.11
 Requires: rubygem(boxgrinder-core) < 0.4.0
 Requires: ruby-libguestfs
 
 BuildArch: noarch
 
 BuildRequires: rubygem(rake)
-BuildRequires: rubygem(boxgrinder-core) >= 0.3.0
+BuildRequires: rubygem(boxgrinder-core) >= 0.3.11
 BuildRequires: rubygem(boxgrinder-core) < 0.4.0
 BuildRequires: rubygem(echoe)
 BuildRequires: ruby-libguestfs
@@ -110,6 +110,9 @@ find %{_builddir}%{geminstdir}/bin -type f | xargs chmod a+x
 rm -rf %{_builddir}/%{geminstdir}/integ/packages/*.rpm
 cp -r %{_builddir}%{gemdir}/* %{buildroot}/%{gemdir}
 
+install -d -m 755 %{buildroot}/%{_sysconfdir}/bash_completion.d
+mv %{buildroot}/%{geminstdir}/bash_completion %{buildroot}/%{_sysconfdir}/bash_completion.d/%{name}
+
 %check
 pushd %{_builddir}/%{geminstdir}
 rake spec
@@ -118,6 +121,7 @@ popd
 %files
 %defattr(-, root, root, -)
 %{_bindir}/boxgrinder-build
+%{_sysconfdir}/bash_completion.d/%{name}
 %dir %{geminstdir}
 %{geminstdir}/bin
 %{geminstdir}/lib
@@ -139,6 +143,24 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Wed Feb 29 2012 Marc Savy <msavy@redhat.com> - 0.10.1-1
+- Upstream release: 0.10.1
+- [BGBUILD-332] Add support for bash completion
+- [BGBUILD-338] Weed out non-deterministic tests
+- [BGBUILD-337] In SL if default repos are disabled, /etc/yum.repos.d folder is not created
+- [BGBUILD-344] New filesystem monitoring improvements (Fixes: Shifting failed. Permission denied issues)
+- [BGBUILD-345] Change sudo/chown magic so it only occurs when running without explicit sudo/su (or --change-to-user)
+- [BGBUILD-346] Confirm Ruby 1.9.3 support
+- [BGBUILD-348] Simplecov coverage testing for Ruby >=1.9
+- [BGBUILD-349] Use RbConfig instead of obsolete and deprecated Config deprecation warning with Ruby 1.9.3
+
+
+* Tue Dec 27 2011 Marek Goldmann <mgoldman@redhat.com> - 0.11.0-1
+- Upstream release: 0.11.0
+- [BGBUILD-332] Add support for bash completion
+- [BGBUILD-338] Weed out non-deterministic tests
+- [BGBUILD-337] In SL if default repos are disabled, /etc/yum.repos.d folder is not created.
+
 * Tue Nov 29 2011 Marek Goldmann <mgoldman@redhat.com> - 0.10.0-1
 - Upstream release: 0.10.0
 - [BGBUILD-313] boxgrinder build fails to build ec2 image if ec2-user already exists

data/spec/appliance-spec.rb

@@ -16,8 +16,6 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'rubygems'
-require 'rspec'
 require 'boxgrinder-build/appliance'
 require 'ostruct'
 require 'logger'
@@ -26,8 +24,9 @@ module BoxGrinder
   describe Appliance do
     def prepare_appliance(options = {}, definition_file = "#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.appl")
       @log = LogHelper.new(:level => :trace, :type => :stdout)
-      @config = OpenCascade.new(:platform => :none, :delivery => :none, :force => false,
-                                :uid => 501, :gid => 501, :dir => {:root => '/', :build => 'build'}).merge(options)
+      @config = OpenCascade.new(:platform => :none, :delivery => :none, :force => false, 
+        :change_to_user => false, :uid => 501, :gid => 501, 
+        :dir => {:root => '/', :build => 'build'}).merge(options)
 
       @plugin_manager = mock(PluginManager)
 
@@ -174,6 +173,13 @@ module BoxGrinder
       before(:each) do
         prepare_appliance
         @appliance.instance_variable_set(:@appliance_config, prepare_appliance_config)
+
+        UserSwitcher.stub(:change_user)
+
+        @plugin1, @plugin2, @plugin3 = 3.times.map{|i| mock(i).as_null_object}
+
+        @p_chain = [{:plugin => @plugin1, :param => 'definition'},
+          {:plugin => @plugin2}, {:plugin => @plugin3}]
       end
 
       it "should not fail when plugin chain is empty" do
@@ -182,30 +188,67 @@ module BoxGrinder
       end
 
       it "should execute the whole plugin chain" do
-        @appliance.instance_variable_set(:@plugin_chain, [{:plugin => :plugin1, :param => 'definition'}, {:plugin => :plugin2}, {:plugin => :plugin3}])
+        @appliance.instance_variable_set(:@plugin_chain, @p_chain) 
+       
+        @appliance.should_receive(:execute_plugin).with(@plugin1, 'definition')
+        @appliance.should_receive(:execute_plugin).with(@plugin2, nil)
+        @appliance.should_receive(:execute_plugin).with(@plugin3, nil)
+          
+        @appliance.execute_plugin_chain
+      end   
 
-        @appliance.should_receive(:execute_plugin).ordered.with(:plugin1, 'definition')
-        @appliance.should_receive(:execute_plugin).ordered.with(:plugin2, nil)
-        @appliance.should_receive(:execute_plugin).ordered.with(:plugin3, nil)
+      context "when executing without change_user" do
+        before(:each) do
+          @config.stub(:change_to_user).and_return(false) # default
+        end
+      
+        it "should not switch users" do
+          @appliance.instance_variable_set(:@plugin_chain, [])
+          
+          UserSwitcher.should_not_receive(:change_user)
+          @appliance.execute_plugin_chain
+        end
+      end
 
-        @appliance.execute_plugin_chain
+      context "when executing with change_user" do
+        before(:each) do
+          @config.stub(:change_to_user).and_return(true)
+          @plugin1.stub_chain(:plugin_info, :[]).and_return(true)
+          @plugin2.stub_chain(:plugin_info, :[]).and_return(false)
+          @plugin3.stub_chain(:plugin_info, :[]).and_return(false)
+
+          @appliance.instance_variable_set(:@plugin_chain, @p_chain)
+        end
+
+        it "should switch users if the plugin requires root, but not for those that do not" do
+          UserSwitcher.should_receive(:change_user).with(0, 0)
+          UserSwitcher.should_receive(:change_user).twice.with(501, 501)
+          
+          @appliance.execute_plugin_chain
+        end
       end
     end
 
     describe ".initialize_plugins" do
+      let(:os_plugin){ mock("OSPlugin") }
+
+      let(:os_plugin_info_mock){ mock('os_plugin_info_mock', :[] => 'os').as_null_object }
+      let(:platform_plugin_info_mock){ mock('platform_plugin_info_mock', :[] => 'plat').as_null_object }
+      let(:delivery_plugin_info_mock){ mock('delivery_plugin_info_mock', :[] => 'deliver').as_null_object }
+
+      let(:platform_plugin){ mock("PlatformPlugin", :deliverables => OpenCascade.new(:disk => 'a/disk.vmdk')) }
+      let(:delivery_plugin){ mock("DeliveryPlugin", :deliverables => {}) }
+
       it "should prepare the plugin chain to create an appliance and convert it to VMware format" do
         prepare_appliance(:platform => :vmware)
         @appliance.instance_variable_set(:@appliance_config, prepare_appliance_config)
 
-        os_plugin = mock("OSPlugin")
-        platform_plugin = mock("PlatformPlugin", :deliverables => OpenCascade.new(:disk => 'a/disk.vmdk'))
-
-        @plugin_manager.should_receive(:initialize_plugin).with(:os, :fedora).and_return([os_plugin, "os_plugin_info"])
-        @plugin_manager.should_receive(:initialize_plugin).with(:platform, :vmware).and_return([platform_plugin, "platform_plugin_info"])
+        @plugin_manager.should_receive(:initialize_plugin).with(:os, :fedora).and_return([os_plugin, os_plugin_info_mock])
+        @plugin_manager.should_receive(:initialize_plugin).with(:platform, :vmware).and_return([platform_plugin, platform_plugin_info_mock])
         @plugin_manager.should_not_receive(:initialize_plugin).with(:delivery, anything)
 
-        os_plugin.should_receive(:init).with(@config, @appliance_config, "os_plugin_info", :log => @log)
-        platform_plugin.should_receive(:init).with(@config, @appliance_config, "platform_plugin_info", :log => @log, :previous_plugin => os_plugin)
+        os_plugin.should_receive(:init).with(@config, @appliance_config, os_plugin_info_mock, :log => @log)
+        platform_plugin.should_receive(:init).with(@config, @appliance_config, platform_plugin_info_mock, :log => @log, :previous_plugin => os_plugin)
 
         @appliance.initialize_plugins
 
@@ -217,17 +260,13 @@ module BoxGrinder
         prepare_appliance(:platform => :vmware, :delivery => :s3)
         @appliance.instance_variable_set(:@appliance_config, prepare_appliance_config)
 
-        os_plugin = mock("OSPlugin")
-        platform_plugin = mock("PlatformPlugin")
-        delivery_plugin = mock("DeliveryPlugin", :deliverables => {})
+        @plugin_manager.should_receive(:initialize_plugin).with(:os, :fedora).and_return([os_plugin, os_plugin_info_mock])
+        @plugin_manager.should_receive(:initialize_plugin).with(:platform, :vmware).and_return([platform_plugin, platform_plugin_info_mock])
+        @plugin_manager.should_receive(:initialize_plugin).with(:delivery, :s3).and_return([delivery_plugin, delivery_plugin_info_mock])
 
-        @plugin_manager.should_receive(:initialize_plugin).with(:os, :fedora).and_return([os_plugin, "os_plugin_info"])
-        @plugin_manager.should_receive(:initialize_plugin).with(:platform, :vmware).and_return([platform_plugin, "platform_plugin_info"])
-        @plugin_manager.should_receive(:initialize_plugin).with(:delivery, :s3).and_return([delivery_plugin, "delivery_plugin_info"])
-
-        os_plugin.should_receive(:init).with(@config, @appliance_config, "os_plugin_info", :log => @log)
-        platform_plugin.should_receive(:init).with(@config, @appliance_config, "platform_plugin_info", :log => @log, :previous_plugin => os_plugin)
-        delivery_plugin.should_receive(:init).with(@config, @appliance_config, "delivery_plugin_info", :log => @log, :previous_plugin => platform_plugin, :type => :s3)
+        os_plugin.should_receive(:init).with(@config, @appliance_config, os_plugin_info_mock, :log => @log)
+        platform_plugin.should_receive(:init).with(@config, @appliance_config, platform_plugin_info_mock, :log => @log, :previous_plugin => os_plugin)
+        delivery_plugin.should_receive(:init).with(@config, @appliance_config, delivery_plugin_info_mock, :log => @log, :previous_plugin => platform_plugin, :type => :s3)
 
         @appliance.initialize_plugins
 
@@ -239,15 +278,12 @@ module BoxGrinder
         prepare_appliance(:delivery => :s3)
         @appliance.instance_variable_set(:@appliance_config, prepare_appliance_config)
 
-        os_plugin = mock("OSPlugin")
-        delivery_plugin = mock("DeliveryPlugin")
-
-        @plugin_manager.should_receive(:initialize_plugin).with(:os, :fedora).and_return([os_plugin, "os_plugin_info"])
-        @plugin_manager.should_receive(:initialize_plugin).with(:delivery, :s3).and_return([delivery_plugin, "delivery_plugin_info"])
+        @plugin_manager.should_receive(:initialize_plugin).with(:os, :fedora).and_return([os_plugin, os_plugin_info_mock])
+        @plugin_manager.should_receive(:initialize_plugin).with(:delivery, :s3).and_return([delivery_plugin, delivery_plugin_info_mock])
         @plugin_manager.should_not_receive(:initialize_plugin).with(:platform, anything)
 
-        os_plugin.should_receive(:init).with(@config, @appliance_config, "os_plugin_info", :log => @log)
-        delivery_plugin.should_receive(:init).with(@config, @appliance_config, "delivery_plugin_info", :log => @log, :previous_plugin => os_plugin, :type => :s3)
+        os_plugin.should_receive(:init).with(@config, @appliance_config, os_plugin_info_mock, :log => @log)
+        delivery_plugin.should_receive(:init).with(@config, @appliance_config, delivery_plugin_info_mock, :log => @log, :previous_plugin => os_plugin, :type => :s3)
 
         @appliance.initialize_plugins
       end
@@ -271,30 +307,6 @@ module BoxGrinder
 
         @appliance.execute_plugin(plugin, :s3)
       end
-
-      context "user switching" do
-        before(:each) do
-          FileUtils.stub!(:chown_R)
-          @appliance.stub!(:change_user)
-        end
-
-        it "should switch to user from root after execution of OS plugin" do
-          plugin = mock('OSPlugin', :deliverables_exists? => false, :plugin_info => {:name => :test, :type => :os})
-          FileUtils.should_receive(:chown_R).with(501, 501, '/build')
-          @appliance.should_receive(:change_user).with(501, 501)
-          plugin.should_receive(:run).with(:test)
-
-          @appliance.execute_plugin(plugin, :test)
-        end
-
-        it "should switch to user from root after OS plugin even if deliverables exist" do
-          plugin = mock('OSPlugin', :deliverables_exists? => true, :plugin_info => {:name => :test, :type => :os})
-          FileUtils.should_receive(:chown_R).with(501, 501, '/build')
-          @appliance.should_receive(:change_user).with(501, 501)
-
-          @appliance.execute_plugin(plugin, :test)
-        end
-      end
     end
 
     context "preparations" do
@@ -318,30 +330,5 @@ module BoxGrinder
         @appliance.delivery_selected?.should == false
       end
     end
-
-    context ".change_user" do
-      before(:each) do
-        prepare_appliance
-      end
-      context "Interpreters supporting changes to real, effective and saved ids" do
-        it "should change the real, effective and saved uid & gid" do
-          Process::Sys.should_receive(:respond_to?).twice.and_return(true)
-          Process::Sys.should_receive(:setresuid).with(501, 501, 501)
-          Process::Sys.should_receive(:setresgid).with(502, 502, 502)
-          @appliance.change_user(501, 502)
-        end
-      end
-      context "Interpreters only supporting changes to real and effective ids" do
-        it "should change the real and effective uid & gid" do
-          Process::Sys.should_receive(:respond_to?).once.and_return(false)
-          Process.should_receive(:gid=).with(502)
-          Process.should_receive(:egid=).with(502)
-          Process.should_receive(:uid=).with(501)
-          Process.should_receive(:euid=).with(501)
-          @appliance.change_user(501, 502)
-        end
-      end
-    end
-
   end
 end

data/spec/helpers/augeas-helper-spec.rb

@@ -16,8 +16,6 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'rubygems'
-require 'rspec'
 require 'boxgrinder-build/helpers/augeas-helper'
 
 module BoxGrinder

data/spec/helpers/guestfs-helper-spec.rb

@@ -17,8 +17,6 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'boxgrinder-build/helpers/guestfs-helper'
-require 'rubygems'
-require 'rspec'
 require 'hashery/opencascade'
 
 module BoxGrinder
@@ -56,7 +54,7 @@ module BoxGrinder
         end
       end
 
-      it "should prepare and run guestfs wid IDE disk" do
+      it "should prepare and run guestfs with IDE disk" do
         guestfs = mock('Guestfs')
         @helper.instance_variable_set(:@guestfs, guestfs)
 

data/spec/helpers/image-helper-spec.rb

@@ -16,8 +16,6 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'rubygems'
-require 'rspec'
 require 'boxgrinder-build/helpers/image-helper'
 
 module BoxGrinder

data/spec/helpers/linux-helper-spec.rb

@@ -16,8 +16,6 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'rubygems'
-require 'rspec'
 require 'boxgrinder-build/helpers/linux-helper'
 
 module BoxGrinder

data/spec/helpers/package-helper-spec.rb

@@ -16,8 +16,6 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'rubygems'
-require 'rspec'
 require 'logger'
 require 'boxgrinder-build/helpers/package-helper'
 

data/spec/helpers/plugin-helper-spec.rb

@@ -16,8 +16,6 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'rubygems'
-require 'rspec'
 require 'boxgrinder-core/helpers/log-helper'
 require 'boxgrinder-build/helpers/plugin-helper'
 require 'ostruct'

data/spec/helpers/s3-helper-spec.rb

@@ -16,8 +16,6 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'rubygems'
-require 'rspec'
 require 'boxgrinder-build/helpers/s3-helper'
 require 'aws-sdk'
 

data/spec/managers/plugin-manager-spec.rb

@@ -16,8 +16,6 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'rubygems'
-require 'rspec'
 require 'boxgrinder-build/managers/plugin-manager'
 
 module BoxGrinder

data/spec/plugins/base-plugin-spec.rb

@@ -16,8 +16,6 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'rubygems'
-require 'rspec'
 require 'boxgrinder-build/plugins/base-plugin'
 require 'boxgrinder-core/helpers/log-helper'
 require 'yaml'

data/spec/plugins/delivery/ebs/ebs-plugin-spec.rb

@@ -17,8 +17,6 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'boxgrinder-build/plugins/delivery/ebs/ebs-plugin'
-require 'rubygems'
-require 'rspec'
 require 'ostruct'
 require 'logger'
 require 'set'

data/spec/plugins/delivery/elastichosts/elastichosts-plugin-spec.rb

@@ -16,8 +16,6 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'rubygems'
-require 'rspec'
 require 'hashery/opencascade'
 require 'boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin'
 
@@ -236,7 +234,7 @@ module BoxGrinder
           @plugin.upload_chunk("data", 1)
         end
 
-        it "should upload a chunk of data and be succesful after 1 retry" do
+        it "should upload a chunk of data and be successful after 1 retry" do
           @plugin.should_receive(:api_url).with('/drives/drive-uuid/write/0').and_return('url')
           RestClient.should_receive(:post).with('url', 'data', :content_type=>"application/octet-stream", "Content-Encoding"=>"gzip").and_raise('boom')
           @plugin.should_receive(:sleep).with(5)
@@ -267,7 +265,7 @@ module BoxGrinder
           }.should raise_error(PluginError, "Couldn't upload appliance, boom.")
         end
 
-        it "should not specify add content-encoding header if uplaoding to cloudsigma" do
+        it "should not specify add content-encoding header if uploading to cloudsigma" do
           @plugin_config.merge!('endpoint' => 'api.cloudsigma.com')
 
           @plugin.should_receive(:api_url).with('/drives/drive-uuid/write/0').and_return('url')
@@ -329,7 +327,7 @@ module BoxGrinder
 
           lambda {
             @plugin.create_server
-          }.should raise_error(PluginError, 'An error occured while creating the server, boom. See logs for more info.')
+          }.should raise_error(PluginError, 'An error occurred while creating the server, boom. See logs for more info.')
         end
       end
 

data/spec/plugins/delivery/libvirt/libvirt-plugin-spec.rb

@@ -279,22 +279,24 @@ module BoxGrinder
 
     # Fuller combinatorial coverage in cucumber required
     describe ".build_xml" do
-      it "should build an xml definition from appliance config & user options" do
-        prepare_plugin do |p, c|
-        end
-
-        @plugin.build_xml(:bus => 'bus', :os_type => :box, :domain_type => :grinder).
-            should == open("#{File.dirname(__FILE__)}/libvirt_test.xml").read
-      end
-
-      it "should allow modification of the xml definition via script" do
-        prepare_plugin do |p, c|
-          c['script'] = "#{File.dirname(__FILE__)}/libvirt_modify.sh"
-        end
-
-        @plugin.build_xml(:bus => 'bus', :os_type => :box, :domain_type => :grinder).
-            should == open("#{File.dirname(__FILE__)}/libvirt_modified.xml").read
-      end
+      # These sometimes fail due to ordering of XML elements, after adding xml 
+      # equivalence operators it should be much simpler.
+      # it "should build an xml definition from appliance config & user options" do
+      #   prepare_plugin do |p, c|
+      #   end
+
+      #   @plugin.build_xml(:bus => 'bus', :os_type => :box, :domain_type => :grinder).
+      #       should == open("#{File.dirname(__FILE__)}/libvirt_test.xml").read
+      # end
+
+      # it "should allow modification of the xml definition via script" do
+      #   prepare_plugin do |p, c|
+      #     c['script'] = "#{File.dirname(__FILE__)}/libvirt_modify.sh"
+      #   end
+
+      #   @plugin.build_xml(:bus => 'bus', :os_type => :box, :domain_type => :grinder).
+      #       should == open("#{File.dirname(__FILE__)}/libvirt_modified.xml").read
+      # end
     end
   end
-end
+end