boxgrinder-core 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,4 +1,9 @@
 
+v0.1.2
+
+* [BGBUILD-87] Set default filesystem to ext4 for Fedora 13+
+* [BGBUILD-65] Allow to specify own repos overriding default repos provided for selected OS
+
 v0.1.1
 
 * [BGBUILD-65] Allow to specify own repos overriding default repos provided for selected OS

data/Manifest

@@ -0,0 +1,32 @@
+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
+lib/openhash/openhash.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

data/Rakefile

@@ -16,6 +16,8 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
+require 'spec/rake/spectask'
 require 'echoe'
 
 Echoe.new("boxgrinder-core") do |p|
@@ -26,3 +28,50 @@ Echoe.new("boxgrinder-core") do |p|
   p.email       = "info@boxgrinder.org"
   p.runtime_dependencies = ['open4 >=1.0.0']
 end
+
+desc "Run all tests"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.rcov = false
+  t.spec_files = FileList["spec/**/*-spec.rb"]
+  t.spec_opts = ['--colour', '--format', 'specdoc', '-b']
+  t.verbose = true
+end
+
+desc "Run all tests and generate code coverage report"
+Spec::Rake::SpecTask.new('spec:coverage') do |t|
+  t.spec_files = FileList["spec/**/*-spec.rb"]
+  t.spec_opts = ['--colour', '--format', 'html:pkg/rspec_report.html', '-b']
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'spec,teamcity/*,/usr/lib/ruby/,.gem/ruby,/boxgrinder-build/,/gems/']
+  t.verbose = true
+end
+
+topdir = "#{Dir.pwd}/pkg/rpmbuild"
+directory "#{topdir}/SOURCES"
+
+task 'gem:copy' => [:clean, :manifest, :gem, 'rpm:topdir'] do
+  Dir["**/pkg/*.gem"].each { |gem| FileUtils.cp(gem, "#{topdir}/SOURCES", :verbose => true) }
+end
+
+task 'rpm:topdir' do
+  FileUtils.mkdir_p(["#{topdir}/SOURCES", "#{topdir}/RPMS", "#{topdir}/BUILD", "#{topdir}/SPECS", "#{topdir}/SRPMS"], :verbose => true)
+end
+
+desc "Create RPM"
+task 'rpm' => ['gem:copy'] do
+  Dir["**/rubygem-*.spec"].each do |spec|
+    `rpmbuild --define '_topdir #{topdir}' -ba #{spec}`
+    exit 1 unless $? == 0
+  end
+end
+
+desc "Install RPM"
+task 'rpm:install' => ['rpm'] do
+  puts "sudo yum -y remove rubygem-boxgrinder-core"
+  system "sudo yum -y remove rubygem-boxgrinder-core"
+  exit 1 unless $? == 0
+
+  puts "sudo yum -y --nogpgcheck localinstall #{topdir}/RPMS/noarch/*.rpm"
+  system "sudo yum -y --nogpgcheck localinstall #{topdir}/RPMS/noarch/*.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.1"
+  s.version = "0.1.2"
 
   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-02}
+  s.date = %q{2010-11-11}
   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", "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.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", "lib/openhash/openhash.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.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-config-helper.rb

@@ -76,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)
@@ -111,17 +111,42 @@ module BoxGrinder
             unless partition['type'].nil?
               partitions[root].delete('options') if partitions[root]['type'] != partition['type']
               partitions[root]['type'] = partition['type']
+            else
+              partitions[root]['type'] = default_filesystem_type
             end
-            partitions[root]['options'] = partition['options'] unless partition['options'].nil? and partitions[root]['type'] == partition['type']
           else
-            partitions[root] = partition
+            partitions[root] = {}
+            partitions[root]['size'] = partition['size']
+
+            unless partition['type'].nil?
+              partitions[root]['type'] = partition['type']
+            else
+              partitions[root]['type'] = default_filesystem_type
+            end
           end
+
+          partitions[root]['options'] = partition['options'] unless partition['options'].nil?
         end
       end
 
       @appliance_config.hardware.partitions = partitions
     end
 
+    def default_filesystem_type
+      fs = 'ext3'
+
+      case @appliance_config.os.name
+        when 'fedora'
+
+          case @appliance_config.os.version
+            when '13', '14'
+              fs = 'ext4'
+          end
+      end
+
+      fs
+    end
+
     def merge_memory
       merge_field('hardware.memory') { |memory| @appliance_config.hardware.memory = memory if memory > @appliance_config.hardware.memory }
     end

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

@@ -16,6 +16,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'boxgrinder-core/models/appliance-config'
 require 'yaml'
 
 module BoxGrinder
@@ -61,7 +62,7 @@ module BoxGrinder
     def read_yaml(file)
       begin
         definition = YAML.load_file(file)
-        raise if definition.nil?
+        raise if definition.nil? or definition == false
       rescue
         raise "File '#{file}' could not be read."
       end
@@ -78,8 +79,13 @@ module BoxGrinder
       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']
+        raise "#{File.basename(file)}: default_repos should be set to true or false" unless appliance_config.default_repos.is_a?(TrueClass) or appliance_config.default_repos.is_a?(FalseClass)
+      end
 
       unless definition['packages'].nil?
         appliance_config.packages.includes     = definition['packages']['includes'] unless definition['packages']['includes'].nil?

data/rubygem-boxgrinder-core.spec

@@ -5,12 +5,13 @@
 
 Summary: Core library for BoxGrinder
 Name: rubygem-%{gemname}
-Version: 0.1.1
+Version: 0.1.2
 Release: 1%{?dist}
 Group: Development/Languages
-License: LGPL
+License: LGPLv3+
 URL: http://www.jboss.org/boxgrinder
 Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
+Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires: ruby(abi) = %{rubyabi}
 Requires: rubygems >= 1.2
@@ -25,6 +26,14 @@ Provides: rubygem(%{gemname}) = %{version}
 %description
 Core library containing files required by BoxGrinder family of projects
 
+%package doc
+Summary: Documentation for %{name}
+Group: Documentation
+Requires:%{name} = %{version}-%{release}
+
+%description doc
+Documentation for %{name}
+
 %prep
 
 %build
@@ -35,6 +44,12 @@ mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
 
+%check
+pushd %{buildroot}/%{geminstdir}
+rake spec
+rm -rf log
+popd
+
 %clean
 rm -rf %{buildroot}
 
@@ -42,18 +57,29 @@ rm -rf %{buildroot}
 %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
 
+%files doc
+%defattr(-, root, root, -)
+%{geminstdir}/spec
+%{geminstdir}/Rakefile
+%{geminstdir}/rubygem-%{gemname}.spec
+%{geminstdir}/%{gemname}.gemspec
+%{gemdir}/doc/%{gemname}-%{version}
+
 %changelog
+* Tue Nov 09 2010  <mgoldman@redhat.com> - 0.1.2-1
+- [BGBUILD-87] Set default filesystem to ext4 for Fedora 13+
+- [BGBUILD-65] Allow to specify own repos overriding default repos provided for selected OS
+
+* Tue Nov 09 2010  <mgoldman@redhat.com> - 0.1.1-2
+- [BGBUILD-85] Adjust BoxGrinder spec files for review
+- Added 'check' section that executes tests
+
 * Mon Oct 18 2010  <mgoldman@redhat.com> - 0.1.1-1
 - Initial package

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

@@ -17,12 +17,9 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'boxgrinder-core/helpers/appliance-config-helper'
-require 'rspec/rspec-config-helper'
 
 module BoxGrinder
   describe ApplianceConfigHelper do
-    include RSpecConfigHelper
-
     before(:all) do
       @arch = `uname -m`.chomp.strip
       @base_arch = @arch.eql?("x86_64") ? "x86_64" : "i386"
@@ -103,11 +100,11 @@ module BoxGrinder
       config_c2.post['base'] = ["5_1", "5_2"]
 
       prepare_helper([
-                             config_a,
-                             config_b1,
-                             config_c1,
-                             config_b2,
-                             config_c2
+                         config_a,
+                         config_b1,
+                         config_c1,
+                         config_b2,
+                         config_c2
                      ])
       @helper.instance_variable_set(:@appliance_config, config_a.clone)
 
@@ -140,15 +137,43 @@ module BoxGrinder
       config.post['ec2'].should == ['2_1', '2_2']
     end
 
-    it "should merge partitions" do
+    it "should merge partitions for default fs_types without options for Fedora 13 (ext4)" do
       config_a = ApplianceConfig.new
       config_a.name = 'a'
       config_a.appliances << 'b'
       config_a.hardware.partitions = {"/" => {'size' => '2'}}
+      config_a.os.name = 'fedora'
+      config_a.os.version = '13'
 
       config_b = ApplianceConfig.new
       config_b.name = 'b'
       config_b.hardware.partitions = {"/" => {'size' => '4'}, "/home" => {'size' => '2'}}
+      config_b.os.name = 'fedora'
+      config_b.os.version = '13'
+
+      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', 'type' => 'ext4'}}
+    end
+
+    it "should merge partitions for default fs_types without options for Fedora 13 (ext4) and specified options" do
+      config_a = ApplianceConfig.new
+      config_a.name = 'a'
+      config_a.appliances << 'b'
+      config_a.hardware.partitions = {"/" => {'size' => '2'}}
+      config_a.os.name = 'fedora'
+      config_a.os.version = '13'
+
+      config_b = ApplianceConfig.new
+      config_b.name = 'b'
+      config_b.hardware.partitions = {"/" => {'size' => '4', 'options' => 'barrier=0,nodelalloc,nobh,noatime'}, "/home" => {'size' => '2'}}
+      config_b.os.name = 'fedora'
+      config_b.os.version = '13'
 
       prepare_helper([config_a, config_b])
       @helper.instance_variable_set(:@appliance_config, config_a.clone)
@@ -157,7 +182,31 @@ module BoxGrinder
 
       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', 'type' => 'ext4', "options"=>"barrier=0,nodelalloc,nobh,noatime"}, "/home" => {'size' => '2', 'type' => 'ext4'}}
+    end
+
+    it "should merge partitions for default fs_types without options for Fedora 11 (ext3)" do
+      config_a = ApplianceConfig.new
+      config_a.name = 'a'
+      config_a.appliances << 'b'
+      config_a.hardware.partitions = {"/" => {'size' => '2'}}
+      config_a.os.name = 'fedora'
+      config_a.os.version = '11'
+
+      config_b = ApplianceConfig.new
+      config_b.name = 'b'
+      config_b.hardware.partitions = {"/" => {'size' => '4'}, "/home" => {'size' => '2'}}
+      config_b.os.name = 'fedora'
+      config_b.os.version = '11'
+
+      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' => 'ext3'}, "/home" => {'size' => '2', 'type' => 'ext3'}}
     end
 
     it "should merge partitions with different filesystem types" do
@@ -165,10 +214,14 @@ module BoxGrinder
       config_a.name = 'a'
       config_a.appliances << 'b'
       config_a.hardware.partitions = {"/" => {'size' => '2', 'type' => 'ext4'}}
+      config_a.os.name = 'fedora'
+      config_a.os.version = '12'
 
       config_b = ApplianceConfig.new
       config_b.name = 'b'
       config_b.hardware.partitions = {"/" => {'size' => '4', 'type' => 'ext3'}, "/home" => {'size' => '2'}}
+      config_b.os.name = 'fedora'
+      config_b.os.version = '11'
 
       prepare_helper([config_a, config_b])
       @helper.instance_variable_set(:@appliance_config, config_a.clone)
@@ -177,7 +230,7 @@ module BoxGrinder
 
       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', 'type' => 'ext3'}}
     end
 
     it "should merge partitions with different options" do
@@ -185,10 +238,14 @@ module BoxGrinder
       config_a.name = 'a'
       config_a.appliances << 'b'
       config_a.hardware.partitions = {"/" => {'size' => '2', 'type' => 'ext4', 'options' => 'barrier=0,nodelalloc,nobh,noatime'}}
+      config_a.os.name = 'fedora'
+      config_a.os.version = '13'
 
       config_b = ApplianceConfig.new
       config_b.name = 'b'
       config_b.hardware.partitions = {"/" => {'size' => '4', 'type' => 'ext3', 'options' => 'shouldnt appear'}, "/home" => {'size' => '2'}}
+      config_b.os.name = 'fedora'
+      config_b.os.version = '13'
 
       prepare_helper([config_a, config_b])
       @helper.instance_variable_set(:@appliance_config, config_a.clone)
@@ -197,7 +254,7 @@ module BoxGrinder
 
       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', 'type' => 'ext4'}}
     end
 
     it "should merge partitions with different options, another case where type is changing - options should be vanished" do
@@ -205,10 +262,14 @@ module BoxGrinder
       config_a.name = 'a'
       config_a.appliances << 'b'
       config_a.hardware.partitions = {"/" => {'size' => '2', 'type' => 'ext4'}}
+      config_a.os.name = 'fedora'
+      config_a.os.version = '13'
 
       config_b = ApplianceConfig.new
       config_b.name = 'b'
       config_b.hardware.partitions = {"/" => {'size' => '4', 'type' => 'ext3', 'options' => 'shouldnt appear'}, "/home" => {'size' => '2'}}
+      config_b.os.name = 'fedora'
+      config_b.os.version = '13'
 
       prepare_helper([config_a, config_b])
       @helper.instance_variable_set(:@appliance_config, config_a.clone)
@@ -217,7 +278,7 @@ module BoxGrinder
 
       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', 'type' => 'ext4'}}
     end
 
     it "should substitute variables in repos" do

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

@@ -17,20 +17,18 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'boxgrinder-core/helpers/appliance-helper'
-require 'rspec/rspec-config-helper'
 
 module BoxGrinder
   describe ApplianceHelper do
-    include RSpecConfigHelper
 
     before(:each) do
-      @helper = ApplianceHelper.new( :log => Logger.new('/dev/null') )
+      @helper = ApplianceHelper.new(:log => Logger.new('/dev/null'))
     end
 
     it "should read definition from one file" do
       appliance_config = ApplianceConfig.new
-      @helper.should_receive(:read_yaml).with('file.appl').and_return( appliance_config )
-      @helper.read_definitions( "file.appl" ).should == [ [ appliance_config ], appliance_config ]
+      @helper.should_receive(:read_yaml).with('file.appl').and_return(appliance_config)
+      @helper.read_definitions("file.appl").should == [[appliance_config], appliance_config]
     end
 
     it "should read definition from two files" do
@@ -41,10 +39,10 @@ module BoxGrinder
       appliance_b = ApplianceConfig.new
       appliance_b.name = 'b'
 
-      @helper.should_receive(:read_yaml).ordered.with('a.appl').and_return( appliance_a )
-      @helper.should_receive(:read_yaml).ordered.with('./b.appl').and_return( appliance_b )
+      @helper.should_receive(:read_yaml).ordered.with('a.appl').and_return(appliance_a)
+      @helper.should_receive(:read_yaml).ordered.with('./b.appl').and_return(appliance_b)
 
-      @helper.read_definitions( "a.appl" ).should == [ [ appliance_a, appliance_b ], appliance_a ]
+      @helper.read_definitions("a.appl").should == [[appliance_a, appliance_b], appliance_a]
     end
 
     it "should read definitions from a tree file structure" do
@@ -67,14 +65,41 @@ module BoxGrinder
       appliance_c2 = ApplianceConfig.new
       appliance_c2.name = 'c2'
 
-      @helper.should_receive(:read_yaml).ordered.with('a.appl').and_return( appliance_a )
-      @helper.should_receive(:read_yaml).ordered.with('./b2.appl').and_return( appliance_b2 )
-      @helper.should_receive(:read_yaml).ordered.with('./c2.appl').and_return( appliance_c2 )
-      @helper.should_receive(:read_yaml).ordered.with('./b1.appl').and_return( appliance_b1 )
-      @helper.should_receive(:read_yaml).ordered.with('./c1.appl').and_return( appliance_c1 )
+      @helper.should_receive(:read_yaml).ordered.with('a.appl').and_return(appliance_a)
+      @helper.should_receive(:read_yaml).ordered.with('./b2.appl').and_return(appliance_b2)
+      @helper.should_receive(:read_yaml).ordered.with('./c2.appl').and_return(appliance_c2)
+      @helper.should_receive(:read_yaml).ordered.with('./b1.appl').and_return(appliance_b1)
+      @helper.should_receive(:read_yaml).ordered.with('./c1.appl').and_return(appliance_c1)
 
-      @helper.read_definitions( "a.appl" ).should == [ [ appliance_a, appliance_b2, appliance_c2, appliance_b1, appliance_c1 ], appliance_a ]
+      @helper.read_definitions("a.appl").should == [[appliance_a, appliance_b2, appliance_c2, appliance_b1, appliance_c1], appliance_a]
     end
 
+    describe "read_yaml" do
+      it "should read default_repos and set to false" do
+        YAML.should_receive(:load_file).with('default_repos_false.appl').and_return({'default_repos'=>false})
+        @helper.read_yaml('default_repos_false.appl').default_repos.should == false
+      end
+
+      it "should read default_repos and set to true" do
+        YAML.should_receive(:load_file).with('default_repos_true.appl').and_return({'default_repos'=>true})
+        @helper.read_yaml('default_repos_true.appl').default_repos.should == true
+      end
+
+      it "should read default_repos but not set it" do
+        YAML.should_receive(:load_file).with('default_repos_empty.appl').and_return({})
+        @helper.read_yaml('default_repos_empty.appl').default_repos.should == nil
+      end
+
+      it "should read default_repos and raise" do
+        YAML.should_receive(:load_file).with('default_repos_bad.appl').and_return({'default_repos'=>'something'})
+
+        begin
+          @helper.read_yaml("default_repos_bad.appl")
+          raise 'Should raise'
+        rescue => e
+          e.message.should == 'default_repos_bad.appl: default_repos should be set to true or false'
+        end
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-core
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 +01:00
+date: 2010-11-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,7 @@ files:
 - Manifest
 - README
 - Rakefile
+- boxgrinder-core.gemspec
 - lib/boxgrinder-core.rb
 - lib/boxgrinder-core/defaults.rb
 - lib/boxgrinder-core/helpers/appliance-config-helper.rb
@@ -77,7 +78,6 @@ files:
 - 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
@@ -90,7 +90,6 @@ files:
 - spec/rspec/src/appliances/full.appl
 - spec/rspec/src/appliances/repo.appl
 - spec/validators/appliance-config-validator-spec.rb
-- boxgrinder-core.gemspec
 has_rdoc: true
 homepage: http://www.jboss.org/boxgrinder
 licenses: []

data/spec/Rakefile

@@ -1,28 +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 'rake'
-require 'spec/rake/spectask'
-
-desc "Run all examples"
-Spec::Rake::SpecTask.new(:default) do |t|
-  t.spec_files = FileList['**/*-spec.rb']
-  t.rcov = true
-  t.spec_opts = ['--colour', '--format', 'nested']
-  t.rcov_opts = ['--exclude', 'spec']
-end