nucleon 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/core/core.rb

@@ -5,8 +5,9 @@ class Core < Config
   #-----------------------------------------------------------------------------
   # Properties
   
-  @@logger = Util::Logger.new('core')
-  @@ui     = Util::Console.new('core')
+  @@logger  = Util::Logger.new('core')
+  @@ui      = Util::Console.new('core')
+  @@ui_lock = Mutex.new
   
   #-----------------------------------------------------------------------------
   # Constructor / Destructor
@@ -60,10 +61,25 @@ class Core < Config
   #-----------------------------------------------------------------------------
   # General utilities
   
+  def self.ui_group(resource)
+    @@ui_lock.synchronize do
+      begin
+        ui_resource = ui.resource
+        ui.resource = resource
+        yield(ui)
+    
+      ensure
+        ui.resource = ui_resource
+      end
+    end  
+  end 
+  
+  #---
+  
   def ui_group(resource)
     ui_resource = ui.resource
     ui.resource = resource
-    yield
+    yield(ui)
     
   ensure
     ui.resource = ui_resource  

data/lib/core/facade.rb

@@ -6,6 +6,10 @@ module Facade
     Core.ui
   end
   
+  def ui_group(resource, &code)
+    Core.ui_group(resource, &code)
+  end
+  
   def quiet=quiet
     Util::Console.quiet = quiet  
   end
@@ -40,9 +44,43 @@ module Facade
   
   #---
   
-  def ip_address
-    result = cli_run(value(:ip_address_command, 'curl --silent ifconfig.me'), { :quiet => true })
-    result.output
+  @@ip_cache = nil
+  
+  def ip_address(reset = false)
+    external_ip    = nil
+    cached_ip_file = File.join(Dir.tmpdir(), 'nucleon_ip.json')
+    
+    unless @@ip_cache      
+      json_text  = Util::Data.ensure_value(Util::Disk.read(cached_ip_file), '')
+      @@ip_cache = Util::Data.parse_json(json_text) unless json_text.empty?
+    end
+        
+    fetch_ip = lambda do
+      result     = cli_run(value(:external_address_command, 'curl --silent ifconfig.me'), { :quiet => true })
+      ip_address = result.output
+      
+      unless ip_address.empty?
+        @@ip_cache = {
+          'ip'      => ip_address,
+          'updated' => Time.new.to_s
+        }
+        Util::Disk.write(cached_ip_file, Util::Data.to_json(@@ip_cache))
+      end
+      ip_address
+    end
+        
+    if reset || (! @@ip_cache || @@ip_cache.empty? || ! @@ip_cache.has_key?('ip'))
+      external_ip = fetch_ip.call
+    else
+      external_ip    = @@ip_cache['ip']
+      updated_time   = Time.parse(@@ip_cache['updated'])
+      cache_duration = (Time.new - updated_time) / 60 # Seconds to minutes
+      
+      if cache_duration >= value(:external_address_lifetime, 60)
+        external_ip = fetch_ip.call
+      end
+    end
+    external_ip
   end
   
   #-----------------------------------------------------------------------------
@@ -315,7 +353,13 @@ module Facade
       main_command   = arg_components.shift
       sub_command    = arg_components.shift
       sub_args       = arg_components
-  
+      
+      lib_dir = File.join(Dir.pwd, 'lib')
+      if File.directory?(lib_dir)
+        logger.debug("Registering plugins at #{lib_dir}")
+        Nucleon.register(lib_dir)
+      end
+            
       if main_command.processed && sub_command
         exit_status = action_cli(sub_command, sub_args, false, name)
       else
@@ -379,6 +423,30 @@ module Facade
   
   def sha1(data)
     Digest::SHA1.hexdigest(Util::Data.to_json(data, false))
+  end
+  
+  #---
+  
+  def silence
+    result = nil
+    
+    begin
+      orig_stderr = $stderr.clone
+      orig_stdout = $stdout.clone
+      $stderr.reopen File.new('/dev/null', 'w')
+      $stdout.reopen File.new('/dev/null', 'w')
+      
+      result = yield
+    
+    rescue Exception => error
+      $stdout.reopen orig_stdout
+      $stderr.reopen orig_stderr
+      raise error
+    ensure
+      $stdout.reopen orig_stdout
+      $stderr.reopen orig_stderr
+    end
+    result
   end  
 end
 end

data/lib/core/mixin/macro/plugin_interface.rb

@@ -100,7 +100,7 @@ module PluginInterface
       logger.debug("Providers: #{providers.inspect}")
             
       symbol_map(data).each do |provider, instance_settings|
-        if ! providers || providers.include?(provider)
+        if ! providers || providers.include?(provider.to_s)
           if _single_instance
             logger.debug("Initializing single instance plugin: #{instance_settings.inspect}")
             

data/lib/core/plugin/project.rb

@@ -44,7 +44,7 @@ class Project < Base
     
     set_url(get(:url)) if get(:url, false)
     
-    myself.plugin_name = path if myself.plugin_name == plugin_provider
+    myself.plugin_name = path
     
     ui.resource = plugin_name
     logger      = plugin_name
@@ -67,8 +67,8 @@ class Project < Base
   def init_project
     init_auth
     init_parent
-    init_remotes    
-    load_revision    
+    init_remotes
+    load_revision
   end
    
   #-----------------------------------------------------------------------------
@@ -79,7 +79,7 @@ class Project < Base
     if directory
       lib_path = File.join(directory, 'lib')
       if File.directory?(lib_path)
-        CORL.register(lib_path)
+        Nucleon.register(lib_path)
       end
     end
   end
@@ -374,6 +374,8 @@ class Project < Base
   #---
   
   def checkout(revision)
+    success = false
+    
     if can_persist?
       localize do      
         if extension_check(:checkout, { :revision => revision })
@@ -393,6 +395,7 @@ class Project < Base
     else
       logger.warn("Project #{name} does not meet the criteria for persistence and can not checkout a revision")
     end
+    success
   end
   
   #---
@@ -711,7 +714,7 @@ class Project < Base
   #-----------------------------------------------------------------------------
   # Remote operations
  
-  def pull(remote = :origin, options = {})
+  def pull(remote = :edit, options = {})
     success = false
     
     if can_persist?
@@ -728,7 +731,7 @@ class Project < Base
           if success
             load_revision
             update_subprojects
-          
+             
             extension(:pull_success, { :directory => directory, :remote => remote, :config => config })          
              
             if ! parent.nil? && config.get(:propogate, true)
@@ -772,7 +775,7 @@ class Project < Base
             if config.get(:propogate, true)
               logger.debug("Pushing sub projects as propogate option was given")
         
-              foreach! do |path, project|
+              each do |path, project|
                 project.push(remote, config)
               end
             end

data/lib/core/plugin/template.rb

@@ -53,7 +53,7 @@ class Template < Base
     logger.debug("Rendering data: normalize: #{normalize.inspect}; interpolate: #{interpolate.inspect}: #{data.inspect}")
     
     if normalize
-      data = Config.normalize(data, nil, config)
+      data = Config.normalize(data, nil, export)
       logger.debug("Pre-rendering data normalization: #{data.inspect}")
     end
     

data/lib/nucleon/project/git.rb

@@ -385,30 +385,65 @@ class Git < Plugin::Project
    
   #-----------------------------------------------------------------------------
   # SSH operations
+  
+  def git_fetch(remote = :edit, options = {})
+    config         = Config.ensure(options)
+    local_revision = config.get(:revision, get(:revision, :master))
+     
+    result = Nucleon.command({
+      :command => :git,
+      :data    => { 'git-dir=' => git.git_dir },
+      :subcommand => {
+        :command => :fetch,
+        :args    => [ remote ]
+      }
+    }, config.get(:provider, Nucleon.type_default(:command))).exec(config.import({ :quiet => true })) do |op, command, data|
+      block_given? ? yield(op, command, data) : true
+    end
+       
+    if result.status == code.success
+      new?(true)
+      checkout(local_revision)
+    else
+      false
+    end 
+  end
+  protected :git_fetch
+  
+  #---
  
-  def pull(remote = :origin, options = {})
+  def pull(remote = :edit, options = {})
     return super do |config, processed_remote|
-      flags = []
-      flags << :tags if config.get(:tags, true)
-      
-      result = Nucleon.command({
-        :command => :git,
-        :data    => { 'git-dir=' => git.git_dir },
-        :subcommand => {
-          :command => :pull,
-          :flags   => flags,
-          :args    => [ processed_remote, config.get(:revision, get(:revision, :master)) ]
-        }
-      }, config.get(:provider, :bash)).exec(config.import({ :quiet => true })) do |op, command, data|
-        block_given? ? yield(op, command, data) : true
-      end
+      success = false
       
-      if result.status == code.success
-        new?(true)
-        true
+      if new? || get(:create, false)
+        success = git_fetch(processed_remote, config)  
       else
-        false
-      end    
+        flags = []
+        flags << :tags if config.get(:tags, true)
+        
+        local_revision = config.get(:revision, get(:revision, :master))
+      
+        if checkout(local_revision)
+          result = Nucleon.command({
+            :command => :git,
+            :data    => { 'git-dir=' => git.git_dir },
+            :subcommand => {
+              :command => :pull,
+              :flags   => flags,
+              :args    => [ processed_remote, local_revision ]
+            }
+          }, config.get(:provider, Nucleon.type_default(:command))).exec(config.import({ :quiet => true })) do |op, command, data|
+            block_given? ? yield(op, command, data) : true
+          end
+      
+          if result.status == code.success
+            new?(true)
+            success = true
+          end
+        end
+      end
+      success  
     end
   end
   

data/nucleon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "nucleon"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]
-  s.date = "2014-03-05"
+  s.date = "2014-03-16"
   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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nucleon
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &17443440 !ruby/object:Gem::Requirement
+  requirement: &21624320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *17443440
+  version_requirements: *21624320
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &17442440 !ruby/object:Gem::Requirement
+  requirement: &21623400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *17442440
+  version_requirements: *21623400
 - !ruby/object:Gem::Dependency
   name: netrc
-  requirement: &17441440 !ruby/object:Gem::Requirement
+  requirement: &21180980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *17441440
+  version_requirements: *21180980
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &17440400 !ruby/object:Gem::Requirement
+  requirement: &20893780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *17440400
+  version_requirements: *20893780
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &17439420 !ruby/object:Gem::Requirement
+  requirement: &20891780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *17439420
+  version_requirements: *20891780
 - !ruby/object:Gem::Dependency
   name: sshkey
-  requirement: &17438100 !ruby/object:Gem::Requirement
+  requirement: &20890120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *17438100
+  version_requirements: *20890120
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &17435380 !ruby/object:Gem::Requirement
+  requirement: &20875100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *17435380
+  version_requirements: *20875100
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &17432340 !ruby/object:Gem::Requirement
+  requirement: &20868900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.15'
   type: :runtime
   prerelease: false
-  version_requirements: *17432340
+  version_requirements: *20868900
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &17431060 !ruby/object:Gem::Requirement
+  requirement: &20863720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '2.5'
   type: :runtime
   prerelease: false
-  version_requirements: *17431060
+  version_requirements: *20863720
 - !ruby/object:Gem::Dependency
   name: octokit
-  requirement: &17429200 !ruby/object:Gem::Requirement
+  requirement: &20862300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *17429200
+  version_requirements: *20862300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17426380 !ruby/object:Gem::Requirement
+  requirement: &20860560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *17426380
+  version_requirements: *20860560
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &17424440 !ruby/object:Gem::Requirement
+  requirement: &20859660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *17424440
+  version_requirements: *20859660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17423620 !ruby/object:Gem::Requirement
+  requirement: &20858540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: '2.10'
   type: :development
   prerelease: false
-  version_requirements: *17423620
+  version_requirements: *20858540
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17422640 !ruby/object:Gem::Requirement
+  requirement: &20853600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *17422640
+  version_requirements: *20853600
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &17420960 !ruby/object:Gem::Requirement
+  requirement: &20851920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,7 +175,7 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *17420960
+  version_requirements: *20851920
 description: ! '
 
   A framework that provides a simple foundation for building Ruby applications that