nucleon 0.1.19 → 0.2.0

data/lib/nucleon/action/{update.rb → project/update.rb}

@@ -1,9 +1,17 @@
 
 module Nucleon
 module Action
-class Update < Nucleon.plugin_class(:action)
+module Project
+class Update < Nucleon.plugin_class(:nucleon, :action)
   
   include Mixin::Action::Project
+  
+  #-----------------------------------------------------------------------------
+  # Info
+  
+  def self.describe
+    super(:project, :update, 900)
+  end
  
   #-----------------------------------------------------------------------------
   # Settings
@@ -22,7 +30,7 @@ class Update < Nucleon.plugin_class(:action)
    
   def execute
     super do
-      info('nucleon.actions.update.start')
+      info('nucleon.action.project.update.start')
       
       project       = project_load(settings[:path], false, true)
       myself.status = code.project_failure unless project
@@ -31,3 +39,4 @@ class Update < Nucleon.plugin_class(:action)
 end
 end
 end
+end

data/lib/nucleon/command/bash.rb

@@ -1,7 +1,7 @@
 
 module Nucleon
 module Command
-class Bash < Plugin::Command
+class Bash < Nucleon.plugin_class(:nucleon, :command)
 
   #-----------------------------------------------------------------------------
   # Command plugin interface

data/lib/nucleon/event/regex.rb

@@ -1,7 +1,7 @@
 
 module Nucleon
 module Event
-class Regex < Plugin::Event
+class Regex < Nucleon.plugin_class(:nucleon, :event)
  
   #-----------------------------------------------------------------------------
   # Regular expression event interface

data/lib/nucleon/project/git.rb

@@ -1,7 +1,7 @@
 
 module Nucleon
 module Project
-class Git < Plugin::Project
+class Git < Nucleon.plugin_class(:nucleon, :project)
   
   #-----------------------------------------------------------------------------
   # Project plugin interface
@@ -399,7 +399,7 @@ class Git < Plugin::Project
   
   #---
     
-  def syncronize(cloud, options = {})
+  def synchronize(cloud, options = {})
     return super do |config|
       config.init(:remote_path, '/var/git')
       config.set(:add, true)
@@ -524,7 +524,7 @@ class Git < Plugin::Project
           end
         end
         
-        command_provider = get(:command_provider, Nucleon.type_default(:command))
+        command_provider = get(:command_provider, Nucleon.type_default(:nucleon, :command))
         quiet            = get(:quiet, true)        
         
         command = Nucleon.command({

data/lib/nucleon/template/{json.rb → JSON.rb}

@@ -1,7 +1,7 @@
 
 module Nucleon
 module Template
-class Json < Plugin::Template
+class JSON < Nucleon.plugin_class(:nucleon, :template)
   
   #-----------------------------------------------------------------------------
   # Renderers  

data/lib/nucleon/template/{yaml.rb → YAML.rb}

@@ -1,7 +1,7 @@
 
 module Nucleon
 module Template
-class Yaml < Plugin::Template
+class YAML < Nucleon.plugin_class(:nucleon, :template)
   
   #-----------------------------------------------------------------------------
   # Renderers  

data/lib/nucleon/template/wrapper.rb

@@ -1,7 +1,7 @@
 
 module Nucleon
 module Template
-class Wrapper < Plugin::Template
+class Wrapper < Nucleon.plugin_class(:nucleon, :template)
   
   #-----------------------------------------------------------------------------
   # Renderers  

data/lib/nucleon/translator/{json.rb → JSON.rb}

@@ -1,7 +1,7 @@
 
 module Nucleon
 module Translator
-class Json < Plugin::Translator
+class JSON < Nucleon.plugin_class(:nucleon, :translator)
    
   #-----------------------------------------------------------------------------
   # Translator operations

data/lib/nucleon/translator/{yaml.rb → YAML.rb}

@@ -1,7 +1,7 @@
 
 module Nucleon
 module Translator
-class Yaml < Plugin::Translator
+class YAML < Nucleon.plugin_class(:nucleon, :translator)
    
   #-----------------------------------------------------------------------------
   # Translator operations

data/lib/nucleon_base.rb

@@ -12,21 +12,6 @@
 # Global namespace
 
 module Kernel
-   
-  def dbg(data, label = '')
-    # Invocations of this function should NOT be committed to the project
-    require 'pp'
-    
-    puts '>>----------------------'
-    unless ! label || label.empty?
-      puts label
-      puts '---'
-    end
-    pp data
-    puts '<<'
-  end
-  
-  #---  
     
   def nucleon_locate(command)
     command = command.to_s
@@ -170,8 +155,33 @@ module Nucleon
   
   def self.parallel?
     debugging? || ENV['NUCLEON_NO_PARALLEL'] ? false : true
+  end
+  
+  #---
+  
+  @@console_lock = Mutex.new
+  
+  def self.console_lock
+    @@console_lock
   end  
 end
+
+#-------------------------------------------------------------------------------
+
+module Kernel
+  
+  def dbg(data, label = '')
+    # Invocations of this function should NOT be committed to the project
+    require 'pp'
+    puts '>>----------------------'
+    unless ! label || label.empty?
+      puts label
+      puts '---'
+    end
+    pp data
+    puts '<<'
+  end
+end
   
 #-------------------------------------------------------------------------------
 # Coral requirements
@@ -301,6 +311,7 @@ end
 
 # Include plugin system
 nucleon_require(core_dir, :gems)
+nucleon_require(core_dir, :environment)
 nucleon_require(core_dir, :manager)
 nucleon_require(plugin_dir, :base)
 nucleon_require(core_dir, :plugin)

data/locales/en.yml

@@ -7,14 +7,24 @@ en:
             Usage
           header: |-
             Available actions
+          action_group: |-
+            %{namespace} actions
+          no_actions_found: |-
+            No action found.  Try these.
+          multiple_actions_found: |-
+            Multiple actions were found.  Did you mean one of these?
           footer: |-
-            For help on any individual action run `%{name} <action> -h`
+            For help on any individual action run `%{command}`
         errors:
           missing_argument: |-
             Argument <%{name}> must be specified          
       util:
         cli:
           options:
+            version: |-
+              Print the current version information and exit
+            color: |-
+              Whether or not to output console messages in color (default %{default_value})
             short_help: |-
               Display brief help information for this command
             extended_help: |-
@@ -26,10 +36,6 @@ en:
           parse:
             error: |-
               There was a problem with the command arguments given
-      action:
-        options:
-          color: |-
-            Whether or not to output console messages in color (default %{default_value})
       mixin:
         action:
           project:
@@ -62,8 +68,64 @@ en:
                 Branch to push (default %{default_value})
               propogate_push: |-
                 Propogate pushes to the remote throughout the project tree (default %{default_value})
-    actions:
+    action:
+      unknown: 
+        description: |-
+          This Nucleon action has no description available
+        help: |-
+          There is no extended help information available for this Nucleon action.
+      project:
+        create:
+          description: |-
+            Create a new project
+          options:
+            path: |-
+              Project path (default %{default_value})
+          start: |-
+            Creating a new project at %{path} from %{project_reference}
+        update:
+          description: |-
+            Update this project from a remote
+          options:
+            path: |-
+              Project path (default %{default_value})
+          start: |-
+            Starting update run from provider %{project_provider} (ref: %{project_reference} rev: %{project_revision})
+        save:
+          description: |-
+            Save changes to files in this project
+          options:
+            path: |-
+              Project path (default %{default_value})
+            files: |-
+              Optional space separated list of files to save
+          start: |-
+            Saving project changes with provider %{project_provider} (ref: %{project_reference} rev: %{project_revision})        
+        add:
+          description: |-
+            Add a new sub-project to this project
+          options:
+            path: |-
+              Project path (default %{default_value})
+            sub_path: |-
+              Subproject path
+            editable: |-
+              Whether or not this sub project should be added as an editable remote (default %{default_value})
+          start: |-
+            Adding new subproject from %{sub_reference} at %{sub_path}
+        remove:
+          description: |-
+            Remove an existing sub-project from this project
+          options:
+            path: |-
+              Project path (default %{default_value})
+            sub_path: |-
+              Subproject path
+          start: |-
+            Removing existing subproject at %{sub_path}
       extract:
+        description: |-
+          Extract an encoded package into a directory
         options:
           path: |-
             Base path in which to extract the encoded data
@@ -74,41 +136,4 @@ en:
             "Base path for extracted files must be an existing directory"
           encoded: |-
             "Data is either not properly encoded or is empty %{value}"
-      create:
-        options:
-          path: |-
-            Project path (default %{default_value})
-        start: |-
-          Creating a new project at %{path} from %{project_reference}
-      add:
-        options:
-          path: |-
-            Project path (default %{default_value})
-          sub_path: |-
-            Subproject path
-          editable: |-
-            Whether or not this sub project should be added as an editable remote (default %{default_value})
-        start: |-
-          Adding new subproject from %{sub_reference} at %{sub_path}
-      remove:
-        options:
-          path: |-
-            Project path (default %{default_value})
-          sub_path: |-
-            Subproject path
-        start: |-
-          Removing existing subproject at %{sub_path}
-      update:
-        options:
-          path: |-
-            Project path (default %{default_value})
-        start: |-
-          Starting update run from provider %{project_provider} (ref: %{project_reference} rev: %{project_revision})
-      save:
-        options:
-          path: |-
-            Project path (default %{default_value})
-          files: |-
-            Optional space separated list of files to save
-        start: |-
-          Saving project changes with provider %{project_provider} (ref: %{project_reference} rev: %{project_revision})
+        

data/nucleon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "nucleon"
-  s.version = "0.1.19"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]
-  s.date = "2014-05-21"
+  s.date = "2014-07-01"
   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"]
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "lib/core/config/collection.rb",
     "lib/core/config/options.rb",
     "lib/core/core.rb",
+    "lib/core/environment.rb",
     "lib/core/errors.rb",
     "lib/core/facade.rb",
     "lib/core/gems.rb",
@@ -69,24 +70,138 @@ Gem::Specification.new do |s|
     "lib/core/util/shell.rb",
     "lib/core/util/ssh.rb",
     "lib/nucleon.rb",
-    "lib/nucleon/action/add.rb",
-    "lib/nucleon/action/create.rb",
     "lib/nucleon/action/extract.rb",
-    "lib/nucleon/action/remove.rb",
-    "lib/nucleon/action/save.rb",
-    "lib/nucleon/action/update.rb",
+    "lib/nucleon/action/project/add.rb",
+    "lib/nucleon/action/project/create.rb",
+    "lib/nucleon/action/project/remove.rb",
+    "lib/nucleon/action/project/save.rb",
+    "lib/nucleon/action/project/update.rb",
     "lib/nucleon/command/bash.rb",
     "lib/nucleon/event/regex.rb",
     "lib/nucleon/project/git.rb",
     "lib/nucleon/project/github.rb",
-    "lib/nucleon/template/json.rb",
+    "lib/nucleon/template/JSON.rb",
+    "lib/nucleon/template/YAML.rb",
     "lib/nucleon/template/wrapper.rb",
-    "lib/nucleon/template/yaml.rb",
-    "lib/nucleon/translator/json.rb",
-    "lib/nucleon/translator/yaml.rb",
+    "lib/nucleon/translator/JSON.rb",
+    "lib/nucleon/translator/YAML.rb",
     "lib/nucleon_base.rb",
     "locales/en.yml",
     "nucleon.gemspec",
+    "rdoc/site/0.1.19/ARCHITECTURE_rdoc.html",
+    "rdoc/site/0.1.19/Hash.html",
+    "rdoc/site/0.1.19/Kernel.html",
+    "rdoc/site/0.1.19/Nucleon.html",
+    "rdoc/site/0.1.19/Nucleon/Action.html",
+    "rdoc/site/0.1.19/Nucleon/Action/Add.html",
+    "rdoc/site/0.1.19/Nucleon/Action/Create.html",
+    "rdoc/site/0.1.19/Nucleon/Action/Extract.html",
+    "rdoc/site/0.1.19/Nucleon/Action/Remove.html",
+    "rdoc/site/0.1.19/Nucleon/Action/Save.html",
+    "rdoc/site/0.1.19/Nucleon/Action/Update.html",
+    "rdoc/site/0.1.19/Nucleon/Codes.html",
+    "rdoc/site/0.1.19/Nucleon/Command.html",
+    "rdoc/site/0.1.19/Nucleon/Command/Bash.html",
+    "rdoc/site/0.1.19/Nucleon/Config.html",
+    "rdoc/site/0.1.19/Nucleon/Config/Collection.html",
+    "rdoc/site/0.1.19/Nucleon/Config/Options.html",
+    "rdoc/site/0.1.19/Nucleon/Core.html",
+    "rdoc/site/0.1.19/Nucleon/Errors.html",
+    "rdoc/site/0.1.19/Nucleon/Errors/BatchError.html",
+    "rdoc/site/0.1.19/Nucleon/Errors/NucleonError.html",
+    "rdoc/site/0.1.19/Nucleon/Errors/SSHUnavailable.html",
+    "rdoc/site/0.1.19/Nucleon/Event.html",
+    "rdoc/site/0.1.19/Nucleon/Event/Regex.html",
+    "rdoc/site/0.1.19/Nucleon/Facade.html",
+    "rdoc/site/0.1.19/Nucleon/Gems.html",
+    "rdoc/site/0.1.19/Nucleon/Manager.html",
+    "rdoc/site/0.1.19/Nucleon/Mixin.html",
+    "rdoc/site/0.1.19/Nucleon/Mixin/Action.html",
+    "rdoc/site/0.1.19/Nucleon/Mixin/Action/Commit.html",
+    "rdoc/site/0.1.19/Nucleon/Mixin/Action/Project.html",
+    "rdoc/site/0.1.19/Nucleon/Mixin/Action/Push.html",
+    "rdoc/site/0.1.19/Nucleon/Mixin/Colors.html",
+    "rdoc/site/0.1.19/Nucleon/Mixin/ConfigCollection.html",
+    "rdoc/site/0.1.19/Nucleon/Mixin/ConfigOptions.html",
+    "rdoc/site/0.1.19/Nucleon/Mixin/Macro.html",
+    "rdoc/site/0.1.19/Nucleon/Mixin/Macro/ObjectInterface.html",
+    "rdoc/site/0.1.19/Nucleon/Mixin/Macro/PluginInterface.html",
+    "rdoc/site/0.1.19/Nucleon/Mixin/Settings.html",
+    "rdoc/site/0.1.19/Nucleon/Mixin/SubConfig.html",
+    "rdoc/site/0.1.19/Nucleon/Parallel.html",
+    "rdoc/site/0.1.19/Nucleon/Parallel/ClassMethods.html",
+    "rdoc/site/0.1.19/Nucleon/Parallel/InstanceMethods.html",
+    "rdoc/site/0.1.19/Nucleon/Plugin.html",
+    "rdoc/site/0.1.19/Nucleon/Plugin/Action.html",
+    "rdoc/site/0.1.19/Nucleon/Plugin/Action/Option.html",
+    "rdoc/site/0.1.19/Nucleon/Plugin/Base.html",
+    "rdoc/site/0.1.19/Nucleon/Plugin/Command.html",
+    "rdoc/site/0.1.19/Nucleon/Plugin/Event.html",
+    "rdoc/site/0.1.19/Nucleon/Plugin/Extension.html",
+    "rdoc/site/0.1.19/Nucleon/Plugin/Project.html",
+    "rdoc/site/0.1.19/Nucleon/Plugin/Template.html",
+    "rdoc/site/0.1.19/Nucleon/Plugin/Translator.html",
+    "rdoc/site/0.1.19/Nucleon/Project.html",
+    "rdoc/site/0.1.19/Nucleon/Project/Git.html",
+    "rdoc/site/0.1.19/Nucleon/Project/Github.html",
+    "rdoc/site/0.1.19/Nucleon/Template.html",
+    "rdoc/site/0.1.19/Nucleon/Template/Json.html",
+    "rdoc/site/0.1.19/Nucleon/Template/Wrapper.html",
+    "rdoc/site/0.1.19/Nucleon/Template/Yaml.html",
+    "rdoc/site/0.1.19/Nucleon/Translator.html",
+    "rdoc/site/0.1.19/Nucleon/Translator/Json.html",
+    "rdoc/site/0.1.19/Nucleon/Translator/Yaml.html",
+    "rdoc/site/0.1.19/Nucleon/Util.html",
+    "rdoc/site/0.1.19/Nucleon/Util/CLI.html",
+    "rdoc/site/0.1.19/Nucleon/Util/CLI/Parser.html",
+    "rdoc/site/0.1.19/Nucleon/Util/Cache.html",
+    "rdoc/site/0.1.19/Nucleon/Util/Console.html",
+    "rdoc/site/0.1.19/Nucleon/Util/Data.html",
+    "rdoc/site/0.1.19/Nucleon/Util/Disk.html",
+    "rdoc/site/0.1.19/Nucleon/Util/Git.html",
+    "rdoc/site/0.1.19/Nucleon/Util/Liquid.html",
+    "rdoc/site/0.1.19/Nucleon/Util/Logger.html",
+    "rdoc/site/0.1.19/Nucleon/Util/Package.html",
+    "rdoc/site/0.1.19/Nucleon/Util/SSH.html",
+    "rdoc/site/0.1.19/Nucleon/Util/SSH/Keypair.html",
+    "rdoc/site/0.1.19/Nucleon/Util/Shell.html",
+    "rdoc/site/0.1.19/Nucleon/Util/Shell/Result.html",
+    "rdoc/site/0.1.19/README_rdoc.html",
+    "rdoc/site/0.1.19/TODO_rdoc.html",
+    "rdoc/site/0.1.19/created.rid",
+    "rdoc/site/0.1.19/images/add.png",
+    "rdoc/site/0.1.19/images/brick.png",
+    "rdoc/site/0.1.19/images/brick_link.png",
+    "rdoc/site/0.1.19/images/bug.png",
+    "rdoc/site/0.1.19/images/bullet_black.png",
+    "rdoc/site/0.1.19/images/bullet_toggle_minus.png",
+    "rdoc/site/0.1.19/images/bullet_toggle_plus.png",
+    "rdoc/site/0.1.19/images/date.png",
+    "rdoc/site/0.1.19/images/delete.png",
+    "rdoc/site/0.1.19/images/find.png",
+    "rdoc/site/0.1.19/images/loadingAnimation.gif",
+    "rdoc/site/0.1.19/images/macFFBgHack.png",
+    "rdoc/site/0.1.19/images/package.png",
+    "rdoc/site/0.1.19/images/page_green.png",
+    "rdoc/site/0.1.19/images/page_white_text.png",
+    "rdoc/site/0.1.19/images/page_white_width.png",
+    "rdoc/site/0.1.19/images/plugin.png",
+    "rdoc/site/0.1.19/images/ruby.png",
+    "rdoc/site/0.1.19/images/tag_blue.png",
+    "rdoc/site/0.1.19/images/tag_green.png",
+    "rdoc/site/0.1.19/images/transparent.png",
+    "rdoc/site/0.1.19/images/wrench.png",
+    "rdoc/site/0.1.19/images/wrench_orange.png",
+    "rdoc/site/0.1.19/images/zoom.png",
+    "rdoc/site/0.1.19/index.html",
+    "rdoc/site/0.1.19/js/darkfish.js",
+    "rdoc/site/0.1.19/js/jquery.js",
+    "rdoc/site/0.1.19/js/navigation.js",
+    "rdoc/site/0.1.19/js/search.js",
+    "rdoc/site/0.1.19/js/search_index.js",
+    "rdoc/site/0.1.19/js/searcher.js",
+    "rdoc/site/0.1.19/rdoc.css",
+    "rdoc/site/0.1.19/table_of_contents.html",
     "spec/coral_mock_input.rb",
     "spec/coral_test_kernel.rb",
     "spec/core/util/console_spec.rb",
@@ -108,6 +223,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<log4r>, ["~> 1.1"])
       s.add_runtime_dependency(%q<i18n>, ["~> 0.6"])
       s.add_runtime_dependency(%q<netrc>, ["~> 0.7"])
+      s.add_runtime_dependency(%q<highline>, ["~> 1.6"])
       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"])
@@ -127,6 +243,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<log4r>, ["~> 1.1"])
       s.add_dependency(%q<i18n>, ["~> 0.6"])
       s.add_dependency(%q<netrc>, ["~> 0.7"])
+      s.add_dependency(%q<highline>, ["~> 1.6"])
       s.add_dependency(%q<deep_merge>, ["~> 1.0"])
       s.add_dependency(%q<multi_json>, ["~> 1.7"])
       s.add_dependency(%q<sshkey>, ["~> 1.6"])
@@ -147,6 +264,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<log4r>, ["~> 1.1"])
     s.add_dependency(%q<i18n>, ["~> 0.6"])
     s.add_dependency(%q<netrc>, ["~> 0.7"])
+    s.add_dependency(%q<highline>, ["~> 1.6"])
     s.add_dependency(%q<deep_merge>, ["~> 1.0"])
     s.add_dependency(%q<multi_json>, ["~> 1.7"])
     s.add_dependency(%q<sshkey>, ["~> 1.6"])