nucleon 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06bdd932957dc7d3f8826e92fe3f442ba4a9282a
-  data.tar.gz: 24475db3cdf4caeff3cea91f532810fad0d71db9
+  metadata.gz: 13c3e887c66f5bd85d72047d61e46bc174ca5a1f
+  data.tar.gz: 0674201c3ff404e52e32088f12fe31cffd9603fe
 SHA512:
-  metadata.gz: 853934fd92e3040ec8bb6c18568c800c330cf2d17a56537a719740ceb68a2365ed4c11e1d632f12d042bba4f327c47b960c7614cc12a0a5fe47633c91098105d
-  data.tar.gz: 456532aa926d41a93d363a86c7e9fb41309f1ba819ff34432725a142ca264edd523f895439185fa8192066086274224fbc9ad78de93caef0770d037de99acf92
+  metadata.gz: 143381f6f9f12c2dceb6edb2cdaacf4065ef3baf766a058ae817e303841308afb6186c091d9c41f2733f256649cc9a21f5eb085aed9017dc482c9f4dca932582
+  data.tar.gz: de63e90529ad0b13345fbcd5e67e0df67f07c0745367637769840cb0bd766a40bd9b3586d9e62a0d708a8f56a097cb4293260160ffd9022eeac0290a7dece74e

data/VERSION

@@ -1 +1 @@
-0.2.11
+0.2.12

data/lib/core/util/cache.rb

@@ -25,6 +25,10 @@ class Cache < Core
     @cache_filename   = "#{id}.#{translator}"
     @cache_path       = File.join(@cache_root, @cache_filename)
 
+    unless File.exist?(file)
+      parser = CORL.translator({}, translator)
+      Disk.write(file, parser.generate({}))
+    end
     load
   end
 

data/lib/core/util/console.rb

@@ -270,11 +270,12 @@ class Console
     defaults = { :new_line => true, :prefix => true }
     options  = defaults.merge(options)
     printer  = options[:new_line] ? :puts : :print
+    suffix   = options[:new_line] ? "\n" : ''
 
     puts_options           = { :printer => printer }
     puts_options[:channel] = options[:channel] if options.has_key?(:channel)
 
-    safe_puts(format_message(type, message, options), puts_options)
+    safe_puts(format_message(type, message, options) + suffix, puts_options)
   end
 
   # Dump an object to an output channel even if quiet specified
@@ -336,7 +337,10 @@ class Console
 
     user_input = nil
 
-    say(:info, message, Config.ensure(options).import({ :quiet_override => true }).export)
+    say(:info, message, Config.ensure(options).import({
+      :quiet_override => true,
+      :new_line => false
+    }).export)
 
     if options[:echo]
       user_input = @input.gets.chomp
@@ -386,7 +390,8 @@ class Console
         try_again = false
       end
     end
-    password.strip
+    password = password.strip if password
+    password
   end
 
   #*****************************************************************************

data/lib/core/util/ssh.rb

@@ -10,9 +10,13 @@ class SSH < Core
 
   #---
 
-  def self.key_path
+  def self.key_path(ssh_user = nil)
     unless @@key_path
-      home_path  = ( ENV['USER'] == 'root' ? '/root' : ENV['HOME'] ) # In case we are using sudo
+      if ssh_user
+        home_path = "/home/#{ssh_user}"
+      else
+        home_path = ( ENV['USER'] == 'root' ? '/root' : ENV['HOME'] ) # In case we are using sudo
+      end
       @@key_path = File.join(home_path, '.ssh')
 
       FileUtils.mkdir(@@key_path) unless File.directory?(@@key_path)
@@ -374,6 +378,8 @@ class SSH < Core
 
     port         = config.get(:port, 22)
     private_keys = config.get(:private_keys, File.join(ENV['HOME'], '.ssh', 'id_rsa'))
+    key_dir      = config.get(:key_dir, nil)
+    key_name     = config.get(:key_name, 'default')
 
     command_options = [
       "#{user}@#{hostname}",
@@ -386,8 +392,15 @@ class SSH < Core
       "-o", "IdentitiesOnly=yes"
     ]
 
-    Util::Data.array(private_keys).each do |path|
-      command_options += [ "-i", File.expand_path(path) ]
+    Util::Data.array(private_keys).each do |private_key|
+      unless ENV['NUCLEON_NO_SSH_KEY_SAVE'] || key_dir.nil?
+        keypair = unlock_private_key(private_key, {
+          :key_dir  => key_dir,
+          :key_name => key_name
+        })
+        private_key = keypair.private_key_file(key_dir, key_name) if keypair
+      end
+      command_options += [ "-i", File.expand_path(private_key) ]
     end
 
     if config.get(:forward_x11, false)

data/lib/nucleon/project/github.rb

@@ -44,7 +44,7 @@ class Github < Git
 
   def init_auth
     super do
-      external_ip = Nucleon.ip_address
+      external_ip = get(:external_ip, Nucleon.ip_address)
       internal_ip = get(:internal_ip, nil)
 
       if internal_ip && internal_ip.to_s != external_ip

data/nucleon.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: nucleon 0.2.11 ruby lib
+# stub: nucleon 0.2.12 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nucleon"
-  s.version = "0.2.11"
+  s.version = "0.2.12"
 
   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 = "2015-04-25"
+  s.date = "2015-04-29"
   s.description = "\nA framework that provides a simple foundation for building Ruby applications that are:\n\n* Highly configurable (with both distributed and persistent configurations)\n* Extremely pluggable and extendable\n* Easily parallel\n\nNote: This framework is still very early in development!\n"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["nucleon"]

data/spec/core/core_spec.rb

@@ -173,7 +173,7 @@ module Nucleon
     describe "#ui_group" do
 
       it "prints a colored message with a set prefix to the console" do
-        test_output("[\e\[36mtest string\e\[0m] -----------------------------------------------------") do |output|
+        test_output("[\e\[36mtest string\e\[0m] -----------------------------------------------------\n") do |output|
           Core.ui_group("test string", :cyan) do |ui|
             ui.output = output
             ui.info("-----------------------------------------------------")

data/spec/core/util/console_spec.rb

@@ -23,7 +23,7 @@ module Nucleon
     describe "#say" do
 
       it "can delegate to another class that contains this method" do
-        test_output('message', :puts) do |output|
+        test_output("message\n", :puts) do |output|
           console({ :output => output }) do |console|
             console({ :console_delegate => console }).say(:info, 'message')
           end
@@ -31,11 +31,11 @@ module Nucleon
       end
 
       it "prints a message with default options" do
-        test_output('message', :puts) do |output|
+        test_output("message\n", :puts) do |output|
           console({ :output => output }).say(:info, 'message')
         end
 
-        test_output('[component] message', :puts) do |output|
+        test_output("[component] message\n", :puts) do |output|
           console({
             :resource => 'component',
             :output   => output,
@@ -44,7 +44,7 @@ module Nucleon
       end
 
       it "prints a message with and without newlines included" do
-        test_output('message', :puts) do |output|
+        test_output("message\n", :puts) do |output|
           console({ :output => output }).say(:info, 'message', { :new_line => true })
         end
 
@@ -55,7 +55,7 @@ module Nucleon
 
       it "routes message of different types" do
         [:info, :warn, :success, :error].each do |type|
-          test_output('message', :puts) do |output|
+          test_output("message\n", :puts) do |output|
             console({ :output => output, :color => false }).say(type, 'message')
           end
         end
@@ -63,7 +63,7 @@ module Nucleon
 
       it "routes message to output and error channels based on channel given" do
         [:info, :warn, :success].each do |type|
-          test_output(type.to_s, :puts) do |output|
+          test_output(type.to_s + "\n", :puts) do |output|
             console({ :color => false }).say(type, type.to_s, { :channel => output })
           end
         end
@@ -116,7 +116,7 @@ module Nucleon
     describe "#info" do
 
       it "can delegate to another class that contains this method" do
-        test_output('message', :puts) do |output|
+        test_output("message\n", :puts) do |output|
           console({ :output => output }) do |console|
             console({ :console_delegate => console }).info('message')
           end
@@ -124,7 +124,7 @@ module Nucleon
       end
 
       it "prints an uncolored information message" do
-        test_output('message', :puts) do |output|
+        test_output("message\n", :puts) do |output|
           console({ :output => output }).info('message')
         end
       end
@@ -135,7 +135,7 @@ module Nucleon
     describe "#warn" do
 
       it "can delegate to another class that contains this method" do
-        test_output('message', :puts) do |output|
+        test_output("message\n", :puts) do |output|
           console({ :output => output, :color => false }) do |console|
             console({ :console_delegate => console }).warn('message')
           end
@@ -143,7 +143,7 @@ module Nucleon
       end
 
       it "prints an uncolored warning message" do
-        test_output('message', :puts) do |output|
+        test_output("message\n", :puts) do |output|
           console({ :output => output, :color => false }).warn('message')
         end
       end
@@ -160,7 +160,7 @@ module Nucleon
     describe "#error" do
 
       it "can delegate to another class that contains this method" do
-        test_output('message', :puts) do |output|
+        test_output("message\n", :puts) do |output|
           console({ :output => output, :color => false }) do |console|
             console({ :console_delegate => console }).error('message')
           end
@@ -168,7 +168,7 @@ module Nucleon
       end
 
       it "prints an uncolored error message" do
-        test_output('message', :puts) do |output|
+        test_output("message\n", :puts) do |output|
           console({ :output => output, :color => false }).error('message')
         end
       end
@@ -185,7 +185,7 @@ module Nucleon
     describe "#success" do
 
       it "can delegate to another class that contains this method" do
-        test_output('message', :puts) do |output|
+        test_output("message\n", :puts) do |output|
           console({ :output => output, :color => false }) do |console|
             console({ :console_delegate => console }).success('message')
           end
@@ -193,7 +193,7 @@ module Nucleon
       end
 
       it "prints an uncolored success message" do
-        test_output('message', :puts) do |output|
+        test_output("message\n", :puts) do |output|
           console({ :output => output, :color => false }).success('message')
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nucleon
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Adrian Webb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r