boxgrinder-core 0.3.6 → 0.3.7

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.3.7
+
+* [BGBUILD-276] Import files into appliance via appliance definition file (Files section)
+
 v0.3.6
 
 * [BGBUILD-295] Remove arbitrary 4 CPU limit

data/Manifest

@@ -0,0 +1,44 @@
+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
+lib/boxgrinder-core/schemas/appliance_schema_0.9.6.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/appliance-config-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

data/boxgrinder-core.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-core}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2011-08-26}
+  s.date = %q{2011-09-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/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/appliance-config-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.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", "lib/boxgrinder-core/schemas/appliance_schema_0.9.6.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", "lib/boxgrinder-core/schemas/appliance_schema_0.9.6.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/appliance-config-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/helpers/appliance-config-helper.rb

@@ -37,6 +37,7 @@ module BoxGrinder
       merge_repos
       merge_default_repos
       merge_packages
+      merge_files
       merge_post_operations
 
       @appliance_config
@@ -190,6 +191,23 @@ module BoxGrinder
       end
     end
 
+    # [BGBUILD-276] Import files into appliance via appliance definition file (Files section)
+    # https://issues.jboss.org/browse/BGBUILD-276
+    def merge_files
+      @appliance_config.files.each_value { |dirs| dirs.clear }
+
+      included = []
+
+      @appliance_configs.each do |appliance_config|
+        next if included.include?(appliance_config)
+        appliance_config.files.each do |dir, files|
+          @appliance_config.files[dir] = [] if @appliance_config.files[dir].nil?
+          files.each { |f| @appliance_config.files[dir] << substitute_vars(f) }
+        end
+        included << appliance_config
+      end
+    end
+
     def merge_post_operations
       @appliance_config.post.each_value { |cmds| cmds.clear }
 

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

@@ -117,6 +117,7 @@ module BoxGrinder
         end
       end
 
+      definition['files'].each { |key, value| appliance_config.files[key] = value } unless definition['files'].nil?
       definition['post'].each { |key, value| appliance_config.post[key] = value } unless definition['post'].nil?
 
       appliance_config

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

@@ -44,6 +44,7 @@ module BoxGrinder
       @default_repos = true
 
       @post = {}
+      @files = {}
 
       @packages = []
       @appliances = []
@@ -58,6 +59,7 @@ module BoxGrinder
     attr_reader :hardware
     attr_reader :path
     attr_reader :post
+    attr_reader :files
 
     attr_accessor :packages
     attr_accessor :repos

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

@@ -0,0 +1,103 @@
+#0.9.x schema
+version: 0.9.0
+type: map
+mapping:
+  "name":
+    type: str
+    length: { min: 1 }
+    required: yes
+  "summary":
+    type: str
+    length: { min: 1 }
+  "version":
+    type: int
+  "release":
+    type: int
+  "os":
+    type: map
+    mapping:
+      "name":
+        type: str
+        length: { min: 1 }
+        required: yes
+      "version":
+        type: text
+        required: yes
+      "password":
+        type: str
+  "hardware":
+    type: map
+    name: Hardware
+    mapping:
+      "cpus":
+        type: int
+        range: { min: 1, max: 16 }
+      "memory":
+        type: int
+        range: { min: 1 }
+      "partitions":
+        type: map
+        mapping:
+          "=": #No way of providing validation regex for wildcard name.
+            type: map
+            mapping:
+              "size":
+                type: number
+                range: { min: 0.01 }
+              "type":
+                type: str
+                enum: [ext3, ext4]
+  "appliances":
+    type: seq
+    sequence:
+      - type: str
+        pattern: /^[^\/]+$/ #dont support path resolution yet
+        length: { min: 1 }
+  "packages":
+    type: seq
+    sequence:
+      - 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 }
+  "default_repos":
+    type: bool
+    default: true
+  "repos":
+    type: seq
+    sequence:
+      - type: map
+        name: Repository
+        mapping:
+          "name":
+            type: str
+            pattern: /^[\w\-+.#]+$/
+            length: { min: 1 }
+            required: yes
+          "baseurl": &pkg-mirror
+            type: str
+            pattern: /(^((http|https|ftp):)(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?$|^file:\/\/.+$)/ #customised rfc3986 standard regexp for URIs
+          "mirrorlist": *pkg-mirror
+          "ephemeral":
+            type: bool
+  "files":
+    type: map
+    mapping:
+      "=":
+        type: seq
+        sequence:
+          - type: str
+            length: { min: 1 }
+  "post":
+    type: map
+    mapping:
+      "=":
+        type: seq
+        sequence:
+          - type: str
+            length: { min: 1 }
+  "variables":
+    type: map
+    mapping:
+      "=": # wibble: value
+        type: str
+        length: { min: 1 }

data/rubygem-boxgrinder-core.spec

@@ -5,7 +5,7 @@
 
 Summary: Core library for BoxGrinder
 Name: rubygem-%{gemname}
-Version: 0.3.6
+Version: 0.3.7
 Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
@@ -76,6 +76,10 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Tue Aug 30 2011 Marek Goldmann <mgoldman@redhat.com> - 0.3.7-1
+- Upstream release: 0.3.7
+- [BGBUILD-276] Import files into appliance via appliance definition file (Files section)
+
 * Tue Aug 23 2011 Marek Goldmann <mgoldman@redhat.com> - 0.3.6-1
 - Upstream release: 0.3.6
 - [BGBUILD-295] Remove arbitrary 4 CPU limit

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-core
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-26 00:00:00 +02:00
+date: 2011-09-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,6 +90,7 @@ extra_rdoc_files:
 - 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
+- lib/boxgrinder-core/schemas/appliance_schema_0.9.6.yaml
 files: 
 - CHANGELOG
 - LICENSE
@@ -111,6 +112,7 @@ files:
 - 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
+- lib/boxgrinder-core/schemas/appliance_schema_0.9.6.yaml
 - rubygem-boxgrinder-core.spec
 - spec/appliance-parser-spec.rb
 - spec/appliance-validator-spec.rb