boxgrinder-core 0.0.10 → 0.0.11

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

@@ -125,23 +125,12 @@ module BoxGrinder
       end
     end
 
-    # TODO this needs to be plugin independent!
     def merge_post_operations
-      @appliance_config.post.base.clear
-      @appliance_config.post.ec2.clear
-      @appliance_config.post.vmware.clear
+      @appliance_config.post.each_value {|cmds| cmds.clear}
 
       @appliance_configs.each do |appliance_config|
-        appliance_config.post.base.each do |cmd|
-          @appliance_config.post.base << cmd
-        end
-
-        appliance_config.post.ec2.each do |cmd|
-          @appliance_config.post.ec2 << cmd
-        end
-
-        appliance_config.post.vmware.each do |cmd|
-          @appliance_config.post.vmware << cmd
+        appliance_config.post.each do |platform, cmds|
+          cmds.each { |cmd| @appliance_config.post[platform] << cmd }
         end
       end
     end

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

@@ -92,18 +92,14 @@ module BoxGrinder
       end
 
       unless definition['hardware'].nil?
-        appliance_config.hardware.arch        = definition['hardware']['cpus'] unless definition['hardware']['arch'].nil?
+        appliance_config.hardware.arch        = definition['hardware']['arch'] unless definition['hardware']['arch'].nil?
         appliance_config.hardware.cpus        = definition['hardware']['cpus'] unless definition['hardware']['cpus'].nil?
         appliance_config.hardware.memory      = definition['hardware']['memory'] unless definition['hardware']['memory'].nil?
         appliance_config.hardware.network     = definition['hardware']['network'] unless definition['hardware']['network'].nil?
         appliance_config.hardware.partitions  = definition['hardware']['partitions'] unless definition['hardware']['partitions'].nil?
       end
 
-      unless definition['post'].nil?
-        appliance_config.post.base      = definition['post']['base'] unless definition['post']['base'].nil?
-        appliance_config.post.ec2       = definition['post']['ec2'] unless definition['post']['ec2'].nil?
-        appliance_config.post.vmware    = definition['post']['vmware'] unless definition['post']['vmware'].nil?
-      end
+      definition['post'].each { |key, value| appliance_config.post[key] = value } unless definition['post'].nil?
 
       appliance_config
     end

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

@@ -42,11 +42,7 @@ module BoxGrinder
       @hardware.memory    = APPLIANCE_DEFAULTS[:hardware][:memory]
       @hardware.network   = APPLIANCE_DEFAULTS[:hardware][:network]
 
-      @post = OpenStruct.new
-
-      @post.base    = []
-      @post.ec2     = []
-      @post.vmware  = []
+      @post = {}
 
       @packages = OpenStruct.new
       @packages.includes = []
@@ -69,6 +65,7 @@ module BoxGrinder
     #attr_reader :packages
     attr_reader :path
     attr_reader :file
+    attr_reader :post
 
     attr_accessor :packages
     attr_accessor :repos
@@ -77,7 +74,6 @@ module BoxGrinder
     attr_accessor :name
     attr_accessor :version
     attr_accessor :release
-    attr_accessor :post
 
     def init
       init_arch

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - BoxGrinder Project
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-30 00:00:00 +02:00
+date: 2010-06-08 00:00:00 +02:00
 default_executable: 
 dependencies: []