nucleon 0.1.1 → 0.1.2

data/lib/nucleon/action/extract.rb

@@ -1,10 +1,10 @@
 
 module Nucleon
 module Action
-class Extract < Plugin::Action
+class Extract < Nucleon.plugin_class(:action)
  
   #-----------------------------------------------------------------------------
-  # Action settings
+  # Settings
   
   def configure
     super do
@@ -35,7 +35,7 @@ class Extract < Plugin::Action
   end
  
   #-----------------------------------------------------------------------------
-  # Action operations
+  # Operations
   
   def execute
     super do |node, network|

data/lib/nucleon/action/remove.rb

@@ -1,49 +1,53 @@
 
 module Nucleon
 module Action
-class Remove < Plugin::Action
+class Remove < Nucleon.plugin_class(:action)
   
   include Mixin::Action::Project
   include Mixin::Action::Push
  
   #-----------------------------------------------------------------------------
-  # Remove action interface
+  # Settings
   
-  def normalize
-    super('nucleon remove <subproject/path>')    
-    
-    codes :project_failure => 20,
-          :delete_failure  => 21,
-          :push_failure    => 22
+  def configure
+    super do    
+      codes :project_failure,
+            :delete_failure,
+            :push_failure
+            
+      register :sub_path, :str, nil
+      
+      project_config
+      push_config
+    end
   end
- 
-  #-----------------------------------------------------------------------------
-  # Action operations
   
-  def parse(parser)
-    parser.arg_str(:sub_path, nil, 
-      'nucleon.core.actions.remove.options.sub_path'
-    )
-    project_options(parser, true, true)
-    push_options(parser, true)
+  #---
+  
+  def ignore
+    [ :project_reference ]
   end
   
-  #---
-   
+  def arguments
+    [ :sub_path ]
+  end
+ 
+  #-----------------------------------------------------------------------------
+  # Operations
+  
   def execute
-    super do |node, network, status|
-      info('nucleon.core.actions.remove.start')
+    super do |node, network|
+      info('nucleon.actions.remove.start')
       
       if project = project_load(Dir.pwd, false)
         if project.delete_subproject(settings[:sub_path])
-          status = code.push_failure unless push(project)
+          myself.status = code.push_failure unless push(project)
         else
-          status = code.delete_failure
+          myself.status = code.delete_failure
         end
       else
-        status = code.project_failure  
-      end      
-      status
+        myself.status = code.project_failure  
+      end
     end
   end
 end

data/lib/nucleon/action/save.rb

@@ -1,51 +1,51 @@
 
 module Nucleon
 module Action
-class Save < Plugin::Action
+class Save < Nucleon.plugin_class(:action)
   
   include Mixin::Action::Project
   include Mixin::Action::Commit
   include Mixin::Action::Push
  
   #-----------------------------------------------------------------------------
-  # Save action interface
+  # Settings
   
-  def normalize
-    super('nucleon save [ <file> ... ]')    
-    
-    codes :project_failure => 20,
-          :commit_failure  => 21,
-          :push_failure    => 22
-  end
-
-  #-----------------------------------------------------------------------------
-  # Action operations
-  
-  def parse(parser)
-    parser.arg_array(:files, '.', 
-      'nucleon.core.actions.save.options.files'
-    )
-    project_options(parser, true, false)
-    commit_options(parser, false)
-    push_options(parser, true)
+  def configure
+    super do 
+      codes :project_failure,
+            :commit_failure,
+            :push_failure
+      
+      register :files, :array, '.'
+      
+      project_config
+      commit_config(false)
+      push_config
+    end
   end
   
   #---
+  
+  def arguments
+    [ :files ]
+  end
+
+  #-----------------------------------------------------------------------------
+  # Operations
    
   def execute          
-    super do |node, network, status|
-      info('nucleon.core.actions.save.start')
+    super do |node, network|
+      info('nucleon.actions.save.start')
           
       if project = project_load(Dir.pwd, false)
         if commit(project, settings[:files])
-          status = code.push_failure unless push(project)
+          myself.status = code.push_failure unless push(project)
         else
-          status = code.commit_failure
+          myself.status = code.commit_failure
         end
       else
-        status = code.project_failure
+        myself.status = code.project_failure
       end
-      status
     end
   end
 end

data/lib/nucleon/action/update.rb

@@ -1,35 +1,30 @@
 
 module Nucleon
 module Action
-class Update < Plugin::Action
+class Update < Nucleon.plugin_class(:action)
   
   include Mixin::Action::Project
  
   #-----------------------------------------------------------------------------
-  # Update action interface
+  # Settings
   
-  def normalize
-    super('nucleon update')    
-    
-    codes :project_failure => 20
+  def configure
+    super do
+      codes :project_failure
+      
+      project_options
+    end
   end
   
   #-----------------------------------------------------------------------------
-  # Action operations
-  
-  def parse(parser)
-    project_options(parser, true, true)
-  end
-  
-  #---
+  # Operations
    
   def execute
-    super do |node, network, status|
-      info('nucleon.core.actions.update.start')
+    super do |node, network|
+      info('nucleon.actions.update.start')
       
-      project = project_load(Dir.pwd, true)
-      status  = code.project_failure unless project
-      status
+      project       = project_load(Dir.pwd, true)
+      myself.status = code.project_failure unless project
     end
   end
 end

data/lib/nucleon/project/git.rb

@@ -399,7 +399,7 @@ class Git < Plugin::Project
           :flags   => flags,
           :args    => [ processed_remote, config.get(:revision, get(:revision, :master)) ]
         }
-      }, config.get(:provider, :shell)).exec(config) do |op, command, data|
+      }, config.get(:provider, :bash)).exec(config) 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, :shell)).exec(config) do |op, command, data|
+      }, config.get(:provider, :bash)).exec(config) do |op, command, data|
         block_given? ? yield(op, command, data) : true
       end
       

data/lib/nucleon_base.rb

@@ -0,0 +1,184 @@
+
+#*******************************************************************************
+# Nucleon
+#
+# Framework that provides a simple foundation for building distributively 
+# configured, extremely pluggable and extendable, and easily parallel 
+# applications.
+#
+# Author::    Adrian Webb (mailto:adrian.webb@coralnexus.com)
+# License::   GPLv3
+
+#-------------------------------------------------------------------------------
+# 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
+    exts    = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      exts.each do |ext|
+        exe = File.join(path, "#{command}#{ext}")
+        return exe if File.executable?(exe)
+      end
+    end
+    return nil
+  end
+    
+  #---
+  
+  def nucleon_require(base_dir, name)
+    name = name.to_s
+    top_level_file = File.join(base_dir, "#{name}.rb")
+    
+    require top_level_file if File.exists?(top_level_file) 
+     
+    directory = File.join(base_dir, name)
+      
+    if File.directory?(directory)
+      Dir.glob(File.join(directory, '**', '*.rb')).each do |sub_file|
+        require sub_file
+      end
+    end  
+  end
+end
+
+#-------------------------------------------------------------------------------
+# Load paths 
+
+lib_dir          = File.dirname(__FILE__)
+core_dir         = File.join(lib_dir, 'core')
+mixin_dir        = File.join(core_dir, 'mixin')
+mixin_config_dir = File.join(mixin_dir, 'config')
+mixin_action_dir = File.join(mixin_dir, 'action')
+macro_dir        = File.join(mixin_dir, 'macro')
+util_dir         = File.join(core_dir, 'util')
+mod_dir          = File.join(core_dir, 'mod')
+plugin_dir       = File.join(core_dir, 'plugin')
+  
+#-------------------------------------------------------------------------------
+# Coral requirements
+
+$:.unshift(lib_dir) unless $:.include?(lib_dir) || $:.include?(File.expand_path(lib_dir))
+
+#---
+  
+require 'rubygems'
+
+require 'optparse'
+require 'pp'
+require 'i18n'
+require 'log4r'
+require 'log4r/configurator'
+require 'deep_merge'
+
+require 'digest/sha1'
+require 'base64'
+
+require 'yaml'
+require 'multi_json'
+
+require 'thread' # Eventually depreciated
+require 'celluloid'
+require 'celluloid/autostart'
+
+#---
+
+# TODO: Make this dynamically settable
+
+I18n.enforce_available_locales = false
+I18n.load_path << File.expand_path(File.join('..', 'locales', 'en.yml'), lib_dir)
+
+#---
+
+if nucleon_locate('git')
+  require 'grit'
+  nucleon_require(util_dir, :git)
+end
+
+#---
+
+# Make sure logger is at the top of our load order priorities
+nucleon_require(util_dir, :logger)
+
+#---
+
+# Object modifications (100% pure monkey patches)
+Dir.glob(File.join(mod_dir, '*.rb')).each do |file|
+  require file
+end
+
+#---
+
+# Mixins for classes
+Dir.glob(File.join(mixin_dir, '*.rb')).each do |file|
+  require file
+end
+Dir.glob(File.join(mixin_config_dir, '*.rb')).each do |file|
+  require file
+end
+Dir.glob(File.join(mixin_action_dir, '*.rb')).each do |file|
+  require file
+end
+Dir.glob(File.join(macro_dir, '*.rb')).each do |file|
+  require file
+end
+
+#---
+
+# Include bootstrap classes
+nucleon_require(core_dir, :errors)
+nucleon_require(core_dir, :codes)
+nucleon_require(util_dir, :data)
+nucleon_require(core_dir, :config)
+nucleon_require(util_dir, :console) 
+nucleon_require(core_dir, :core) 
+
+#---
+
+# Include core utilities
+[ :liquid, 
+  :cli, 
+  :disk, 
+  :package, 
+  :shell
+].each do |name| 
+  nucleon_require(util_dir, name)
+end
+
+# Include plugin system
+nucleon_require(core_dir, :facade)
+nucleon_require(core_dir, :gems)
+nucleon_require(core_dir, :manager)
+nucleon_require(plugin_dir, :base)
+nucleon_require(core_dir, :plugin)
+
+#-------------------------------------------------------------------------------
+# Core interface
+
+module Nucleon
+ 
+  def self.VERSION
+    File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))  
+  end
+  
+  #-----------------------------------------------------------------------------
+  
+  extend Facade
+end

data/locales/en.yml

@@ -1,14 +1,24 @@
 en:
   nucleon:
-    errors:
-      batch_error: |-
-        An issue was encountered during batch processing
     core:
+      exec:
+        help:
+          usage: |-
+            Usage
+          header: |-
+            Available actions
+          footer: |-
+            For help on any individual action run `corl <action> -h`
+        errors:
+          missing_argument: |-
+            Argument <%{name}> must be specified          
       util:
         cli:
           options:
-            help: |-
-              Display help information for this command
+            short_help: |-
+              Display brief help information for this command
+            extended_help: |-
+              Display a more extended breakdown of available options for this commands available actions
             log_level: |-
               Set the logging level for this execution run
             encoded: |-
@@ -16,42 +26,38 @@ en:
           parse:
             error: |-
               There was a problem with the command arguments given
-        batch:
-          unexpected_error: |
-            There was a problem with batch %{process}: %{message}
-          coral_error: |
-            There was a problem with batch %{process}: %{message}
-      mixins:
-        project:
-          options:
-            provider: |-
-              Nucleon plugin provider to use for this project (default %{default_value})
-            reference: |-
-              Project URL or reference string to set as primary remote (default %{default_value})
-            revision: |-
-              Revision or branch to load (default %{default_value})
-        commit:
-          options:
-            commit: |-
-              Commit any uncommitted changes (default %{default_value})
-            empty: |-
-              Allow commits with no changes (default %{default_value})
-            message: |-
-              Commit message (defaults to auto generated commit information)
-            author: |-
-              Author of the changes being committed if different from the committer
-            propogate: |-
-              Propogate commits throughout the project tree (default %{default_value})
-        push:
-          options:
-            push: |-
-              Push changes to remote server (default %{default_value})
-            propogate: |-
-              Propogate pushes to the remote throughout the project tree (default %{default_value})
-            remote: |-
-              Remote name to push to (default %{default_value})
-            revision: |-
-              Branch to push (default %{default_value})
+      mixin:
+        action:
+          project:
+            options:
+              project_provider: |-
+                Plugin provider to use for this project (default %{default_value})
+              project_reference: |-
+                Project URL or reference string to set as primary remote (default %{default_value})
+              revision: |-
+                Revision or branch to load (default %{default_value})
+          commit:
+            options:
+              commit: |-
+                Commit any uncommitted changes (default %{default_value})
+              allow_empty: |-
+                Allow commits with no changes (default %{default_value})
+              message: |-
+                Commit message (defaults to auto generated commit information)
+              author: |-
+                Author of the changes being committed if different from the committer
+              propogate_commit: |-
+                Propogate commits throughout the project tree (default %{default_value})
+          push:
+            options:
+              push: |-
+                Push changes to remote server (default %{default_value})
+              remote: |-
+                Remote name to push to (default %{default_value})
+              revision: |-
+                Branch to push (default %{default_value})
+              propogate_push: |-
+                Propogate pushes to the remote throughout the project tree (default %{default_value})
     actions:
       extract:
         options: