simonmenke-shuttle 0.1.07 → 0.1.08

data/lib/shuttle/app_runner.rb

@@ -1,4 +1,5 @@
-require 'thor'
+Shuttle.runtime_gem('thor', Shuttle::THOR_VERSION)
+
 require File.dirname(__FILE__)+'/extentions/thor_extentions'
 
 module Shuttle

data/lib/shuttle/apps/dev.rb

@@ -1,4 +1,4 @@
-require 'thor'
+Shuttle.runtime_gem('thor', Shuttle::THOR_VERSION)
 
 module Shuttle
   module Apps # :nodoc:
@@ -6,7 +6,8 @@ module Shuttle
     class Dev < Thor
       desc "create NAME", "create a new engine"
       def create(name)
-        require 'rubigen'
+        Shuttle.runtime_gem('rubigen', Shuttle::RUBIGEN_VERSION)
+        
         system("rails #{name}")
         
         FileUtils.rm_r("#{name}/doc", :verbose => true)

data/lib/shuttle/apps/engines.rb

@@ -1,4 +1,4 @@
-require 'thor'
+Shuttle.runtime_gem('thor', Shuttle::THOR_VERSION)
 
 module Shuttle
   module Apps # :nodoc:

data/lib/shuttle/apps/jobs.rb

@@ -1,4 +1,4 @@
-require 'thor'
+Shuttle.runtime_gem('thor', Shuttle::THOR_VERSION)
 
 module Shuttle
   module Apps

data/lib/shuttle/apps/satellite.rb

@@ -1,4 +1,4 @@
-require 'thor'
+Shuttle.runtime_gem('thor', Shuttle::THOR_VERSION)
 
 module Shuttle
   module Apps # :nodoc:

data/lib/shuttle/apps/server.rb

@@ -1,5 +1,4 @@
-require 'thor'
-require 'simple-daemon'
+Shuttle.runtime_gem('thor', Shuttle::THOR_VERSION)
 
 module Shuttle
   module Apps
@@ -9,6 +8,7 @@ module Shuttle
       desc "start", 'start the server'
       method_options :foreground => :boolean,  :config => :optional
       def start
+        Shuttle.runtime_gem('simple-daemon', Shuttle::SIMPLE_DEAMON_VERSION)
         Shuttle.server? true
         Shuttle::System.load!(options[:root_path])
         

data/lib/shuttle/exception_handler.rb

@@ -1,4 +1,3 @@
-autoload :Logger, 'logger'
 
 module Shuttle
   module ExceptionHandler
@@ -50,4 +49,4 @@ end
 
 def FileUtils.fu_output_message(msg)
   Shuttle::ExceptionHandler.out.info(msg)
-end
+end

data/lib/shuttle/extentions/thor_extentions.rb

@@ -1,4 +1,4 @@
-require 'thor'
+Shuttle.runtime_gem('thor', Shuttle::THOR_VERSION)
 
 class Thor
   class << self

data/lib/shuttle/satellite/dependency_loader.rb

@@ -1,5 +1,4 @@
 
-autoload :TSort, 'tsort'
 
 module Shuttle
   class Satellite
@@ -76,4 +75,4 @@ module Shuttle
       
     end
   end
-end
+end

data/lib/shuttle/server/daemon.rb

@@ -45,10 +45,13 @@ module Shuttle
             case $?.exitstatus
             when Shuttle::STOP_STATUS
               stop_server = true
+              retries     = 0
             when Shuttle::RESTART_STATUS
               wait_before_start = 2
+              retries     = 0
             when Shuttle::RELOAD_STATUS
               stop_server = true
+              retries     = 0
               Shuttle.system.run(%{sleep 2 ; #{Shuttle::BIN_PATH} #{ORIGINAL_ARGV.join(' ')}})
             else
               retries += 1
@@ -65,8 +68,9 @@ module Shuttle
           Dir.chdir(Shuttle.system.root)
           
           Shuttle.log "Server started"
-          DRb.start_service "druby://localhost:5000", self.proxy, self.options_for_server
-          Shuttle.log "listening at #{self.construct_uri("druby://#{`hostname`.strip}:5000")}"
+          uri = "druby://#{Shuttle.system.server_hostname}:#{Shuttle.system.server_port}"
+          DRb.start_service uri, self.proxy, self.options_for_server
+          Shuttle.log "listening at #{self.construct_uri(uri)}"
           make_client_cert_public!
           
           at_exit do

data/lib/shuttle/server.rb

@@ -1,6 +1,4 @@
-require 'drb'
-require 'drb/ssl'
-require 'simple-daemon'
+Shuttle.runtime_gem('simple-daemon', Shuttle::SIMPLE_DEAMON_VERSION)
 
 module Shuttle
   

data/lib/shuttle/system/config.rb

@@ -31,6 +31,19 @@ module Shuttle
         option(:use_ssl, nil)
       end
       
+      def bind(hostname=nil, port=nil)
+        server_hostname { hostname }
+        server_port     { port }
+      end
+      
+      def server_hostname(&block)
+        option(:server_hostname, block) { |v| v or 'localhost' }
+      end
+      
+      def server_port(&block)
+        option(:server_port, block) { |v| v or 5000 }
+      end
+      
     end
   end
 end

data/lib/shuttle/system/process_user.rb

@@ -1,6 +1,4 @@
 
-autoload :Etc, 'etc'
-
 module Shuttle
   class System
     module ProcessUser

data/lib/shuttle.rb

@@ -1,9 +1,12 @@
 require 'rubygems'
 
-require File.dirname(__FILE__)+'/shuttle/extentions/rubygems_plugin'
-
+autoload :Etc,         'etc'
+autoload :DRb,         'drb'
+autoload :TSort,       'tsort'
+autoload :Logger,      'logger'
+autoload :OpenSSL,     'drb/ssl'
+autoload :FileUtils,   'fileutils'
 autoload :DRbUndumped, 'drb'
-autoload :FileUtils, 'fileutils'
 
 module Shuttle
   base = File.expand_path(File.dirname(__FILE__))
@@ -45,6 +48,10 @@ module Shuttle
   RELOAD_STATUS  = 103
   QUICK_CERT     = "http://segment7.net/projects/ruby/QuickCert/QuickCert-1.0.2.tar.gz"
   
+  THOR_VERSION          = '>= 0.9.9'
+  RUBIGEN_VERSION       = '>= 1.5.2'
+  SIMPLE_DEAMON_VERSION = '>= 0.1.2'
+  
   Shuttle::ExceptionHandler.setup
   extend ExceptionHandler
   
@@ -79,4 +86,14 @@ module Shuttle
     @is_server
   end
   
+  def self.runtime_gem(gem, version='>= 0.0.0', lib=nil)
+    begin
+      gem(gem, version)
+      require(lib || gem)
+    rescue LoadError
+      puts "You must install #{gem} (#{version}) to use this.\nPlease run: [sudo] gem install #{gem}"
+      exit(1)
+    end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simonmenke-shuttle
 version: !ruby/object:Gem::Version 
-  version: 0.1.07
+  version: 0.1.08
 platform: ruby
 authors: 
 - Simon Menke
@@ -9,39 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-02 00:00:00 -07:00
+date: 2009-06-03 00:00:00 -07:00
 default_executable: shuttle
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: thor
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.9
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rubigen
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: simple-daemon
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.2
-    version: 
+dependencies: []
+
 description: Manage satellites
 email: simon.menke@gmail.com
 executables: 
@@ -90,8 +61,6 @@ files:
 - lib/shuttle/system/satellites.rb
 - lib/shuttle/system/shell.rb
 - lib/shuttle/system.rb
-- lib/shuttle/systems/centos_plesk_system.rb
-- lib/shuttle/systems/macports_system.rb
 - lib/shuttle.rb
 - app_generators/engine/engine_generator.rb
 - app_generators/engine/templates/config/routes.rb

data/lib/shuttle/systems/centos_plesk_system.rb

@@ -1,28 +0,0 @@
-use :PassengerActor
-use :PleskActor
-
-apachectl_path { '/opt/local/apache2/bin/apachectl' }
-ruby_path      { '/usr/bin/ruby' }
-gem_path       { '/usr/bin/gem' }
-plesk_path     { '/usr/bin/gem' }
-
-web_user  { |s| s.domain.gsub(/[^a-zA-Z0-9]+/, '_') }
-web_group { 'psacln' }
-
-plesk_root { |s| "/var/www/vhost" }
-
-satellite_root do |s|
-  if s.subdomain?
-    "#{plesk_root}/#{s.basedomain}/subdomains/#{s.subdomain}/satellite"
-  else
-    "#{plesk_root}/#{s.domain}/satellite"
-  end
-end
-
-shared_root do |s|
-  if s.subdomain?
-    "#{plesk_root}/#{s.basedomain}/subdomains/#{s.subdomain}/shared"
-  else
-    "#{plesk_root}/#{s.domain}/shared"
-  end
-end

data/lib/shuttle/systems/macports_system.rb

@@ -1,14 +0,0 @@
-use :PassengerActor
-use :ApacheActor
-use :MysqlActor
-
-apachectl_path { '/opt/local/apache2/bin/apachectl' }
-ruby_path      { '/opt/local/bin/ruby' }
-gem_path       { '/opt/local/bin/gem' }
-
-
-web_user  { 'www' }
-web_group { 'www' }
-
-satellite_root { |s| "/opt/local/var/www/#{s.domain}/satellite" }
-shared_root    { |s| "/opt/local/var/www/#{s.domain}/shared"    }