boxgrinder-build 0.9.2 → 0.9.3

data/spec/plugins/os/rpm-based/rpm-based-os-plugin-spec.rb

@@ -43,7 +43,7 @@ module BoxGrinder
 
       @plugin.stub!(:merge_plugin_config)
 
-      @plugin.init(@config, @appliance_config, :log => LogHelper.new(:level => :trace, :type => :stdout), :plugin_info => {:name => :rpm_based})
+      @plugin.init(@config, @appliance_config, {:name => :rpm_based}, :log => LogHelper.new(:level => :trace, :type => :stdout))
 
       @config = @plugin.instance_variable_get(:@config)
       @appliance_config = @plugin.instance_variable_get(:@appliance_config)
@@ -203,7 +203,7 @@ module BoxGrinder
         validator = mock(RPMDependencyValidator)
         validator.should_receive(:resolve_packages)
 
-        Kickstart.should_receive(:new).with(@config, @appliance_config, {}, {:tmp=>"build/path/rpm_based-plugin/tmp", :base=>"build/path/rpm_based-plugin"}, :log => @log).and_return(kickstart)
+        Kickstart.should_receive(:new).with(@config, @appliance_config, {:tmp=>"build/path/rpm_based-plugin/tmp", :base=>"build/path/rpm_based-plugin"}, :log => @log).and_return(kickstart)
         RPMDependencyValidator.should_receive(:new).and_return(validator)
 
         @exec_helper.should_receive(:execute).with("appliance-creator -d -v -t 'build/path/rpm_based-plugin/tmp' --cache=cachedir/rpms-cache/mainpath --config 'kickstart.ks' -o 'build/path/rpm_based-plugin/tmp' --name 'full' --vmem 512 --vcpu 1 --format raw")
@@ -233,12 +233,16 @@ module BoxGrinder
 
       it "should build appliance" do
         @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '14'}))
+        @appliance_config.should_receive(:default_repos).and_return(true)
+        @plugin.should_receive(:add_repos).with({})
         do_build
         @plugin.build_with_appliance_creator('jeos.appl')
       end
 
       it "should execute additional steps for Fedora 15" do
         @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '15'}))
+        @appliance_config.should_receive(:default_repos).and_return(true)
+        @plugin.should_receive(:add_repos).with({})
 
         do_build do |guestfs, guestfs_helper|
           @plugin.should_receive(:disable_biosdevname).with(guestfs)
@@ -252,6 +256,31 @@ module BoxGrinder
       end
     end
 
+    describe ".add_repos" do
+      it "should add specified repos to appliance" do
+        repos = []
+
+        @appliance_config.stub!(:variables).and_return({'OS_VERSION' => '11', 'BASE_ARCH' => 'i386'})
+        @appliance_config.stub!(:repos).and_return(repos)
+
+        @plugin.add_repos({
+          "11" => {
+              "base" => {
+                  "mirrorlist" => "http://mirrorlist.centos.org/?release=#OS_VERSION#&arch=#BASE_ARCH#&repo=os"
+              }
+          }
+        })
+
+        repos.size.should == 1
+        repos.first['mirrorlist'].should == 'http://mirrorlist.centos.org/?release=11&arch=i386&repo=os'
+
+      end
+
+      it "should not fail with empty repos" do
+        @plugin.add_repos({})
+      end
+    end
+
     describe ".execute_appliance_creator" do
       it "should execute appliance creator successfuly" do
         @exec_helper.should_receive(:execute).with("appliance-creator -d -v -t 'build/path/rpm_based-plugin/tmp' --cache=cachedir/rpms-cache/mainpath --config 'kickstart.ks' -o 'build/path/rpm_based-plugin/tmp' --name 'full' --vmem 512 --vcpu 1 --format raw")

data/spec/plugins/os/rpm-based/rpm-dependency-validator-spec.rb

@@ -33,18 +33,31 @@ module BoxGrinder
       @appliance_config.stub!(:name).and_return('full')
       @appliance_config.stub!(:version).and_return(1)
       @appliance_config.stub!(:release).and_return(0)
+      @appliance_config.stub!(:hardware).and_return(OpenCascade.new(:arch => 'i386'))
       @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '11'}))
 
-      @plugin = RPMBasedOSPlugin.new
+      @validator = RPMDependencyValidator.new(@config, @appliance_config, OpenCascade.new(:tmp => 'tmp'))
+    end
+
+    describe ".generate_yum_config" do
+      it "should create a yum config also with an url with tilde character" do
+        Dir.should_receive(:pwd).and_return('/dir')
+
+        @appliance_config.stub!(:version).and_return(1)
+        @appliance_config.stub!(:repos).and_return([{'name' => 'name', 'mirrorlist' => 'mirror~list'}])
 
-      @plugin.stub!(:merge_plugin_config)
+        file = mock(File)
+        file.should_receive(:puts).with("[main]\r\ncachedir=/dir/tmp/boxgrinder-i386-yum-cache/\r\n\r\n")
+        file.should_receive(:puts).with("[boxgrinder-name]")
+        file.should_receive(:puts).with("name=name")
+        file.should_receive(:puts).with("mirrorlist=mirror~list")
+        file.should_receive(:puts).with("enabled=1")
+        file.should_receive(:puts)
 
-      @plugin.init(@config, @appliance_config, :log => Logger.new('/dev/null'), :plugin_info => {:name => :rpm_based})
+        File.should_receive(:open).with("tmp/yum.conf", "w").and_yield(file)
 
-      @config = @plugin.instance_variable_get(:@config)
-      @appliance_config = @plugin.instance_variable_get(:@appliance_config)
-      @exec_helper = @plugin.instance_variable_get(:@exec_helper)
-      @log = @plugin.instance_variable_get(:@log)
+        @validator.generate_yum_config
+      end
     end
   end
 end

data/spec/plugins/os/sl/sl-plugin-spec.rb

@@ -0,0 +1,44 @@
+#
+# Copyright 2010 Red Hat, Inc.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 3 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+require 'boxgrinder-build/plugins/os/sl/sl-plugin'
+require 'hashery/opencascade'
+
+module BoxGrinder
+  describe ScientificLinuxPlugin do
+    before(:each) do
+      @config = Config.new
+      @appliance_config = mock(ApplianceConfig,
+        :name => 'name',
+        :path => OpenCascade.new({:build => 'build/path'})
+      )
+
+      @plugin = ScientificLinuxPlugin.new.init(@config, @appliance_config, {:class => BoxGrinder::ScientificLinuxPlugin, :type => :os, :name => :sl, :full_name  => "Scientific Linux", :versions   => ["5", "6"]}, :log => LogHelper.new(:level => :trace, :type => :stdout))
+
+    end
+
+    describe ".execute" do
+      it "should use rhel plugin to build the appliance" do
+        @plugin.should_receive(:build_rhel).with('definition', {"6"=>{"security"=>{"baseurl"=>"http://ftp.scientificlinux.org/linux/scientific/#OS_VERSION#x/#BASE_ARCH#/updates/security/"}, "base"=>{"baseurl"=>"http://ftp.scientificlinux.org/linux/scientific/#OS_VERSION#x/#BASE_ARCH#/os/"}}, "5"=>{"security"=>{"baseurl"=>"http://ftp.scientificlinux.org/linux/scientific/#OS_VERSION#x/#BASE_ARCH#/updates/security/"}, "base"=>{"baseurl"=>"http://ftp.scientificlinux.org/linux/scientific/#OS_VERSION#x/#BASE_ARCH#/SL/"}}})
+
+        @plugin.execute('definition')
+      end
+    end
+  end
+end
+ 

data/spec/plugins/platform/ec2/ec2-plugin-spec.rb

@@ -55,7 +55,7 @@ module BoxGrinder
                           })
       )
 
-      @plugin = EC2Plugin.new.init(@config, @appliance_config, :previous_deliverables => OpenCascade.new(:disk => 'a/disk.raw'), :log => LogHelper.new(:level => :trace, :type => :stdout), :plugin_info => {:class => BoxGrinder::EC2Plugin, :type => :platform, :name => :ec2, :full_name => "Amazon Elastic Compute Cloud (Amazon EC2)"})
+      @plugin = EC2Plugin.new.init(@config, @appliance_config, {:class => BoxGrinder::EC2Plugin, :type => :platform, :name => :ec2, :full_name => "Amazon Elastic Compute Cloud (Amazon EC2)"}, :previous_plugin => OpenCascade.new(:deliverables => {:disk => 'a/disk.raw'}), :log => LogHelper.new(:level => :trace, :type => :stdout))
 
       @config = @plugin.instance_variable_get(:@config)
       @appliance_config = @plugin.instance_variable_get(:@appliance_config)

data/spec/plugins/platform/virtualbox/virtualbox-plugin-spec.rb

@@ -52,11 +52,11 @@ module BoxGrinder
       )
 
       options[:log] = LogHelper.new(:level => :trace, :type => :stdout)
-      options[:plugin_info] = {:class => BoxGrinder::VirtualBoxPlugin, :type => :platform, :name => :virtualbox, :full_name => "VirtualBox"}
+      options[:previous_plugin] = OpenCascade.new(:deliverables => {:disk => 'a/base/image/path.raw'})
       @plugin = VirtualBoxPlugin.new
 
       @plugin.should_receive(:read_plugin_config)
-      @plugin.init(@config, @appliance_config, options)
+      @plugin.init(@config, @appliance_config, {:class => BoxGrinder::VirtualBoxPlugin, :type => :platform, :name => :virtualbox, :full_name => "VirtualBox"}, options)
 
       @exec_helper = @plugin.instance_variable_get(:@exec_helper)
       @image_helper = @plugin.instance_variable_get(:@image_helper)
@@ -64,17 +64,17 @@ module BoxGrinder
     end
 
     describe ".build_virtualbox" do
-      it "should build virtualbox image on new qemu-img" do
-        prepare_image(:previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
+      before(:each) do
+        prepare_image
+      end
 
+      it "should build virtualbox image on new qemu-img" do
         @image_helper.should_receive(:convert_disk).with("a/base/image/path.raw", :vmdk, "build/path/virtualbox-plugin/tmp/full.vmdk")
 
         @plugin.build_virtualbox
       end
 
       it "should build virtualbox image on old qemu-img" do
-        prepare_image(:previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
-
         @image_helper.should_receive(:convert_disk).with("a/base/image/path.raw", :vmdk, "build/path/virtualbox-plugin/tmp/full.vmdk")
 
         @plugin.build_virtualbox

data/spec/plugins/platform/vmware/vmware-plugin-spec.rb

@@ -52,20 +52,21 @@ module BoxGrinder
       )
 
       options[:log] = Logger.new('/dev/null')
-      options[:plugin_info] = {:class => BoxGrinder::VMwarePlugin, :type => :platform, :name => :vmware, :full_name => "VMware"}
+      options[:previous_plugin] = OpenCascade.new(:deliverables => {:disk => 'a/base/image/path.raw'})
       @plugin = VMwarePlugin.new
 
       @plugin.instance_variable_set(:@plugin_config, plugin_config)
       @plugin.should_receive(:read_plugin_config)
       @plugin.should_receive(:validate_plugin_config)
-      @plugin.init(@config, @appliance_config, options)
+      @plugin.init(@config, @appliance_config, {:class => BoxGrinder::VMwarePlugin, :type => :platform, :name => :vmware, :full_name => "VMware"}, options)
+#      @plugin.validate
 
       @exec_helper = @plugin.instance_variable_get(:@exec_helper)
       @image_helper = @plugin.instance_variable_get(:@image_helper)
     end
 
     it "should calculate good CHS value for 0.5GB disk" do
-      prepare_image({'thin_disk' => false, 'type' => 'enterprise'}, :previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
+      prepare_image({'thin_disk' => false, 'type' => 'enterprise'})
 
       File.should_receive(:stat).with("a/base/image/path.raw").and_return(OpenStruct.new(:size => 536870912))
 
@@ -78,7 +79,7 @@ module BoxGrinder
     end
 
     it "should calculate good CHS value for 1GB disk" do
-      prepare_image({'thin_disk' => false, 'type' => 'enterprise'}, :previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
+      prepare_image({'thin_disk' => false, 'type' => 'enterprise'})
 
       File.should_receive(:stat).with("a/base/image/path.raw").and_return(OpenStruct.new(:size => 1073741824))
 
@@ -91,7 +92,7 @@ module BoxGrinder
     end
 
     it "should calculate good CHS value for 40GB disk" do
-      prepare_image({'thin_disk' => false, 'type' => 'enterprise'}, :previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
+      prepare_image({'thin_disk' => false, 'type' => 'enterprise'})
 
       File.should_receive(:stat).with("a/base/image/path.raw").and_return(OpenStruct.new(:size => 42949672960))
 
@@ -104,7 +105,7 @@ module BoxGrinder
     end
 
     it "should calculate good CHS value for 160GB disk" do
-      prepare_image({'thin_disk' => false, 'type' => 'enterprise'}, :previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
+      prepare_image({'thin_disk' => false, 'type' => 'enterprise'})
 
       File.should_receive(:stat).with("a/base/image/path.raw").and_return(OpenStruct.new(:size => 171798691840))
 
@@ -118,7 +119,7 @@ module BoxGrinder
 
     describe ".change_vmdk_values" do
       it "should change vmdk data (vmfs)" do
-        prepare_image({'thin_disk' => false, 'type' => 'enterprise'}, :previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
+        prepare_image({'thin_disk' => false, 'type' => 'enterprise'})
 
         File.should_receive(:stat).with("a/base/image/path.raw").and_return(OpenStruct.new(:size => 5368709120))
 
@@ -141,7 +142,7 @@ module BoxGrinder
       end
 
       it "should change vmdk data (flat)" do
-        prepare_image({'thin_disk' => false, 'type' => 'enterprise'}, :previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
+        prepare_image({'thin_disk' => false, 'type' => 'enterprise'})
 
         File.should_receive(:stat).with("a/base/image/path.raw").and_return(OpenStruct.new(:size => 5368709120))
 
@@ -165,7 +166,7 @@ module BoxGrinder
       end
 
       it "should change vmdk data (flat) enabling thin disk" do
-        prepare_image({'thin_disk' => true, 'type' => 'enterprise'}, :previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
+        prepare_image({'thin_disk' => true, 'type' => 'enterprise'})
 
         File.should_receive(:stat).with("a/base/image/path.raw").and_return(OpenStruct.new(:size => 5368709120))
 
@@ -193,7 +194,7 @@ module BoxGrinder
 
     describe ".build_vmware_personal" do
       it "should build personal thick image" do
-        prepare_image({'type' => 'personal', 'thin_disk' => false}, :previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
+        prepare_image({'type' => 'personal', 'thin_disk' => false})
 
         @exec_helper.should_receive(:execute).with("cp 'a/base/image/path.raw' 'build/path/vmware-plugin/tmp/full.raw'")
         File.should_receive(:open).once.with("build/path/vmware-plugin/tmp/full.vmx", "w")
@@ -203,7 +204,7 @@ module BoxGrinder
       end
 
       it "should build personal thin image" do
-        prepare_image({'type' => 'personal', 'thin_disk' => true}, :previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
+        prepare_image({'type' => 'personal', 'thin_disk' => true})
 
         @image_helper.should_receive(:convert_disk).with('a/base/image/path.raw', :vmdk, 'build/path/vmware-plugin/tmp/full.vmdk')
         File.should_receive(:open).once.with("build/path/vmware-plugin/tmp/full.vmx", "w")
@@ -214,7 +215,7 @@ module BoxGrinder
 
     describe ".build_vmware_enterprise" do
       it "should build enterprise thick image" do
-        prepare_image({'type' => 'enterprise', 'thin_disk' => false}, :previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
+        prepare_image({'type' => 'enterprise', 'thin_disk' => false})
 
         @plugin.should_receive(:change_common_vmx_values).and_return("")
         @exec_helper.should_receive(:execute).with("cp 'a/base/image/path.raw' 'build/path/vmware-plugin/tmp/full.raw'")
@@ -225,7 +226,7 @@ module BoxGrinder
       end
 
       it "should build enterprise thin image" do
-        prepare_image({'type' => 'enterprise', 'thin_disk' => true}, :previous_deliverables => OpenStruct.new({:disk => 'a/base/image/path.raw'}))
+        prepare_image({'type' => 'enterprise', 'thin_disk' => true})
 
         @plugin.should_receive(:change_common_vmx_values).and_return("")
         @exec_helper.should_receive(:execute).with("cp 'a/base/image/path.raw' 'build/path/vmware-plugin/tmp/full.raw'")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-build
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 +02:00
+date: 2011-06-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -156,6 +156,7 @@ extra_rdoc_files:
 - lib/boxgrinder-build/plugins/os/rpm-based/src/appliance.ks.erb
 - lib/boxgrinder-build/plugins/os/rpm-based/src/base.repo
 - lib/boxgrinder-build/plugins/os/rpm-based/src/motd.init
+- lib/boxgrinder-build/plugins/os/sl/sl-plugin.rb
 - lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb
 - lib/boxgrinder-build/plugins/platform/ec2/src/fstab_32bit
 - lib/boxgrinder-build/plugins/platform/ec2/src/fstab_64bit
@@ -176,6 +177,26 @@ files:
 - Rakefile
 - bin/boxgrinder-build
 - boxgrinder-build.gemspec
+- integ/appliances/_hardware_cpus.appl
+- integ/appliances/_hardware_memory.appl
+- integ/appliances/_hardware_partitions_home.appl
+- integ/appliances/_hardware_partitions_root.appl
+- integ/appliances/_os_password.appl
+- integ/appliances/_packages_groups_base.appl
+- integ/appliances/_packages_groups_core.appl
+- integ/appliances/_packages_squid.appl
+- integ/appliances/_packages_utils.appl
+- integ/appliances/_repos_boxgrinder_permanent_noarch.appl
+- integ/appliances/_repos_testlocal_ephemeral_noarch.appl
+- integ/appliances/_test_base.appl
+- integ/appliances/gnome-fedora.appl
+- integ/appliances/jeos-centos.appl
+- integ/appliances/jeos-fedora.appl
+- integ/appliances/modular.appl
+- integ/packages/ephemeral-repo-test-0.1-1.noarch.rpm
+- integ/packages/local-repo-test.spec
+- integ/spec/jeos-spec.rb
+- integ/spec/modular-spec.rb
 - lib/boxgrinder-build.rb
 - lib/boxgrinder-build/appliance.rb
 - lib/boxgrinder-build/helpers/augeas-helper.rb
@@ -203,6 +224,7 @@ files:
 - lib/boxgrinder-build/plugins/os/rpm-based/src/appliance.ks.erb
 - lib/boxgrinder-build/plugins/os/rpm-based/src/base.repo
 - lib/boxgrinder-build/plugins/os/rpm-based/src/motd.init
+- lib/boxgrinder-build/plugins/os/sl/sl-plugin.rb
 - lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb
 - lib/boxgrinder-build/plugins/platform/ec2/src/fstab_32bit
 - lib/boxgrinder-build/plugins/platform/ec2/src/fstab_64bit
@@ -216,7 +238,6 @@ files:
 - lib/boxgrinder-build/plugins/platform/vmware/src/base.vmx
 - lib/boxgrinder-build/plugins/platform/vmware/vmware-plugin.rb
 - rubygem-boxgrinder-build.spec
-- spec/Rakefile
 - spec/appliance-spec.rb
 - spec/helpers/augeas-helper-spec.rb
 - spec/helpers/guestfs-helper-spec.rb
@@ -241,6 +262,7 @@ files:
 - spec/plugins/os/rpm-based/src/jeos-f13-plain.ks
 - spec/plugins/os/rpm-based/src/jeos-f13-without-version.ks
 - spec/plugins/os/rpm-based/src/jeos-f13.ks
+- spec/plugins/os/sl/sl-plugin-spec.rb
 - spec/plugins/platform/ec2/ec2-plugin-spec.rb
 - spec/plugins/platform/virtualbox/virtualbox-plugin-spec.rb
 - spec/plugins/platform/vmware/vmware-plugin-spec.rb

data/spec/Rakefile

@@ -1,32 +0,0 @@
-#
-# Copyright 2010 Red Hat, Inc.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 3 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# 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 'rake'
-require 'spec/rake/spectask'
-
-desc "Run all examples"
-Spec::Rake::SpecTask.new(:default) do |t|
-  t.libs.unshift "../../boxgrinder-core/lib"
-  t.libs.unshift "../../boxgrinder-core/spec"
-
-  t.spec_files = FileList['**/*-spec.rb']
-  t.rcov = true
-  t.rcov_opts = ['--exclude', 'spec' ]
-  t.spec_opts = [ '--format', 's']
-end