boxgrinder-core 0.3.2 → 0.3.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.3.3
+
+* [BGBUILD-233] BoxGrinder Build fails to report a missing config file
+
 v0.3.2
 
 * [BGBUILD-210] In Fedora 14 parameters are not being expanded, and cause early string truncation.

data/Manifest

@@ -0,0 +1,29 @@
+CHANGELOG
+LICENSE
+Manifest
+README
+Rakefile
+boxgrinder-core.gemspec
+lib/boxgrinder-core.rb
+lib/boxgrinder-core/appliance-parser.rb
+lib/boxgrinder-core/appliance-validator.rb
+lib/boxgrinder-core/errors.rb
+lib/boxgrinder-core/helpers/appliance-config-helper.rb
+lib/boxgrinder-core/helpers/appliance-definition-helper.rb
+lib/boxgrinder-core/helpers/appliance-transformation-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/schemas/appliance_schema_0.8.0.yaml
+lib/boxgrinder-core/schemas/appliance_schema_0.9.0.yaml
+rubygem-boxgrinder-core.spec
+spec/appliance-parser-spec.rb
+spec/appliance-validator-spec.rb
+spec/helpers/appliance-config-helper-spec.rb
+spec/helpers/appliance-definition-helper-spec.rb
+spec/helpers/appliance-transformation-helper-spec.rb
+spec/helpers/exec-helper-spec.rb
+spec/helpers/log-helper-spec.rb
+spec/models/config-spec.

data/boxgrinder-core.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-core}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2011-05-17}
+  s.date = %q{2011-06-28}
   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/appliance-parser.rb", "lib/boxgrinder-core/appliance-validator.rb", "lib/boxgrinder-core/errors.rb", "lib/boxgrinder-core/helpers/appliance-config-helper.rb", "lib/boxgrinder-core/helpers/appliance-definition-helper.rb", "lib/boxgrinder-core/helpers/appliance-transformation-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/schemas/appliance_schema_0.8.0.yaml", "lib/boxgrinder-core/schemas/appliance_schema_0.9.0.yaml"]

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

@@ -131,7 +131,7 @@ module BoxGrinder
       end
 
       # https://bugzilla.redhat.com/show_bug.cgi?id=466275
-      partitions['/boot'] = {'type' => 'ext3', 'size' => 0.1} if partitions['/boot'].nil? and (@appliance_config.os.name == 'centos' or @appliance_config.os.name == 'rhel') and @appliance_config.os.version == '5'
+      partitions['/boot'] = {'type' => 'ext3', 'size' => 0.1} if partitions['/boot'].nil? and (@appliance_config.os.name == 'sl' or @appliance_config.os.name == 'centos' or @appliance_config.os.name == 'rhel') and @appliance_config.os.version == '5'
 
       @appliance_config.hardware.partitions = partitions
     end

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

@@ -93,13 +93,15 @@ module BoxGrinder
     def default_filesystem_type
       fs = 'ext4'
 
-      case @os.name
-        when 'rhel', 'centos'
-          case @os.version
-            when '5'
-              fs = 'ext3'
-          end
-      end
+# Since RHEL 5.6 the default filesystem is ext4
+#
+#      case @os.name
+#        when 'rhel', 'centos'
+#          case @os.version
+#            when '5'
+#              fs = 'ext3'
+#          end
+#      end
 
       fs
     end

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

@@ -45,12 +45,25 @@ module BoxGrinder
           :additional_plugins => []
       )
 
-      deep_merge(self, YAML.load_file(self.file)) if File.exists?(self.file)
-      merge!(values.inject({}) { |memo, (k, v)| memo[k.to_sym] = v; memo })
+      if ENV['BG_CONFIG_FILE']
+        raise "You specified empty configuration file path. Please make sure you set correct path for BG_CONFIG_FILE environment variable." if ENV['BG_CONFIG_FILE'].strip.empty?
+        raise "Configuration file '#{ENV['BG_CONFIG_FILE']}' couldn't be found. Please make sure you set correct path for BG_CONFIG_FILE environment variable." unless File.exists?(ENV['BG_CONFIG_FILE'])
+      end
+
+      deep_merge!(YAML.load_file(self.file)) if File.exists?(self.file)
+      merge_with_symbols!(values)
 
       self.backtrace = true if [:debug, :trace].include?(self.log_level)
     end
 
+    def merge_with_symbols!(values)
+      merge!(values.inject({}) { |memo, (k, v)| memo[k.to_sym] = v; memo })
+    end
+
+    def deep_merge!(h)
+      deep_merge(self, h)
+    end
+
     def deep_merge(first, second)
       second.each_key do |k|
         if first[k.to_sym].is_a?(Hash) and second[k].is_a?(Hash)

data/lib/boxgrinder-core/schemas/appliance_schema_0.8.0.yaml

@@ -59,8 +59,8 @@ mapping:
       "includes": &pkg
         type: seq
         sequence:
-          - type: str 
-            pattern: /^[\w\-+.@\043]+$/ #fedora packaging standard http://bit.ly/h0JN9u (plus a few more, disallow symbols/spaces)
+          - type: str # Now allowing spaces due to group labels (these map to real groups with no spaces, but confuses users) https://issues.jboss.org/browse/BGBUILD-220
+            pattern: /^[\w\-+.@#\s]+$/ #fedora packaging standard http://bit.ly/h0JN9u (plus a few more, disallow symbols) 
             length: { min: 1 }
       "excludes": *pkg
   "repos":

data/lib/boxgrinder-core/schemas/appliance_schema_0.9.0.yaml

@@ -56,8 +56,8 @@ mapping:
   "packages":
     type: seq
     sequence:
-      - type: str
-        pattern: /^[\w\-+.@#]+$/ #fedora packaging standard http://bit.ly/h0JN9u (plus a few more, disallow symbols/spaces)
+      - type: str # Now allowing spaces due to group labels (these map to real groups with no spaces, but confuses users) https://issues.jboss.org/browse/BGBUILD-220
+        pattern: /^[\w\-+.@#\s]+$/ #fedora packaging standard http://bit.ly/h0JN9u (plus a few more, disallow symbols) 
         length: { min: 1 }
   "repos":
     type: seq

data/rubygem-boxgrinder-core.spec

@@ -5,7 +5,7 @@
 
 Summary: Core library for BoxGrinder
 Name: rubygem-%{gemname}
-Version: 0.3.2
+Version: 0.3.3
 Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
@@ -76,6 +76,12 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+
+* Tue Jun 14 2011 Marc Savy <msavy@redhat.com> - 0.3.3-1
+- Upstream release: 0.3.3
+- [BGBUILD-233] BoxGrinder Build fails to report a missing config file
+
+
 * Tue May 10 2011 Marek Goldmann <mgoldman@redhat.com> - 0.3.2-1
 - Upstream release: 0.3.2
 - [BGBUILD-210] In Fedora 14 parameters are not being expanded, and cause early string truncation.

data/spec/models/config-spec.rb

@@ -21,11 +21,12 @@ require 'boxgrinder-core/models/config'
 
 module BoxGrinder
   describe Config do
-    it "should not load options from file if it doesn't exists" do
-      ENV['BG_CONFIG_FILE'] = "doesntexists"
+    it "should not load options from file if it doesn't exist" do
+      ENV['BG_CONFIG_FILE'] = ""
 
-      config = Config.new
-      config.force.should == false
+      lambda {
+        config = Config.new
+      }.should raise_error(RuntimeError, "You specified empty configuration file path. Please make sure you set correct path for BG_CONFIG_FILE environment variable.")
     end
 
     it "should load empty config file" do
@@ -46,11 +47,23 @@ module BoxGrinder
       config.dir.root.should == 'root/dir'
     end
 
-    it "should merge platform" do
-      ENV['BG_CONFIG_FILE'] = "doesntexists"
+    it "should raise a file not found error if BG_CONFIG_FILE is set, but the path is invalid" do
+      ENV['BG_CONFIG_FILE'] = "leo/tol/stoy"
+      lambda { Config.new }.should raise_error(RuntimeError, "Configuration file 'leo/tol/stoy' couldn't be found. Please make sure you set correct path for BG_CONFIG_FILE environment variable.")
+    end
 
-      config = Config.new.merge(:platform => :ec2)
+    it "should raise if the specified config file is whitespace" do
+      ENV['BG_CONFIG_FILE'] = "  "
 
+      lambda {
+        config = Config.new
+      }.should raise_error(RuntimeError, "You specified empty configuration file path. Please make sure you set correct path for BG_CONFIG_FILE environment variable.")
+    end
+
+    it "should merge platform" do
+      # Make sure we don't have the variable defined anymore
+      ENV.delete('BG_CONFIG_FILE')
+      config = Config.new.merge(:platform => :ec2)
       config.platform.should == :ec2
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-core
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 +02:00
+date: 2011-06-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency