boxgrinder-core 0.3.1 → 0.3.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.3.2
+
+* [BGBUILD-210] In Fedora 14 parameters are not being expanded, and cause early string truncation.
+* [BGBUILD-208] Kickstart files not working with 0.9.1
+* [BGBUILD-218] Incorrect error messages since revision of parser/validator
+
 v0.3.1
 
 * [BGBUILD-164] Guestfs writes to /tmp/ by default, potentially filling the root filesystem

data/boxgrinder-core.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-core}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2011-04-27}
+  s.date = %q{2011-05-17}
   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"]
-  s.files = ["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.rb", "spec/rspec/ls/one", "spec/rspec/ls/two", "spec/rspec/src/appliances/0.8.x.appl", "spec/rspec/src/appliances/0.9.x-invalid.appl", "spec/rspec/src/appliances/0.9.x.appl", "spec/rspec/src/appliances/ephemeral-repo.appl", "spec/rspec/src/appliances/full.appl", "spec/rspec/src/appliances/invalid-yaml.appl", "spec/rspec/src/appliances/legacy.appl", "spec/rspec/src/appliances/repo.appl", "spec/rspec/src/config/empty", "spec/rspec/src/config/valid"]
+  s.files = ["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.rb", "spec/rspec/ls/one", "spec/rspec/ls/two", "spec/rspec/src/appliances/0.8.x.appl", "spec/rspec/src/appliances/0.9.x-invalid.appl", "spec/rspec/src/appliances/0.9.x.appl", "spec/rspec/src/appliances/comments.appl", "spec/rspec/src/appliances/ephemeral-repo.appl", "spec/rspec/src/appliances/full.appl", "spec/rspec/src/appliances/invalid-yaml.appl", "spec/rspec/src/appliances/legacy.appl", "spec/rspec/src/appliances/repo.appl", "spec/rspec/src/config/empty", "spec/rspec/src/config/valid"]
   s.homepage = %q{http://boxgrinder.org}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-core", "--main", "README"]
   s.require_paths = ["lib"]

data/lib/boxgrinder-core/appliance-parser.rb

@@ -31,7 +31,9 @@ module BoxGrinder
 
     def load_schemas
       Dir.glob("#{File.dirname(__FILE__)}/schemas/{*.yaml,*.yml}").each do |f|
-        schema = Kwalify::Yaml.load_file(f)
+        # DON'T use Kwalify::Yaml here!
+        # This will not threat '#' sign in schema files correctly
+        schema = YAML.load_file(f)
         @schemas[schema['version']] = schema
       end
     end
@@ -74,7 +76,7 @@ module BoxGrinder
       begin
         parsed = parser.parse(appliance_definition)
       rescue Kwalify::KwalifyError => e
-        raise ApplianceValidationError, "The appliance definition couldn't be parsed. [line #{e.linenum}, col #{e.column}] [#{e.path}] Most probably you try to specify partition mount point starting with backslash (/), please quote it like this: \"/foo\"." if e.message =~ /document end expected \(maybe invalid tab char found\)/
+        raise ApplianceValidationError, "The appliance definition couldn't be parsed. [line #{e.linenum}, col #{e.column}] [#{e.path}] Make sure you use correct indentation (don't use tabs). If indentation is correct and you try to specify partition mount point, please quote it: \"/foo\" instead of /foo." if e.message =~ /document end expected \(maybe invalid tab char found\)/
         raise ApplianceValidationError, "The appliance definition couldn't be parsed. #{e}"
       end
 

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

@@ -52,7 +52,7 @@ module BoxGrinder
                 end
             end
 
-        raise 'Unsupported file format for appliance definition file.' if appliance_config.nil?
+        return if appliance_config.nil?
 
         @appliance_configs << appliance_config
         appliances = []

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

@@ -70,12 +70,12 @@ mapping:
         mapping:
           "name":
             type: str
-            pattern: /^[\w\-+.\043]+$/
+            pattern: /^[\w\-+.#]+$/
             length: { min: 1 }
             required: yes
           "baseurl": &pkg-mirror
             type: str
-            pattern: /(^((http|ftp):)(\/\/([^\/?\043]*))?([^?\043]*)(\?([^\043]*))?(\043(.*))?$|^file:\/\/.+$)/ #customised rfc3986 standard regexp for URIs
+            pattern: /(^((http|https|ftp):)(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?$|^file:\/\/.+$)/ #customised rfc3986 standard regexp for URIs
           "mirrorlist": *pkg-mirror
           "ephemeral": 
             type: bool

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

@@ -57,7 +57,7 @@ mapping:
     type: seq
     sequence:
       - type: str
-        pattern: /^[\w\-+.@\043]+$/ #fedora packaging standard http://bit.ly/h0JN9u (plus a few more, disallow symbols/spaces)
+        pattern: /^[\w\-+.@#]+$/ #fedora packaging standard http://bit.ly/h0JN9u (plus a few more, disallow symbols/spaces)
         length: { min: 1 }
   "repos":
     type: seq
@@ -67,12 +67,12 @@ mapping:
         mapping:
           "name":
             type: str
-            pattern: /^[\w\-+.\043]+$/
+            pattern: /^[\w\-+.#]+$/
             length: { min: 1 }
             required: yes
           "baseurl": &pkg-mirror
             type: str
-            pattern: /(^((http|ftp):)(\/\/([^\/?\043]*))?([^?\043]*)(\?([^\043]*))?(\043(.*))?$|^file:\/\/.+$)/ #customised rfc3986 standard regexp for URIs
+            pattern: /(^((http|https|ftp):)(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?$|^file:\/\/.+$)/ #customised rfc3986 standard regexp for URIs
           "mirrorlist": *pkg-mirror
           "ephemeral":
             type: bool    

data/rubygem-boxgrinder-core.spec

@@ -5,7 +5,7 @@
 
 Summary: Core library for BoxGrinder
 Name: rubygem-%{gemname}
-Version: 0.3.1
+Version: 0.3.2
 Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
@@ -76,7 +76,13 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
-* Thu Mar 17 2011 <mgoldman@redhat.com> - 0.3.1-1
+* 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.
+- [BGBUILD-208] Kickstart files not working with 0.9.1
+- [BGBUILD-218] Incorrect error messages since revision of parser/validator
+
+* Wed Apr 27 2011 Marek Goldmann <mgoldman@redhat.com> - 0.3.1-1
 - Upstream release: 0.3.1
 - [BGBUILD-164] Guestfs writes to /tmp/ by default, potentially filling the root filesystem
 - [BGBUILD-97] some filesystems dont get unmounted on BG interruption
@@ -86,19 +92,12 @@ popd
 - [BGBUILD-198] root password is not inherited
 - [BGBUILD-156] Validate appliance definition files early and return meaningful error messages
 
-* Sat Mar 05 2011  <mgoldman@redhat.com> - 0.3.0-1
+* Sat Mar 05 2011 Marek Goldmann <mgoldman@redhat.com> - 0.3.0-1
 - Upstream release: 0.3.0
 - [BGBUILD-178] Remove sensitive data from logs
 - [BGBUILD-168] Support deprecated package inclusion format in appliance definitions
-
-* Tue Feb 16 2011  <mgoldman@redhat.com> - 0.2.1-1
-- Upstream release: 0.2.1
 - [BGBUILD-142] Backtraces make output unreadable - add option to enable them, and disable by default
 - [BGBUILD-150] Cyclical inclusion dependencies in appliance definition files are not detected/handled
-
-* Tue Jan 04 2011  <mgoldman@redhat.com> - 0.2.0-1
-- Upstream release: 0.2.0
-- Added BuildRoot tag to build for EPEL 5
 - [BGBUILD-79] Allow to use BoxGrinder Build as a library
 - [BGBUILD-127] Use appliance definition object instead of a file when using BG as a library
 - [BGBUILD-68] Global .boxgrinder/config or rc style file for config
@@ -107,38 +106,35 @@ popd
 - [BGBUILD-101] Don't use 'includes' subsection when specifying packages
 - [BGBUILD-60] Post section merging pattern for appliances depending on the same appliance
 - [BGBUILD-151] Overriding hardware partitions via inclusion in Appliance Definition File causes build failure
-
-* Tue Dec 21 2010  <mgoldman@redhat.com> - 0.1.6-1
-- Updated to upstream version: 0.1.6
 - [BGBUILD-100] Enable boxgrinder_build to create a Fedora image with encrypted partition(s)
 
-* Sun Dec 12 2010  <mgoldman@redhat.com> - 0.1.5-1
+* Sun Dec 12 2010 Marek Goldmann <mgoldman@redhat.com> - 0.1.5-1
 - Updated to upstream version: 0.1.5
 - [BGBUILD-73] Add support for kickstart files
 
-* Thu Dec 02 2010  <mgoldman@redhat.com> - 0.1.4-1
+* Thu Dec 02 2010 Marek Goldmann <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
+* Wed Nov 17 2010 Marek Goldmann <mgoldman@redhat.com> - 0.1.3-3
 - Added: BuildRequires: rubygem(echoe)
 - Changed the way Gem is installed and tests are exeuted
 
-* Mon Nov 15 2010  <mgoldman@redhat.com> - 0.1.3-2
+* Mon Nov 15 2010 Marek Goldmann <mgoldman@redhat.com> - 0.1.3-2
 - Removing unecessary Requires: rubygems
 
-* Mon Nov 15 2010  <mgoldman@redhat.com> - 0.1.3-1
+* Mon Nov 15 2010 Marek Goldmann <mgoldman@redhat.com> - 0.1.3-1
 - Removed BuildRoot tag
 - Adjusted Requires and BuildRequires
 - Different approach for testing
 - [BGBUILD-98] Use hashery gem
 
-* Tue Nov 09 2010  <mgoldman@redhat.com> - 0.1.2-1
+* Tue Nov 09 2010 Marek Goldmann <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
+* Tue Nov 09 2010 Marek Goldmann <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
+* Mon Oct 18 2010 Marek Goldmann <mgoldman@redhat.com> - 0.1.1-1
 - Initial package

data/spec/appliance-parser-spec.rb

@@ -29,8 +29,8 @@ module BoxGrinder
 
     describe ".load_schemas" do
       it "should load all available schemas" do
-        Kwalify::Yaml.should_receive(:load_file).with('filea').and_return({'version' => '0.8.0'})
-        Kwalify::Yaml.should_receive(:load_file).with('fileb').and_return({'version' => '0.9.0'})
+        YAML.should_receive(:load_file).with('filea').and_return({'version' => '0.8.0'})
+        YAML.should_receive(:load_file).with('fileb').and_return({'version' => '0.9.0'})
 
         Dir.should_receive(:glob).with(an_instance_of(String)).and_return(['filea', 'fileb'])
 
@@ -64,5 +64,17 @@ module BoxGrinder
         definition['packages'].size.should == 3
       end
     end
+
+    describe ".parse" do
+      it "should parse the doc" do
+        @parser.load_schemas
+        definition = File.read("#{File.dirname(__FILE__)}/rspec/src/appliances/repo.appl")
+        schemas = @parser.instance_variable_get(:@schemas)
+        schema = schemas[schemas.keys.first]
+        schema.delete('version')
+        parsed, errors = @parser.parse(schema, definition)
+        parsed['repos'].first['baseurl'].should == 'http://repo.boxgrinder.org/packages/#OS_NAME#/#OS_VERSION#/RPMS/#ARCH#'
+      end
+    end
   end
 end

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

@@ -32,6 +32,15 @@ module BoxGrinder
     end
 
     describe ".read_definitions" do
+      it "should pass all sample definitions that are not marked as invalid" do
+        prepare_helper
+
+        Dir.glob("#{File.dirname(__FILE__)}/../rspec/src/appliances/*.appl").each do |l|
+          next if l =~ /invalid/
+          @helper.read_definitions(l)
+        end
+      end
+
       it "should read definition from files with different extensions" do
         appliance_config = ApplianceConfig.new
         ['appl', 'yml', 'yaml'].each do |ext|
@@ -42,8 +51,6 @@ module BoxGrinder
           @helper.read_definitions("file.#{ext}")
           configs = @helper.appliance_configs
 
-          puts configs.size
-
           configs.should == [appliance_config]
         end
       end
@@ -186,9 +193,9 @@ module BoxGrinder
         lambda { @helper.read_definitions("#{File.dirname(__FILE__)}/../rspec/src/appliances/invalid-yaml.appl") }.should raise_error(ApplianceValidationError, "The appliance definition was invalid according to schema 0.9.0. See log for details.")
       end
 
-      it "should raise because of unsupported file format" do
+      it "should return nil of unsupported file format" do
         File.should_receive(:exists?).with("file.xmdfl").and_return(true)
-        lambda { @helper.read_definitions("file.xmdfl") }.should raise_error(RuntimeError, "Unsupported file format for appliance definition file.")
+        @helper.read_definitions("file.xmdfl").should == nil
       end
 
       #Do more extensive tests in the parser/validator itself

data/spec/rspec/src/appliances/0.8.x.appl

@@ -13,8 +13,6 @@ hardware:
     "/":
       size: 4
       type: ext4
-appliances:
-  - _include
 packages:
   includes: 
     - @base

data/spec/rspec/src/appliances/0.9.x.appl

@@ -13,8 +13,6 @@ hardware:
     "/":
       size: 4
       type: ext4
-appliances:
-  - _include
 packages:
   - squid
   - rubygem-boxgrinder-build

data/spec/rspec/src/appliances/comments.appl

@@ -0,0 +1,20 @@
+name: repo
+summary: A dummy repo appliance
+os:
+  name: fedora
+  version: 12
+hardware:
+  memory: 256 # asdas asd as # asd
+  partitions:
+    "/":
+      size: 1 # abc
+packages:
+  - gcc-c++
+  - wget
+repos:
+  - name: "cirras"
+    baseurl: "http://repo.boxgrinder.org/packages/#OS_NAME#/#OS_VERSION#/RPMS/#ARCH#"
+  - name: "abc"
+    mirrorlist: "http://repo.boxgrinder.org/packages/#OS_NAME#/#OS_VERSION#/RPMS/#ARCH#"
+  - name: "boxgrinder-f12-testing-#ARCH#"
+    mirrorlist: "https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f#OS_VERSION#&arch=#ARCH#"

data/spec/rspec/src/appliances/ephemeral-repo.appl

@@ -17,7 +17,6 @@ repos:
     ephemeral: true
   - name: "abc"
     baseurl: "http://abc"
-    mirrorlist: "http://repo.boxgrinder.org/packages/#OS_NAME#/#OS_VERSION#/RPMS/#ARCH#"
     ephemeral: true
   - name: "boxgrinder-f12-testing-#ARCH#"
     mirrorlist: "https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f#OS_VERSION#&arch=#ARCH#"

data/spec/rspec/src/appliances/full.appl

@@ -17,7 +17,6 @@ repos:
   - name: "cirras"
     baseurl: "http://repo.boxgrinder.org/packages/#OS_NAME#/#OS_VERSION#/RPMS/#ARCH#"
   - name: "abc"
-    baseurl: "http://abc"
     mirrorlist: "http://repo.boxgrinder.org/packages/#OS_NAME#/#OS_VERSION#/RPMS/#ARCH#"
   - name: "boxgrinder-f11-testing-#ARCH#"
     mirrorlist: "https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f#OS_VERSION#&arch=#ARCH#"

data/spec/rspec/src/appliances/repo.appl

@@ -15,7 +15,6 @@ repos:
   - name: "cirras"
     baseurl: "http://repo.boxgrinder.org/packages/#OS_NAME#/#OS_VERSION#/RPMS/#ARCH#"
   - name: "abc"
-    baseurl: "http://abc"
     mirrorlist: "http://repo.boxgrinder.org/packages/#OS_NAME#/#OS_VERSION#/RPMS/#ARCH#"
   - name: "boxgrinder-f12-testing-#ARCH#"
     mirrorlist: "https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f#OS_VERSION#&arch=#ARCH#"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-core
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 +02:00
+date: 2011-05-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,6 +125,7 @@ files:
 - spec/rspec/src/appliances/0.8.x.appl
 - spec/rspec/src/appliances/0.9.x-invalid.appl
 - spec/rspec/src/appliances/0.9.x.appl
+- spec/rspec/src/appliances/comments.appl
 - spec/rspec/src/appliances/ephemeral-repo.appl
 - spec/rspec/src/appliances/full.appl
 - spec/rspec/src/appliances/invalid-yaml.appl