boxgrinder-core 0.0.4 → 0.0.6

data/lib/boxgrinder-core/defaults.rb

@@ -21,23 +21,9 @@
 module BoxGrinder
   # here are global variables
   SUPPORTED_ARCHES = [ "i386", "x86_64" ]
-  SUPPORTED_OSES = {
-          "fedora" => [ "12", "11", "rawhide" ]
-  }
-
-  LATEST_STABLE_RELEASES = {
-          "fedora" => "12",
-          "rhel" => "5"
-  }
-
-  DEVELOPMENT_RELEASES = {
-          "fedora" => "rawhide"
-  }
 
   APPLIANCE_DEFAULTS = {
           :os => {
-                  :name => "fedora",
-                  :version => LATEST_STABLE_RELEASES['fedora'],
                   :password => "boxgrinder"
           },
           :hardware => {
@@ -50,33 +36,6 @@ module BoxGrinder
 
   SUPPORTED_DESKTOP_TYPES = [ "gnome" ]
 
-  # you can use #ARCH# variable to specify build arch
-  REPOS = {
-          "fedora" => {
-                  "12" => {
-                          "base" => {
-                                  "mirrorlist" => "http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-12&arch=#ARCH#"
-                          },
-                          "updates" => {
-                                  "mirrorlist" => "http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f12&arch=#ARCH#"
-                          }
-                  },
-                  "11" => {
-                          "base" => {
-                                  "mirrorlist" => "http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=#ARCH#"
-                          },
-                          "updates" => {
-                                  "mirrorlist" => "http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=#ARCH#"
-                          }
-                  },
-                  "rawhide" => {
-                          "base" => {
-                                  "mirrorlist" => "http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=#ARCH#"
-                          }
-                  }
-          }
-  }
-
   DEFAULT_LOCATION = {
           :log => 'log/boxgrinder.log'
   }

data/lib/boxgrinder-core/helpers/appliance-config-helper.rb

@@ -23,21 +23,15 @@ require 'boxgrinder-core/validators/errors'
 module BoxGrinder
   class ApplianceConfigHelper
 
-    def initialize( appliance_definitions )
-      @appliance_definitions = appliance_definitions
+    def initialize(appliance_configs)
+      @appliance_configs  = appliance_configs.values.reverse
     end
 
-    def merge( appliance_config )
+    def merge(appliance_config)
       @appliance_config = appliance_config
 
-      # add current appliance definition
-      @appliance_definitions[@appliance_config.name] = @appliance_config.definition unless @appliance_definitions.has_key?( @appliance_config.name )
-
-      @current_appliances = get_appliances( @appliance_config.name ).reverse
-
       prepare_os
       prepare_appliances
-      prepare_version_and_release
 
       merge_hardware
       merge_repos
@@ -56,33 +50,19 @@ module BoxGrinder
     end
 
     def merge_cpus
-      unless @appliance_config.definition['hardware'].nil? or @appliance_config.definition['hardware']['cpus'].nil?
-        @appliance_config.hardware.cpus = @appliance_config.definition['hardware']['cpus']
-      end
-
-      merge_field('cpus', 'hardware'){ |cpus| @appliance_config.hardware.cpus = cpus if cpus > @appliance_config.hardware.cpus }
-
-      @appliance_config.hardware.cpus = APPLIANCE_DEFAULTS[:hardware][:cpus] if @appliance_config.hardware.cpus == 0
+      merge_field('hardware.cpus') { |cpus| @appliance_config.hardware.cpus = cpus if cpus > @appliance_config.hardware.cpus }
     end
 
     # This will merge partitions from multiple appliances.
     def merge_partitions
       partitions = {}
 
-      unless @appliance_config.definition['hardware'].nil? or @appliance_config.definition['hardware']['partitions'].nil?
-        for partition in @appliance_config.definition['hardware']['partitions']
-          partitions[partition['root']] = partition
-        end
-      end
-
-      partitions['/'] = { 'root' => '/', 'size' => APPLIANCE_DEFAULTS[:hardware][:partition] } unless partitions.keys.include?('/')
-
-      merge_field('partitions', 'hardware') do |parts|
-        for partition in parts
-          if partitions.keys.include?(partition['root'])
-            partitions[partition['root']]['size'] = partition['size'] if partitions[partition['root']]['size'] < partition['size']
+      merge_field('hardware.partitions') do |parts|
+        parts.each do |root, partition|
+          if partitions.keys.include?(root)
+            partitions[root]['size'] = partition['size'] if partitions[root]['size'] < partition['size']
           else
-            partitions[partition['root']] = partition
+            partitions[root] = partition
           end
         end
       end
@@ -91,118 +71,87 @@ module BoxGrinder
     end
 
     def merge_memory
-      @appliance_config.hardware.memory = @appliance_config.definition['hardware']['memory'] unless @appliance_config.definition['hardware'].nil? or @appliance_config.definition['hardware']['memory'].nil?
-
-      merge_field('memory', 'hardware') { |memory| @appliance_config.hardware.memory = memory if memory > @appliance_config.hardware.memory }
-
-      @appliance_config.hardware.memory = APPLIANCE_DEFAULTS[:hardware][:memory] if @appliance_config.hardware.memory == 0
+      merge_field('hardware.memory') { |memory| @appliance_config.hardware.memory = memory if memory > @appliance_config.hardware.memory }
     end
 
     def prepare_os
-      merge_field( 'name', 'os' ) { |name| @appliance_config.os.name = name.to_s }
-      merge_field( 'version', 'os' ) { |version| @appliance_config.os.version = version.to_s }
-      merge_field( 'password', 'os' ) { |password| @appliance_config.os.password = password.to_s }
-    end
+      merge_field('os.name') { |name| @appliance_config.os.name = name.to_s }
+      merge_field('os.version') { |version| @appliance_config.os.version = version.to_s }
+      merge_field('os.password') { |password| @appliance_config.os.password = password.to_s }
 
-    def prepare_appliances
-      for appliance in @current_appliances
-        @appliance_config.appliances << appliance
-      end
+      @appliance_config.os.password = APPLIANCE_DEFAULTS[:os][:password] if @appliance_config.os.password.nil?
     end
 
-    def prepare_version_and_release
-      unless @appliance_config.definition['version'].nil?
-        @appliance_config.version = @appliance_config.definition['version']
-      end
+    def prepare_appliances
+      @appliance_config.appliances.clear
 
-      unless @appliance_config.definition['release'].nil?
-        @appliance_config.release = @appliance_config.definition['release']
+      @appliance_configs.each do |appliance_config|
+        @appliance_config.appliances << appliance_config.name unless appliance_config.name == @appliance_config.name
       end
     end
 
     def merge_repos
-      for appliance_name in @current_appliances
-        definition = @appliance_definitions[appliance_name]
+      @appliance_config.repos.clear
 
-        for repo in definition['repos']
-          repo['name'] = substitute_repo_parameters( repo['name'] )
-          ['baseurl', 'mirrorlist'].each  do |type|
-            repo[type] = substitute_repo_parameters( repo[type] ) unless repo[type].nil?
+      @appliance_configs.each do |appliance_config|
+        for repo in appliance_config.repos
+          repo['name'] = substitute_repo_parameters(repo['name'])
+          ['baseurl', 'mirrorlist'].each do |type|
+            repo[type] = substitute_repo_parameters(repo[type]) unless repo[type].nil?
           end
 
           @appliance_config.repos << repo
-        end unless definition['repos'].nil?
+        end
       end
     end
 
-    def substitute_repo_parameters( str )
+    def substitute_repo_parameters(str)
       return if str.nil?
-      str.gsub( /#OS_NAME#/, @appliance_config.os.name ).gsub( /#OS_VERSION#/, @appliance_config.os.version ).gsub( /#ARCH#/, @appliance_config.hardware.arch )
+      str.gsub(/#OS_NAME#/, @appliance_config.os.name).gsub(/#OS_VERSION#/, @appliance_config.os.version).gsub(/#ARCH#/, @appliance_config.hardware.arch)
     end
 
     def merge_packages
-      for appliance_name in @current_appliances
-        definition = @appliance_definitions[appliance_name]
+      @appliance_config.packages.includes.clear
+      @appliance_config.packages.excludes.clear
 
-        unless definition['packages'].nil?
-          for package in definition['packages']['includes']
-            @appliance_config.packages << package
-          end unless definition['packages']['includes'].nil?
+      @appliance_configs.each do |appliance_config|
+        appliance_config.packages.includes.each do |package|
+          @appliance_config.packages.includes << package
+        end
 
-          for package in definition['packages']['excludes']
-            @appliance_config.packages << "-#{package}"
-          end unless definition['packages']['excludes'].nil?
+        appliance_config.packages.excludes.each do |package|
+          @appliance_config.packages.excludes << package
         end
       end
     end
 
+    # TODO this needs to be plugin independent!
     def merge_post_operations
-      for appliance_name in @current_appliances
-        definition = @appliance_definitions[appliance_name]
+      @appliance_config.post.base.clear
+      @appliance_config.post.ec2.clear
+      @appliance_config.post.vmware.clear
 
-        unless definition['post'].nil?
-          for cmd in definition['post']['base']
-            @appliance_config.post.base << cmd
-          end unless definition['post']['base'].nil?
-
-          for cmd in definition['post']['ec2']
-            @appliance_config.post.ec2 << cmd
-          end unless definition['post']['ec2'].nil?
+      @appliance_configs.each do |appliance_config|
+        appliance_config.post.base do |cmd|
+          @appliance_config.post.base << cmd
+        end
 
-          for cmd in definition['post']['vmware']
-            @appliance_config.post.vmware << cmd
-          end unless definition['post']['vmware'].nil?
+        appliance_config.post.ec2 do |cmd|
+          @appliance_config.post.ec2 << cmd
         end
 
+        appliance_config.post.vmware do |cmd|
+          @appliance_config.post.vmware << cmd
+        end
       end
     end
 
-    def merge_field( field, section )
-      for appliance_name in @current_appliances
-        appliance_definition = @appliance_definitions[appliance_name]
-        next if appliance_definition[section].nil? or appliance_definition[section][field].nil?
-        val = appliance_definition[section][field]
-        yield val
-      end unless @appliance_config.definition['appliances'].nil?
-    end
-
-    def get_appliances( appliance_name )
-      appliances = []
-
-      if @appliance_definitions.has_key?( appliance_name )
-        definition = @appliance_definitions[appliance_name]
-        # add current appliance name
-        appliances << definition['name']
-
-        definition['appliances'].each do |appl|
-          appliances += get_appliances( appl ) unless appliances.include?( appl )
-        end unless definition['appliances'].nil? or definition['appliances'].empty?
-      else
-        raise ApplianceValidationError, "Not valid appliance name: Specified appliance name '#{appliance_name}' could not be found in appliance list. Please correct your definition file."
+    def merge_field(field, force = false)
+      @appliance_configs.each do |appliance_config|
+        value = eval("appliance_config.#{field}")
+        next if value.nil? and !force
+        yield value
       end
-
-      appliances
     end
-
   end
 end

data/lib/boxgrinder-core/helpers/appliance-helper.rb

@@ -0,0 +1,115 @@
+# JBoss, Home of Professional Open Source
+# Copyright 2009, Red Hat Middleware LLC, and individual contributors
+# by the @authors tag. See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+#
+# 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 2.1 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 'yaml'
+
+module BoxGrinder
+  class ApplianceHelper
+    def initialize(options = {})
+      @log = options[:log] || Logger.new(STDOUT)
+    end
+
+    def read_definitions(definition_file, content_type = nil)
+      @log.debug "Reading definition from '#{definition_file}' file..."
+
+      definition_file_extension = File.extname(definition_file)
+      configs = {}
+
+      appliance_config =
+              case definition_file_extension
+                when '.appl', '.yml'
+                  read_yaml(definition_file)
+                when '.xml'
+                  read_xml(definition_file)
+                else
+                  unless content_type.nil?
+                    case content_type
+                      when 'application/x-yaml', 'text/yaml'
+                        read_yaml(definition_file)
+                      when 'application/xml', 'text/xml', 'application/x-xml'
+                        read_xml(definition_file)
+                    end
+                  else
+                    raise 'Unsupported file format for appliance definition file'
+                  end
+              end
+
+      configs[appliance_config.name] = appliance_config
+
+      appliance_config.appliances.each do |appliance_name|
+        configs.merge!(read_definitions("#{File.dirname(definition_file)}/#{appliance_name}#{definition_file_extension}").first)
+      end unless appliance_config.appliances.nil? or !appliance_config.appliances.is_a?(Array)
+
+      [ configs, appliance_config ]
+    end
+
+    def read_yaml(file)
+      begin
+        definition = YAML.load_file(file)
+        raise if definition.nil?
+      rescue
+        raise "File '#{file}' could not be read."
+      end
+
+      return definition if definition.is_a?(ApplianceConfig)
+
+      appliance_config = ApplianceConfig.new
+
+      appliance_config.name         = definition['name'] unless definition['name'].nil?
+      appliance_config.summary      = definition['summary'] unless definition['summary'].nil?
+      appliance_config.appliances   = definition['appliances'] unless definition['appliances'].nil?
+      appliance_config.repos        = definition['repos'] unless definition['repos'].nil?
+
+      appliance_config.version      = definition['version'].to_s unless definition['version'].nil?
+      appliance_config.release      = definition['release'].to_s unless definition['release'].nil?
+
+      unless definition['packages'].nil?
+        appliance_config.packages.includes     = definition['packages']['includes'] unless definition['packages']['includes'].nil?
+        appliance_config.packages.excludes     = definition['packages']['excludes'] unless definition['packages']['excludes'].nil?
+      end
+
+      unless definition['os'].nil?
+        appliance_config.os.name      = definition['os']['name'].to_s unless definition['os']['name'].nil?
+        appliance_config.os.version   = definition['os']['version'].to_s unless definition['os']['version'].nil?
+        appliance_config.os.password  = definition['os']['password'].to_s unless definition['os']['password'].nil?
+      end
+
+      unless definition['hardware'].nil?
+        appliance_config.hardware.arch        = definition['hardware']['cpus'] unless definition['hardware']['arch'].nil?
+        appliance_config.hardware.cpus        = definition['hardware']['cpus'] unless definition['hardware']['cpus'].nil?
+        appliance_config.hardware.memory      = definition['hardware']['memory'] unless definition['hardware']['memory'].nil?
+        appliance_config.hardware.network     = definition['hardware']['network'] unless definition['hardware']['network'].nil?
+        appliance_config.hardware.partitions  = definition['hardware']['partitions'] unless definition['hardware']['partitions'].nil?
+      end
+
+      unless definition['post'].nil?
+        appliance_config.post.base      = definition['post']['base'] unless definition['post']['base'].nil?
+        appliance_config.post.ec2       = definition['post']['ec2'] unless definition['post']['ec2'].nil?
+        appliance_config.post.vmware    = definition['post']['vmware'] unless definition['post']['vmware'].nil?
+      end
+
+      appliance_config
+    end
+
+    def read_xml(file)
+      raise "Reading XML files is not supported right now. File '#{file}' could not be read"
+    end
+  end
+end

data/lib/boxgrinder-core/helpers/log-helper.rb

@@ -21,10 +21,31 @@
 require 'logger'
 require 'boxgrinder-core/defaults'
 
+Logger.const_set(:TRACE, 0)
+Logger.const_set(:DEBUG, 1)
+Logger.const_set(:INFO, 2)
+Logger.const_set(:WARN, 3)
+Logger.const_set(:ERROR, 4)
+Logger.const_set(:FATAL, 5)
+Logger.const_set(:UNKNOWN, 6)
+
+Logger::SEV_LABEL.insert(0, 'TRACE')
+
+class Logger
+  def trace?
+    @level <= TRACE
+  end
+
+  def trace(progname = nil, &block)
+    add(TRACE, nil, progname, &block)
+  end
+end
+
 module BoxGrinder
   class LogHelper
 
     THRESHOLDS = {
+            :trace  => Logger::TRACE,
             :fatal  => Logger::FATAL,
             :debug  => Logger::DEBUG,
             :error  => Logger::ERROR,
@@ -32,30 +53,38 @@ module BoxGrinder
             :info   => Logger::INFO
     }
 
-    def initialize( log_location = ENV['BG_LOG_LOCATION'] )
-      threshold     = ENV['BG_LOG_THRESHOLD']
-      log_location  ||= DEFAULT_LOCATION[:log]
+    def initialize(options = {})
+      location      = options[:location] || DEFAULT_LOCATION[:log]
+      threshold     = options[:threshold] || :info
+      type          = options[:type] || [:stdout, :file]
 
-      unless File.directory?(File.dirname(log_location))
-        FileUtils.mkdir_p(File.dirname(log_location))
+      unless type.is_a?(Array)
+        type = [type.to_s.to_sym]
       end
 
       threshold = THRESHOLDS[threshold.to_sym] unless threshold.nil?
+      formatter = Logger::Formatter.new
 
-      @stdout_log         = Logger.new(STDOUT)
-      @stdout_log.level   = threshold || Logger::INFO
+      if type.include?(:file)
+        unless File.directory?(File.dirname(location))
+          FileUtils.mkdir_p(File.dirname(location))
+        end
 
-      @file_log           = Logger.new( log_location, 10, 1024000 )
-      @file_log.level     = Logger::DEBUG
-    end
+        @file_log             = Logger.new(location, 10, 1024000)
+        @file_log.level       = Logger::TRACE
+        @file_log.formatter   = formatter
+      end
 
-    def method_missing( method_name, *args )
-      if THRESHOLDS.keys.include?( method_name )
-        @stdout_log.send( method_name, *args )
-        @file_log.send( method_name, *args )
-      else
-        raise NoMethodError
+      if type.include?(:stdout)
+        @stdout_log           = Logger.new(STDOUT)
+        @stdout_log.level     = threshold || Logger::INFO
+        @stdout_log.formatter = formatter
       end
     end
+
+    def method_missing(method_name, *args)
+      @stdout_log.send(method_name, *args) unless @stdout_log.nil?
+      @file_log.send(method_name, *args) unless @file_log.nil?
+    end
   end
 end

data/lib/boxgrinder-core/helpers/queue-helper.rb

@@ -0,0 +1,54 @@
+# JBoss, Home of Professional Open Source
+# Copyright 2009, Red Hat Middleware LLC, and individual contributors
+# by the @authors tag. See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+#
+# 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 2.1 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 'logger'
+
+module BoxGrinder
+  class QueueHelper
+    def initialize(options = {})
+      @log = options[:log]  || Logger.new(STDOUT)
+    end
+
+    def client(opts = {})
+      begin
+        require 'rubygems'
+        require 'torquebox-messaging-client'
+      rescue
+        @log.error "Couldn't load TorqueBox messaging client."
+        return nil
+      end
+
+      host = opts[:host] || 'localhost'
+      port = opts[:port] || 1099
+
+      naming_provider_url = "jnp://#{host}:#{port}/"
+
+      @log.trace "Creating messaging client..."
+
+      ret_val = TorqueBox::Messaging::Client.connect(:naming_provider_url => naming_provider_url ) do |client|
+        yield client
+      end
+
+      @log.trace "Messaging client closed."
+
+      ret_val
+    end
+  end
+end

data/lib/boxgrinder-core/models/appliance-config.rb

@@ -24,22 +24,22 @@ require 'rbconfig'
 
 module BoxGrinder
   class ApplianceConfig
-    def initialize( definition )
-      @definition = definition
+    def initialize #( definition )
+      #@definition = definition
 
-      @name     = @definition['name']
-      @summary  = @definition['summary']
+      @name     = nil #@definition['name']
+      @summary  = nil #@definition['summary']
 
       @os = OpenStruct.new
 
-      @os.name      = APPLIANCE_DEFAULTS[:os][:name]
-      @os.version   = APPLIANCE_DEFAULTS[:os][:version]
-      @os.password  = APPLIANCE_DEFAULTS[:os][:password]
+      @os.name      = nil #APPLIANCE_DEFAULTS[:os][:name]
+      @os.version   = nil #APPLIANCE_DEFAULTS[:os][:version]
+      @os.password  = nil #APPLIANCE_DEFAULTS[:os][:password]
 
       @hardware = OpenStruct.new
 
-      @hardware.cpus      = 0
-      @hardware.memory    = 0
+      @hardware.cpus      = APPLIANCE_DEFAULTS[:hardware][:cpus]
+      @hardware.memory    = APPLIANCE_DEFAULTS[:hardware][:memory]
       @hardware.network   = APPLIANCE_DEFAULTS[:hardware][:network]
 
       @post = OpenStruct.new
@@ -48,24 +48,33 @@ module BoxGrinder
       @post.ec2     = []
       @post.vmware  = []
 
+      @packages = OpenStruct.new
+      @packages.includes = []
+      @packages.excludes = []
+
       @appliances   = []
       @repos        = []
-      @packages     = []
+
       @version      = 1
       @release      = 0
     end
 
-    attr_reader :definition
-    attr_reader :name
-    attr_reader :summary
-    attr_reader :appliances
+    #attr_reader :definition
+    #attr_reader :name
+    #attr_reader :summary
+    #attr_reader :appliances
     attr_reader :os
     attr_reader :hardware
-    attr_reader :repos
-    attr_reader :packages
+    #attr_reader :repos
+    #attr_reader :packages
     attr_reader :path
     attr_reader :file
 
+    attr_accessor :packages
+    attr_accessor :repos
+    attr_accessor :appliances
+    attr_accessor :summary
+    attr_accessor :name
     attr_accessor :version
     attr_accessor :release
     attr_accessor :post
@@ -98,6 +107,8 @@ module BoxGrinder
 
       @path.dir.packages = "build/#{appliance_path}/packages"
 
+      @path.dir.build = "build/#{appliance_path}"
+
       @path.dir.raw.build = "build/#{appliance_path}/raw"
       @path.dir.raw.build_full = "build/#{appliance_path}/raw/#{@name}"
 
@@ -115,15 +126,15 @@ module BoxGrinder
       @path.file.raw.xml = "#{@path.dir.raw.build_full}/#{@name}.xml"
 
       @path.file.ec2.disk = "#{@path.dir.ec2.build}/#{@name}.ec2"
-      @path.file.ec2.manifest = "#{@path.dir.ec2.bundle}/#{@name}.ec2.manifest.xml"
+      @path.file.ec2.manifest = "#{@path.dir.ec2.bundle}/#{@name}-sda.raw.manifest.xml"
 
-      @path.file.vmware.disk = "#{@path.dir.vmware.build}/#{@name}-sda.raw"
+      @path.file.vmware.disk = "#{@path.dir.vmware.build}/#{@name}.raw"
       @path.file.vmware.personal.vmx = "#{@path.dir.vmware.personal}/#{@name}.vmx"
       @path.file.vmware.personal.vmdk = "#{@path.dir.vmware.personal}/#{@name}.vmdk"
-      @path.file.vmware.personal.disk = "#{@path.dir.vmware.personal}/#{@name}-sda.raw"
+      @path.file.vmware.personal.disk = "#{@path.dir.vmware.personal}/#{@name}.raw"
       @path.file.vmware.enterprise.vmx = "#{@path.dir.vmware.enterprise}/#{@name}.vmx"
       @path.file.vmware.enterprise.vmdk = "#{@path.dir.vmware.enterprise}/#{@name}.vmdk"
-      @path.file.vmware.enterprise.disk = "#{@path.dir.vmware.enterprise}/#{@name}-sda.raw"
+      @path.file.vmware.enterprise.disk = "#{@path.dir.vmware.enterprise}/#{@name}.raw"
 
       @path.file.package = {
               :raw => {
@@ -140,9 +151,10 @@ module BoxGrinder
 
     # used to checking if configuration differs from previous in appliance-kickstart
     def hash
-      "#{@name}-#{@summary}-#{@version}-#{@release}-#{@os.name}-#{@os.version}-#{@os.password}-#{@hardware.cpus}-#{@hardware.memory}-#{@hardware.partitions}-#{@appliances.join("-")}".hash
+      "#{@name}-#{@summary}-#{@version}-#{@release}-#{@os.name}-#{@os.version}-#{@os.password}-#{@hardware.cpus}-#{@hardware.memory}-#{@hardware.partitions}-#{@appliances}".hash
     end
 
+    # TODO remove this, leave only :name
     def simple_name
       @name
     end
@@ -167,8 +179,13 @@ module BoxGrinder
       @hardware.arch.eql?("x86_64")
     end
 
-    def is_os_version_stable?
-      DEVELOPMENT_RELEASES[@os.name].eql?(@os.version)
+    def clone
+      Marshal::load(Marshal.dump(self))
+    end
+
+    def os_family
+      return :linux if [ 'fedora' ].include?( @os.name )
+      return :unknown
     end
   end
 end

data/lib/boxgrinder-core/models/config.rb

@@ -24,14 +24,27 @@ require 'rbconfig'
 
 module BoxGrinder
   class Config
-    def initialize( name, version, release, dir, config_file )
-      @name         = name
-      @dir          = dir
-      @config_file  = config_file
+    def initialize
+
+      @name = DEFAULT_PROJECT_CONFIG[:name]
+
+      @dir = OpenStruct.new
+      @dir.root        = `pwd`.strip
+      @dir.base        = "#{File.dirname( __FILE__ )}/../../"
+      @dir.build       =  DEFAULT_PROJECT_CONFIG[:dir_build]
+      @dir.top         = "#{@dir.build}/topdir"
+      @dir.src_cache   =  DEFAULT_PROJECT_CONFIG[:dir_src_cache]
+      @dir.rpms_cache  =  DEFAULT_PROJECT_CONFIG[:dir_rpms_cache]
+      @dir.specs       =  DEFAULT_PROJECT_CONFIG[:dir_specs]
+      @dir.appliances  =  DEFAULT_PROJECT_CONFIG[:dir_appliances]
+      @dir.src         =  DEFAULT_PROJECT_CONFIG[:dir_src]
+      @dir.kickstarts  =  DEFAULT_PROJECT_CONFIG[:dir_kickstarts]
+
+      @config_file  = ENV['BG_CONFIG_FILE'] || "#{ENV['HOME']}/.boxgrinder/config"
 
       @version = OpenStruct.new
-      @version.version = version
-      @version.release = release
+      @version.version = DEFAULT_PROJECT_CONFIG[:version]
+      @version.release = DEFAULT_PROJECT_CONFIG[:release]
 
       @files = OpenStruct.new
       @data = {}

data/lib/boxgrinder-core/validators/appliance-config-validator.rb

@@ -0,0 +1,75 @@
+# JBoss, Home of Professional Open Source
+# Copyright 2009, Red Hat Middleware LLC, and individual contributors
+# by the @authors tag. See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+#
+# 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 2.1 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-core/validators/errors'
+require 'boxgrinder-core/defaults'
+
+module BoxGrinder
+  class ApplianceConfigValidator
+    def initialize( appliance_config, options = {} )
+      @appliance_config = appliance_config
+      @options          = options
+    end
+
+    def validate
+      check_for_missing_field( 'name' )
+      check_for_missing_field( 'summary' )
+
+      validate_os
+      validate_hardware
+      validate_repos
+    end
+
+    protected
+
+    def check_for_missing_field( name )
+      raise ApplianceValidationError, "Missing field: appliance definition file should have field '#{name}'" if eval("@appliance_config.#{name}").nil?
+    end
+
+    def validate_os
+      raise ApplianceValidationError, "No operating system selected" if @appliance_config.os.name.nil?
+
+      unless @options[:os_plugins].nil?
+        os_plugin = @options[:os_plugins][@appliance_config.os.name.to_sym]
+
+        raise ApplianceValidationError, "Not supported operating system selected: #{@appliance_config.os.name}. Supported OSes are: #{OperatingSystemPluginManager.instance.plugins.keys.join(", ")}" if os_plugin.nil?
+        raise ApplianceValidationError, "Not supported operating system version selected: #{@appliance_config.os.version}. Supported versions are: #{os_plugin.info[:versions].join(", ")}" unless @appliance_config.os.version.nil? or os_plugin.info[:versions].include?( @appliance_config.os.version )
+      end
+    end
+
+    def validate_hardware
+      raise ApplianceValidationError, "Not valid CPU amount: Too many or too less CPU's: '#{@appliance_config.hardware.cpus}'. Please choose from 1-4. Please correct your appliance definition file, thanks." unless @appliance_config.hardware.cpus >= 1 and @appliance_config.hardware.cpus <= 4
+      raise ApplianceValidationError, "Not valid memory amount: '#{@appliance_config.hardware.memory}' is wrong value. Please correct your appliance definition file" if @appliance_config.hardware.memory =~ /\d/
+      raise ApplianceValidationError, "Not valid memory amount: '#{@appliance_config.hardware.memory}' is not allowed here. Memory should be multiplicity of 64. Please correct your appliance definition file" if (@appliance_config.hardware.memory.to_i % 64 > 0)
+
+      raise ApplianceValidationError, "No partitions found. Please correct your appliance definition file" if @appliance_config.hardware.partitions.size == 0
+    end
+
+    def validate_repos
+      return if @appliance_config.repos.size == 0
+
+      @appliance_config.repos.each do |repo|
+        raise ApplianceValidationError, "Not valid repo format: '#{repo}' is wrong value. Please correct your appliance definition file, thanks." unless repo.class.eql?(Hash)
+        raise ApplianceValidationError, "Not valid repo format: Please specify name for repository. Please correct your appliance definition file, thanks." unless repo.keys.include?('name')
+        raise ApplianceValidationError, "Not valid repo format: There is no 'mirrorlist' or 'baseurl' specified for '#{repo['name']}' repository. Please correct your appliance definition file, thanks." unless repo.keys.include?('mirrorlist') or repo.keys.include?('baseurl')
+      end
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - BoxGrinder Project
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 +01:00
+date: 2010-05-10 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -33,8 +33,10 @@ files:
 - lib/boxgrinder-core/models/task.rb
 - lib/boxgrinder-core/defaults.rb
 - lib/boxgrinder-core/validators/errors.rb
-- lib/boxgrinder-core/validators/appliance-definition-validator.rb
+- lib/boxgrinder-core/validators/appliance-config-validator.rb
 - lib/boxgrinder-core/helpers/exec-helper.rb
+- lib/boxgrinder-core/helpers/queue-helper.rb
+- lib/boxgrinder-core/helpers/appliance-helper.rb
 - lib/boxgrinder-core/helpers/log-helper.rb
 - lib/boxgrinder-core/helpers/appliance-config-helper.rb
 - README

data/lib/boxgrinder-core/validators/appliance-definition-validator.rb

@@ -1,90 +0,0 @@
-# JBoss, Home of Professional Open Source
-# Copyright 2009, Red Hat Middleware LLC, and individual contributors
-# by the @authors tag. See the copyright.txt in the distribution for a
-# full listing of individual contributors.
-#
-# 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 2.1 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-core/validators/errors'
-require 'boxgrinder-core/defaults'
-
-module BoxGrinder
-  class ApplianceDefinitionValidator
-    def initialize( appliance_definition )
-      @appliance_definition = appliance_definition
-    end
-
-    def validate
-      check_for_missing_field( 'name' )
-
-      validate_os
-      validate_hardware
-      validate_repos
-    end
-
-    protected
-
-    def check_for_missing_field( name )
-      raise ApplianceValidationError, "Missing field: appliance definition file should have field '#{name}'" if @appliance_definition[name].nil?
-    end
-
-    def validate_os
-      return if @appliance_definition['os'].nil?
-
-      raise ApplianceValidationError, "Unsupported OS: operating system '#{@appliance_definition['os']['name']}' is not supported. Supported OS types: #{SUPPORTED_OSES.keys.join(", ")}. Please correct your appliance definition file, thanks." if !@appliance_definition['os']['name'].nil? and !SUPPORTED_OSES.keys.include?( @appliance_definition['os']['name'] )
-
-      #unless @appliance_definition['os']['version'].nil?
-        #@appliance_definition['os']['version'] = @appliance_definition['os']['version'].to_s
-        #raise ApplianceValidationError, "Not valid OS version: operating system version '#{@appliance_definition['os']['version']}' is not supported for OS type '#{@appliance_definition['os']['name']}'. Supported OS versions for this OS type are: #{SUPPORTED_OSES[@appliance_definition['os']['name']].join(", ")}. Please correct your definition file '#{@appliance_definition_file}', thanks" if !SUPPORTED_OSES[@appliance_definition['os']['name'].nil? ? APPLIANCE_DEFAULTS[:os][:name] : @appliance_definition['os']['name']].include?( @appliance_definition['os']['version'] )
-      #end
-    end
-
-    def validate_hardware
-      return if @appliance_definition['hardware'].nil?
-
-      unless @appliance_definition['hardware']['cpus'].nil?
-        raise ApplianceValidationError, "Not valid CPU amount: '#{@appliance_definition['hardware']['cpus']}' is not allowed here. Please correct your appliance definition file, thanks." if @appliance_definition['hardware']['cpus'] =~ /\d/
-        raise ApplianceValidationError, "Not valid CPU amount: Too many or too less CPU's: '#{@appliance_definition['hardware']['cpus']}'. Please choose from 1-4. Please correct your appliance definition file, thanks." unless @appliance_definition['hardware']['cpus'] >= 1 and @appliance_definition['hardware']['cpus'] <= 4
-      end
-
-      unless @appliance_definition['hardware']['memory'].nil?
-        raise ApplianceValidationError, "Not valid memory amount: '#{@appliance_definition['hardware']['memory']}' is wrong value. Please correct your appliance definition file, thanks." if @appliance_definition['hardware']['memory'] =~ /\d/
-        raise ApplianceValidationError, "Not valid memory amount: '#{@appliance_definition['hardware']['memory']}' is not allowed here. Memory should be a multiplicity of 64. Please correct your appliance definition file, thanks." if (@appliance_definition['hardware']['memory'].to_i % 64 > 0)
-      end
-
-      unless @appliance_definition['hardware']['partitions'].nil?
-        raise ApplianceValidationError, "Not valid partitions format: Please correct your appliance definition file, thanks." unless @appliance_definition['hardware']['partitions'].class.eql?(Array)
-
-        for partition in @appliance_definition['hardware']['partitions']
-          raise ApplianceValidationError, "Not valid partition format: '#{partition}' is wrong value. Please correct your appliance definition file, thanks." unless partition.class.eql?(Hash)
-          raise ApplianceValidationError, "Not valid partition format: Keys 'root' and 'size' should be specified for every partition. Please correct your appliance definition file, thanks." if !partition.keys.include?("root") or !partition.keys.include?("size")
-          raise ApplianceValidationError, "Not valid partition size: '#{partition['size']}' is not a valid value. Please correct your appliance definition file, thanks." if partition['size'] =~ /\d/ or partition['size'].to_i < 1
-        end
-      end
-    end
-
-    def validate_repos
-      return if @appliance_definition['repos'].nil?
-      raise ApplianceValidationError, "Not valid repos format: Please correct your appliance definition file, thanks." unless @appliance_definition['repos'].class.eql?(Array)
-
-      for repo in @appliance_definition['repos']
-        raise ApplianceValidationError, "Not valid repo format: '#{repo}' is wrong value. Please correct your appliance definition file, thanks." unless repo.class.eql?(Hash)
-        raise ApplianceValidationError, "Not valid repo format: Please specify name for repository. Please correct your appliance definition file, thanks." unless repo.keys.include?('name')
-        raise ApplianceValidationError, "Not valid repo format: There is no 'mirrorlist' or 'baseurl' specified for '#{repo['name']}' repository. Please correct your appliance definition file, thanks." unless repo.keys.include?('mirrorlist') or repo.keys.include?('baseurl')
-      end
-    end
-  end
-end