nucleon 0.1.9 → 0.1.10

data/Gemfile

@@ -12,7 +12,7 @@ gem "sshkey", "~> 1.6"
 gem "childprocess", "~> 0.5.0"
 gem "celluloid", "~> 0.15"
 
-gem "grit", "~> 2.5"
+gem "rugged", "~> 0.19"
 gem "octokit", "~> 2.7"
 
 group :development do

data/Gemfile.lock

@@ -1,14 +1,16 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.3.6)
+    atomic (1.1.16)
     builder (3.2.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    childprocess (0.5.1)
+    childprocess (0.5.2)
       ffi (~> 1.0, >= 1.0.11)
     deep_merge (1.0.1)
-    descendants_tracker (0.0.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
@@ -22,10 +24,6 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.0)
       oauth2
-    grit (2.5.0)
-      diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
     hashie (2.0.5)
     highline (1.6.21)
     i18n (0.6.9)
@@ -42,8 +40,7 @@ GEM
     jwt (0.1.11)
       multi_json (>= 1.5)
     log4r (1.1.10)
-    mime-types (1.25.1)
-    mini_portile (0.5.2)
+    mini_portile (0.5.3)
     multi_json (1.9.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
@@ -58,9 +55,8 @@ GEM
       rack (~> 1.2)
     octokit (2.7.2)
       sawyer (~> 0.5.2)
-    posix-spawn (0.3.8)
     rack (1.5.2)
-    rake (10.1.1)
+    rake (10.2.2)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.14.1)
@@ -71,12 +67,15 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    sawyer (0.5.3)
+    rugged (0.19.0)
+    sawyer (0.5.4)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
     sshkey (1.6.1)
+    thread_safe (0.3.1)
+      atomic (>= 1.1.7, < 2)
     timers (1.1.0)
-    yard (0.8.7.3)
+    yard (0.8.7.4)
 
 PLATFORMS
   ruby
@@ -86,7 +85,6 @@ DEPENDENCIES
   celluloid (~> 0.15)
   childprocess (~> 0.5.0)
   deep_merge (~> 1.0)
-  grit (~> 2.5)
   i18n (~> 0.6)
   jeweler (~> 2.0)
   log4r (~> 1.1)
@@ -95,5 +93,6 @@ DEPENDENCIES
   octokit (~> 2.7)
   rdoc (~> 3.12)
   rspec (~> 2.10)
+  rugged (~> 0.19)
   sshkey (~> 1.6)
   yard (~> 0.8)

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/lib/core/facade.rb

@@ -332,7 +332,7 @@ module Facade
         
     result = Util::Shell.connection.exec(command, config, &code)
     
-    unless result.status == Nucleon.code.success
+    unless config.get(:quiet, false) || result.status == Nucleon.code.success
       ui.error("Command #{command} failed to execute")
     end     
     result

data/lib/core/manager.rb

@@ -3,7 +3,6 @@ module Nucleon
 class Manager
   
   include Celluloid
-  task_class TaskThread
   
   #-----------------------------------------------------------------------------
   

data/lib/core/mixin/action/project.rb

@@ -8,7 +8,7 @@ module Project
   # Settings
         
   def project_config
-    project_plugins = CORL.loaded_plugins(:project)
+    project_plugins = Nucleon.loaded_plugins(:project)
     
     register :project_provider, :str, :git, 'nucleon.core.mixin.action.project.options.project_provider' do |value|
       value = value.to_sym
@@ -21,7 +21,7 @@ module Project
     end
     register :project_reference, :str, nil, 'nucleon.core.mixin.action.project.options.project_reference' do |value|
       success = true
-      if info = CORL.plugin_class(:project).translate_reference(value)
+      if info = Nucleon.plugin_class(:project).translate_reference(value)
         if ! project_plugins.keys.include?(info[:provider].to_sym)
           warn('nucleon.core.mixin.action.project.errors.project_reference', { 
             :value     => value, 
@@ -35,26 +35,27 @@ module Project
       end
       success
     end
-    register :revision, :str, :master
+    register :project_revision, :str, :master, 'nucleon.core.mixin.action.project.options.project_revision'
   end
         
   #-----------------------------------------------------------------------------
   # Operations
         
-  def project_load(root_dir, update = false)
+  def project_load(root_dir, create = false, update = false)
         
     # 1. Set a default project provider (reference can override)
     # 2. Get project from root directory
-    # 3. Initialize project if not yet initialized
+    # 3. Initialize project if not yet initialized if requested
     # 4. Set remote if needed
     # 5. Checkout revision if needed
     # 6. Pull down updates if requested
           
     return Nucleon.project(extended_config(:project, {
+      :create    => create,
       :provider  => settings[:project_provider],
       :directory => root_dir,
-      :url       => settings[:reference],
-      :revision  => settings[:revision],
+      :url       => settings[:project_reference],
+      :revision  => settings[:project_revision],
       :pull      => update
     }))
   end       

data/lib/core/plugin/action.rb

@@ -337,7 +337,7 @@ class Action < Base
       begin
         if skip_validate || validate
           yield if block_given? && ( skip_hooks || extension_check(:exec_init) )
-          myself.status = extension_set(:exec_exit) unless skip_hooks
+          myself.status = extension_set(:exec_exit, myself.status) unless skip_hooks
         else
           puts "\n" + I18n.t('corl.core.exec.help.usage') + ': ' + help + "\n" unless quiet?
           myself.status = code.validation_failed 

data/lib/core/plugin/project.rb

@@ -550,14 +550,16 @@ class Project < Base
  
   #---
    
-  def update_subprojects
+  def update_subprojects(options = {})
     if can_persist?
       localize do
+        config = Config.ensure(options)
+        
         if extension_check(:update_projects)
           logger.info("Updating sub projects in project #{name}")
       
           success = false
-          success = yield if block_given?
+          success = yield(config) if block_given?
         
           if success
             extension(:update_projects_success)
@@ -723,11 +725,12 @@ class Project < Base
       
         if extension_check(:pull, { :directory => directory, :config => config })
           remote = config.delete(:remote)
-        
-          logger.info("Pulling from #{remote} into #{directory}") 
-      
-          success = yield(config, remote) if block_given?
-      
+              
+          if remote(remote)
+            logger.info("Pulling from #{remote} into #{directory}") 
+            success = yield(config, remote) if block_given?
+          end
+          
           if success
             load_revision
             update_subprojects
@@ -763,20 +766,40 @@ class Project < Base
         if extension_check(:push, { :directory => directory, :config => config })
           remote = config.delete(:remote)
         
-          logger.info("Pushing to #{remote} from #{directory}") 
-      
-          success = yield(config, remote) if block_given?
-        
+          if remote(remote)
+            logger.info("Pushing to #{remote} from #{directory}") 
+            success = yield(config, remote) if block_given? && pull(remote, options)
+          end
+          
           if success
             config.delete(:revision)
           
             extension(:push_success, { :directory => directory, :remote => remote, :config => config })  
       
             if config.get(:propogate, true)
-              logger.debug("Pushing sub projects as propogate option was given")
+              unless parent.nil?
+                propogate_up = config.get(:propogate_up, nil)
+                
+                if propogate_up.nil? || propogate_up
+                  logger.debug("Commit to parent as parent exists and propogate option was given")
+                  parent.push(remote, Config.new(config.export.dup).import({ 
+                    :propogate_up   => true, 
+                    :propogate_down => false 
+                  }))
+                end
+              end
+              
+              logger.debug("Pushing sub projects")
+              
+              propogate_down = config.get(:propogate_down, nil)
         
-              each do |path, project|
-                project.push(remote, config)
+              if propogate_down.nil? || propogate_down
+                each do |path, project|
+                  project.push(remote, Config.new(config.export.dup).import({ 
+                    :propogate_up   => false, 
+                    :propogate_down => true 
+                  }))
+                end
               end
             end
           end
@@ -883,9 +906,11 @@ class Project < Base
   
   #---
   
-  def localize
+  def localize(path = nil)
     prev_directory = Dir.pwd
-    Dir.chdir(directory)
+    path           = directory if path.nil?
+    
+    Dir.chdir(path)
     
     result = safe_exec(true) do
       yield  

data/lib/core/util/git.rb

@@ -1,42 +1,47 @@
 
 module Nucleon
 module Util
-class Git < ::Grit::Repo
+class Git
 
   #-----------------------------------------------------------------------------
-  # Constructor / Destructor
-
-  def initialize(path, options = {})
+  # Git repo loader
+  
+  def self.load(path, options = {})
     epath   = File.expand_path(path)
     git_dir = File.join(epath, '.git')
+    git     = nil
     
-    @bare = (options[:is_bare] ? true : false)
-    
-    Grit.debug = true if Nucleon.log_level == :debug
-    
-    if File.exist?(git_dir)
-      self.working_dir = epath
-      
-      if File.directory?(git_dir)
-        self.path = git_dir
-      else
-        git_dir = Util::Disk.read(git_dir)
-        unless git_dir.nil?
-          git_dir = git_dir.gsub(/^gitdir\:\s*/, '').strip
-          self.path = git_dir if File.directory?(git_dir)
-        end
+    begin
+      if File.exist?(git_dir)
+        if File.directory?(git_dir)
+          git = Rugged::Repository.new(git_dir)
+        else
+          # TODO: Find out if this is actually necessary with Rugged / LibGit2
+          git_dir = Util::Disk.read(git_dir)
+          unless git_dir.nil?
+            git_dir = git_dir.gsub(/^gitdir\:\s*/, '').strip
+          
+            if File.directory?(git_dir)
+              git         = Rugged::Repository.new(git_dir)
+              git.workdir = epath  
+            end
+          end
+        end      
+      elsif File.directory?(epath) && (options[:bare] || (epath =~ /\.git$/ && File.exist?(File.join(epath, 'HEAD'))))
+        git = Rugged::Repository.bare(epath)
       end
-      
-    elsif File.directory?(epath) && (options[:is_bare] || (epath =~ /\.git$/ && File.exist?(File.join(epath, 'HEAD'))))
-      self.path = epath
-      @bare = true
-      
-    else
-      self.path = git_dir
+    rescue
     end
     
-    self.git = ::Grit::Git.new(self.path)
-    self.git.work_tree = epath
+    if git.nil? && options[:create]
+      FileUtils.mkdir_p(epath) unless File.directory?(epath)
+      if options[:bare]
+        git = Rugged::Repository.init_at(epath, :bare)
+      else
+        git = Rugged::Repository.init_at(epath)
+      end
+    end        
+    git
   end
 end
 end

data/lib/nucleon/action/add.rb

@@ -14,8 +14,26 @@ class Add < Nucleon.plugin_class(:action)
       codes :project_failure,
             :add_failure,
             :push_failure
-            
+      
+      register :path, :str, Dir.pwd        
+      
       register :sub_path, :str, nil
+      register :sub_reference, :str, nil do |value|
+        success = true
+        if info = Nucleon.plugin_class(:project).translate_reference(value)
+          if ! Nucleon.loaded_plugins(:project).keys.include?(info[:provider].to_sym)
+            warn('nucleon.core.mixin.action.project.errors.project_reference', { 
+              :value     => value, 
+              :provider  => info[:provider],  
+              :reference => info[:reference],
+              :url       => info[:url],
+              :revision  => info[:revision] 
+            })
+            success = false
+          end
+        end
+        success
+      end      
       register :editable, :bool, false
       
       project_config
@@ -26,7 +44,7 @@ class Add < Nucleon.plugin_class(:action)
   #---
   
   def arguments
-    [ :sub_path, :project_reference ]
+    [ :sub_path, :sub_reference ]
   end
 
   #-----------------------------------------------------------------------------
@@ -36,15 +54,15 @@ class Add < Nucleon.plugin_class(:action)
     super do
       info('nucleon.actions.add.start')
       
-      if project = project_load(Dir.pwd, false)
-        sub_info = project.translate_reference(settings[:project_reference], settings[:editable])
+      if project = project_load(settings[:path], false)
+        sub_info = project.translate_reference(settings[:sub_reference], settings[:editable])
         sub_path = settings[:sub_path]
           
         if sub_info
           sub_url      = sub_info[:url]
           sub_revision = sub_info[:revision]
         else
-          sub_url      = settings[:project_reference]
+          sub_url      = settings[:sub_reference]
           sub_revision = nil
         end
           

data/lib/nucleon/action/create.rb

@@ -12,9 +12,10 @@ class Create < Nucleon.plugin_class(:action)
     super do    
       codes :project_failure
       
-      register :path, :str, Dir.pwd
-      
+      register :path, :str, Dir.pwd      
       project_config
+      
+      config[:project_reference].default = ''
     end
   end
   
@@ -28,17 +29,10 @@ class Create < Nucleon.plugin_class(:action)
   # Operations
    
   def execute
-    super do |node, network|
+    super do
       info('nucleon.actions.create.start')
       
-      project = Nucleon.project(extended_config(:project, {
-        :create    => true,
-        :directory => settings[:path],
-        :url       => settings[:project_reference],
-        :revision  => settings[:revision],
-        :pull      => true
-      }), settings[:project_provider])
-      
+      project       = project_load(settings[:path], true, true)
       myself.status = code.project_failure unless project
     end
   end

data/lib/nucleon/action/extract.rb

@@ -38,7 +38,7 @@ class Extract < Nucleon.plugin_class(:action)
   # Operations
   
   def execute
-    super do |node, network|
+    super do
       unless @package.extract(settings[:path])
         myself.status = code.extract_failure
       end

data/lib/nucleon/action/remove.rb

@@ -14,7 +14,8 @@ class Remove < Nucleon.plugin_class(:action)
       codes :project_failure,
             :delete_failure,
             :push_failure
-            
+      
+      register :path, :str, Dir.pwd       
       register :sub_path, :str, nil
       
       project_config
@@ -36,10 +37,10 @@ class Remove < Nucleon.plugin_class(:action)
   # Operations
   
   def execute
-    super do |node, network|
+    super do
       info('nucleon.actions.remove.start')
       
-      if project = project_load(Dir.pwd, false)
+      if project = project_load(settings[:path], false)
         if project.delete_subproject(settings[:sub_path])
           myself.status = code.push_failure unless push(project)
         else