nucleon 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 966899ec9ca819e5cbfc37f589762d08ee4d37d0
-  data.tar.gz: c39dc67b0a2ed70f0de66eac0b1caaccd452353c
+  metadata.gz: d10a46930f8caf3251ae8b76d41b6ab9b62d574e
+  data.tar.gz: 985081596d90a480a7ec1db3d632942d22b679af
 SHA512:
-  metadata.gz: 4e20ea49274b90ba8f883ba9e8481ca9ba080678e3bf996b15a5abefb31d5d59b0b194e0f3c5db6b07be30ccba024d75d80f267ead918c049469c48b60c1c3fb
-  data.tar.gz: 6b9ce73ba51a95c903969b80334c05a520746a23d6e4e06e59b2aa81f49d0c93ce607c48db87cfe4054b09093c1c927a174da92f833b3fed81668fa911933467
+  metadata.gz: 7955a1fd5c4816170b7aedcbcede162b309bccad724c47a8f502e213ebade046ad8f324283a60acbf2c190de5ff5bfe1018513ccae142aae6ff150582d6a7d0b
+  data.tar.gz: 57d13dce28164b20c48ea994df8c612021f76ad2e61b64a245a60b69188858c259f1c144545d5be6d3cde9f22700642916d23b7cefdbad54c5418894e6409eca

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/lib/core/manager.rb

@@ -529,6 +529,8 @@ class Manager
     type_info  = loaded_plugin(namespace, plugin_type, provider)
     options    = translate_type(type_info, options)
     config     = Config.ensure(options)
+
+    provider   = config.get(:provider, provider)
     name       = config.get(:name, nil)
     ensure_new = config.get(:new, false)
 

data/lib/core/plugin/project.rb

@@ -28,9 +28,9 @@ class Project < Nucleon.plugin_class(:nucleon, :base)
       logger.info("Creating new project at #{directory} with #{provider}")
 
       return Nucleon.project(config.import({
-        :name      => directory,
-        :directory => directory,
-        :corl_file => config.get(:corl_file, true)
+        :name         => directory,
+        :directory    => directory,
+        :nucleon_file => config.get(:nucleon_file, true)
       }), provider)
 
     else
@@ -74,8 +74,14 @@ class Project < Nucleon.plugin_class(:nucleon, :base)
       @cache = Util::Cache.new(directory, Nucleon.sha1(plugin_name), '.project_cache')
       init_cache
 
-      if get(:corl_file, true) && ! self.class.load_provider(directory)
-        self.class.store_provider(directory, plugin_provider)
+      if get(:nucleon_file, true) && ( get(:nucleon_resave, false) || self.class.load_project_info(directory).empty? )
+        self.class.store_project_info(directory, plugin_provider, Util::Data.subset(export, [
+          :provider,
+          :url,
+          :edit,
+          :revision,
+          :manage_ignore
+        ]))
       end
     end
   end
@@ -523,7 +529,7 @@ class Project < Nucleon.plugin_class(:nucleon, :base)
           if add_project
             logger.debug("Directory #{project_path} is a valid sub project for this #{plugin_provider} project")
 
-            project = myself.class.open(project_path, plugin_provider, { :corl_file => get(:corl_file, true) })
+            project = myself.class.open(project_path, plugin_provider, { :nucleon_file => get(:nucleon_file, true) })
 
             extension(:load_project, { :project => project })
             subprojects[path] = project
@@ -888,18 +894,18 @@ class Project < Nucleon.plugin_class(:nucleon, :base)
   # State configurations
 
   def self.state_file
-    '.corl'
+    '.nucleon'
   end
 
   #---
 
   @@project_data = {}
 
-  def self.store_provider(directory, provider)
+  def self.store_project_info(directory, provider, options)
     if File.directory?(directory)
-      @@project_data[directory] = {
+      @@project_data[directory] = Config.ensure(options).import({
         :provider => provider
-      }
+      }).export
       json_data = Util::Data.to_json(@@project_data[directory], true)
       Util::Disk.write(File.join(directory, state_file), json_data)
     end
@@ -907,20 +913,20 @@ class Project < Nucleon.plugin_class(:nucleon, :base)
 
   #---
 
-  def self.clear_provider(directory)
+  def self.clear_project_info(directory)
     @@project_data.delete(directory)
   end
 
   #---
 
-  def self.load_provider(directory, override = nil)
+  def self.load_project_info(directory)
     @@project_data[directory] = {} unless @@project_data.has_key?(directory)
 
-    if override.nil? && @@project_data[directory].empty?
+    if @@project_data[directory].empty?
       json_data                 = Util::Disk.read(File.join(directory, state_file))
       @@project_data[directory] = hash(Util::Data.parse_json(json_data)) if json_data
     end
-    override.nil? ? symbol_map(@@project_data[directory])[:provider] : override
+    symbol_map(@@project_data[directory])
   end
 
   #-----------------------------------------------------------------------------

data/lib/core/util/ssh.rb

@@ -162,12 +162,12 @@ class SSH < Core
         :user_known_hosts_file => [ File.join(key_path, 'known_hosts'), File.join(key_path, 'known_hosts2') ],
         :auth_methods          => [ 'publickey' ],
         :paranoid              => :very
-      }, {}, true, false).import(Util::Data.subset(config, config.keys - [ :keypair, :key_dir, :key_name ]))
+      }, {}, true, false).import(Util::Data.subset(config, config.keys - [ :keypair, :key_dir, :key_name, :reset_conn ]))
 
       if private_key
         auth_id = [ session_id, private_key ].join('_')
 
-        if ! @@auth[auth_id] && keypair = unlock_private_key(private_key, config)
+        if (config[:reset_conn] || ! @@auth[auth_id]) && keypair = unlock_private_key(private_key, config)
           @@auth[auth_id] = keypair
         end
         config[:keypair] = @@auth[auth_id] # Reset so caller can access updated keypair

data/lib/nucleon/extension/project.rb

@@ -2,11 +2,12 @@
 module Nucleon
 module Extension
 class Project < Nucleon.plugin_class(:nucleon, :extension)
-  
+
   def manager_plugin_provider(config)
     if config[:namespace] == :nucleon && config[:type] == :project
-      if config[:directory] && provider = Nucleon::Plugin::Project.load_provider(config[:directory])
-        return provider
+      if config[:directory]
+        project_info = Nucleon::Plugin::Project.load_project_info(config[:directory])
+        return project_info[:provider] unless project_info.empty?
       end
     end
     nil

data/lib/nucleon/project/github.rb

@@ -6,79 +6,79 @@ nucleon_require(File.dirname(__FILE__), :git)
 module Nucleon
 module Project
 class Github < Git
- 
+
   #-----------------------------------------------------------------------------
   # Project plugin interface
- 
-  def normalize(reload)    
+
+  def normalize(reload)
     if reference = delete(:reference, nil)
       myself.plugin_name = normalize_reference(reference)
     else
       if url = get(:url, nil)
         myself.plugin_name = url
         set(:url, myself.class.expand_url(url, get(:ssh, false)))
-      end  
-    end    
+      end
+    end
     super
   end
-  
+
   #---
-  
+
   def set_connection
     require 'octokit'
-    
+
     @client = Octokit::Client.new :netrc => true
     @client.login
   end
-  
+
   #-----------------------------------------------------------------------------
   # Property accessor / modifiers
-  
+
   def client
     set_connection unless @client
     @client
   end
-  
+
   #-----------------------------------------------------------------------------
   # Project operations
-  
+
   def init_auth
     super do
       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
         deploy_keys = client.deploy_keys(plugin_name)
         github_id   = nil
         keys_match  = true
-                   
+
         deploy_keys.each do |key_resource|
           if key_resource.title == key_id
-            github_id  = key_resource.id              
+            github_id  = key_resource.id
             keys_match = false if key_resource.key != ssh_key
             break
-          end  
+          end
         end
-                     
+
         client.remove_deploy_key(myself.plugin_name, github_id) if github_id && ! keys_match
         client.add_deploy_key(myself.plugin_name, key_id, ssh_key)
         verify_key
       end
-    end  
+    end
   end
-     
+
   #-----------------------------------------------------------------------------
   # Utilities
-  
+
   def self.expand_url(path, editable = false)
     if path =~ /^[a-zA-Z0-9_\-\/]+$/
       if editable
@@ -92,19 +92,19 @@ class Github < Git
     else
       url = path
     end
-    url    
+    url
   end
-  
+
   #---
-  
+
   def verify_key
     Util::SSH.init_session('github.com', 'git', 22, private_key)
     Util::SSH.close('github.com', 'git')
   end
   protected :verify_key
-  
+
   #---
-  
+
   def normalize_reference(reference)
     reference.sub(/^(git\@|(https?|git)\:\/\/)[^\/\:]+(\/|\:)?/, '').sub(/\.git$/, '')
   end

data/nucleon.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: nucleon 0.2.6 ruby lib
+# stub: nucleon 0.2.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nucleon"
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   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 = "2015-01-18"
+  s.date = "2015-01-19"
   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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nucleon
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Adrian Webb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r