capricorn 0.2.00 → 0.2.01

data/app_generators/engine/engine_generator.rb

@@ -3,8 +3,8 @@ class EngineGenerator < RubiGen::Base
 
   def initialize(runtime_args, runtime_options = {})
     super
-    @destination_root = args.shift
-    @engine_name = File.basename(File.expand_path(@destination_root)).underscore
+    @destination_root = File.expand_path('.')
+    @engine_name = args.shift.underscore
   end
   
   def manifest
@@ -23,15 +23,16 @@ class EngineGenerator < RubiGen::Base
       m.directory "rails"
       m.directory "tasks"
       
-      m.template('config/routes.rb',        "config/routes.rb")
-      m.template('Gmfile',                  "Gmfile")
-      m.template('rails/init.rb',           "rails/init.rb")
-      m.template('init.rb',                 "init.rb")
-      m.template('tasks/engine_tasks.rake', "tasks/#{engine_name}_tasks.rake")
-      m.template('README.rdoc',             "README.rdoc")
-      m.template('MIT-LICENSE.txt',         "MIT-LICENSE.txt")
-      m.template('lib/engine.rb',           "lib/#{engine_name}.rb")
-      m.template('gitignore',               ".gitignore")
+      m.template('config/routes.rb',                  "config/routes.rb")
+      m.template('config/initializers/rails_init.rb', "config/initializers/rails_init.rb")
+      m.template('Gmfile',                            "Gmfile")
+      m.template('rails/init.rb',                     "rails/init.rb")
+      m.template('init.rb',                           "init.rb")
+      m.template('tasks/engine_tasks.rake',           "tasks/#{engine_name}_tasks.rake")
+      m.template('README.rdoc',                       "README.rdoc")
+      m.template('MIT-LICENSE.txt',                   "MIT-LICENSE.txt")
+      m.template('lib/engine.rb',                     "lib/#{engine_name}.rb")
+      m.template('gitignore',                         ".gitignore")
       
     end
   end

data/app_generators/engine/templates/Gmfile

@@ -4,7 +4,7 @@ specify do |s|
   s.summary = %q{Fix this}
   s.homepage = %q{Fix this}
 
-  s.author = "Fix this"
+  s.author = "[AUTHOR]"
   s.email  = %q{Fix this}
   
   s.ignore_files %r{^public/(\d{3}|index)\.html$}

data/app_generators/engine/templates/config/initializers/rails_init.rb

@@ -0,0 +1 @@
+require File.dirname(__FILE__)+'/../../init'

data/app_generators/engine/templates/gitignore

@@ -1,3 +1,9 @@
 *.gem
 rdoc
-.DS_Store
+.DS_Store
+log/*
+tmp/*
+lib/tasks/vendor/*
+public/vendor/*
+db/migrate/*create_lalala_assets*
+db/schema*

data/lib/capricorn/actors/base_actor.rb

@@ -71,7 +71,7 @@ module Capricorn
         gems_header  = "  # Gems added by engine_manager:\n  \n"
         
         gsub_file('config/environment.rb') do |content|
-          content.gsub! /^\s*config.gem.+\n/, ''
+          content.gsub!(/^\s*config.gem.+\n/, '')
           content.gsub! %r{#{Regexp.escape(rails_header)}(#{Regexp.escape(gems_header)})?},
             "#{rails_header}#{gems_header}"
           
@@ -105,7 +105,7 @@ module Capricorn
           FileUtils.mkdir_p("db/migrate", :verbose => true)
           unlinked_migrations.concat(Dir.glob("#{path}/*.rb"))
           linked_migrations.each do |migration, target|
-            if target.starts_with? spec.full_gem_path
+            if target[0,spec.full_gem_path.size] == spec.full_gem_path
               unlinked_migrations.delete(target)
               unused_migrations.delete(migration)
             end
@@ -133,7 +133,14 @@ module Capricorn
         end
         system.as_user(system.web_user, system.web_group) do
           unlinked_migrations.each do |migration|
-            FileUtils.ln_s(migration, "db/migrate/#{File.basename(migration)}", :verbose => true)
+            
+            begin
+              FileUtils.ln_s(migration, "db/migrate/#{File.basename(migration)}", :verbose => true)
+            rescue
+              FileUtils.rm_rf("db/migrate/#{File.basename(migration)}", :verbose => true)
+              retry
+            end
+              
           end
         end
         
@@ -171,18 +178,30 @@ module Capricorn
         # install a gem.
         def gem_install(name, options={})
           gem_cmd('install', name, options)
+          gem_refresh
+        end
+        
+        def gem_refresh
+          original_paths = Gem.path
+          Gem.refresh
+          Gem.send(:set_paths, original_paths.compact.join(File::PATH_SEPARATOR))
         end
         
         # check if a gem is installed
         def gem_installed(name, options)
           version = options[:version] || '0.0.0'
           options = { :version => version, :installed => true }
-          (gem_cmd('list', name, options).strip == 'true')
+          (gem_cmd('list', name, options).strip =~ /true/)
         end
         
         # update a gem
         def gem_update(name, options={})
-          !(gem_cmd('update', name, options) =~ /Nothing to update/)
+          if !(gem_cmd('update', name, options) =~ /Nothing to update/)
+            gem_refresh
+            true
+          else
+            false
+          end
         end
         
         # ensure the presence of a gem
@@ -207,9 +226,7 @@ module Capricorn
               "--#{k}=#{v.inspect}"
             end
           end
-          output = user_run(user, "#{gem_bin_path} #{cmd} #{args.join(' ')}")
-          Gem.refresh
-          output
+          user_run(user, "#{gem_bin_path} #{cmd} #{args.join(' ')}")
         end
         
       end

data/lib/capricorn/actors/plesk_actor.rb

@@ -60,17 +60,30 @@ module Capricorn
       end
       
       def create_database
-        db_name = satellite.domain.downcase.gsub(/[^a-z]+/, '_')[0,63]
+        db_name = database_name_for(satellite)
         db_user = db_name[0,13]
         db_pswd = (rand(1_000_000_000) + 10_000).to_s
         
-        system.create_database(satellite.basedomain, "#{db_name}_d", "#{db_user}_ud", db_pswd)
-        system.create_database(satellite.basedomain, "#{db_name}_t", "#{db_user}_ut", db_pswd)
-        system.create_database(satellite.basedomain, "#{db_name}_p", "#{db_user}_up", db_pswd)
-        
+        create_database_for(satellite, :d, db_name, db_user, db_pswd)
+        create_database_for(satellite, :t, db_name, db_user, db_pswd)
+        create_database_for(satellite, :p, db_name, db_user, db_pswd)
         
         system.as_user(system.web_user, system.web_group) do
-          config = %{
+          db_file = File.join(system.satellite_root, 'config', 'database.yml')
+          write_database_config(db_file, db_name, db_user, db_pswd)
+        end
+      end
+      
+      def drop_databases
+        db_name = satellite.domain.downcase.gsub(/[^a-z]+/, '_')[0,63]
+        
+        system.drop_database("#{db_name}_d")
+        system.drop_database("#{db_name}_t")
+        system.drop_database("#{db_name}_p")
+      end
+      
+      def write_database_config(db_file, db_name, db_user, db_pswd)
+        File.open(db_file, 'w+') { |f| f.write(%{
 development:
   adapter: mysql
   database: #{db_name}_d
@@ -97,19 +110,17 @@ production:
   host: localhost
   encoding: utf8
   socket: /var/lib/mysql/mysql.sock
-}
-          
-          db_file = File.join(system.satellite_root, 'config', 'database.yml')
-          File.open(db_file, 'w+') { |f| f.write config }
-        end
+}) }
       end
       
-      def drop_databases
-        db_name = satellite.domain.downcase.gsub(/[^a-z]+/, '_')[0,63]
-        
-        system.drop_database("#{db_name}_d")
-        system.drop_database("#{db_name}_t")
-        system.drop_database("#{db_name}_p")
+      def database_name_for(satellite)
+        satellite.domain.downcase.gsub(/[^a-z]+/, '_')[0,63]
+      end
+      
+      def create_database_for(satellite, environment, db_name, db_user, db_pswd)
+        db_name = "#{db_name}_#{environment}"
+        db_user = "#{db_user}_u#{environment}"
+        system.create_database(satellite.basedomain, db_name, db_user, db_pswd)
       end
       
       module Helper

data/lib/capricorn/app_runner.rb

@@ -25,7 +25,7 @@ module Capricorn
           (options[:all] || k.group_name == group) && 
           Thor::Util.constant_to_thor_path(k.name) =~ search
         end
-        display_klasses(false, classes)
+        display_klasses(classes)
       end
     end
     
@@ -44,48 +44,37 @@ module Capricorn
     
     private
     
-    def display_klasses(with_modules = false, klasses = Thor.subclasses)
-      klasses -= [Thor, Capricorn::AppRunner] unless with_modules
-      raise Error, "No Thor tasks available" if klasses.empty?
+    def display_klasses(klasses = Thor.subclasses)
+      klasses -= [Thor, Capricorn::AppRunner]
       
-      if with_modules && !thor_yaml.empty?
-        max_name = thor_yaml.max { |(xk, xv), (yk, yv)| xk.to_s.size <=> yk.to_s.size }.first.size
-        modules_label    = "Modules"
-        namespaces_label = "Namespaces"
-        column_width     = [max_name + 4, modules_label.size + 1].max
-        
-        print "%-#{column_width}s" % modules_label
-        puts namespaces_label
-        print "%-#{column_width}s" % ("-" * modules_label.size)
-        puts "-" * namespaces_label.size
+      if klasses.empty?
+        puts "\033[1;34mNo Thor tasks available\033[0m"
+      else
+        maxima = column_maxima_for(klasses)
         
-        thor_yaml.each do |name, info|
-          print "%-#{column_width}s" % name
-          puts info[:constants].map { |c| Thor::Util.constant_to_thor_path(c) }.join(", ")
-        end
-      
-        puts
+        puts # add some spacing
+        klasses.each { |k| display_tasks(k, maxima.first, maxima.last) }
       end
-      
+    end  
+    
+    def column_maxima_for(klasses)
       # Calculate the largest base class name
-      max_base = klasses.max do |x,y| 
+      klass_with_longest_name = klasses.max do |x,y| 
         Thor::Util.constant_to_thor_path(x.name).size <=> Thor::Util.constant_to_thor_path(y.name).size
-      end.name.size
+      end
+      max_base = klass_with_longest_name.name.size
       
       # Calculate the size of the largest option description
       max_left_item = klasses.max do |x,y| 
-        (x.maxima.usage + x.maxima.opt).to_i <=> (y.maxima.usage + y.maxima.opt).to_i
+        total_x = (x.maxima.usage + x.maxima.opt).to_i
+        total_y = (y.maxima.usage + y.maxima.opt).to_i
+        total_x <=> total_y
       end
       
       max_left = max_left_item.maxima.usage + max_left_item.maxima.opt
       
-      unless klasses.empty?
-        puts # add some spacing
-        klasses.each { |k| display_tasks(k, max_base, max_left); }
-      else
-        puts "\033[1;34mNo Thor tasks available\033[0m"
-      end
-    end  
+      return [max_base, max_left]
+    end
     
     def display_tasks(klass, max_base, max_left)
       if klass.tasks.values.length > 1

data/lib/capricorn/apps/dev.rb

@@ -4,10 +4,10 @@ module Capricorn
   module Apps # :nodoc:
     
     class Dev < Thor
-      desc "activate DOMAIN", "turn an existing satelite into a development satelite"
-      def activate(domain)
+      desc "activate DOMAIN NAME", "turn an existing satelite into a development satelite"
+      def activate(domain, name)
         Capricorn.runtime_gem('rubigen', Capricorn::RUBIGEN_VERSION)
-        Capricorn.client.make_development_satellite(domain)
+        Capricorn.client.make_development_satellite(domain, name)
       end
     end
     

data/lib/capricorn/daemon.rb

@@ -41,15 +41,10 @@ module Capricorn
             puts "Pid file #{PidFile.pid_file} already exists. Not starting."
             exit 1
           end
-          Capricorn::Daemon::PidFile.store(Process.pid)
-          Dir.chdir Capricorn.system.root
-          File.umask 0000
           
-          Capricorn::ExceptionHandler.redirect_std
+          setup_child
+          regitser_handlers(daemon, &block)
           
-          trap("TERM") { daemon.stop; exit }
-          at_exit { Capricorn::Daemon::PidFile.destroy if $master }
-          at_exit(&block) if block
           daemon.start
         end
         puts "Daemon started."
@@ -66,6 +61,21 @@ module Capricorn
         puts "Pid file found, but process was not running. The daemon may have died."
       end
       
+    private
+      
+      def self.setup_child
+        Capricorn::Daemon::PidFile.store(Process.pid)
+        Dir.chdir Capricorn.system.root
+        File.umask 0000
+        Capricorn::ExceptionHandler.redirect_std
+      end
+      
+      def self.regitser_handlers(daemon, &block)
+        trap("TERM") { daemon.stop; exit }
+        at_exit { Capricorn::Daemon::PidFile.destroy if $master }
+        at_exit(&block) if block
+      end
+      
     end
   end
 end

data/lib/capricorn/extentions/rubygems_plugin.rb

@@ -20,7 +20,7 @@ module Gem # :nodoc:
     alias_method :to_ruby_without_engines, :to_ruby # :nodoc:
     def to_ruby # :nodoc:
       code = to_ruby_without_engines
-      code.gsub! /s\.engine_dependencies\s+[=]([^\n]+)/, 's.instance_variable_set(:@engine_dependencies,\1)'
+      code.gsub!(/s\.engine_dependencies\s+[=]([^\n]+)/, 's.instance_variable_set(:@engine_dependencies,\1)')
       code
     end
   end

data/lib/capricorn/extentions/thor_extentions.rb

@@ -21,7 +21,7 @@ module Thor::Util # :nodoc:
   
   def self.constant_to_thor_path(*args) # :nodoc:
     path = old_constant_to_thor_path(*args)
-    path.sub! /^#{Thor.namespace}:/, '' if Thor.namespace
+    path.sub!(/^#{Thor.namespace}:/, '') if Thor.namespace
     path
   end
   

data/lib/capricorn/job_queue.rb

@@ -16,7 +16,8 @@ module Capricorn
       @worker    = Thread.new(self) do |job_queue|
         while job_queue.running? or job_queue.peek
           
-          if job = job_queue.peek
+          job = job_queue.peek
+          if job
             job.run(job_queue)
             job_queue.delete(job.id)
           else

data/lib/capricorn/satellite.rb

@@ -21,7 +21,7 @@ module Capricorn
         @domain = domain
         @engines = {}
       end
-      @domain.gsub! /^www\./, ''
+      @domain.gsub!(/^www\./, '')
     end
     
     def basedomain

data/lib/capricorn/server.rb

@@ -61,10 +61,10 @@ module Capricorn
       end
     end
     
-    def make_development_satellite(domain)
+    def make_development_satellite(domain, name)
       satellite = Capricorn.system.find_satellite(domain)
       if satellite
-        Capricorn.system.make_development_satellite(satellite)
+        Capricorn.system.make_development_satellite(satellite, name)
       else
         Capricorn.log "Satellite not found (#{domain})"
       end

data/lib/capricorn/server/daemon.rb

@@ -31,55 +31,50 @@ module Capricorn
         # start the failsafe runner.
         def start_with_failsafe
           $master = true
-          stop_server = false
-          wait_before_start = 0
           retries = 0
-          until stop_server
-            if wait_before_start > 0
-              sleep(wait_before_start)
-              wait_before_start = 0
-            end
-            
-            pid = Process.fork { self.run_server }
+          loop do
+            pid = self.run_server
             return unless pid
             Process.waitpid(pid, 0)
+            
             case $?.exitstatus
             when Capricorn::STOP_STATUS
-              stop_server = true
-              retries     = 0
+              return
             when Capricorn::RESTART_STATUS
-              wait_before_start = 2
-              retries     = 0
+              retries = 0
             when Capricorn::RELOAD_STATUS
-              stop_server = true
-              retries     = 0
               Capricorn::Daemon::PidFile.destroy
               Capricorn.system.run %{#{Capricorn::BIN_PATH} #{ORIGINAL_ARGV.join(' ')}}
+              return
             else
               retries += 1
-              stop_server = true if retries >= 3
+              return if retries >= 3
             end
+            
+            sleep(2)
           end
         end
         
         # start the actual DRb server
         def run_server
-          $master = false
-          Dir.chdir(Capricorn.system.root)
-          
-          Capricorn.log "Server started"
-          uri = "druby://#{Capricorn.system.server_hostname}:#{Capricorn.system.server_port}"
-          DRb.start_service uri, self.proxy, self.options_for_server
-          Capricorn.log "listening at #{self.construct_uri(uri)}"
-          make_client_cert_public!
-          
-          at_exit do
-            Capricorn.system.queue.stop!
-            Capricorn.log "Server stopped"
+          Process.fork do
+            $master = false
+            Dir.chdir(Capricorn.system.root)
+            
+            Capricorn.log "Server started"
+            uri = "druby://#{Capricorn.system.server_hostname}:#{Capricorn.system.server_port}"
+            DRb.start_service uri, self.proxy, self.options_for_server
+            Capricorn.log "listening at #{self.construct_uri(uri)}"
+            make_client_cert_public!
+            
+            at_exit do
+              Capricorn.system.queue.stop!
+              Capricorn.log "Server stopped"
+            end
+            
+            DRb.thread.join
+            exit($exitstatus || Capricorn::STOP_STATUS)
           end
-          
-          DRb.thread.join
-          exit($exitstatus || Capricorn::STOP_STATUS)
         end
         
       end

data/lib/capricorn/server/security.rb

@@ -36,21 +36,28 @@ module Capricorn
             FileUtils.mkdir_p('/tmp/quick_cert')
             File.chmod(0700, '/tmp/quick_cert')
             
-            Dir.chdir('/tmp/quick_cert') do
-              Capricorn.system.run "curl -O #{Capricorn::QUICK_CERT}"
-              Capricorn.system.run "tar xzf QuickCert-1.0.2.tar.gz"
-              
-              Dir.chdir('/tmp/quick_cert/QuickCert-1.0.2') do
-                Capricorn.system.run "#{Capricorn.system.ruby_path} ./setup.rb config"
-                Capricorn.system.run "#{Capricorn.system.ruby_path} ./setup.rb setup"
-                Capricorn.system.run "#{Capricorn.system.ruby_path} ./setup.rb install"
-              end
-            end
+            download_quick_cert!
+            build_quick_cert!
             
             FileUtils.rm_rf('/tmp/quick_cert')
           end
         end
         
+        def download_quick_cert!
+          Dir.chdir('/tmp/quick_cert') do
+            Capricorn.system.run "curl -O #{Capricorn::QUICK_CERT}"
+            Capricorn.system.run "tar xzf QuickCert-1.0.2.tar.gz"
+          end
+        end
+        
+        def build_quick_cert!
+          Dir.chdir('/tmp/quick_cert/QuickCert-1.0.2') do
+            Capricorn.system.run "#{Capricorn.system.ruby_path} ./setup.rb config"
+            Capricorn.system.run "#{Capricorn.system.ruby_path} ./setup.rb setup"
+            Capricorn.system.run "#{Capricorn.system.ruby_path} ./setup.rb install"
+          end
+        end
+        
         def dump_quick_cert_config!
           return if File.file? Capricorn.system.path('quick_cert', 'qc_config')
           

data/lib/capricorn/system.rb

@@ -88,18 +88,16 @@ module Capricorn
       end
     end
     
-    def make_development_satellite(satellite)
+    def make_development_satellite(satellite, name)
       if satellite
         Capricorn.runtime_gem('rubigen', Capricorn::RUBIGEN_VERSION)
         resolve_options_with satellite do
           as_user(web_user, web_group) do
-            Dir.chdir(File.dirname(satellite_root)) do
+            Dir.chdir(satellite_root) do
               
-              name = File.basename(satellite_root)
-              
-              FileUtils.rm_r("#{name}/doc", :verbose => true) rescue nil
-              FileUtils.rm_r("#{name}/README", :verbose => true) rescue nil
-              FileUtils.rm_r("#{name}/public/javascripts", :verbose => true) rescue nil
+              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
               
               require 'rubigen/scripts/generate'
               RubiGen::Base.use_application_sources!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capricorn
 version: !ruby/object:Gem::Version 
-  version: 0.2.00
+  version: 0.2.01
 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-06-16 00:00:00 +02:00
 default_executable: capricorn
 dependencies: []
 
@@ -66,14 +66,15 @@ files:
 - lib/capricorn.rb
 - lib/rubygems_plugin.rb
 - app_generators/engine/engine_generator.rb
-- app_generators/engine/templates/Gmfile
-- app_generators/engine/templates/MIT-LICENSE.txt
-- app_generators/engine/templates/README.rdoc
+- app_generators/engine/templates/config/initializers/rails_init.rb
 - app_generators/engine/templates/config/routes.rb
 - app_generators/engine/templates/gitignore
+- app_generators/engine/templates/Gmfile
 - app_generators/engine/templates/init.rb
 - app_generators/engine/templates/lib/engine.rb
+- app_generators/engine/templates/MIT-LICENSE.txt
 - app_generators/engine/templates/rails/init.rb
+- app_generators/engine/templates/README.rdoc
 - app_generators/engine/templates/tasks/engine_tasks.rake
 has_rdoc: true
 homepage: http://github.com/simonmenke/capricorn
@@ -99,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.3
 signing_key: 
 specification_version: 3
 summary: Manage satellites