corl 0.4.3 → 0.4.4

data/lib/puppet/parser/functions/corl_resources.rb

@@ -37,21 +37,29 @@ If no resources are found, it returns without creating anything.
       default_var     = tag_var.empty? ? nil : "#{tag_var}::#{type_name}_defaults"
       
       options         = ( args[4] ? args[4] : {} )
-
-      config = CORL::Config.init_flat(options, [ :resource, :corl_resources ], {
+      
+      module_name     = parent_module_name
+      contexts        = [ :resource, type_name ]
+      
+      default_options = {
         :provisioner     => :puppetnode,
         :hiera_scope     => self,
         :puppet_scope    => self,
         :search          => 'core::default',
         :force           => true,
         :merge           => true,
-        :resource_prefix => tag,
-        :title_prefix    => tag
-      })      
+        :undefined_value => :undef
+      }      
       unless tag.empty?
-        config[:tag]             = tag
-        config[:resource_prefix] = tag
-        config[:title_prefix]    = tag
+        default_options[:tag]             = tag
+        default_options[:resource_prefix] = tag
+        default_options[:title_prefix]    = tag
+      end
+      
+      if module_name
+        config = CORL::Config.init(options, contexts, module_name, default_options)  
+      else
+        config = CORL::Config.init_flat(options, contexts, default_options)
       end
       
       resources = CORL::Config.normalize(resources, override_var, config)
@@ -60,4 +68,4 @@ If no resources are found, it returns without creating anything.
       CORL::Util::Puppet.add(definition_name, resources, defaults, config)
     end
   end
-end
+end

data/lib/puppet/parser/functions/global_array.rb

@@ -20,13 +20,14 @@ If no value is found in the defined sources, it returns an empty array ([])
       default  = ( args.size > 1 ? args[1] : [] ) 
       options  = ( args.size > 2 ? args[2] : {} )
     
-      config = CORL::Config.init_flat(options, [ :param, :global_array ], {
-        :provisioner  => :puppetnode,
-        :hiera_scope  => self,
-        :puppet_scope => self,
-        :search       => 'core::default',
-        :force        => true,
-        :merge        => true
+      config = CORL::Config.init_flat(options, [ :param, :global_array, var_name ], {
+        :provisioner     => :puppetnode,
+        :hiera_scope     => self,
+        :puppet_scope    => self,
+        :search          => 'core::default',
+        :force           => true,
+        :merge           => true,
+        :undefined_value => :undef
       })
       value = CORL::Config.lookup_array(var_name, default, config)
     end

data/lib/puppet/parser/functions/global_hash.rb

@@ -20,13 +20,14 @@ If no value is found in the defined sources, it returns an empty hash ({})
       default  = ( args.size > 1 ? args[1] : {} )  
       options  = ( args.size > 2 ? args[2] : {} )
     
-      config = CORL::Config.init_flat(options, [ :param, :global_hash ], {
-        :provisioner  => :puppetnode,
-        :hiera_scope  => self,
-        :puppet_scope => self,
-        :search       => 'core::default',
-        :force        => true,
-        :merge        => true
+      config = CORL::Config.init_flat(options, [ :param, :global_hash, var_name ], {
+        :provisioner     => :puppetnode,
+        :hiera_scope     => self,
+        :puppet_scope    => self,
+        :search          => 'core::default',
+        :force           => true,
+        :merge           => true,
+        :undefined_value => :undef
       })
       value = CORL::Config.lookup_hash(var_name, default, config)
     end

data/lib/puppet/parser/functions/global_param.rb

@@ -28,13 +28,14 @@ If no value is found in the defined sources, it returns an empty string ('')
       default  = ( args.size > 1 ? args[1] : '' )
       options  = ( args.size > 2 ? args[2] : {} )
     
-      config = CORL::Config.init_flat(options, [ :param, :global_param ], {
-        :provisioner  => :puppetnode,
-        :hiera_scope  => self,
-        :puppet_scope => self,
-        :search       => 'core::default',
-        :force        => true,
-        :merge        => true
+      config = CORL::Config.init_flat(options, [ :param, :global_param, var_name ], {
+        :provisioner     => :puppetnode,
+        :hiera_scope     => self,
+        :puppet_scope    => self,
+        :search          => 'core::default',
+        :force           => true,
+        :merge           => true,
+        :undefined_value => :undef
       })
       value = CORL::Config.lookup(var_name, default, config)
     end

data/lib/puppet/parser/functions/interpolate.rb

@@ -18,8 +18,34 @@ This function interpolates values from one hash to another for configuration inj
       data    = ( args.size > 1 ? args[1] : {} )
       options = ( args.size > 2 ? args[2] : {} )
       
-      config = CORL::Config.init_flat(options, [ :data, :interpolate ])
-      value  = CORL::Util::Data.interpolate(value, data, config.export)
+      module_name = parent_module_name
+      contexts    = [ :data, :interpolate ]
+      
+      if module_name
+        config = CORL::Config.init(options, contexts, module_name)  
+      else
+        config = CORL::Config.init_flat(options, contexts)
+      end
+      
+      value = CORL::Util::Data.interpolate(value, data, config.export)
+      
+      if config.get(:debug, false)
+        display_name = module_name ? module_name : "toplevel"
+              
+        CORL.ui.info("\n", { :prefix => false })
+        CORL.ui_group(CORL::Util::Console.cyan("#{display_name} interpolation")) do |ui|
+          ui.info("-----------------------------------------------------")
+        
+          source_dump        = CORL::Util::Console.blue(CORL::Util::Data.to_json(args[0], true))
+          interpolation_data = CORL::Util::Console.grey(CORL::Util::Data.to_json(data, true))
+          value_dump         = CORL::Util::Console.green(CORL::Util::Data.to_json(value, true))       
+        
+          ui.info("Original:\n#{source_dump}")
+          ui.info("Interpolation data:\n#{interpolation_data}")
+          ui.info("Interpolated:\n#{value_dump}")
+          ui.info("\n", { :prefix => false }) 
+        end
+      end
     end
     return value
   end

data/lib/puppet/parser/functions/module_array.rb

@@ -18,19 +18,23 @@ If no value is found in the defined sources, it returns an empty array ([])
       default  = ( args.size > 1 ? args[1] : [] )
       options  = ( args.size > 2 ? args[2] : {} )
       
-      module_name     = self.source.module_name
-      module_var_name = "#{module_name}::#{var_name}"
+      module_name = parent_module_name
       
-      config = CORL::Config.init(options, [ :param, :module_array ], module_name, {
-        :provisioner  => :puppetnode,
-        :hiera_scope  => self,
-        :puppet_scope => self,
-        :search       => 'core::default',
-        :search_name  => false,
-        :force        => true,
-        :merge        => true
-      })
-      value = CORL::Config.lookup_array(module_var_name, default, config)
+      if module_name
+        module_var_name = "#{module_name}::#{var_name}"
+      
+        config = CORL::Config.init(options, [ :param, :module_array, var_name ], module_name, {
+          :provisioner     => :puppetnode,
+          :hiera_scope     => self,
+          :puppet_scope    => self,
+          :search          => 'core::default',
+          :search_name     => false,
+          :force           => true,
+          :merge           => true,
+          :undefined_value => :undef
+        })
+        value = CORL::Config.lookup_array(module_var_name, default, config)
+      end
     end
     return value
   end

data/lib/puppet/parser/functions/module_hash.rb

@@ -18,19 +18,23 @@ If no value is found in the defined sources, it returns an empty hash ({})
       default  = ( args.size > 1 ? args[1] : {} )
       options  = ( args.size > 2 ? args[2] : {} )
     
-      module_name     = self.source.module_name
-      module_var_name = "#{module_name}::#{var_name}"
+      module_name = parent_module_name
       
-      config = CORL::Config.init(options, [ :param, :module_hash ], module_name, {
-        :provisioner  => :puppetnode,
-        :hiera_scope  => self,
-        :puppet_scope => self,
-        :search       => 'core::default',
-        :search_name  => false,
-        :force        => true,
-        :merge        => true
-      })
-      value = CORL::Config.lookup_hash(module_var_name, default, config)
+      if module_name
+        module_var_name = "#{module_name}::#{var_name}"
+      
+        config = CORL::Config.init(options, [ :param, :module_hash, var_name ], module_name, {
+          :provisioner     => :puppetnode,
+          :hiera_scope     => self,
+          :puppet_scope    => self,
+          :search          => 'core::default',
+          :search_name     => false,
+          :force           => true,
+          :merge           => true,
+          :undefined_value => :undef
+        })
+        value = CORL::Config.lookup_hash(module_var_name, default, config)
+      end
     end
     return value
   end

data/lib/puppet/parser/functions/module_options.rb

@@ -17,7 +17,9 @@ EOS
       options  = args[1]
       force    = ( args[2] ? true : false )
       
-      CORL::Config.set_options(CORL::Util::Data.prefix(self.source.module_name, contexts), options, force)
+      if module_name = parent_module_name
+        CORL::Config.set_options(CORL::Util::Data.prefix(module_name, contexts), options, force)
+      end
     end
   end
 end

data/lib/puppet/parser/functions/module_param.rb

@@ -28,19 +28,23 @@ If no value is found in the defined sources, it returns an empty string ('')
       default  = ( args.size > 1 ? args[1] : '' )
       options  = ( args.size > 2 ? args[2] : {} )
     
-      module_name     = self.source.module_name
-      module_var_name = "#{module_name}::#{var_name}"
+      module_name = parent_module_name
       
-      config = CORL::Config.init(options, [ :param, :module_param ], module_name, {
-        :provisioner  => :puppetnode,
-        :hiera_scope  => self,
-        :puppet_scope => self,
-        :search       => 'core::default',
-        :search_name  => false,
-        :force        => true,
-        :merge        => true
-      })
-      value = CORL::Config.lookup(module_var_name, default, config)
+      if module_name
+        module_var_name = "#{module_name}::#{var_name}"
+      
+        config = CORL::Config.init(options, [ :param, :module_param, var_name ], module_name, {
+          :provisioner     => :puppetnode,
+          :hiera_scope     => self,
+          :puppet_scope    => self,
+          :search          => 'core::default',
+          :search_name     => false,
+          :force           => true,
+          :merge           => true,
+          :undefined_value => :undef
+        })
+        value = CORL::Config.lookup(module_var_name, default, config)
+      end
     end
     return value
   end

data/lib/puppet/parser/functions/render.rb

@@ -17,16 +17,41 @@ This function returns the string-ified form of a given value.
       provider = args[0]  
       data     = ( args.size > 1 ? args[1] : {} )
       options  = ( args.size > 2 ? args[2] : {} )
+      
+      module_name = parent_module_name
+      contexts    = [ :data, :render, "template_#{provider}" ]
     
-      config = CORL::Config.init_flat(options, [ :data, :render ], {
-        :provisioner  => :puppetnode,
-        :hiera_scope  => self,
-        :puppet_scope => self,
-        :search       => 'core::default',
-        :force        => true,
-        :merge        => true
-      })
+      default_options = {
+        :provisioner     => :puppetnode,
+        :hiera_scope     => self,
+        :puppet_scope    => self,
+        :search          => 'core::default',
+        :force           => true,
+        :merge           => true,
+        :undefined_value => :undef
+      }
+      
+      if module_name
+        config = CORL::Config.init(options, contexts, module_name, default_options)  
+      else
+        config = CORL::Config.init_flat(options, contexts, default_options)
+      end
+      
       value = CORL.template(config, provider).render(data)
+      
+      if config.get(:debug, false)      
+        CORL.ui.info("\n", { :prefix => false })
+        CORL.ui_group(CORL::Util::Console.cyan("#{provider} template")) do |ui|
+          ui.info("-----------------------------------------------------")
+        
+          source_dump  = CORL::Util::Console.blue(CORL::Util::Data.to_json(data, true))
+          value_render = CORL::Util::Console.green(value)       
+        
+          ui.info("Data:\n#{source_dump}")
+          ui.info("Rendered:\n#{value_render}")
+          ui.info("\n", { :prefix => false }) 
+        end
+      end
     end
     return value
   end

data/locales/en.yml

@@ -8,6 +8,8 @@ en:
         options:
           parallel: |-
             Enable parallelism of node action execution (default %{default_value})
+          net_remote: |-
+            Optional network project remote name to use in updating and storing changes remotely (default %{default_value})
           net_provider: |-
             CORL network provider to use for managing cloud nodes (default %{default_value})
           node_provider: |-
@@ -152,5 +154,9 @@ en:
           Now seeding CORL node
       provision:
         options:
-          provider: |-
-            Provisioner provider to use to provision the node (default %{default_value})
+          dry_run: |-
+            Whether or not to build the provisioner catalog without configuring the system (default %{default_value})
+          color: |-
+            Whether or not to output log messages in color (default %{default_value})
+        start: |-
+          Starting provision run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: corl
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nucleon
-  requirement: &11223780 !ruby/object:Gem::Requirement
+  requirement: &13324860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *11223780
+  version_requirements: *13324860
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &11222760 !ruby/object:Gem::Requirement
+  requirement: &13324220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.20'
   type: :runtime
   prerelease: false
-  version_requirements: *11222760
+  version_requirements: *13324220
 - !ruby/object:Gem::Dependency
   name: unf
-  requirement: &11221980 !ruby/object:Gem::Requirement
+  requirement: &13323500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *11221980
+  version_requirements: *13323500
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &11221380 !ruby/object:Gem::Requirement
+  requirement: &13320840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *11221380
+  version_requirements: *13320840
 - !ruby/object:Gem::Dependency
   name: hiera
-  requirement: &11220780 !ruby/object:Gem::Requirement
+  requirement: &13320140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *11220780
+  version_requirements: *13320140
 - !ruby/object:Gem::Dependency
   name: puppet
-  requirement: &11220080 !ruby/object:Gem::Requirement
+  requirement: &13319540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *11220080
+  version_requirements: *13319540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11219400 !ruby/object:Gem::Requirement
+  requirement: &13319060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *11219400
+  version_requirements: *13319060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &11210660 !ruby/object:Gem::Requirement
+  requirement: &13318580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *11210660
+  version_requirements: *13318580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11209760 !ruby/object:Gem::Requirement
+  requirement: &13944680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '2.10'
   type: :development
   prerelease: false
-  version_requirements: *11209760
+  version_requirements: *13944680
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &11208300 !ruby/object:Gem::Requirement
+  requirement: &13804500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *11208300
+  version_requirements: *13804500
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &11176660 !ruby/object:Gem::Requirement
+  requirement: &13627500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *11176660
+  version_requirements: *13627500
 description: Framework that provides a simple foundation for growing organically in
   the cloud
 email: adrian.webb@coralnexus.com
@@ -174,6 +174,7 @@ files:
 - lib/CORL/action/exec.rb
 - lib/CORL/action/image.rb
 - lib/CORL/action/images.rb
+- lib/CORL/action/keypair.rb
 - lib/CORL/action/lookup.rb
 - lib/CORL/action/machines.rb
 - lib/CORL/action/provision.rb