simonmenke-capricorn 0.2.07 → 0.2.25

data/app_generators/engine/templates/Gmfile

@@ -5,14 +5,14 @@ specify do |s|
   s.homepage = %q{Fix this}
 
   s.author = "[AUTHOR]"
-  s.email  = %q{Fix this}
+  s.email  = "[EMAIL]"
   
   s.ignore_files %r{^public/(\d{3}|index)\.html$}
   s.ignore_files %r{^public/favicon.ico$}
   s.ignore_files %r{^public/robots.txt$}
   s.ignore_files %r{^public/images/rails\.png$}
   s.ignore_files %r{^lib/tasks}
-  s.ignore_files %r{^config/(boot|database|environment|initializers|locales)}
+  s.ignore_files %r{^config/(boot|database|environment|initializers)}
   s.ignore_files %r{^app/controllers/application_controller.rb}
   s.ignore_files %r{^app/helpers/application_helper.rb}
   s.ignore_files %r{^db/schema.rb}

data/lib/capricorn.rb

@@ -51,7 +51,7 @@ module Capricorn
   RELOAD_STATUS  = 103
   QUICK_CERT     = "http://segment7.net/projects/ruby/QuickCert/QuickCert-1.0.2.tar.gz"
   
-  THOR_VERSION          = '>= 0.9.9'
+  THOR_VERSION          = '= 0.9.9'
   RUBIGEN_VERSION       = '>= 1.5.2'
   
   Capricorn::ExceptionHandler.setup

data/lib/capricorn/actors/base_actor.rb

@@ -43,12 +43,30 @@ module Capricorn
         Dir.chdir(system.satellite_root) do
           system.as_user(system.web_user, system.web_group) do
             
+            clean_index_html_file
             write_environment
             clean_links
             @dependecies.reverse_each do |spec|
               link_engine(spec)
             end
             
+            FileUtils.symlink(
+              File.join(system.satellite_root, "public"),
+              File.join(system.satellite_root, "public/vendor", satellite.module_name),
+              :verbose => true) rescue nil
+            
+            if File.exist? 'public/crossdomain.xml'
+              File.unlink 'public/crossdomain.xml'
+            end
+            File.open('public/crossdomain.xml', 'w+') do |f|
+              f.write %{<?xml version="1.0" encoding="UTF-8"?>
+<cross-domain-policy xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.adobe.com/xml/schemas/PolicyFile.xsd">
+  <allow-access-from domain="*" />
+  <site-control permitted-cross-domain-policies="master-only"/>
+  <allow-http-request-headers-from domain="*" headers="*" secure="false"/>
+</cross-domain-policy>}
+            end
+            
           end
           run_migrations
         end
@@ -56,6 +74,13 @@ module Capricorn
       
     private
       
+      def clean_index_html_file
+        index_html = File.join(system.satellite_root, 'public', 'index.html')
+        if File.file?(index_html)
+          FileUtils.rm_f(index_html, :verbose => true) rescue nil
+        end
+      end
+      
       def link(src, dst)
         FileUtils.mkdir_p(File.dirname(dst), :verbose => true)
         FileUtils.mkdir_p(src, :verbose => true)
@@ -100,6 +125,15 @@ module Capricorn
           end
         end
         
+        path = File.join(spec.full_gem_path, 'config/locales')
+        if File.directory?(path)
+          FileUtils.mkdir_p("config/locales", :verbose => true)
+          Dir.glob("#{path}/*.{rb,yml,yaml}").each do |locale_file|
+            FileUtils.ln_s(locale_file, "config/locales/#{File.basename(locale_file)}",
+              :verbose => true) rescue nil
+          end
+        end
+        
         path = File.join(spec.full_gem_path, 'db', 'migrate')
         if File.directory?(path)
           FileUtils.mkdir_p("db/migrate", :verbose => true)
@@ -114,6 +148,9 @@ module Capricorn
       end
       
       def clean_links
+        Dir.glob("config/locales/*").each do |path|
+          FileUtils.rm_rf(path) if File.symlink?(path)
+        end
         FileUtils.rm_rf("lib/tasks/vendor", :verbose => true)
         FileUtils.rm_rf("public/vendor", :verbose => true)
       end
@@ -196,7 +233,12 @@ module Capricorn
         
         # update a gem
         def gem_update(name, options={})
-          if !(gem_cmd('update', name, options) =~ /Nothing to update/)
+          output = if name == :all
+            gem_cmd('update', nil, options)
+          else
+            gem_cmd('update', name, options)
+          end
+          if !(output =~ /Nothing to update/)
             gem_refresh
             true
           else

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

@@ -4,15 +4,28 @@ 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
+        
+        names_by_index = []
         satellites.size.times do |i|
           sat = satellites[i]
-          puts sat.domain
-          sat.engines.each do |name, options|
-            puts "- #{name} #{options.inspect}"
+          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] : [])
+            ].flatten.join(' ')
+            sat.engines.each do |name, options|
+              puts "- #{name} #{options.inspect}"
+            end
           end
         end
       rescue => e
@@ -21,16 +34,34 @@ 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, :immediate => :boolean
+      def relink(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, :immediate => :boolean
+      def update(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, :immediate => :boolean
+      # def upgrade(domain)
+      #   Capricorn.client(options[:token]).upgrade_satellite(domain)
+      # end
     end
     
   end

data/lib/capricorn/apps/server.rb

@@ -54,6 +54,12 @@ module Capricorn
         Capricorn.client(options[:token]).update_server
       end
       
+      desc "gupdate", 'update the gems'
+      method_options :token => :optional
+      def gupdate
+        Capricorn.client(options[:token]).update_gems
+      end
+      
       desc "version", 'version of the server'
       method_options :token => :optional
       def version

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.rb

@@ -11,6 +11,7 @@ module Capricorn
     include Capricorn::Satellite::Persistence
     
     attr_reader :domain, :engines
+    attr_accessor :development, :module_name
     
     def initialize(domain)
       if Hash === domain
@@ -20,6 +21,7 @@ module Capricorn
       else
         @domain = domain
         @engines = {}
+        @development = false
       end
       @domain.gsub!(/^www\./, '')
     end

data/lib/capricorn/satellite/actions.rb

@@ -12,6 +12,26 @@ module Capricorn
         end
       end
       
+      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)
+          
+          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

@@ -48,14 +48,36 @@ module Capricorn
       end
     end
     
-    def install_satellite(domain)
-      Capricorn.system.install_satellite(domain)
+    def update_gems
+      Capricorn.system.gem_update(:all)
     end
     
-    def uninstall_satellite(domain)
+    def install_satellite(domain, immediate)
+      Capricorn.system.install_satellite(domain, immediate)
+    end
+    
+    def relink_satellite(domain, immediate)
+      satellite = Capricorn.system.find_satellite(domain)
+      if satellite
+        Capricorn.system.relink_satellite(satellite, immediate)
+      else
+        Capricorn.log "Satellite not found (#{domain})"
+      end
+    end
+    
+    def update_satellite(domain, immediate)
+      satellite = Capricorn.system.find_satellite(domain)
+      if satellite
+        Capricorn.system.update_satellite(satellite, immediate)
+      else
+        Capricorn.log "Satellite not found (#{domain})"
+      end
+    end
+    
+    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
@@ -70,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/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
+      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

@@ -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,9 +77,37 @@ module Capricorn
       end
     end
     
-    def uninstall_satellite(satellite)
+    def relink_satellite(satellite, immediate)
+      self.queue.enqueue("relink #{satellite.domain}", :satellite => satellite, :immediate => immediate) do |options|
+        satellite = options[:satellite]
+        
+        if satellite
+          run_action_on :link_satellite, satellite
+          save_satellite! satellite
+        end
+      end
+    end
+    
+    def update_satellite(satellite, immediate)
       if satellite
-        self.queue.enqueue("uninstall #{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
+            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, immediate)
+      if satellite
+        self.queue.enqueue("uninstall #{satellite.domain}", :satellite => satellite, :immediate => immediate) do |options|
           run_action_on :uninstall_satellite, options[:satellite]
           destroy_satellite! options[:satellite]
         end
@@ -90,6 +118,8 @@ module Capricorn
     
     def make_development_satellite(satellite, name)
       if satellite
+        satellite.module_name = name.to_s
+        satellite.development = true
         Capricorn.runtime_gem('rubigen', Capricorn::RUBIGEN_VERSION)
         resolve_options_with satellite do
           as_user(web_user, web_group) do
@@ -98,6 +128,11 @@ module Capricorn
               FileUtils.rm_r("doc", :verbose => true) rescue nil
               FileUtils.rm_r("README", :verbose => true) rescue nil
               FileUtils.rm_r("public/javascripts", :verbose => true) rescue nil
+              FileUtils.mkdir_p("public/vendor", :verbose => true) rescue nil
+              FileUtils.ln_s(
+                File.join(satellite_root, "public"),
+                File.join(satellite_root, "public/vendor", satellite.module_name),
+                :verbose => true) rescue nil
               
               require 'rubigen/scripts/generate'
               RubiGen::Base.use_application_sources!
@@ -106,15 +141,16 @@ module Capricorn
             end
           end
         end
+        save_satellite! satellite
       else
         false
       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) }
@@ -130,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) }
@@ -149,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: simonmenke-capricorn
 version: !ruby/object:Gem::Version 
-  version: 0.2.07
+  version: 0.2.25
 platform: ruby
 authors: 
 - Simon Menke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-18 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: capricorn
 dependencies: []
 
@@ -77,6 +77,7 @@ files:
 - app_generators/engine/templates/tasks/engine_tasks.rake
 has_rdoc: false
 homepage: http://github.com/simonmenke/capricorn
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -97,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Manage satellites