nucleon 0.1.11 → 0.1.12

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8dd7fe9a002e9dc6651cfb1d29a8bc4c018b7c2e
+  data.tar.gz: 245aa7ddc78a89366e6485787c07ae8e34db9a85
+SHA512:
+  metadata.gz: 66614d6050b88c9d13d0ab233277537be26bf1f587bbf9ff995b40af2ea427b33f821edf4beadb0a08589a9638506ed80197d4b731063d6b570569177b0dda6d
+  data.tar.gz: 70e40b7931c525a9c62711d9dfcd47835fddcb7b283a5b0d899f35376fa6215226c1b0becf00b0d97adfdfc7d4bcf17f10b746687eb97dd5db04ad8d90606017

data/Gemfile

@@ -9,7 +9,7 @@ gem "multi_json", "~> 1.7"
 
 gem "sshkey", "~> 1.6"
 
-gem "childprocess", "~> 0.5.0"
+gem "childprocess", "~> 0.5"
 gem "celluloid", "~> 0.15"
 
 gem "rugged", "~> 0.19"

data/Gemfile.lock

@@ -2,7 +2,6 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.3.6)
-    atomic (1.1.16)
     builder (3.2.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
@@ -24,7 +23,7 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.0)
       oauth2
-    hashie (2.0.5)
+    hashie (2.1.0)
     highline (1.6.21)
     i18n (0.6.9)
     jeweler (2.0.1)
@@ -72,8 +71,7 @@ GEM
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
     sshkey (1.6.1)
-    thread_safe (0.3.1)
-      atomic (>= 1.1.7, < 2)
+    thread_safe (0.3.3)
     timers (1.1.0)
     yard (0.8.7.4)
 
@@ -83,7 +81,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.2)
   celluloid (~> 0.15)
-  childprocess (~> 0.5.0)
+  childprocess (~> 0.5)
   deep_merge (~> 1.0)
   i18n (~> 0.6)
   jeweler (~> 2.0)

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

data/lib/core/plugin/project.rb

@@ -3,6 +3,10 @@ module Nucleon
 module Plugin
 class Project < Base
   
+  @@ignore_lock = Mutex.new
+  
+  #---
+  
   @@projects = {}
   
   #---
@@ -49,11 +53,6 @@ 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])
@@ -65,6 +64,11 @@ class Project < Base
     extension(:init)
     
     pull if get(:pull, false)
+    
+    unless reload
+      @cache = Util::Cache.new(directory, Nucleon.sha1(plugin_name), '.project_cache')
+      init_cache
+    end
   end
   
   #---
@@ -91,7 +95,7 @@ class Project < Base
         
   #-----------------------------------------------------------------------------
   # Checks
-   
+  
   def can_persist?
     return top?(directory) if directory
     false
@@ -118,6 +122,16 @@ class Project < Base
     false
   end
   protected :project_directory?
+  
+  #---
+  
+  def manage_ignore=ignore
+    set(:manage_ignore, ignore)
+  end
+  
+  def manage_ignore?
+    get(:manage_ignore, false)
+  end
    
   #-----------------------------------------------------------------------------
   # Property accessor / modifiers
@@ -369,12 +383,18 @@ class Project < Base
   def load_revision
     if can_persist?
       localize do
-        logger.info("Loading project #{name} revision")
-      
+        logger.info("Loading project #{plugin_name} revision")
+        
+        specified_revision = get(:revision, nil)
+        
         current_revision = revision.to_s
         current_revision = yield if block_given?
-      
-        if current_revision && extended_revision = extension_set(:load_revision, current_revision).to_s.strip
+        
+        if current_revision && extended_revision = extension_set(:load_revision, specified_revision).to_s.strip
+          if extended_revision.empty?
+            extended_revision = current_revision  
+          end
+          
           set(:revision, extended_revision)
           checkout(extended_revision) if current_revision != extended_revision     
            
@@ -445,7 +465,7 @@ class Project < Base
             extension(:commit_success, { :files => files })
       
             if ! parent.nil? && config.get(:propogate, true)
-              logger.debug("Commit to parent as parent exists and propogate option given")
+              logger.info("Commit to parent as parent exists and propogate option given")
         
               parent.load_revision
               parent.commit(directory, config.import({
@@ -464,10 +484,13 @@ class Project < Base
   #---
 
   def ignore(files)
-    return unless directory
-    files = nil
-    files = yield if block_given?
-    commit(files, { :message => "Adding project ignores." }) if files
+    return unless directory && manage_ignore?
+    
+    @@ignore_lock.synchronize do
+      files = nil
+      files = yield if block_given?
+      commit(files, { :message => "Adding project ignores." }) if files
+    end
   end
   
   #-----------------------------------------------------------------------------
@@ -759,7 +782,6 @@ class Project < Base
           end
           
           if success
-            load_revision
             update_subprojects
              
             extension(:pull_success, { :directory => directory, :remote => remote, :config => config })          

data/lib/nucleon/project/git.rb

@@ -2,7 +2,7 @@
 module Nucleon
 module Project
 class Git < Plugin::Project
- 
+  
   #-----------------------------------------------------------------------------
   # Project plugin interface
    
@@ -209,7 +209,6 @@ class Git < Plugin::Project
   def ignore(files)
     super do
       ensure_in_gitignore(files)
-      '.gitignore'
     end  
   end
   
@@ -433,19 +432,19 @@ class Git < Plugin::Project
       
       if new? || get(:create, false)
         success = git_fetch(processed_remote, config)  
-      else
-        pull_options = {}
-        pull_options[:tags] = true if config.get(:tags, true)
+      end
+      
+      pull_options = {}
+      pull_options[:tags] = true if config.get(:tags, true)
         
-        local_revision = config.get(:revision, get(:revision, :master))
+      local_revision = config.get(:revision, get(:revision, :master))
       
-        if checkout(local_revision)
-          result = cli.pull(pull_options, processed_remote, local_revision, &block)
+      if checkout(local_revision)
+        result = cli.pull(pull_options, processed_remote, local_revision, &block)
       
-          if result.status == code.success
-            new?(true)
-            success = true
-          end
+        if result.status == code.success
+          new?(true)
+          success = true
         end
       end
       success  
@@ -549,8 +548,9 @@ class Git < Plugin::Project
   #---
   
   def ensure_in_gitignore(files)
-    files   = [ files ] unless files.is_a?(Array)
-    changes = false
+    files        = [ files ] unless files.is_a?(Array)
+    commit_files = nil
+    changes      = false
     
     gitignore_file = File.join(directory, '.gitignore')
     ignore_raw     = Util::Disk.read(gitignore_file)
@@ -571,7 +571,11 @@ class Git < Plugin::Project
         changes = true
       end 
     end
-    Util::Disk.write(gitignore_file, ignores.join("\n")) if changes
+    if changes
+      Util::Disk.write(gitignore_file, ignores.join("\n"))
+      commit_files = '.gitignore'
+    end
+    commit_files
   end
   protected :ensure_in_gitignore
 end

data/lib/nucleon/project/github.rb

@@ -44,7 +44,16 @@ class Github < Git
   
   def init_auth
     super do
-      key_id  = ENV['USER'] + '@' + Nucleon.ip_address
+      external_ip = Nucleon.ip_address
+      internal_ip = get(:internal_ip, nil)
+      
+      if internal_ip && internal_ip.to_s != external_ip
+        location = "#{external_ip}[#{internal_ip}]"
+      else
+        location = external_ip
+      end
+      
+      key_id  = ENV['USER'] + '@' + location
       ssh_key = public_key_str
       
       if private_key && ssh_key

data/nucleon.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: nucleon 0.1.12 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nucleon"
-  s.version = "0.1.11"
+  s.version = "0.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Adrian Webb"]
-  s.date = "2014-04-02"
+  s.date = "2014-04-08"
   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"]
@@ -92,14 +94,13 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/coralnexus/nucleon"
   s.licenses = ["GPLv3"]
   s.rdoc_options = ["--title", "Nucleon", "--main", "README.rdoc", "--line-numbers"]
-  s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.1")
   s.rubyforge_project = "nucleon"
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "2.2.2"
   s.summary = "Framework that provides a simple foundation for building distributively configured, extremely pluggable and extendable, and easily parallel Ruby applications"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<log4r>, ["~> 1.1"])
@@ -108,7 +109,7 @@ Gem::Specification.new do |s|
       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<childprocess>, ["~> 0.5"])
       s.add_runtime_dependency(%q<celluloid>, ["~> 0.15"])
       s.add_runtime_dependency(%q<rugged>, ["~> 0.19"])
       s.add_runtime_dependency(%q<octokit>, ["~> 2.7"])
@@ -124,7 +125,7 @@ Gem::Specification.new do |s|
       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<childprocess>, ["~> 0.5"])
       s.add_dependency(%q<celluloid>, ["~> 0.15"])
       s.add_dependency(%q<rugged>, ["~> 0.19"])
       s.add_dependency(%q<octokit>, ["~> 2.7"])
@@ -141,7 +142,7 @@ Gem::Specification.new do |s|
     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<childprocess>, ["~> 0.5"])
     s.add_dependency(%q<celluloid>, ["~> 0.15"])
     s.add_dependency(%q<rugged>, ["~> 0.19"])
     s.add_dependency(%q<octokit>, ["~> 2.7"])

metadata

@@ -1,197 +1,234 @@
 --- !ruby/object:Gem::Specification
 name: nucleon
 version: !ruby/object:Gem::Version
-  version: 0.1.11
-  prerelease: 
+  version: 0.1.12
 platform: ruby
 authors:
 - Adrian Webb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &23185960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *23185960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &23185380 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *23185380
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: netrc
-  requirement: &23184460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *23184460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &23183740 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *23183740
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &23183200 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *23183200
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: sshkey
-  requirement: &23182520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *23182520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &23181760 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *23181760
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &23181040 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
   type: :runtime
   prerelease: false
-  version_requirements: *23181040
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: rugged
-  requirement: &23180540 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
   type: :runtime
   prerelease: false
-  version_requirements: *23180540
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: octokit
-  requirement: &23179980 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *23179980
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &23253080 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *23253080
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &23251720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *23251720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23250760 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.10'
   type: :development
   prerelease: false
-  version_requirements: *23250760
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &23249360 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *23249360
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &23248640 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *23248640
-description: ! '
-
-  A framework that provides a simple foundation for building Ruby applications that
-  are:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+description: |2
 
+  A framework that provides a simple foundation for building Ruby applications that are:
 
   * Highly configurable (with both distributed and persistent configurations)
-
   * Extremely pluggable and extendable
-
   * Easily parallel
 
-
   Note: This framework is still very early in development!
-
-'
 email: adrian.webb@coralnexus.com
 executables:
 - nucleon
@@ -200,7 +237,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
+- ".document"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -273,32 +310,31 @@ files:
 homepage: http://github.com/coralnexus/nucleon
 licenses:
 - GPLv3
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - Nucleon
-- --main
+- "--main"
 - README.rdoc
-- --line-numbers
+- "--line-numbers"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.1
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: nucleon
-rubygems_version: 1.8.11
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Framework that provides a simple foundation for building distributively configured,
   extremely pluggable and extendable, and easily parallel Ruby applications
 test_files: []