capricorn 0.2.21 → 0.2.22

data/lib/capricorn/apps/satellite.rb

@@ -4,15 +4,21 @@ module Capricorn
   module Apps # :nodoc:
     
     class Satellite < Thor
-      desc 'list', 'show all managed satellites'
+      desc 'list [DOMAIN]', 'show info for managed satellites'
       method_options :token => :optional
-      def list
-        satellites = Capricorn.client(options[:token]).satellites
+      def list(domain=nil)
+        satellites = Capricorn.client(options[:token]).satellites.dup
+        satellites.sort! { |a,b| a.domain <=> b.domain }
         satellites.size.times do |i|
           sat = satellites[i]
-          puts [sat.domain, (sat.development ? ['development:', sat.module_name] : [])].flatten.join(' ')
-          sat.engines.each do |name, options|
-            puts "- #{name} #{options.inspect}"
+          if domain.nil? or domain == sat.domain
+            puts [
+              sat.domain,
+              (sat.development ? ['development:', sat.module_name] : [])
+            ].flatten.join(' ')
+            sat.engines.each do |name, options|
+              puts "- #{name} #{options.inspect}"
+            end
           end
         end
       rescue => e
@@ -37,6 +43,18 @@ module Capricorn
       def relink(domain)
         Capricorn.client(options[:token]).relink_satellite(domain)
       end
+      
+      desc 'update DOMAIN', 'update the installed engines of a satellite'
+      method_options :token => :optional
+      def update(domain)
+        Capricorn.client(options[:token]).update_satellite(domain)
+      end
+      
+      # desc 'upgrade DOMAIN', 'upgrade/rebuild the rails app of a satellite'
+      # method_options :token => :optional
+      # def upgrade(domain)
+      #   Capricorn.client(options[:token]).upgrade_satellite(domain)
+      # end
     end
     
   end

data/lib/capricorn/satellite/actions.rb

@@ -12,6 +12,24 @@ module Capricorn
         end
       end
       
+      def update_all_engines
+        @engines.each do |gem_name,options|
+          dep = Gem::Dependency.new(gem_name.to_s, Gem::Requirement.default)
+          specs = Gem::SourceIndex.from_installed_gems.search(dep)
+          
+          return false if specs.empty?
+          
+          specs.sort! do |a,b|
+            b.version <=> a.version
+          end
+          
+          spec_version = specs.first.version.to_s
+          options[:version] = spec_version
+        end
+        
+        return true
+      end
+      
       def update_engine(name, options={})
         if @engines.key? name
           @engines[name] = options

data/lib/capricorn/server.rb

@@ -65,6 +65,15 @@ module Capricorn
       end
     end
     
+    def update_satellite(domain)
+      satellite = Capricorn.system.find_satellite(domain)
+      if satellite
+        Capricorn.system.update_satellite(satellite)
+      else
+        Capricorn.log "Satellite not found (#{domain})"
+      end
+    end
+    
     def uninstall_satellite(domain)
       satellite = Capricorn.system.find_satellite(domain)
       if satellite

data/lib/capricorn/server/proxy.rb

@@ -14,7 +14,7 @@ module Capricorn
         end
       end
       
-      allow :stop_server, :restart_server, :reload_server, :server_version, :update_server, :install_satellite, :uninstall_satellite, :install_engine, :update_engine, :uninstall_engine, :satellites, :queued_jobs, :cancel_job, :immediate_job, :make_development_satellite, :update_gems, :relink_satellite
+      allow :stop_server, :restart_server, :reload_server, :server_version, :update_server, :install_satellite, :uninstall_satellite, :install_engine, :update_engine, :uninstall_engine, :satellites, :queued_jobs, :cancel_job, :immediate_job, :make_development_satellite, :update_gems, :relink_satellite, :update_satellite
       
       class << self
         undef_method :allow

data/lib/capricorn/system.rb

@@ -88,6 +88,23 @@ module Capricorn
       end
     end
     
+    def update_satellite(satellite)
+      if satellite
+        self.queue.enqueue("update #{satellite.domain}", :satellite => satellite) do |options|
+          
+          satellite = options[:satellite]
+          if satellite.update_all_engines
+            run_action_on :update_engine, satellite
+            run_action_on :link_satellite, satellite
+            save_satellite! satellite
+          end
+          
+        end
+      else
+        false
+      end
+    end
+    
     def uninstall_satellite(satellite)
       if satellite
         self.queue.enqueue("uninstall #{satellite.domain}", :satellite => satellite) do |options|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capricorn
 version: !ruby/object:Gem::Version 
-  version: 0.2.21
+  version: 0.2.22
 platform: ruby
 authors: 
 - Simon Menke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-20 00:00:00 +02:00
+date: 2009-09-16 00:00:00 +02:00
 default_executable: capricorn
 dependencies: []