capricorn 0.2.22 → 0.2.23

data/lib/capricorn/apps/engines.rb

@@ -5,27 +5,27 @@ module Capricorn
     
     class Engines < Thor
       desc 'install DOMAIN NAME', 'install an engine'
-      method_options :version => :required, :lib => :optional, :source => :optional, :token => :optional
+      method_options :version => :required, :lib => :optional, :source => :optional, :token => :optional, :immediate => :boolean
       def install(domain, name)
         desc = { :version => options[:version] }
         desc[:lib]    = options[:lib]    if options[:lib]
         desc[:source] = options[:source] if options[:source]
-        Capricorn.client(options[:token]).install_engine(domain, name, desc)
+        Capricorn.client(options[:token]).install_engine(domain, name, desc, options[:immediate])
       end
       
       desc 'update DOMAIN NAME', 'update an engine'
-      method_options :version => :required, :lib => :optional, :source => :optional, :token => :optional
+      method_options :version => :required, :lib => :optional, :source => :optional, :token => :optional, :immediate => :boolean
       def update(domain, name)
         desc = { :version => options[:version] }
         desc[:lib]    = options[:lib]    if options[:lib]
         desc[:source] = options[:source] if options[:source]
-        Capricorn.client(options[:token]).update_engine(domain, name, desc)
+        Capricorn.client(options[:token]).update_engine(domain, name, desc, options[:immediate])
       end
       
       desc 'uninstall DOMAIN NAME', 'uninstall an engine'
-      method_options :token => :optional
+      method_options :token => :optional, :immediate => :boolean
       def uninstall(domain, name)
-        Capricorn.client(options[:token]).uninstall_engine(domain, name)
+        Capricorn.client(options[:token]).uninstall_engine(domain, name, options[:immediate])
       end
     end
     

data/lib/capricorn/apps/satellite.rb

@@ -8,10 +8,17 @@ module Capricorn
       method_options :token => :optional
       def list(domain=nil)
         satellites = Capricorn.client(options[:token]).satellites.dup
-        satellites.sort! { |a,b| a.domain <=> b.domain }
+        
+        names_by_index = []
         satellites.size.times do |i|
           sat = satellites[i]
-          if domain.nil? or domain == sat.domain
+          names_by_index.push([sat.domain, i])
+        end
+        names_by_index.sort! { |a,b| a.first <=> b.first }
+        
+        names_by_index.each do |(domain, i)|
+          sat = satellites[i]
+          if domain.nil? or sat.domain.include?(domain)
             puts [
               sat.domain,
               (sat.development ? ['development:', sat.module_name] : [])
@@ -27,31 +34,31 @@ module Capricorn
       end
       
       desc 'install DOMAIN', 'install a satellite'
-      method_options :token => :optional
+      method_options :token => :optional, :immediate => :boolean
       def install(domain)
-        Capricorn.client(options[:token]).install_satellite(domain)
+        Capricorn.client(options[:token]).install_satellite(domain, options[:immediate])
       end
       
       desc 'uninstall DOMAIN', 'uninstall a satellite'
-      method_options :token => :optional
+      method_options :token => :optional, :immediate => :boolean
       def uninstall(domain)
-        Capricorn.client(options[:token]).uninstall_satellite(domain)
+        Capricorn.client(options[:token]).uninstall_satellite(domain, options[:immediate])
       end
       
       desc 'relink DOMAIN', 'relink a satellite'
-      method_options :token => :optional
+      method_options :token => :optional, :immediate => :boolean
       def relink(domain)
-        Capricorn.client(options[:token]).relink_satellite(domain)
+        Capricorn.client(options[:token]).relink_satellite(domain, options[:immediate])
       end
       
       desc 'update DOMAIN', 'update the installed engines of a satellite'
-      method_options :token => :optional
+      method_options :token => :optional, :immediate => :boolean
       def update(domain)
-        Capricorn.client(options[:token]).update_satellite(domain)
+        Capricorn.client(options[:token]).update_satellite(domain, options[:immediate])
       end
       
       # desc 'upgrade DOMAIN', 'upgrade/rebuild the rails app of a satellite'
-      # method_options :token => :optional
+      # method_options :token => :optional, :immediate => :boolean
       # def upgrade(domain)
       #   Capricorn.client(options[:token]).upgrade_satellite(domain)
       # end

data/lib/capricorn/job_queue.rb

@@ -35,6 +35,9 @@ module Capricorn
         @next_id += 1
         @jobs[job.id] = job
         @job_queue.push job.id
+        if options[:immediate]
+          @immediated_jobs.push(id)
+        end
         return job.id
       end
     end

data/lib/capricorn/satellite/actions.rb

@@ -14,6 +14,8 @@ module Capricorn
       
       def update_all_engines
         @engines.each do |gem_name,options|
+          Capricorn.system.gem_update(gem_name)
+          
           dep = Gem::Dependency.new(gem_name.to_s, Gem::Requirement.default)
           specs = Gem::SourceIndex.from_installed_gems.search(dep)
           

data/lib/capricorn/server.rb

@@ -52,32 +52,32 @@ module Capricorn
       Capricorn.system.gem_update(:all)
     end
     
-    def install_satellite(domain)
-      Capricorn.system.install_satellite(domain)
+    def install_satellite(domain, immediate)
+      Capricorn.system.install_satellite(domain, immediate)
     end
     
-    def relink_satellite(domain)
+    def relink_satellite(domain, immediate)
       satellite = Capricorn.system.find_satellite(domain)
       if satellite
-        Capricorn.system.relink_satellite(satellite)
+        Capricorn.system.relink_satellite(satellite, immediate)
       else
         Capricorn.log "Satellite not found (#{domain})"
       end
     end
     
-    def update_satellite(domain)
+    def update_satellite(domain, immediate)
       satellite = Capricorn.system.find_satellite(domain)
       if satellite
-        Capricorn.system.update_satellite(satellite)
+        Capricorn.system.update_satellite(satellite, immediate)
       else
         Capricorn.log "Satellite not found (#{domain})"
       end
     end
     
-    def uninstall_satellite(domain)
+    def uninstall_satellite(domain, immediate)
       satellite = Capricorn.system.find_satellite(domain)
       if satellite
-        Capricorn.system.uninstall_satellite(satellite)
+        Capricorn.system.uninstall_satellite(satellite, immediate)
       else
         Capricorn.log "Satellite not found (#{domain})"
       end
@@ -92,28 +92,28 @@ module Capricorn
       end
     end
     
-    def install_engine(domain, name, options={})
+    def install_engine(domain, name, options, immediate)
       satellite = Capricorn.system.find_satellite(domain)
       if satellite
-        Capricorn.system.install_engine(satellite, name, options)
+        Capricorn.system.install_engine(satellite, name, options, immediate)
       else
         Capricorn.log "Satellite not found (#{domain})"
       end
     end
     
-    def update_engine(domain, name, options={})
+    def update_engine(domain, name, options, immediate)
       satellite = Capricorn.system.find_satellite(domain)
       if satellite
-        Capricorn.system.update_engine(satellite, name, options)
+        Capricorn.system.update_engine(satellite, name, options, immediate)
       else
         Capricorn.log "Satellite not found (#{domain})"
       end
     end
     
-    def uninstall_engine(domain, name)
+    def uninstall_engine(domain, name, immediate)
       satellite = Capricorn.system.find_satellite(domain)
       if satellite
-        Capricorn.system.uninstall_engine(satellite, name)
+        Capricorn.system.uninstall_engine(satellite, name, immediate)
       else
         Capricorn.log "Satellite not found (#{domain})"
       end

data/lib/capricorn/system.rb

@@ -67,8 +67,8 @@ module Capricorn
       File.join(@root, *args)
     end
     
-    def install_satellite(domain)
-      self.queue.enqueue("install new satellite #{domain}", :domain => domain) do |options|
+    def install_satellite(domain, immediate)
+      self.queue.enqueue("install new satellite #{domain}", :domain => domain, :immediate => immediate) do |options|
         satellite = Capricorn::Satellite.new(options[:domain])
         
         run_action_on :install_satellite, satellite
@@ -77,8 +77,8 @@ module Capricorn
       end
     end
     
-    def relink_satellite(satellite)
-      self.queue.enqueue("relink #{satellite.domain}", :satellite => satellite) do |options|
+    def relink_satellite(satellite, immediate)
+      self.queue.enqueue("relink #{satellite.domain}", :satellite => satellite, :immediate => immediate) do |options|
         satellite = options[:satellite]
         
         if satellite
@@ -88,9 +88,9 @@ module Capricorn
       end
     end
     
-    def update_satellite(satellite)
+    def update_satellite(satellite, immediate)
       if satellite
-        self.queue.enqueue("update #{satellite.domain}", :satellite => satellite) do |options|
+        self.queue.enqueue("update #{satellite.domain}", :satellite => satellite, :immediate => immediate) do |options|
           
           satellite = options[:satellite]
           if satellite.update_all_engines
@@ -105,9 +105,9 @@ module Capricorn
       end
     end
     
-    def uninstall_satellite(satellite)
+    def uninstall_satellite(satellite, immediate)
       if satellite
-        self.queue.enqueue("uninstall #{satellite.domain}", :satellite => satellite) do |options|
+        self.queue.enqueue("uninstall #{satellite.domain}", :satellite => satellite, :immediate => immediate) do |options|
           run_action_on :uninstall_satellite, options[:satellite]
           destroy_satellite! options[:satellite]
         end
@@ -147,10 +147,10 @@ module Capricorn
       end
     end
     
-    def install_engine(satellite, name, options={})
+    def install_engine(satellite, name, options, immediate)
       if satellite
         self.queue.enqueue("install #{satellite.domain}: #{name} #{options.inspect}",
-          :satellite => satellite, :name => name, :options => options) do |options|
+          :satellite => satellite, :name => name, :options => options, :immediate => immediate) do |options|
           
           satellite, name, options = options[:satellite], options[:name], options[:options]
           resolve_options_with(satellite) { ensure_presence_of_gem(name, options) }
@@ -166,10 +166,10 @@ module Capricorn
       end
     end
     
-    def update_engine(satellite, name, options={})
+    def update_engine(satellite, name, options, immediate)
       if satellite
         self.queue.enqueue("update #{satellite.domain}: #{name} #{options.inspect}",
-          :satellite => satellite, :name => name, :options => options) do |options|
+          :satellite => satellite, :name => name, :options => options, :immediate => immediate) do |options|
           
           satellite, name, options = options[:satellite], options[:name], options[:options]
           resolve_options_with(satellite) { ensure_presence_of_gem(name, options) }
@@ -185,10 +185,10 @@ module Capricorn
       end
     end
     
-    def uninstall_engine(satellite, name)
+    def uninstall_engine(satellite, name, immediate)
       if satellite
         self.queue.enqueue("uninstall #{satellite.domain}: #{name}",
-          :satellite => satellite, :name => name) do |options|
+          :satellite => satellite, :name => name, :immediate => immediate) do |options|
           
           satellite, name = options[:satellite], options[:name]
           if satellite.remove_engine(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capricorn
 version: !ruby/object:Gem::Version 
-  version: 0.2.22
+  version: 0.2.23
 platform: ruby
 authors: 
 - Simon Menke