corl 0.4.21 → 0.4.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3bb80a650eb209623ead506dd69a51306c1fcf0
-  data.tar.gz: e41e127547eb7677cf335aa661301b11ffcb690e
+  metadata.gz: 6689cece3da0f0598e2b101e9d830d54f3772fc9
+  data.tar.gz: b82d70a25434a64f1704eec02f5811b9e41283f8
 SHA512:
-  metadata.gz: 2c37715b7116f293ab7d8d2f96610f0e17d7a8d136cce335d06a2b1f540047b7ed2b340643ed998ec02fca54122d8925ffe8af665933e7f177ddd363d554ccc6
-  data.tar.gz: a07956638bdcb9915e2152158417ef1b073b7eae676f57a2b87dc97a2fe0864b79f88c7337589dfbbdc219740ed570cbbc8baef51e13fbdf65ad31ad7790b840
+  metadata.gz: 29952bd940117c67ff3159faddc993dc9d76c2e95ad7a8037e85169caedb1a169a3a5b91960d2d1c893c5d92576bd9dec548f354e96f58bec8e736ca0ef5681d
+  data.tar.gz: 08a1399763d9dbb9865e1642d4ae8769ca1ccb895888ae3e13359518932c364118a3462cfd3f9e23fbf141a8d8e99f751860d2015f2c1855fef3dfe22d568fa3

data/Gemfile.lock

@@ -36,7 +36,7 @@ GIT
 PATH
   remote: .
   specs:
-    corl (0.4.20)
+    corl (0.4.22)
       facter (~> 1.7)
       fog (~> 1.20)
       hiera (~> 1.3)

data/VERSION

@@ -1 +1 @@
-0.4.21
+0.4.22

data/bootstrap/os/ubuntu/06_puppet.sh

@@ -15,8 +15,8 @@ esac
 # Set up Puppet Apt repositories
 apt-key adv --recv-key --keyserver pgp.mit.edu 4BD6EC30 2>&1 || exit 60
 
-echo -e "deb http://apt.puppetlabs.com $OS_NAME main dependencies\ndeb-src http://apt.puppetlabs.com $OS_NAME main dependencies" | cat > /etc/apt/sources.list.d/puppet.list || exit 61
-chmod 0644 /etc/apt/sources.list.d/puppet.list || exit 62
+echo -e "deb http://apt.puppetlabs.com $OS_NAME main dependencies\ndeb-src http://apt.puppetlabs.com $OS_NAME main dependencies" | cat > /etc/apt/sources.list.d/corl_puppet.list || exit 61
+chmod 0644 /etc/apt/sources.list.d/corl_puppet.list || exit 62
 
 # Install Puppet
 apt-get -y update || exit 63
@@ -26,6 +26,8 @@ apt-get -y install puppet-common="$PUPPET_PACKAGE" puppet="$PUPPET_PACKAGE" || e
 # Set up Hiera configuration
 mkdir -p /var/corl/config || exit 65
 
+if [ ! -e /etc/hiera.yaml ]
+then
 ( cat <<'EOP'
 ---
 :merge_behavior: deeper
@@ -41,5 +43,9 @@ mkdir -p /var/corl/config || exit 65
 EOP
 ) > /etc/hiera.yaml || exit 66
 chmod 0440 /etc/hiera.yaml || exit 67
+fi
 
-ln -fs /etc/hiera.yaml /etc/puppet/hiera.yaml || exit 68
+if [ ! -e /etc/puppet/hiera.yaml ]
+then
+    ln -fs /etc/hiera.yaml /etc/puppet/hiera.yaml || exit 68
+fi

data/corl.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: corl 0.4.21 ruby lib
+# stub: corl 0.4.22 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.4.21"
+  s.version = "0.4.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Adrian Webb"]
-  s.date = "2014-04-28"
+  s.date = "2014-05-02"
   s.description = "Framework that provides a simple foundation for growing organically in the cloud"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["corl"]

data/lib/CORL/action/lookup.rb

@@ -9,6 +9,15 @@ class Lookup < Plugin::CloudAction
   def configure
     super do
       register :property, :str, nil
+      register :context, :str, :priority do |value|
+        success = true
+        options = [ :priority, :array, :hash ]
+        unless options.include?(value.to_sym)
+          warn('corl.actions.lookup.errors.context', { :value => value, :options => options.join(', ') })
+          success = false
+        end
+        success
+      end
     end
   end
   

data/lib/core/mixin/lookup.rb

@@ -141,7 +141,7 @@ module Lookup
   
   def lookup_array(properties, default = [], options = {})
     config          = Config.ensure(options) 
-    value, property = lookup(properties, nil, config.import({ :return_property => true }))
+    value, property = lookup(properties, nil, config.import({ :return_property => true, :context => :array }))
      
     if Util::Data.undef?(value)
       value = default
@@ -170,7 +170,7 @@ module Lookup
   
   def lookup_hash(properties, default = {}, options = {})
     config          = Config.ensure(options) 
-    value, property = lookup(properties, nil, config.import({ :return_property => true }))
+    value, property = lookup(properties, nil, config.import({ :return_property => true, :context => :hash }))
     
     if Util::Data.undef?(value)
       value = default
@@ -198,7 +198,7 @@ module Lookup
   #---
 
   def normalize(data, override = nil, options = {})
-    config  = Config.ensure(options)
+    config  = Config.ensure(options).import({ :context => :hash })
     results = {}
     
     unless Util::Data.undef?(override)

data/lib/core/mixin/machine/ssh.rb

@@ -20,7 +20,7 @@ module SSH
       reset = true
       retry
 
-    rescue Net::SSH::ConnectionTimeout, Net::SSH::Disconnect => error     
+    rescue Errno::ECONNREFUSED, Net::SSH::ConnectionTimeout, Net::SSH::Disconnect => error     
       if tries > 1
         sleep(sleep_secs)
         

data/lib/core/plugin/node.rb

@@ -593,7 +593,7 @@ class Node < CORL.plugin_class(:base)
     default_error = Util::Shell::Result.new(:error, 255)
     results       = [ default_error ]
     
-    if machine && machine.running?
+    if local? && local_machine || machine && machine.running?
       config = Config.ensure(options)
       
       if extension_check(:exec, { :config => config })

data/lib/core/util/puppet/resource_group.rb

@@ -121,6 +121,8 @@ class ResourceGroup < Core
     resources = Data.value(resources)
     
     unless Data.empty?(resources)
+      resource_names = {}
+      
       resources.keys.each do |name|
         if ! resources[name] || resources[name].empty? || ! resources[name].is_a?(Hash)
           resources.delete(name)
@@ -151,10 +153,13 @@ class ResourceGroup < Core
           
           if normalize
             resource = Resource.new(self, info, name, resources[name]).defaults(default, config)
-            resources[name] = resource
+            resource_names[name] = true
+            resources[name]      = resource
           end
         end
       end
+      
+      config[:resource_names] = resource_names
       resources.each do |name, resource|
         resource.process(config)
       end
@@ -168,14 +173,7 @@ class ResourceGroup < Core
   def translate(resources, options = {})
     config  = Config.ensure(options)
     results = {}
-        
-    prefix   = config.get(:resource_prefix, '')    
-    name_map = {}
-    
-    resources.keys.each do |name|
-      name_map[name] = true
-    end
-    config[:resource_names] = name_map
+    prefix  = config.get(:resource_prefix, '')    
     
     resources.each do |name, resource|
       unless prefix.empty?

data/lib/core/util/puppet.rb

@@ -119,14 +119,16 @@ module Puppet
     case type[:type]
     when :type, :define
       CORL.ui_group(Util::Console.cyan(display_name)) do |ui|
-        rendered_title = Util::Console.blue(title)
-        ui.info("Adding #{type[:name]} #{rendered_title}")
+        rendered_title    = Util::Console.blue(title)
+        rendered_resource = Util::Console.green("#{type_name(type[:name])}[#{rendered_title}]")
+        ui.info("Adding #{rendered_resource}")
       end
       add_definition(type, title, properties, config)
     when :class
       CORL.ui_group(Util::Console.cyan(display_name)) do |ui|
-        rendered_title = Util::Console.blue(title)
-        ui.info("Adding class #{rendered_title}")
+        rendered_title    = Util::Console.blue(title)
+        rendered_resource = Util::Console.green("Class[#{rendered_title}]")
+        ui.info("Adding #{rendered_resource}")
       end
       add_class(title, properties, config)
     end
@@ -214,7 +216,9 @@ module Puppet
       if classes.is_a?(Array)
         classes.each do |klass|
           CORL.ui_group(Util::Console.cyan(display_name)) do |ui|
-            ui.info("Including class #{klass}")
+            rendered_klass    = Util::Console.blue(klass)
+            rendered_resource = Util::Console.green("Class[#{rendered_klass}]")
+            ui.info("Including #{rendered_resource}")
           end
           class_data[klass] = properties
         end

data/locales/en.yml

@@ -141,6 +141,13 @@ en:
         options:
           command: |-
             Command line executable and arguments to execute on machine
+      lookup:
+        options:
+          context: |-
+            Lookup evaluation context; priority, array, hash (default %{default_value})
+        errors:
+          context: |-
+            Lookup evaluation context %{value} is not valid >> Possible contexts: %{choices}
       seed:
         options:
           project_branch: |-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corl
 version: !ruby/object:Gem::Version
-  version: 0.4.21
+  version: 0.4.22
 platform: ruby
 authors:
 - Adrian Webb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nucleon