nucleon 0.1.10 → 0.1.11

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/lib/core/core.rb

@@ -14,7 +14,7 @@ class Core < Config
   #-----------------------------------------------------------------------------
   # Constructor / Destructor
   
-  def initialize(data = {}, defaults = {}, force = true)
+  def initialize(data = {}, defaults = {}, force = true, set_initialized = true)
     super(data, defaults, force)   
     
     @class_color = Util::Data.ensure_value(delete(:class_color, :cyan), :cyan)
@@ -24,6 +24,14 @@ class Core < Config
     self.ui     = Config.new(export).defaults({ :resource => Util::Console.colorize(@class_label, @class_color) })
     
     logger.debug('Initialized instance logger and interface')
+    @initialized = true if set_initialized
+  end
+  
+  #-----------------------------------------------------------------------------
+  # Checks
+  
+  def initialized?
+    @initialized
   end
   
   #-----------------------------------------------------------------------------

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

@@ -95,12 +95,13 @@ module PluginInterface
       data = get_hash(_plural) unless data
       
       providers = [ providers ] if providers && ! providers.is_a?(Array)
+      providers.collect! { |elem| elem.to_sym }
       
       logger.debug("Initializing #{_plugin_type} plugin data: #{data.inspect}")
       logger.debug("Providers: #{providers.inspect}")
             
       symbol_map(data).each do |provider, instance_settings|
-        if ! providers || providers.include?(provider.to_s)
+        if ! providers || providers.include?(provider)
           if _single_instance
             logger.debug("Initializing single instance plugin: #{instance_settings.inspect}")
             

data/lib/core/plugin/base.rb

@@ -14,11 +14,13 @@ class Base < Core
     set_meta(config.delete(:meta, Config.new))
     
     # No logging statements aove this line!!
-    super(config.import({ :logger => "#{plugin_type}->#{plugin_provider}" }))
+    super(config.import({ :logger => "#{plugin_type}->#{plugin_provider}" }), {}, true, false)
     myself.plugin_name = name
     
     logger.debug("Normalizing #{plugin_type} plugin #{plugin_name} with meta data: #{meta.inspect}")
     normalize(false)
+    
+    @initialized = true
   end
   
   #---
@@ -30,12 +32,6 @@ class Base < Core
   #-----------------------------------------------------------------------------
   # Checks
   
-  def initialized?(options = {})
-    return true  
-  end
-  
-  #---
-  
   def quiet?
     @quiet
   end

data/lib/core/plugin/project.rb

@@ -49,6 +49,11 @@ class Project < Base
     ui.resource = plugin_name
     logger      = plugin_name
     
+    unless reload
+      @cache = Util::Cache.new(directory, Nucleon.sha1(plugin_name), '.project_cache')
+      init_cache
+    end
+    
     if keys = delete(:keys, nil)
       set(:private_key, keys[:private_key])
       set(:public_key, keys[:public_key])
@@ -117,6 +122,12 @@ class Project < Base
   #-----------------------------------------------------------------------------
   # Property accessor / modifiers
   
+  def cache
+    @cache
+  end
+  
+  #---
+  
   def reference
     get(:reference, nil)
   end
@@ -298,6 +309,13 @@ class Project < Base
   #-----------------------------------------------------------------------------
   # Project operations
   
+  def init_cache
+    # Override in providers if needed
+  end
+  protected :init_cache
+  
+  #---
+  
   def init_auth
     if can_persist?
       localize do
@@ -443,6 +461,15 @@ class Project < Base
     success     
   end
 
+  #---
+
+  def ignore(files)
+    return unless directory
+    files = nil
+    files = yield if block_given?
+    commit(files, { :message => "Adding project ignores." }) if files
+  end
+  
   #-----------------------------------------------------------------------------
   # Subproject operations
  

data/lib/core/util/cache.rb

@@ -0,0 +1,149 @@
+
+module Nucleon
+module Util
+class Cache < Core
+  
+  @@cache_lock = Mutex.new
+ 
+  #-----------------------------------------------------------------------------
+  
+  # This class already inherits much of what we need from the core config class.
+  # Right now we just have to worry about persistence
+ 
+  #-----------------------------------------------------------------------------
+  # Constructor / Destructor
+     
+  def initialize(root_path, id, cache_dir = '.cache', force = true)
+    super({}, {}, force)
+    
+    @cache_dir  = cache_dir    
+    @cache_root = File.join(root_path, cache_dir)    
+    FileUtils.mkdir_p(base_path) unless File.directory?(base_path)
+    
+    @cache_id         = id.to_sym
+    @cache_translator = Nucleon.type_default(:translator)
+    @cache_filename   = "#{id}.#{translator}"
+    @cache_path       = File.join(@cache_root, @cache_filename)
+  end
+      
+  #-----------------------------------------------------------------------------
+  # Property accessors / modifiers
+  
+  def base_path
+    @cache_root
+  end
+  
+  #---
+  
+  def directory_name
+    @cache_dir
+  end
+  
+  #---
+  
+  def id
+    @cache_id
+  end
+  
+  #---
+  
+  def translator
+    @cache_translator
+  end
+  
+  #---
+    
+  def file
+    @cache_path
+  end
+  
+  #---
+  
+  def get(keys, default = nil, format = false)
+    result = super
+    
+    if result.nil?
+      load
+      result = super
+    end
+    result
+  end
+
+  #---
+  
+  def set(keys, value)
+    result = super
+    save if initialized?
+    result
+  end
+   
+  #---
+  
+  def delete(keys, default = nil)
+    result = super
+    save if initialized?
+    result
+  end
+  
+  #---
+  
+  def clear
+    result = super
+    save if initialized?
+    result
+  end
+  
+  #-----------------------------------------------------------------------------
+  # Operations
+  
+  def import_base(properties, options = {})
+    config = Config.ensure(options)
+    
+    result = super
+    save if initialized? && ! config.get(:no_save, false)
+    result
+  end
+  
+  #---
+  
+  def load
+    success = false
+    
+    @@cache_lock.synchronize do  
+      logger.info("Loading #{translator} translated cache from #{file}")
+          
+      parser = CORL.translator({}, translator)
+      raw    = Disk.read(file)    
+        
+      if parser && raw && ! raw.empty?
+        logger.debug("Cache file contents: #{raw}")            
+        parse_properties = Data.hash(parser.parse(raw))
+        
+        import(parse_properties, { :no_save => true }) unless parse_properties.empty?
+        success = true
+      end
+    end  
+    success   
+  end
+  protected :load
+  
+  #---
+  
+  def save
+    success = false
+    
+    @@cache_lock.synchronize do
+      if renderer = CORL.translator({}, translator)
+        rendering = renderer.generate(export)
+          
+        if Disk.write(file, rendering)
+          success = true
+        end
+      end
+    end
+    success   
+  end
+  protected :save 
+end
+end
+end

data/lib/core/util/disk.rb

@@ -11,6 +11,8 @@ class Disk
   @@separator   = false
   @@description = ''
   
+  @@file_lock   = Mutex.new
+  
   #-----------------------------------------------------------------------------
   # Utilities
   
@@ -36,13 +38,15 @@ class Disk
       reset = true if ! mode.empty? && mode != @@files[file_name][:mode]
     end
     
-    if ! @@files.has_key?(file_name) || ! @@files[file_name][:file] || reset
-      @@files[file_name][:file].close if @@files[file_name] && @@files[file_name][:file]
-      unless mode.empty? || ( mode == 'r' && ! ::File.exists?(file_name) )
-        @@files[file_name] = {
-          :file => ::File.open(file_name, mode),
-          :mode => mode,
-        }
+    @@file_lock.synchronize do
+      if ! @@files.has_key?(file_name) || ! @@files[file_name][:file] || reset
+        @@files[file_name][:file].close if @@files[file_name] && @@files[file_name][:file]
+        unless mode.empty? || ( mode == 'r' && ! ::File.exists?(file_name) )
+          @@files[file_name] = {
+            :file => ::File.open(file_name, mode),
+            :mode => mode,
+          }
+        end
       end
     end
     return nil unless @@files[file_name]
@@ -52,14 +56,17 @@ class Disk
   #---
   
   def self.read(file_name, options = {})
+    result = nil
     options[:mode] = ( options[:mode] ? options[:mode] : 'r' )
     file           = open(file_name, options)
     
     if file
-      file.pos = 0 if options[:mode] == 'r'
-      return file.read
+      @@file_lock.synchronize do
+        file.pos = 0 if options[:mode] == 'r'
+        result = file.read
+      end
     end
-    return nil
+    return result
   end
   
   #---
@@ -67,23 +74,29 @@ class Disk
   def self.write(file_name, data, options = {})
     options[:mode] = ( options[:mode] ? options[:mode] : 'w' )
     file           = open(file_name, options)
+    result         = nil
     
     if file
-      file.pos = 0 if options[:mode] == 'w'
-      success  = file.write(data)
-      begin
-        file.flush
-      rescue # In case the file is already closed
+      @@file_lock.synchronize do
+        file.pos = 0 if options[:mode] == 'w'
+        result = file.write(data)
+        begin
+          file.flush
+        rescue # In case the file is already closed
+        end
       end
-      return success
     end
-    return nil
+    return result
   end
   
   #---
   
   def self.delete(file_path)
-    return ::File.delete(file_path)
+    result = nil
+    @@file_lock.synchronize do
+      result = ::File.delete(file_path)
+    end
+    result
   end
   
   #---
@@ -91,10 +104,12 @@ class Disk
   def self.log(data, options = {})
     reset = ( options[:file_name] || options[:mode] )
     file  = open(( options[:file_name] ? options[:file_name] : 'log.txt' ), options, reset)    
-    if file      
-      file.write("--------------------------------------\n") if @@separator
-      file.write("#{@@description}\n") if @@description       
-      file.write("#{data}\n")
+    if file
+      @@file_lock.synchronize do      
+        file.write("--------------------------------------\n") if @@separator
+        file.write("#{@@description}\n") if @@description       
+        file.write("#{data}\n")
+      end
     end
   end
   
@@ -108,8 +123,10 @@ class Disk
     end
     
     file_names.each do |file_name|
-      @@files[file_name][:file].close if @@files[file_name] && @@files[file_name][:file]
-      @@files.delete(file_name)
+      @@file_lock.synchronize do
+        @@files[file_name][:file].close if @@files[file_name] && @@files[file_name][:file]
+        @@files.delete(file_name)
+      end
     end
   end
 end

data/lib/core/util/liquid.rb

@@ -10,7 +10,7 @@ class Liquid
   #---
   
   def method_missing(method, *args, &block)  
-    @code.call(method, args, block)
+    @code.call(method, args, &block)
   end   
 end
 end

data/lib/core/util/shell.rb

@@ -16,11 +16,11 @@ class Shell < Core
     attr_accessor :status
     attr_reader :command
     
-    def initialize(command)
+    def initialize(command, status = nil)
       @command = command
       @output  = ''
       @errors  = ''
-      @status  = Nucleon.code.success
+      @status  = status.nil? ? Nucleon.code.success : status
     end
     
     #---

data/lib/nucleon/project/git.rb

@@ -195,10 +195,26 @@ class Git < Plugin::Project
       result
     end
   end
- 
+  
+  #-----------------------------------------------------------------------------
+  # Operations
+    
+  def init_cache
+    ignore(cache.directory_name)   
+  end
+  
   #-----------------------------------------------------------------------------
   # Basic Git operations
   
+  def ignore(files)
+    super do
+      ensure_in_gitignore(files)
+      '.gitignore'
+    end  
+  end
+  
+  #---
+  
   def load_revision
     return super do
       if new?
@@ -529,6 +545,35 @@ class Git < Plugin::Project
     result
   end
   protected :git_exec
+  
+  #---
+  
+  def ensure_in_gitignore(files)
+    files   = [ files ] unless files.is_a?(Array)
+    changes = false
+    
+    gitignore_file = File.join(directory, '.gitignore')
+    ignore_raw     = Util::Disk.read(gitignore_file)
+    ignores        = []
+    ignores        = ignore_raw.split("\n") if ignore_raw && ! ignore_raw.empty?
+    
+    files.each do |file|
+      found = false
+      unless ignores.empty?
+        ignores.each do |ignore|
+          if ignore.strip.match(/^#{file}\/?$/)
+            found = true
+          end  
+        end
+      end
+      unless found
+        ignores << file
+        changes = true
+      end 
+    end
+    Util::Disk.write(gitignore_file, ignores.join("\n")) if changes
+  end
+  protected :ensure_in_gitignore
 end
 end
 end

data/lib/nucleon_base.rb

@@ -164,7 +164,8 @@ nucleon_require(core_dir, :core)
 [ :liquid, 
   :cli, 
   :disk, 
-  :package, 
+  :package,
+  :cache, 
   :shell,
   :ssh
 ].each do |name| 

data/nucleon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "nucleon"
-  s.version = "0.1.10"
+  s.version = "0.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]
-  s.date = "2014-03-28"
+  s.date = "2014-04-02"
   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"]
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
     "lib/core/plugin/project.rb",
     "lib/core/plugin/template.rb",
     "lib/core/plugin/translator.rb",
+    "lib/core/util/cache.rb",
     "lib/core/util/cli.rb",
     "lib/core/util/console.rb",
     "lib/core/util/data.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nucleon
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &12902440 !ruby/object:Gem::Requirement
+  requirement: &23185960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *12902440
+  version_requirements: *23185960
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &12901680 !ruby/object:Gem::Requirement
+  requirement: &23185380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *12901680
+  version_requirements: *23185380
 - !ruby/object:Gem::Dependency
   name: netrc
-  requirement: &12900600 !ruby/object:Gem::Requirement
+  requirement: &23184460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *12900600
+  version_requirements: *23184460
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &13008240 !ruby/object:Gem::Requirement
+  requirement: &23183740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *13008240
+  version_requirements: *23183740
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &13007120 !ruby/object:Gem::Requirement
+  requirement: &23183200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *13007120
+  version_requirements: *23183200
 - !ruby/object:Gem::Dependency
   name: sshkey
-  requirement: &13006360 !ruby/object:Gem::Requirement
+  requirement: &23182520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *13006360
+  version_requirements: *23182520
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &13005560 !ruby/object:Gem::Requirement
+  requirement: &23181760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *13005560
+  version_requirements: *23181760
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &13004820 !ruby/object:Gem::Requirement
+  requirement: &23181040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.15'
   type: :runtime
   prerelease: false
-  version_requirements: *13004820
+  version_requirements: *23181040
 - !ruby/object:Gem::Dependency
   name: rugged
-  requirement: &13004340 !ruby/object:Gem::Requirement
+  requirement: &23180540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '0.19'
   type: :runtime
   prerelease: false
-  version_requirements: *13004340
+  version_requirements: *23180540
 - !ruby/object:Gem::Dependency
   name: octokit
-  requirement: &13003800 !ruby/object:Gem::Requirement
+  requirement: &23179980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *13003800
+  version_requirements: *23179980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13003000 !ruby/object:Gem::Requirement
+  requirement: &23253080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *13003000
+  version_requirements: *23253080
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &13002380 !ruby/object:Gem::Requirement
+  requirement: &23251720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *13002380
+  version_requirements: *23251720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13001880 !ruby/object:Gem::Requirement
+  requirement: &23250760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: '2.10'
   type: :development
   prerelease: false
-  version_requirements: *13001880
+  version_requirements: *23250760
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &13001400 !ruby/object:Gem::Requirement
+  requirement: &23249360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *13001400
+  version_requirements: *23249360
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &13097020 !ruby/object:Gem::Requirement
+  requirement: &23248640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,7 +175,7 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *13097020
+  version_requirements: *23248640
 description: ! '
 
   A framework that provides a simple foundation for building Ruby applications that
@@ -236,6 +236,7 @@ files:
 - lib/core/plugin/project.rb
 - lib/core/plugin/template.rb
 - lib/core/plugin/translator.rb
+- lib/core/util/cache.rb
 - lib/core/util/cli.rb
 - lib/core/util/console.rb
 - lib/core/util/data.rb