corl 0.4.28 → 0.4.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45dcd109e6897f16f0d9119625d0013b74aff5f1
-  data.tar.gz: c8d0d0a1c6c32dfc095ca4b5c0f31022405cfd39
+  metadata.gz: f4340000f307af2a3bfc2bf2922ba022fe8189ae
+  data.tar.gz: 521b4c70644a3a91a947e09e2c11149263064633
 SHA512:
-  metadata.gz: 698c8d4b68179189ec568e055722a88d67fd833164705bef9a281a22aa304260d47e5fd7d49931eb289f85564711bb89a2b75eef61feb8c39e40c637e608c0d0
-  data.tar.gz: ef618b2861629c106df9a9a876eadcb146221c7e828a10e4e26d3d4225f7fb4df16217512eb0de7a0f4e998b4ea06991677ba8addba3862eae63c1f5436bed6c
+  metadata.gz: ef2f1fb2d2113a8493527c544afa3a9818a22f7cd93eedb08eeec0d17a0f9d4f3deb2c0c492c9fbe04fe14dcf047bef98bc9d12cccbf2a876aa2478545f649ad
+  data.tar.gz: 59ed2e3c471866ceed1216bf6577a4fdcc2d50b3d19e8f22000ddfc00f82020b357f1e71d6cc1a42b76e7bc630d5d90b34728c86396ed74be80916a994b4920b

data/.gitmodules

@@ -1,4 +1,7 @@
 
 [submodule "bootstrap"]
 	path = bootstrap
-	url = git://github.com/coralnexus/corl-bootstrap.git
+	url = https://github.com/coralnexus/corl-bootstrap.git
+[submodule "rdoc/template"]
+	path = rdoc/template
+	url = https://github.com/coralnexus/rdoc-darkfish-template.git

data/Gemfile.lock

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

data/README.rdoc

@@ -1,8 +1,26 @@
-=== CORL (Coral Orchestration and Research Library)
+## Welcome to CORL (Coral Orchestration and Research Library)
+
+CORL is a cloud application framework and command line utility that provides 
+easy and extensible creation and management of project based networks and nodes
+and relevant infrastructure.
+
+The CORL system is built on top of our general purpose Nucleon application
+framework.
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-Coming soon!
 
-Note:  This library is still very early in development!
 
 ==== Contributing to CORL
  

data/Rakefile

@@ -63,16 +63,29 @@ task :default => :spec
 version   = CORL.VERSION
 doc_title = "corl #{version}"
 
+class RDoc::Options
+  def template_dir_for(template)
+    File.join(File.dirname(__FILE__), 'rdoc', 'template')
+  end
+end
+
 Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
+  rdoc.rdoc_dir = File.join('rdoc', 'site', version)
+  
   rdoc.title    = doc_title
-  rdoc.rdoc_files.include('README*')
+  rdoc.main     = 'README.rdoc' 
+  
+  rdoc.options << '--line-numbers'
+  rdoc.options << '--all'
+  rdoc.options << '-w' << '2'
+  
+  rdoc.rdoc_files.include('*.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
 #---
 
 YARD::Rake::YardocTask.new do |ydoc|
-  ydoc.files   = [ 'README*', 'lib/**/*.rb' ]
+  ydoc.files   = [ '*.rdoc', 'lib/**/*.rb' ]
   ydoc.options = [ "--output-dir yardoc", "--title '#{doc_title}'" ]
 end

data/VERSION

@@ -1 +1 @@
-0.4.28
+0.4.29

data/corl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.4.28"
+  s.version = "0.4.29"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]
-  s.date = "2014-05-16"
+  s.date = "2014-05-21"
   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/facts.rb

@@ -14,7 +14,7 @@ class Facts < Plugin::CloudAction
       ensure_node(node) do
         facter_facts = Config.facts
       
-        ui.info(Util::Data.to_json(facter_facts, true))
+        ui.info(Util::Data.to_json(facter_facts, true), { :prefix => false })
         myself.result = facter_facts
       end
     end

data/lib/CORL/action/lookup.rb

@@ -36,7 +36,7 @@ class Lookup < Plugin::CloudAction
         property = settings.delete(:property)
         value    = lookup(property, nil, settings)
       
-        ui.info(Util::Data.to_json(value, true))
+        ui.info(Util::Data.to_json(value, true), { :prefix => false })
         myself.result = value
       end
     end

data/lib/CORL/provisioner/puppetnode.rb

@@ -82,6 +82,7 @@ class Puppetnode < CORL.plugin_class(:provisioner)
     # TODO: Figure out how to store these damn settings in a specialized
     # environment without phantom empty environment issues.
     
+    Puppet[:data_binding_terminus] = 'corl'
     Puppet[:default_file_terminus] = :file_server
     Puppet[:node_name_value]       = id.to_s
     

data/lib/core/mixin/lookup.rb

@@ -74,14 +74,21 @@ module Lookup
     hiera_config = CORL.config(:hiera, config)
     loaded_facts = Util::Data.prefix('::', hiera_facts, '')
     
+    if hiera_config[:hierarchy]
+      hiera_config[:hierarchy].delete('common')
+    end
+    
     unless loaded_facts.empty?
       hiera_config[:hierarchy].collect! do |search| 
         Hiera::Interpolate.interpolate(search, loaded_facts, {})
       end
     end
     
-    unless config[:hierarchy]
-      config[:hierarchy] = [ "common" ]
+    unless hiera_config[:hierarchy]
+      hiera_config[:hierarchy] = [ 'common' ]
+    end
+    unless hiera_config[:hierarchy].include?('common')
+      hiera_config[:hierarchy] << 'common'
     end
     hiera_config.export
   end

data/lib/core/vagrant/actions/init_keys.rb

@@ -16,6 +16,8 @@ class InitKeys < BaseAction
             comm.execute("echo '#{ssh_key}' > \$HOME/.ssh/authorized_keys")
           end
           node.set_cache_setting(:use_private_key, true)
+          env[:machine].config.ssh.private_key_path = node.private_key
+          
           node.machine.load
         end
       end      

data/lib/core/vagrant/provisioner/provisioner.rb

@@ -32,9 +32,6 @@ class CORL < ::Vagrant.plugin("2", :provisioner)
       
       if network && node
         # Provision the server
-        
-        dbg(node.profiles, 'profiles')
-        
         success = network.init_node(node, clean(::CORL.config(:vagrant_node_init, {
           :force             => config.force_updates,
           :home              => config.user_home,

metadata

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