boxgrinder-core 0.1.3 → 0.1.4

data/CHANGELOG

@@ -1,4 +1,8 @@
 
+v0.1.4
+
+* Removed QueueHelper class
+
 v0.1.3
 
 * [BGBUILD-98] Use hashery gem

data/Rakefile

@@ -19,7 +19,6 @@
 require 'rubygems'
 require 'spec/rake/spectask'
 require 'echoe'
-require 'rbconfig'
 
 Echoe.new("boxgrinder-core") do |p|
   p.project     = "BoxGrinder"
@@ -46,24 +45,3 @@ Spec::Rake::SpecTask.new('spec:coverage') do |t|
   t.rcov_opts = ['--exclude', 'spec,teamcity/*,/usr/lib/ruby/,.gem/ruby,/boxgrinder-build/,/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-core"
-  system "sudo yum -y localinstall --nogpgcheck pkg/*.rpm"
-  exit 1 unless $? == 0
-end

data/boxgrinder-core.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-core}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   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.description = %q{Core library for BoxGrinder}
   s.email = %q{info@boxgrinder.org}
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/boxgrinder-core.rb", "lib/boxgrinder-core/defaults.rb", "lib/boxgrinder-core/helpers/appliance-config-helper.rb", "lib/boxgrinder-core/helpers/appliance-helper.rb", "lib/boxgrinder-core/helpers/exec-helper.rb", "lib/boxgrinder-core/helpers/log-helper.rb", "lib/boxgrinder-core/helpers/queue-helper.rb", "lib/boxgrinder-core/models/appliance-config.rb", "lib/boxgrinder-core/models/config.rb", "lib/boxgrinder-core/models/task.rb", "lib/boxgrinder-core/validators/appliance-config-validator.rb", "lib/boxgrinder-core/validators/errors.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "boxgrinder-core.gemspec", "lib/boxgrinder-core.rb", "lib/boxgrinder-core/defaults.rb", "lib/boxgrinder-core/helpers/appliance-config-helper.rb", "lib/boxgrinder-core/helpers/appliance-helper.rb", "lib/boxgrinder-core/helpers/exec-helper.rb", "lib/boxgrinder-core/helpers/log-helper.rb", "lib/boxgrinder-core/helpers/queue-helper.rb", "lib/boxgrinder-core/models/appliance-config.rb", "lib/boxgrinder-core/models/config.rb", "lib/boxgrinder-core/models/task.rb", "lib/boxgrinder-core/validators/appliance-config-validator.rb", "lib/boxgrinder-core/validators/errors.rb", "rubygem-boxgrinder-core.spec", "spec/helpers/appliance-config-helper-spec.rb", "spec/helpers/appliance-helper-spec.rb", "spec/helpers/exec-helper-spec.rb", "spec/helpers/log-helper-spec.rb", "spec/helpers/queue-helper-spec.rb", "spec/rspec/ls/one", "spec/rspec/ls/two", "spec/rspec/rspec-config-helper.rb", "spec/rspec/src/appliances/ephemeral-repo.appl", "spec/rspec/src/appliances/full.appl", "spec/rspec/src/appliances/repo.appl", "spec/validators/appliance-config-validator-spec.rb"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/boxgrinder-core.rb", "lib/boxgrinder-core/defaults.rb", "lib/boxgrinder-core/helpers/appliance-config-helper.rb", "lib/boxgrinder-core/helpers/appliance-helper.rb", "lib/boxgrinder-core/helpers/exec-helper.rb", "lib/boxgrinder-core/helpers/log-helper.rb", "lib/boxgrinder-core/models/appliance-config.rb", "lib/boxgrinder-core/models/config.rb", "lib/boxgrinder-core/models/task.rb", "lib/boxgrinder-core/validators/appliance-config-validator.rb", "lib/boxgrinder-core/validators/errors.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "boxgrinder-core.gemspec", "lib/boxgrinder-core.rb", "lib/boxgrinder-core/defaults.rb", "lib/boxgrinder-core/helpers/appliance-config-helper.rb", "lib/boxgrinder-core/helpers/appliance-helper.rb", "lib/boxgrinder-core/helpers/exec-helper.rb", "lib/boxgrinder-core/helpers/log-helper.rb", "lib/boxgrinder-core/models/appliance-config.rb", "lib/boxgrinder-core/models/config.rb", "lib/boxgrinder-core/models/task.rb", "lib/boxgrinder-core/validators/appliance-config-validator.rb", "lib/boxgrinder-core/validators/errors.rb", "rubygem-boxgrinder-core.spec", "spec/helpers/appliance-config-helper-spec.rb", "spec/helpers/appliance-helper-spec.rb", "spec/helpers/exec-helper-spec.rb", "spec/helpers/log-helper-spec.rb", "spec/rspec/ls/one", "spec/rspec/ls/two", "spec/rspec/rspec-config-helper.rb", "spec/rspec/src/appliances/ephemeral-repo.appl", "spec/rspec/src/appliances/full.appl", "spec/rspec/src/appliances/repo.appl", "spec/validators/appliance-config-validator-spec.rb"]
   s.homepage = %q{http://www.jboss.org/boxgrinder}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-core", "--main", "README"]
   s.require_paths = ["lib"]

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

@@ -32,23 +32,23 @@ module BoxGrinder
       configs = []
 
       appliance_config =
-              case definition_file_extension
-                when '.appl', '.yml', '.yaml'
-                  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
+          case definition_file_extension
+            when '.appl', '.yml', '.yaml'
+              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
               end
+          end
+
+      raise 'Unsupported file format for appliance definition file' if appliance_config.nil?
 
       configs << appliance_config
 
@@ -56,7 +56,7 @@ module BoxGrinder
         configs << 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.flatten, appliance_config ]
+      [configs.flatten, appliance_config]
     end
 
     def read_yaml(file)
@@ -71,16 +71,16 @@ module BoxGrinder
 
       appliance_config = ApplianceConfig.new
 
-      appliance_config.name         = definition['name'] unless definition['name'].nil?
-      appliance_config.summary      = definition['summary'] unless definition['summary'].nil?
+      appliance_config.name = definition['name'] unless definition['name'].nil?
+      appliance_config.summary = definition['summary'] unless definition['summary'].nil?
 
       definition['variables'].each { |key, value| appliance_config.variables[key] = value } unless definition['variables'].nil?
 
-      appliance_config.appliances   = definition['appliances'] unless definition['appliances'].nil?
-      appliance_config.repos        = definition['repos'] unless definition['repos'].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?
+      appliance_config.version = definition['version'].to_s unless definition['version'].nil?
+      appliance_config.release = definition['release'].to_s unless definition['release'].nil?
 
       unless definition['default_repos'].nil?
         appliance_config.default_repos = definition['default_repos']
@@ -88,22 +88,22 @@ module BoxGrinder
       end
 
       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?
+        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?
+        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']['arch'] 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?
+        appliance_config.hardware.arch = definition['hardware']['arch'] 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
 
       definition['post'].each { |key, value| appliance_config.post[key] = value } unless definition['post'].nil?

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

@@ -21,14 +21,14 @@ require 'boxgrinder-core/defaults'
 
 module BoxGrinder
   class ApplianceConfigValidator
-    def initialize( appliance_config, options = {} )
+    def initialize(appliance_config, options = {})
       @appliance_config = appliance_config
-      @options          = options
+      @options = options
     end
 
     def validate
-      check_for_missing_field( 'name' )
-      check_for_missing_field( 'summary' )
+      check_for_missing_field('name')
+      check_for_missing_field('summary')
 
       validate_os
       validate_hardware
@@ -37,20 +37,10 @@ module BoxGrinder
 
     protected
 
-    def check_for_missing_field( name )
+    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 "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, "No operating system selected" if @appliance_config.os.name.nil?
-      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 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/
@@ -59,6 +49,10 @@ module BoxGrinder
       raise ApplianceValidationError, "No partitions found. Please correct your appliance definition file" if @appliance_config.hardware.partitions.size == 0
     end
 
+    def validate_os
+      raise ApplianceValidationError, "No operating system selected" if @appliance_config.os.name.nil?
+    end
+
     def validate_repos
       return if @appliance_config.repos.size == 0
 

data/rubygem-boxgrinder-core.spec

@@ -5,8 +5,8 @@
 
 Summary: Core library for BoxGrinder
 Name: rubygem-%{gemname}
-Version: 0.1.3
-Release: 3%{?dist}
+Version: 0.1.4
+Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
 URL: http://www.jboss.org/boxgrinder
@@ -73,6 +73,9 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Thu Dec 02 2010  <mgoldman@redhat.com> - 0.1.4-1
+- Updated to new upstream release: 0.1.4
+
 * Wed Nov 17 2010  <mgoldman@redhat.com> - 0.1.3-3
 - Added: BuildRequires: rubygem(echoe)
 - Changed the way Gem is installed and tests are exeuted

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-core
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 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 
@@ -66,7 +66,6 @@ extra_rdoc_files:
 - lib/boxgrinder-core/helpers/appliance-helper.rb
 - lib/boxgrinder-core/helpers/exec-helper.rb
 - lib/boxgrinder-core/helpers/log-helper.rb
-- lib/boxgrinder-core/helpers/queue-helper.rb
 - lib/boxgrinder-core/models/appliance-config.rb
 - lib/boxgrinder-core/models/config.rb
 - lib/boxgrinder-core/models/task.rb
@@ -85,7 +84,6 @@ files:
 - lib/boxgrinder-core/helpers/appliance-helper.rb
 - lib/boxgrinder-core/helpers/exec-helper.rb
 - lib/boxgrinder-core/helpers/log-helper.rb
-- lib/boxgrinder-core/helpers/queue-helper.rb
 - lib/boxgrinder-core/models/appliance-config.rb
 - lib/boxgrinder-core/models/config.rb
 - lib/boxgrinder-core/models/task.rb
@@ -96,7 +94,6 @@ files:
 - spec/helpers/appliance-helper-spec.rb
 - spec/helpers/exec-helper-spec.rb
 - spec/helpers/log-helper-spec.rb
-- spec/helpers/queue-helper-spec.rb
 - spec/rspec/ls/one
 - spec/rspec/ls/two
 - spec/rspec/rspec-config-helper.rb

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

@@ -1,52 +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 '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/spec/helpers/queue-helper-spec.rb

@@ -1,24 +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 'boxgrinder-core/helpers/queue-helper'
-
-module BoxGrinder
-  describe QueueHelper do
-  end
-end