boxgrinder-build 0.6.4 → 0.6.5

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.6.5
+
+* Release bump required for plugins
+
 v0.6.4
 
 * [BGBUILD-98] Use hashery gem

data/Rakefile

@@ -19,7 +19,6 @@
 require 'rubygems'
 require 'spec/rake/spectask'
 require 'echoe'
-require 'rbconfig'
 
 Echoe.new("boxgrinder-build") do |p|
   p.project     = "BoxGrinder Build"
@@ -27,7 +26,7 @@ Echoe.new("boxgrinder-build") do |p|
   p.summary     = "A tool for creating appliances from simple plain text files for various virtual environments."
   p.url         = "http://www.jboss.org/boxgrinder"
   p.email       = "info@boxgrinder.org"
-  p.runtime_dependencies = ["commander ~>4.0.3", "boxgrinder-core ~>0.1.3"]
+  p.runtime_dependencies = ["commander ~>4.0.3", "boxgrinder-core ~>0.1.4"]
 end
 
 desc "Run all tests"
@@ -48,24 +47,3 @@ Spec::Rake::SpecTask.new('spec:coverage') do |t|
   t.rcov_opts = ['--exclude', 'spec,teamcity/*,/usr/lib/ruby/,.gem/ruby,/boxgrinder-core/,/gems/']
   t.verbose = true
 end
-
-desc "Create RPM"
-task :rpm, :target, :version, :arch, :needs => ['clean', 'gem'] do |t, args|
-  target  = args[:target] || 'fedora'
-  version = args[:version] || 'rawhide'
-  arch    = args[:arch] || RbConfig::CONFIG['host_cpu']
-
-  Dir["**/rubygem-*.spec"].each do |spec|
-    `mock -v -r #{target}-#{version}-#{arch} --buildsrpm --sources pkg/*.gem --spec #{spec} --resultdir pkg/`
-    exit 1 unless $? == 0
-    `mock -v -r #{target}-#{version}-#{arch} --rebuild pkg/*.rpm --resultdir pkg/`
-    exit 1 unless $? == 0
-  end
-end
-
-desc "Install RPM"
-task 'rpm:install' => [:rpm] do
-  system "sudo yum -y remove rubygem-boxgrinder-build"
-  system "sudo yum -y localinstall --nogpgcheck pkg/*.rpm"
-  exit 1 unless $? == 0
-end

data/bin/boxgrinder-build

@@ -46,7 +46,7 @@ module Commander
 end
 
 program :name, 'BoxGrinder Build'
-program :version, '0.6.4'
+program :version, '0.6.5'
 program :description, "A tool for building VM images from simple definition files."
 program :help, 'Homepage', 'http://www.jboss.org/boxgrinder/build.html'
 program :help, 'Documentation', 'http://community.jboss.org/docs/DOC-14358'

data/boxgrinder-build.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-build}
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2010-11-23}
+  s.date = %q{2010-12-03}
   s.default_executable = %q{boxgrinder-build}
   s.description = %q{A tool for creating appliances from simple plain text files for various virtual environments.}
   s.email = %q{info@boxgrinder.org}
@@ -26,13 +26,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<commander>, ["~> 4.0.3"])
-      s.add_runtime_dependency(%q<boxgrinder-core>, ["~> 0.1.3"])
+      s.add_runtime_dependency(%q<boxgrinder-core>, ["~> 0.1.4"])
     else
       s.add_dependency(%q<commander>, ["~> 4.0.3"])
-      s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.3"])
+      s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.4"])
     end
   else
     s.add_dependency(%q<commander>, ["~> 4.0.3"])
-    s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.3"])
+    s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.4"])
   end
 end

data/lib/boxgrinder-build/appliance.rb

@@ -16,6 +16,7 @@
 # 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 'boxgrinder-core/models/appliance-config'
 require 'boxgrinder-core/models/config'
 require 'boxgrinder-core/helpers/appliance-helper'
@@ -28,23 +29,32 @@ module BoxGrinder
   class Appliance
 
     def initialize(appliance_definition_file, options = {})
-      @config                     = Config.new
-      @appliance_definition_file  = appliance_definition_file
-      @log                        = options[:log] || Logger.new(STDOUT)
-      @options                    = options[:options]
+      @config = Config.new
+      @appliance_definition_file = appliance_definition_file
+      @log = options[:log] || Logger.new(STDOUT)
+      @options = options[:options]
 
-      @config.name            = @options.name
+      @config.name = @options.name
       @config.version.version = @options.version
       @config.version.release = nil
     end
 
-    def read_and_validate_definition
+    def read_definition
       appliance_configs, appliance_config = ApplianceHelper.new(:log => @log).read_definitions(@appliance_definition_file)
-      appliance_config_helper             = ApplianceConfigHelper.new(appliance_configs)
+      appliance_config_helper = ApplianceConfigHelper.new(appliance_configs)
 
       @appliance_config = appliance_config_helper.merge(appliance_config.clone.init_arch).initialize_paths
+    end
 
+    def validate_definition
       ApplianceConfigValidator.new(@appliance_config).validate
+
+      raise "No operating system plugins installed. Install one or more operating system plugin. See http://community.jboss.org/docs/DOC-15081 and http://community.jboss.org/docs/DOC-15214 for more info" if PluginManager.instance.plugins[:os].empty?
+
+      os_plugin = PluginManager.instance.plugins[:os][@appliance_config.os.name.to_sym]
+
+      raise ApplianceValidationError, "Not supported operating system selected: #{@appliance_config.os.name}. Make sure you have installed right operating system plugin, see http://community.jboss.org/docs/DOC-15214. Supported OSes are: #{PluginManager.instance.plugins[:os].keys.join(", ")}" if os_plugin.nil?
+      raise ApplianceValidationError, "Not supported operating system version selected: #{@appliance_config.os.version}. Supported versions are: #{os_plugin[:versions].join(", ")}" unless @appliance_config.os.version.nil? or os_plugin[:versions].include?(@appliance_config.os.version)
     end
 
     def remove_old_builds
@@ -56,8 +66,8 @@ module BoxGrinder
     def execute_plugin_chain
       @log.info "Building '#{@appliance_config.name}' appliance for #{@appliance_config.hardware.arch} architecture."
 
-      base_plugin_output       = execute_os_plugin
-      platform_plugin_output   = execute_platform_plugin(base_plugin_output)
+      base_plugin_output = execute_os_plugin
+      platform_plugin_output = execute_platform_plugin(base_plugin_output)
 
       execute_delivery_plugin(platform_plugin_output)
     end
@@ -65,7 +75,8 @@ module BoxGrinder
     def create
       begin
         PluginHelper.new(:options => @options, :log => @log).load_plugins
-        read_and_validate_definition
+        read_definition
+        validate_definition
         remove_old_builds if @options.force
         execute_plugin_chain
       rescue

data/lib/boxgrinder-build/helpers/appliance-customize-helper.rb

@@ -16,9 +16,9 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'boxgrinder-core/validators/errors'
+require 'rubygems'
 require 'boxgrinder-build/helpers/guestfs-helper'
-require 'tempfile'
+require 'boxgrinder-core/helpers/exec-helper'
 require 'logger'
 
 module BoxGrinder

data/rubygem-boxgrinder-build.spec

@@ -5,8 +5,8 @@
 
 Summary: A tool for creating appliances from simple plain text files
 Name: rubygem-%{gemname}
-Version: 0.6.4
-Release: 3%{?dist}
+Version: 0.6.5
+Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
 URL: http://www.jboss.org/boxgrinder
@@ -85,6 +85,9 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Thu Dec 02 2010  <mgoldman@redhat.com> - 0.6.5-1
+- Updated to new upstream release: 0.6.5
+
 * Mon Nov 22 2010  <mgoldman@redhat.com> - 0.6.4-3
 - Changelog rewritten
 - Added Require: parted and e2fsprogs

data/spec/appliance-spec.rb

@@ -18,15 +18,14 @@
 
 require 'rubygems'
 require 'boxgrinder-build/appliance'
-#require 'rspec/rspec-config-helper'
 require 'ostruct'
 require 'logger'
 
 module BoxGrinder
   describe Appliance do
     def prepare_appliance(options = OpenStruct.new)
-      options.name      = 'boxgrinder'
-      options.version   = '1.0'
+      options.name = 'boxgrinder'
+      options.version = '1.0'
 
       @options = options
       @log = Logger.new('/dev/null')
@@ -50,16 +49,16 @@ module BoxGrinder
 
       @appliance_config.stub!(:hardware).and_return(
           OpenCascade.new({
-                           :partitions =>
-                               {
-                                   '/' => {'size' => 2},
-                                   '/home' => {'size' => 3},
-                               },
-                           :arch => 'i686',
-                           :base_arch => 'i386',
-                           :cpus => 1,
-                           :memory => 256,
-                       })
+                              :partitions =>
+                                  {
+                                      '/' => {'size' => 2},
+                                      '/home' => {'size' => 3},
+                                  },
+                              :arch => 'i686',
+                              :base_arch => 'i386',
+                              :cpus => 1,
+                              :memory => 256,
+                          })
       )
 
       @appliance_config
@@ -77,7 +76,8 @@ module BoxGrinder
 
       PluginHelper.should_receive(:new).with(:options => @options, :log => @log).and_return(plugin_helper)
 
-      @appliance.should_receive(:read_and_validate_definition)
+      @appliance.should_receive(:read_definition)
+      @appliance.should_receive(:validate_definition)
       @appliance.should_not_receive(:remove_old_builds)
       @appliance.should_receive(:execute_plugin_chain)
 
@@ -92,14 +92,15 @@ module BoxGrinder
 
       PluginHelper.should_receive(:new).with(:options => @options, :log => @log).and_return(plugin_helper)
 
-      @appliance.should_receive(:read_and_validate_definition)
+      @appliance.should_receive(:read_definition)
+      @appliance.should_receive(:validate_definition)
       @appliance.should_receive(:remove_old_builds)
       @appliance.should_receive(:execute_plugin_chain)
 
       @appliance.create
     end
 
-    it "should read and validate definition" do
+    it "should read definition" do
       prepare_appliance
 
       appliance_config = ApplianceConfig.new
@@ -119,12 +120,98 @@ module BoxGrinder
 
       ApplianceConfigHelper.should_receive(:new).with({}).and_return(appliance_config_helper)
 
-      appliance_config_validator = mock(ApplianceConfigValidator)
-      appliance_config_validator.should_receive(:validate)
+      @appliance.read_definition
+    end
+
+    describe ".validate_definition" do
+      it "should validate definition and pass" do
+        prepare_appliance
+        @appliance.instance_variable_set(:@appliance_config, prepare_appliance_config)
+
+        appliance_config_validator = mock(ApplianceConfigValidator)
+        appliance_config_validator.should_receive(:validate)
+
+        ApplianceConfigValidator.should_receive(:new).with(@appliance_config).and_return(appliance_config_validator)
+
+        puts @appliance_config
+
+        plugin_manager = mock(PluginManager)
+        plugin_manager.stub!(:plugins).and_return({:os => {:fedora => {:type => :os, :name => :fedora, :full_name => "Fedora", :versions => ["11", "12", "13", "14", "rawhide"]}}})
+
+        PluginManager.stub!(:instance).and_return(plugin_manager)
+
+        @appliance.validate_definition
+      end
+
+      it "should validate definition and fail because no operating system plugins are installed" do
+        prepare_appliance
+        @appliance.instance_variable_set(:@appliance_config, prepare_appliance_config)
+
+        appliance_config_validator = mock(ApplianceConfigValidator)
+        appliance_config_validator.should_receive(:validate)
+
+        ApplianceConfigValidator.should_receive(:new).with(@appliance_config).and_return(appliance_config_validator)
+
+        plugin_manager = mock(PluginManager)
+        plugin_manager.stub!(:plugins).and_return({:os => {}})
+
+        PluginManager.stub!(:instance).and_return(plugin_manager)
+
+        begin
+          @appliance.validate_definition
+          raise "Shouldn't raise"
+        rescue => e
+          e.message.should == "No operating system plugins installed. Install one or more operating system plugin. See http://community.jboss.org/docs/DOC-15081 and http://community.jboss.org/docs/DOC-15214 for more info"
+        end
+      end
+
+      it "should validate definition and fail because no supported operating system plugins is installed" do
+        prepare_appliance
+        @appliance.instance_variable_set(:@appliance_config, prepare_appliance_config)
+
+        appliance_config_validator = mock(ApplianceConfigValidator)
+        appliance_config_validator.should_receive(:validate)
+
+        ApplianceConfigValidator.should_receive(:new).with(@appliance_config).and_return(appliance_config_validator)
+
+        puts @appliance_config
+
+        plugin_manager = mock(PluginManager)
+        plugin_manager.stub!(:plugins).and_return({:os => {:rhel => {}}})
+
+        PluginManager.stub!(:instance).and_return(plugin_manager)
+
+        begin
+          @appliance.validate_definition
+          raise "Shouldn't raise"
+        rescue => e
+          e.message.should == "Not supported operating system selected: fedora. Make sure you have installed right operating system plugin, see http://community.jboss.org/docs/DOC-15214. Supported OSes are: rhel"
+        end
+      end
+
+      it "should validate definition and fail because no supported operating system version plugins is installed" do
+        prepare_appliance
+        @appliance.instance_variable_set(:@appliance_config, prepare_appliance_config)
+
+        appliance_config_validator = mock(ApplianceConfigValidator)
+        appliance_config_validator.should_receive(:validate)
+
+        ApplianceConfigValidator.should_receive(:new).with(@appliance_config).and_return(appliance_config_validator)
+
+        puts @appliance_config
+
+        plugin_manager = mock(PluginManager)
+        plugin_manager.stub!(:plugins).and_return({:os => {:fedora => {:type => :os, :name => :fedora, :full_name => "Fedora", :versions => ["xyz"]}}})
 
-      ApplianceConfigValidator.should_receive(:new).with(appliance_config).and_return(appliance_config_validator)
+        PluginManager.stub!(:instance).and_return(plugin_manager)
 
-      @appliance.read_and_validate_definition
+        begin
+          @appliance.validate_definition
+          raise "Shouldn't raise"
+        rescue => e
+          e.message.should == "Not supported operating system version selected: 11. Supported versions are: xyz"
+        end
+      end
     end
 
     it "should remove old builds" do
@@ -147,7 +234,7 @@ module BoxGrinder
       os_plugin.should_receive(:deliverables).and_return({:disk => 'abc'})
 
       @plugin_manager.should_receive(:plugins).and_return({:os => "something"})
-      @plugin_manager.should_receive(:initialize_plugin).once.with(:os, :fedora).and_return([os_plugin, {:class => Appliance, :type => :os, :name => :fedora, :full_name  => "Fedora", :versions   => ["11", "12", "13", "rawhide"]}])
+      @plugin_manager.should_receive(:initialize_plugin).once.with(:os, :fedora).and_return([os_plugin, {:class => Appliance, :type => :os, :name => :fedora, :full_name => "Fedora", :versions => ["11", "12", "13", "rawhide"]}])
 
       @appliance.execute_plugin_chain
     end
@@ -164,7 +251,7 @@ module BoxGrinder
       os_plugin.should_receive(:deliverables).and_return({:disk => 'abc'})
 
       @plugin_manager.should_receive(:plugins).and_return({:os => "something"})
-      @plugin_manager.should_receive(:initialize_plugin).once.with(:os, :fedora).and_return([os_plugin, {:class => Appliance, :type => :os, :name => :fedora, :full_name  => "Fedora", :versions   => ["11", "12", "13", "rawhide"]}])
+      @plugin_manager.should_receive(:initialize_plugin).once.with(:os, :fedora).and_return([os_plugin, {:class => Appliance, :type => :os, :name => :fedora, :full_name => "Fedora", :versions => ["11", "12", "13", "rawhide"]}])
 
       @appliance.execute_plugin_chain
     end
@@ -182,7 +269,7 @@ module BoxGrinder
       platform_plugin.should_receive(:deliverables).and_return({:disk => 'abc'})
 
       @plugin_manager.should_receive(:plugins).and_return({:platform => "something"})
-      @plugin_manager.should_receive(:initialize_plugin).once.with(:platform, :vmware).and_return([platform_plugin, {:class => Appliance, :type => :platform, :name => :vmware, :full_name  => "VMware"}])
+      @plugin_manager.should_receive(:initialize_plugin).once.with(:platform, :vmware).and_return([platform_plugin, {:class => Appliance, :type => :platform, :name => :vmware, :full_name => "VMware"}])
 
       @appliance.execute_plugin_chain
     end
@@ -200,7 +287,7 @@ module BoxGrinder
       platform_plugin.should_receive(:deliverables).and_return({:disk => 'abc'})
 
       @plugin_manager.should_receive(:plugins).and_return({:platform => "something"})
-      @plugin_manager.should_receive(:initialize_plugin).once.with(:platform, :vmware).and_return([platform_plugin, {:class => Appliance, :type => :platform, :name => :vmware, :full_name  => "VMware"}])
+      @plugin_manager.should_receive(:initialize_plugin).once.with(:platform, :vmware).and_return([platform_plugin, {:class => Appliance, :type => :platform, :name => :vmware, :full_name => "VMware"}])
 
       @appliance.execute_plugin_chain
     end
@@ -217,7 +304,7 @@ module BoxGrinder
       delivery_plugin.should_receive(:run).with(:ami)
 
       @plugin_manager.should_receive(:plugins).and_return({:delivery => "something"})
-      @plugin_manager.should_receive(:initialize_plugin).with(:delivery, :ami).and_return([delivery_plugin, {:class => Appliance, :type => :delivery, :name => :s3, :full_name  => "Amazon Simple Storage Service (Amazon S3)", :types => [:s3, :cloudfront, :ami]}])
+      @plugin_manager.should_receive(:initialize_plugin).with(:delivery, :ami).and_return([delivery_plugin, {:class => Appliance, :type => :delivery, :name => :s3, :full_name => "Amazon Simple Storage Service (Amazon S3)", :types => [:s3, :cloudfront, :ami]}])
 
       @appliance.execute_plugin_chain
     end
@@ -234,7 +321,7 @@ module BoxGrinder
       delivery_plugin.should_receive(:run).with(:same)
 
       @plugin_manager.should_receive(:plugins).and_return({:delivery => "something"})
-      @plugin_manager.should_receive(:initialize_plugin).with(:delivery, :same).and_return([delivery_plugin, {:class => Appliance, :type => :delivery, :name => :same, :full_name  => "A plugin"}])
+      @plugin_manager.should_receive(:initialize_plugin).with(:delivery, :same).and_return([delivery_plugin, {:class => Appliance, :type => :delivery, :name => :same, :full_name => "A plugin"}])
 
       @appliance.execute_plugin_chain
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-build
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 +01:00
+date: 2010-12-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 19
         segments: 
         - 0
         - 1
-        - 3
-        version: 0.1.3
+        - 4
+        version: 0.1.4
   type: :runtime
   version_requirements: *id002
 description: A tool for creating appliances from simple plain text files for various virtual environments.