nucleon 0.1.3 → 0.1.4

data/lib/nucleon/command/bash.rb

@@ -6,7 +6,7 @@ class Bash < Plugin::Command
   #-----------------------------------------------------------------------------
   # Command plugin interface
   
-  def normalize
+  def normalize(reload)
     super
     myself.command = executable(myself)    
     logger.info("Setting command executable to #{command}")

data/lib/nucleon/event/regex.rb

@@ -6,7 +6,7 @@ class Regex < Plugin::Event
   #-----------------------------------------------------------------------------
   # Regular expression event interface
   
-  def normalize
+  def normalize(reload)
     super
     
     if get(:string)

data/lib/nucleon/project/git.rb

@@ -6,7 +6,7 @@ class Git < Plugin::Project
   #-----------------------------------------------------------------------------
   # Project plugin interface
    
-  def normalize
+  def normalize(reload)
     super   
   end
   
@@ -399,7 +399,7 @@ class Git < Plugin::Project
           :flags   => flags,
           :args    => [ processed_remote, config.get(:revision, get(:revision, :master)) ]
         }
-      }, config.get(:provider, :bash)).exec(config) do |op, command, data|
+      }, config.get(:provider, :bash)).exec(config.import({ :quiet => true })) do |op, command, data|
         block_given? ? yield(op, command, data) : true
       end
       
@@ -430,7 +430,7 @@ class Git < Plugin::Project
           :flags => flags,
           :args => [ processed_remote, push_branch ]
         }
-      }, config.get(:provider, :bash)).exec(config) do |op, command, data|
+      }, config.get(:provider, :bash)).exec(config.import({ :quiet => true })) do |op, command, data|
         block_given? ? yield(op, command, data) : true
       end
       

data/lib/nucleon/project/github.rb

@@ -10,7 +10,7 @@ class Github < Git
   #-----------------------------------------------------------------------------
   # Project plugin interface
  
-  def normalize    
+  def normalize(reload)    
     if reference = delete(:reference, nil)
       myself.plugin_name = reference
     else
@@ -44,7 +44,7 @@ class Github < Git
   
   def init_auth
     super do
-      key_id  = ENV['USER'] + '@' + lookup(:ipaddress)
+      key_id  = ENV['USER'] + '@' + Nucleon.ip_address
       ssh_key = public_key_str
       
       if private_key && ssh_key
@@ -60,16 +60,11 @@ class Github < Git
               break
             end  
           end
+                     
+          client.remove_deploy_key(myself.plugin_name, github_id) if github_id && ! keys_match
+          client.add_deploy_key(myself.plugin_name, key_id, ssh_key)
+          verify_key
           
-          if github_id
-            unless keys_match
-              client.edit_deploy_key(myself.plugin_name, github_id, { :key => ssh_key })
-              verify_key
-            end
-          else
-            client.add_deploy_key(myself.plugin_name, key_id, ssh_key)
-            verify_key
-          end
                   
         rescue Exception => error
           logger.error(error.inspect)

data/lib/nucleon_base.rb

@@ -94,7 +94,12 @@ require 'base64'
 require 'yaml'
 require 'multi_json'
 
-require 'thread' # Eventually depreciated
+require 'tmpdir'
+require 'sshkey'
+
+require 'childprocess'
+
+require 'thread' # Eventually depreciated?
 require 'celluloid'
 require 'celluloid/autostart'
 
@@ -157,7 +162,8 @@ nucleon_require(core_dir, :core)
   :cli, 
   :disk, 
   :package, 
-  :shell
+  :shell,
+  :ssh
 ].each do |name| 
   nucleon_require(util_dir, name)
 end

data/nucleon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "nucleon"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]
-  s.date = "2014-02-23"
+  s.date = "2014-03-05"
   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"]
@@ -62,6 +62,7 @@ Gem::Specification.new do |s|
     "lib/core/util/logger.rb",
     "lib/core/util/package.rb",
     "lib/core/util/shell.rb",
+    "lib/core/util/ssh.rb",
     "lib/nucleon.rb",
     "lib/nucleon/action/add.rb",
     "lib/nucleon/action/create.rb",
@@ -101,13 +102,14 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<log4r>, ["~> 1.1"])
       s.add_runtime_dependency(%q<i18n>, ["~> 0.6"])
-      s.add_runtime_dependency(%q<rgen>, ["~> 0.6"])
       s.add_runtime_dependency(%q<netrc>, ["~> 0.7"])
       s.add_runtime_dependency(%q<deep_merge>, ["~> 1.0"])
       s.add_runtime_dependency(%q<multi_json>, ["~> 1.7"])
+      s.add_runtime_dependency(%q<sshkey>, ["~> 1.6"])
+      s.add_runtime_dependency(%q<childprocess>, ["~> 0.5.0"])
+      s.add_runtime_dependency(%q<celluloid>, ["~> 0.15"])
       s.add_runtime_dependency(%q<grit>, ["~> 2.5"])
       s.add_runtime_dependency(%q<octokit>, ["~> 2.7"])
-      s.add_runtime_dependency(%q<celluloid>, ["~> 0.15"])
       s.add_development_dependency(%q<bundler>, ["~> 1.2"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.10"])
@@ -116,13 +118,14 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<log4r>, ["~> 1.1"])
       s.add_dependency(%q<i18n>, ["~> 0.6"])
-      s.add_dependency(%q<rgen>, ["~> 0.6"])
       s.add_dependency(%q<netrc>, ["~> 0.7"])
       s.add_dependency(%q<deep_merge>, ["~> 1.0"])
       s.add_dependency(%q<multi_json>, ["~> 1.7"])
+      s.add_dependency(%q<sshkey>, ["~> 1.6"])
+      s.add_dependency(%q<childprocess>, ["~> 0.5.0"])
+      s.add_dependency(%q<celluloid>, ["~> 0.15"])
       s.add_dependency(%q<grit>, ["~> 2.5"])
       s.add_dependency(%q<octokit>, ["~> 2.7"])
-      s.add_dependency(%q<celluloid>, ["~> 0.15"])
       s.add_dependency(%q<bundler>, ["~> 1.2"])
       s.add_dependency(%q<jeweler>, ["~> 2.0"])
       s.add_dependency(%q<rspec>, ["~> 2.10"])
@@ -132,13 +135,14 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<log4r>, ["~> 1.1"])
     s.add_dependency(%q<i18n>, ["~> 0.6"])
-    s.add_dependency(%q<rgen>, ["~> 0.6"])
     s.add_dependency(%q<netrc>, ["~> 0.7"])
     s.add_dependency(%q<deep_merge>, ["~> 1.0"])
     s.add_dependency(%q<multi_json>, ["~> 1.7"])
+    s.add_dependency(%q<sshkey>, ["~> 1.6"])
+    s.add_dependency(%q<childprocess>, ["~> 0.5.0"])
+    s.add_dependency(%q<celluloid>, ["~> 0.15"])
     s.add_dependency(%q<grit>, ["~> 2.5"])
     s.add_dependency(%q<octokit>, ["~> 2.7"])
-    s.add_dependency(%q<celluloid>, ["~> 0.15"])
     s.add_dependency(%q<bundler>, ["~> 1.2"])
     s.add_dependency(%q<jeweler>, ["~> 2.0"])
     s.add_dependency(%q<rspec>, ["~> 2.10"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nucleon
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &10355000 !ruby/object:Gem::Requirement
+  requirement: &17443440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *10355000
+  version_requirements: *17443440
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &10354460 !ruby/object:Gem::Requirement
+  requirement: &17442440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *10354460
-- !ruby/object:Gem::Dependency
-  name: rgen
-  requirement: &10353920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: *10353920
+  version_requirements: *17442440
 - !ruby/object:Gem::Dependency
   name: netrc
-  requirement: &10352980 !ruby/object:Gem::Requirement
+  requirement: &17441440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +43,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *10352980
+  version_requirements: *17441440
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &10352060 !ruby/object:Gem::Requirement
+  requirement: &17440400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *10352060
+  version_requirements: *17440400
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &10351340 !ruby/object:Gem::Requirement
+  requirement: &17439420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,32 +65,32 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *10351340
+  version_requirements: *17439420
 - !ruby/object:Gem::Dependency
-  name: grit
-  requirement: &10350380 !ruby/object:Gem::Requirement
+  name: sshkey
+  requirement: &17438100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *10350380
+  version_requirements: *17438100
 - !ruby/object:Gem::Dependency
-  name: octokit
-  requirement: &10349000 !ruby/object:Gem::Requirement
+  name: childprocess
+  requirement: &17435380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *10349000
+  version_requirements: *17435380
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &10347900 !ruby/object:Gem::Requirement
+  requirement: &17432340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +98,32 @@ dependencies:
         version: '0.15'
   type: :runtime
   prerelease: false
-  version_requirements: *10347900
+  version_requirements: *17432340
+- !ruby/object:Gem::Dependency
+  name: grit
+  requirement: &17431060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: *17431060
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: &17429200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: *17429200
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &10347200 !ruby/object:Gem::Requirement
+  requirement: &17426380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +131,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *10347200
+  version_requirements: *17426380
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &10345540 !ruby/object:Gem::Requirement
+  requirement: &17424440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +142,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *10345540
+  version_requirements: *17424440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10344120 !ruby/object:Gem::Requirement
+  requirement: &17423620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +153,10 @@ dependencies:
         version: '2.10'
   type: :development
   prerelease: false
-  version_requirements: *10344120
+  version_requirements: *17423620
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &10340380 !ruby/object:Gem::Requirement
+  requirement: &17422640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +164,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *10340380
+  version_requirements: *17422640
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &10339500 !ruby/object:Gem::Requirement
+  requirement: &17420960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,7 +175,7 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *10339500
+  version_requirements: *17420960
 description: ! '
 
   A framework that provides a simple foundation for building Ruby applications that
@@ -233,6 +244,7 @@ files:
 - lib/core/util/logger.rb
 - lib/core/util/package.rb
 - lib/core/util/shell.rb
+- lib/core/util/ssh.rb
 - lib/nucleon.rb
 - lib/nucleon/action/add.rb
 - lib/nucleon/action/create.rb