boxgrinder-core 0.1.0 → 0.1.1

data/CHANGELOG

@@ -1,4 +1,8 @@
 
+v0.1.1
+
+* [BGBUILD-65] Allow to specify own repos overriding default repos provided for selected OS
+
 v0.1.0
 
 * [BGBUILD-58] Add ability to substitute custom variables in appliance definition file

data/README

@@ -1 +1,9 @@
-This gem contains core classes used across BoxGrinder projects.
+This gem contains core classes used across BoxGrinder projects.
+
+Project home page
+
+    http://www.jboss.org/boxgrinder
+
+Project documentation
+
+    http://community.jboss.org/docs/DOC-14358

data/Rakefile

@@ -1,10 +1,28 @@
+#
+# 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 'echoe'
 
 Echoe.new("boxgrinder-core") do |p|
-  p.project     = "BoxGrinder Core"
+  p.project     = "BoxGrinder"
   p.author      = "Marek Goldmann"
-  p.summary     = "Core files for BoxGrinder."
-  p.url         = "http://www.jboss.org/stormgrind/projects/boxgrinder.html"
+  p.summary     = "Core library for BoxGrinder"
+  p.url         = "http://www.jboss.org/boxgrinder"
   p.email       = "info@boxgrinder.org"
   p.runtime_dependencies = ['open4 >=1.0.0']
 end

data/boxgrinder-core.gemspec

@@ -2,21 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-core}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2010-10-12}
-  s.description = %q{Core files for BoxGrinder.}
+  s.date = %q{2010-11-02}
+  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", "lib/openhash/openhash.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "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", "lib/openhash/openhash.rb", "spec/Rakefile", "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", "boxgrinder-core.gemspec"]
-  s.homepage = %q{http://www.jboss.org/stormgrind/projects/boxgrinder.html}
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "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", "lib/openhash/openhash.rb", "rubygem-boxgrinder-core.spec", "spec/Rakefile", "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", "boxgrinder-core.gemspec"]
+  s.homepage = %q{http://www.jboss.org/boxgrinder}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-core", "--main", "README"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{BoxGrinder Core}
+  s.rubyforge_project = %q{BoxGrinder}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Core files for BoxGrinder.}
+  s.summary = %q{Core library for BoxGrinder}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/boxgrinder-core/defaults.rb

@@ -1,11 +1,9 @@
-# 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.
+#
+# 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 2.1 of
+# 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,

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

@@ -1,11 +1,9 @@
-# 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.
+#
+# 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 2.1 of
+# 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,
@@ -24,7 +22,7 @@ require 'set'
 module BoxGrinder
   class ApplianceConfigHelper
 
-    def initialize( appliance_configs )
+    def initialize(appliance_configs)
       @appliance_configs  = appliance_configs.reverse
     end
 
@@ -37,12 +35,24 @@ module BoxGrinder
       merge_variables
       merge_hardware
       merge_repos
+      merge_default_repos
       merge_packages
       merge_post_operations
 
       @appliance_config
     end
 
+    def merge_default_repos
+      @appliance_config.default_repos = true
+
+      @appliance_configs.each do |appliance_config|
+        if appliance_config.default_repos == false
+          @appliance_config.default_repos = false
+          break
+        end
+      end
+    end
+
     def merge_variables
       @appliance_config.variables = {} if @appliance_config.variables.nil?
       @appliance_configs.each do |appliance_config|
@@ -66,8 +76,8 @@ module BoxGrinder
         var = resolve_stack.last
         refs = @appliance_config.variables.keys.delete_if { |k|
           @appliance_config.variables[k].nil? ||
-          @appliance_config.variables[k].index("##{k}#").nil? ||
-          resolve_stack.index(k).nil?
+                  @appliance_config.variables[k].index("##{k}#").nil? ||
+                  resolve_stack.index(k).nil?
         }
         refs.each do |ref|
           resolve(Arrays.new(resolve_stack).push(ref), resolved_set) unless resolved_set.include?(ref)
@@ -171,7 +181,7 @@ module BoxGrinder
     end
 
     def merge_post_operations
-      @appliance_config.post.each_value {|cmds| cmds.clear}
+      @appliance_config.post.each_value { |cmds| cmds.clear }
 
       @appliance_configs.each do |appliance_config|
         appliance_config.post.each do |platform, cmds|

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

@@ -1,11 +1,9 @@
-# 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.
+#
+# 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 2.1 of
+# 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,

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

@@ -1,11 +1,9 @@
-# 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.
+#
+# 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 2.1 of
+# 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,

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

@@ -1,11 +1,9 @@
-# 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.
+#
+# 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 2.1 of
+# 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,
@@ -95,4 +93,4 @@ module BoxGrinder
   attr_accessor :file_log
   attr_accessor :stdout_log
 
-end
+end

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

@@ -1,11 +1,9 @@
-# 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.
+#
+# 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 2.1 of
+# 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,
@@ -51,4 +49,4 @@ module BoxGrinder
       ret_val
     end
   end
-end
+end

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

@@ -1,11 +1,9 @@
-# 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.
+#
+# 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 2.1 of
+# 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,
@@ -68,6 +66,7 @@ module BoxGrinder
     attr_accessor :name
     attr_accessor :version
     attr_accessor :release
+    attr_accessor :default_repos
 
     def init
       init_arch

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

@@ -1,11 +1,9 @@
-# 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.
+#
+# 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 2.1 of
+# 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,

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

@@ -1,11 +1,9 @@
-# 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.
+#
+# 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 2.1 of
+# 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,
@@ -32,4 +30,4 @@ module BoxGrinder
     attr_reader :created_at
     attr_reader :data
   end
-end
+end

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

@@ -1,11 +1,9 @@
-# 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.
+#
+# 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 2.1 of
+# 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,
@@ -71,4 +69,4 @@ module BoxGrinder
       end
     end
   end
-end
+end

data/lib/boxgrinder-core/validators/errors.rb

@@ -1,11 +1,9 @@
-# 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.
+#
+# 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 2.1 of
+# 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,
@@ -32,4 +30,4 @@ class StandardError
   def info
     "#{self.class}: #{message}#$/#{backtrace.join($/)}"
   end
-end
+end

data/lib/boxgrinder-core.rb

@@ -1 +1,19 @@
-require 'boxgrinder-core/defaults'
+#
+# 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/defaults'

data/rubygem-boxgrinder-core.spec

@@ -0,0 +1,59 @@
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global gemname boxgrinder-core
+%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global rubyabi 1.8
+
+Summary: Core library for BoxGrinder
+Name: rubygem-%{gemname}
+Version: 0.1.1
+Release: 1%{?dist}
+Group: Development/Languages
+License: LGPL
+URL: http://www.jboss.org/boxgrinder
+Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
+
+Requires: ruby(abi) = %{rubyabi}
+Requires: rubygems >= 1.2
+Requires: ruby >= 0
+Requires: rubygem(open4) >= 1.0.0
+BuildRequires: rubygems >= 1.2
+BuildRequires: ruby >= 0
+
+BuildArch: noarch
+Provides: rubygem(%{gemname}) = %{version}
+
+%description
+Core library containing files required by BoxGrinder family of projects
+
+%prep
+
+%build
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{gemdir}
+gem install --local --install-dir %{buildroot}%{gemdir} \
+            --force --rdoc %{SOURCE0}
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-, root, root, -)
+%dir %{geminstdir}
+%{geminstdir}/lib
+%doc %{gemdir}/doc/%{gemname}-%{version}
+%doc %{geminstdir}/%{gemname}.gemspec
+%doc %{geminstdir}/rubygem-%{gemname}.spec
+%doc %{geminstdir}/CHANGELOG
+%doc %{geminstdir}/LICENSE
+%doc %{geminstdir}/README
+%doc %{geminstdir}/Manifest
+%doc %{geminstdir}/Rakefile
+%doc %{geminstdir}/spec
+%{gemdir}/cache/%{gemname}-%{version}.gem
+%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+
+%changelog
+* Mon Oct 18 2010  <mgoldman@redhat.com> - 0.1.1-1
+- Initial package

data/spec/Rakefile

@@ -1,3 +1,21 @@
+#
+# 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 'rake'
 require 'spec/rake/spectask'
 

data/spec/helpers/appliance-config-helper-spec.rb

@@ -1,3 +1,21 @@
+#
+# 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/appliance-config-helper'
 require 'rspec/rspec-config-helper'
 
@@ -10,21 +28,21 @@ module BoxGrinder
       @base_arch = @arch.eql?("x86_64") ? "x86_64" : "i386"
     end
 
-    def prepare_helper( configs )
-      @helper = ApplianceConfigHelper.new( configs )
+    def prepare_helper(configs)
+      @helper = ApplianceConfigHelper.new(configs)
     end
 
     it "should merge post sections in right order" do
       config_a = ApplianceConfig.new
       config_a.name = 'a'
-      config_a.post['base'] = [ "1_1", "1_2" ]
+      config_a.post['base'] = ["1_1", "1_2"]
       config_a.appliances << 'b'
 
       config_b = ApplianceConfig.new
       config_b.name = 'b'
-      config_b.post['base'] = [ "2_1", "2_2" ]
+      config_b.post['base'] = ["2_1", "2_2"]
 
-      prepare_helper( [ config_a, config_b ] )
+      prepare_helper([config_a, config_b])
       @helper.instance_variable_set(:@appliance_config, config_a.clone)
 
       @helper.merge_post_operations
@@ -37,19 +55,19 @@ module BoxGrinder
     it "should merge post sections in right order with more complicated inheritance" do
       config_a = ApplianceConfig.new
       config_a.name = 'a'
-      config_a.post['base'] = [ "1_1", "1_2" ]
+      config_a.post['base'] = ["1_1", "1_2"]
       config_a.appliances << 'b1'
       config_a.appliances << 'b2'
 
       config_b1 = ApplianceConfig.new
       config_b1.name = 'b1'
-      config_b1.post['base'] = [ "2_1", "2_2" ]
+      config_b1.post['base'] = ["2_1", "2_2"]
 
       config_b2 = ApplianceConfig.new
       config_b2.name = 'b2'
-      config_b2.post['base'] = [ "3_1", "3_2" ]
+      config_b2.post['base'] = ["3_1", "3_2"]
 
-      prepare_helper( [ config_a, config_b1, config_b2 ] )
+      prepare_helper([config_a, config_b1, config_b2])
       @helper.instance_variable_set(:@appliance_config, config_a.clone)
 
       @helper.merge_post_operations
@@ -62,35 +80,35 @@ module BoxGrinder
     it "should merge post sections in right order with even more and more complicated inheritance" do
       config_a = ApplianceConfig.new
       config_a.name = 'a'
-      config_a.post['base'] = [ "1_1", "1_2" ]
+      config_a.post['base'] = ["1_1", "1_2"]
       config_a.appliances << 'b1'
       config_a.appliances << 'b2'
 
       config_b1 = ApplianceConfig.new
       config_b1.name = 'b1'
       config_b1.appliances << 'c1'
-      config_b1.post['base'] = [ "2_1", "2_2" ]
+      config_b1.post['base'] = ["2_1", "2_2"]
 
       config_b2 = ApplianceConfig.new
       config_b2.name = 'b2'
       config_b2.appliances << 'c2'
-      config_b2.post['base'] = [ "3_1", "3_2" ]
+      config_b2.post['base'] = ["3_1", "3_2"]
 
       config_c1 = ApplianceConfig.new
       config_c1.name = 'c1'
-      config_c1.post['base'] = [ "4_1", "4_2" ]
+      config_c1.post['base'] = ["4_1", "4_2"]
 
       config_c2 = ApplianceConfig.new
       config_c2.name = 'c2'
-      config_c2.post['base'] = [ "5_1", "5_2" ]
-
-      prepare_helper( [
-              config_a,
-              config_b1,
-              config_c1,
-              config_b2,
-              config_c2
-      ] )
+      config_c2.post['base'] = ["5_1", "5_2"]
+
+      prepare_helper([
+                             config_a,
+                             config_b1,
+                             config_c1,
+                             config_b2,
+                             config_c2
+                     ])
       @helper.instance_variable_set(:@appliance_config, config_a.clone)
 
       @helper.merge_post_operations
@@ -103,14 +121,14 @@ module BoxGrinder
     it "should merge post sections when dependent appliance has post section for platform for which we haven't specified post operations" do
       config_a = ApplianceConfig.new
       config_a.name = 'a'
-      config_a.post['base'] = [ "1_1", "1_2" ]
+      config_a.post['base'] = ["1_1", "1_2"]
       config_a.appliances << 'b'
 
       config_b = ApplianceConfig.new
       config_b.name = 'b'
-      config_b.post['ec2'] = [ "2_1", "2_2" ]
+      config_b.post['ec2'] = ["2_1", "2_2"]
 
-      prepare_helper( [ config_a, config_b ] )
+      prepare_helper([config_a, config_b])
       @helper.instance_variable_set(:@appliance_config, config_a.clone)
 
       @helper.merge_post_operations
@@ -126,80 +144,80 @@ module BoxGrinder
       config_a = ApplianceConfig.new
       config_a.name = 'a'
       config_a.appliances << 'b'
-      config_a.hardware.partitions = { "/" => { 'size' => '2' } }
+      config_a.hardware.partitions = {"/" => {'size' => '2'}}
 
       config_b = ApplianceConfig.new
       config_b.name = 'b'
-      config_b.hardware.partitions = { "/" => { 'size' => '4' }, "/home" => { 'size' => '2' } }
+      config_b.hardware.partitions = {"/" => {'size' => '4'}, "/home" => {'size' => '2'}}
 
-      prepare_helper( [ config_a, config_b ] )
+      prepare_helper([config_a, config_b])
       @helper.instance_variable_set(:@appliance_config, config_a.clone)
 
       @helper.merge_partitions
 
       config = @helper.instance_variable_get(:@appliance_config)
       config.hardware.partitions.size.should == 2
-      config.hardware.partitions.should == { "/" => { 'size' => '4' }, "/home" => { 'size' => '2' } }
+      config.hardware.partitions.should == {"/" => {'size' => '4'}, "/home" => {'size' => '2'}}
     end
 
     it "should merge partitions with different filesystem types" do
       config_a = ApplianceConfig.new
       config_a.name = 'a'
       config_a.appliances << 'b'
-      config_a.hardware.partitions = { "/" => { 'size' => '2', 'type' => 'ext4' } }
+      config_a.hardware.partitions = {"/" => {'size' => '2', 'type' => 'ext4'}}
 
       config_b = ApplianceConfig.new
       config_b.name = 'b'
-      config_b.hardware.partitions = { "/" => { 'size' => '4', 'type' => 'ext3' }, "/home" => { 'size' => '2' } }
+      config_b.hardware.partitions = {"/" => {'size' => '4', 'type' => 'ext3'}, "/home" => {'size' => '2'}}
 
-      prepare_helper( [ config_a, config_b ] )
+      prepare_helper([config_a, config_b])
       @helper.instance_variable_set(:@appliance_config, config_a.clone)
 
       @helper.merge_partitions
 
       config = @helper.instance_variable_get(:@appliance_config)
       config.hardware.partitions.size.should == 2
-      config.hardware.partitions.should == { "/" => { 'size' => '4', 'type' => 'ext4' }, "/home" => { 'size' => '2' } }
+      config.hardware.partitions.should == {"/" => {'size' => '4', 'type' => 'ext4'}, "/home" => {'size' => '2'}}
     end
 
     it "should merge partitions with different options" do
       config_a = ApplianceConfig.new
       config_a.name = 'a'
       config_a.appliances << 'b'
-      config_a.hardware.partitions = { "/" => { 'size' => '2', 'type' => 'ext4', 'options' => 'barrier=0,nodelalloc,nobh,noatime' } }
+      config_a.hardware.partitions = {"/" => {'size' => '2', 'type' => 'ext4', 'options' => 'barrier=0,nodelalloc,nobh,noatime'}}
 
       config_b = ApplianceConfig.new
       config_b.name = 'b'
-      config_b.hardware.partitions = { "/" => { 'size' => '4', 'type' => 'ext3', 'options' => 'shouldnt appear' }, "/home" => { 'size' => '2' } }
+      config_b.hardware.partitions = {"/" => {'size' => '4', 'type' => 'ext3', 'options' => 'shouldnt appear'}, "/home" => {'size' => '2'}}
 
-      prepare_helper( [ config_a, config_b ] )
+      prepare_helper([config_a, config_b])
       @helper.instance_variable_set(:@appliance_config, config_a.clone)
 
       @helper.merge_partitions
 
       config = @helper.instance_variable_get(:@appliance_config)
       config.hardware.partitions.size.should == 2
-      config.hardware.partitions.should == { "/" => { 'size' => '4', 'type' => 'ext4', 'options' => 'barrier=0,nodelalloc,nobh,noatime' }, "/home" => { 'size' => '2' } }
+      config.hardware.partitions.should == {"/" => {'size' => '4', 'type' => 'ext4', 'options' => 'barrier=0,nodelalloc,nobh,noatime'}, "/home" => {'size' => '2'}}
     end
 
     it "should merge partitions with different options, another case where type is changing - options should be vanished" do
       config_a = ApplianceConfig.new
       config_a.name = 'a'
       config_a.appliances << 'b'
-      config_a.hardware.partitions = { "/" => { 'size' => '2', 'type' => 'ext4' } }
+      config_a.hardware.partitions = {"/" => {'size' => '2', 'type' => 'ext4'}}
 
       config_b = ApplianceConfig.new
       config_b.name = 'b'
-      config_b.hardware.partitions = { "/" => { 'size' => '4', 'type' => 'ext3', 'options' => 'shouldnt appear' }, "/home" => { 'size' => '2' } }
+      config_b.hardware.partitions = {"/" => {'size' => '4', 'type' => 'ext3', 'options' => 'shouldnt appear'}, "/home" => {'size' => '2'}}
 
-      prepare_helper( [ config_a, config_b ] )
+      prepare_helper([config_a, config_b])
       @helper.instance_variable_set(:@appliance_config, config_a.clone)
 
       @helper.merge_partitions
 
       config = @helper.instance_variable_get(:@appliance_config)
       config.hardware.partitions.size.should == 2
-      config.hardware.partitions.should == { "/" => { 'size' => '4', 'type' => 'ext4' }, "/home" => { 'size' => '2' } }
+      config.hardware.partitions.should == {"/" => {'size' => '4', 'type' => 'ext4'}, "/home" => {'size' => '2'}}
     end
 
     it "should substitute variables in repos" do
@@ -207,10 +225,10 @@ module BoxGrinder
       config_a.name = 'a'
       config_a.os.name = 'fedora'
       config_a.os.version = '12'
-      config_a.repos << { 'name' => '#ARCH#', 'baseurl' => '#BASE_ARCH#', 'mirrorlist' => '#OS_NAME#-#OS_VERSION#' }
+      config_a.repos << {'name' => '#ARCH#', 'baseurl' => '#BASE_ARCH#', 'mirrorlist' => '#OS_NAME#-#OS_VERSION#'}
       config_a.init_arch
 
-      prepare_helper( [ config_a ] )
+      prepare_helper([config_a])
       @helper.instance_variable_set(:@appliance_config, config_a.clone)
 
       @helper.merge_variables
@@ -218,7 +236,7 @@ module BoxGrinder
 
       config = @helper.instance_variable_get(:@appliance_config)
       config.repos.size.should == 1
-      config.repos.first.should == { 'name' => "#{@arch}", 'baseurl' => "#{@base_arch}", 'mirrorlist' => 'fedora-12' }
+      config.repos.first.should == {'name' => "#{@arch}", 'baseurl' => "#{@base_arch}", 'mirrorlist' => 'fedora-12'}
     end
 
     it "should substitute variables in post section" do
@@ -230,7 +248,7 @@ module BoxGrinder
       config_a.post['ec2'] = ['#ARCH#', '#BASE_ARCH#', '#OS_VERSION#', '#OS_NAME#']
       config_a.init_arch
 
-      prepare_helper( [ config_a ] )
+      prepare_helper([config_a])
       @helper.instance_variable_set(:@appliance_config, config_a.clone)
 
       @helper.merge_variables
@@ -252,7 +270,7 @@ module BoxGrinder
       config_a.post['base'] = ['#ARCH#', '#BASE_ARCH#', '#OS_VERSION#', '#OS_NAME#', '#CUSTOM_A#', '#CUSTOM_B#']
       config_a.init_arch
 
-      prepare_helper( [ config_a ] )
+      prepare_helper([config_a])
       @helper.instance_variable_set(:@appliance_config, config_a.clone)
 
       @helper.merge_variables
@@ -263,5 +281,59 @@ module BoxGrinder
       config.post['base'].should == [@arch, @base_arch, '12', 'fedora', 'AAA', 'BBB']
     end
 
+    describe ".merge_default_repos" do
+      it "should set default_repos option to true when not specified" do
+        config_a = ApplianceConfig.new
+        config_a.name = 'a'
+        config_a.appliances << 'b'
+
+        config_b = ApplianceConfig.new
+        config_b.name = 'b'
+
+        prepare_helper([config_a, config_b])
+        @helper.instance_variable_set(:@appliance_config, config_a.clone)
+
+        @helper.merge_default_repos
+
+        config = @helper.instance_variable_get(:@appliance_config)
+        config.default_repos.should == true
+      end
+
+      it "should merge default_repos option on last appliance" do
+        config_a = ApplianceConfig.new
+        config_a.name = 'a'
+        config_a.appliances << 'b'
+        config_a.default_repos = false
+
+        config_b = ApplianceConfig.new
+        config_b.name = 'b'
+
+        prepare_helper([config_a, config_b])
+        @helper.instance_variable_set(:@appliance_config, config_a.clone)
+
+        @helper.merge_default_repos
+
+        config = @helper.instance_variable_get(:@appliance_config)
+        config.default_repos.should == false
+      end
+
+      it "should merge default_repos option on first appliance" do
+        config_a = ApplianceConfig.new
+        config_a.name = 'a'
+        config_a.appliances << 'b'
+
+        config_b = ApplianceConfig.new
+        config_b.name = 'b'
+        config_b.default_repos = false
+
+        prepare_helper([config_a, config_b])
+        @helper.instance_variable_set(:@appliance_config, config_a.clone)
+
+        @helper.merge_default_repos
+
+        config = @helper.instance_variable_get(:@appliance_config)
+        config.default_repos.should == false
+      end
+    end
   end
 end

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

@@ -1,3 +1,21 @@
+#
+# 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/appliance-helper'
 require 'rspec/rspec-config-helper'
 

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

@@ -1,3 +1,21 @@
+#
+# 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/exec-helper'
 
 module BoxGrinder

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

@@ -1,3 +1,21 @@
+#
+# 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/log-helper'
 
 module BoxGrinder

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

@@ -1,3 +1,21 @@
+#
+# 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

data/spec/rspec/rspec-config-helper.rb

@@ -1,3 +1,21 @@
+#
+# 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/models/config'
 require 'boxgrinder-core/models/appliance-config'
 require 'boxgrinder-core/helpers/appliance-config-helper'
@@ -56,4 +74,4 @@ module RSpecConfigHelper
 
     appliance_config
   end
-end
+end

data/spec/validators/appliance-config-validator-spec.rb

@@ -1,3 +1,21 @@
+#
+# 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/validators/appliance-config-validator'
 
 module BoxGrinder

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-core
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +02:00
+date: 2010-11-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   version_requirements: *id001
-description: Core files for BoxGrinder.
+description: Core library for BoxGrinder
 email: info@boxgrinder.org
 executables: []
 
@@ -76,6 +76,7 @@ files:
 - lib/boxgrinder-core/validators/appliance-config-validator.rb
 - lib/boxgrinder-core/validators/errors.rb
 - lib/openhash/openhash.rb
+- rubygem-boxgrinder-core.spec
 - spec/Rakefile
 - spec/helpers/appliance-config-helper-spec.rb
 - spec/helpers/appliance-helper-spec.rb
@@ -91,7 +92,7 @@ files:
 - spec/validators/appliance-config-validator-spec.rb
 - boxgrinder-core.gemspec
 has_rdoc: true
-homepage: http://www.jboss.org/stormgrind/projects/boxgrinder.html
+homepage: http://www.jboss.org/boxgrinder
 licenses: []
 
 post_install_message: 
@@ -125,10 +126,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "1.2"
 requirements: []
 
-rubyforge_project: BoxGrinder Core
+rubyforge_project: BoxGrinder
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Core files for BoxGrinder.
+summary: Core library for BoxGrinder
 test_files: []