rails_pwnerer 0.6.53 → 0.6.54

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.6.54. Support Rails 3 applications.
+
 v0.6.53. Updated magic Google search string for RubyGems download location.
 
 v0.6.52. Added dependencies for Rails 3 to the set of scaffolded gems.

data/lib/pwnage/app/cluster_config.rb

@@ -81,11 +81,17 @@ class RailsPwnage::App::ClusterConfig
       RailsPwnage::App::NginxConfig.new.update app_name, instance_name
     end
     
-    static_cmd = "thin start -a 127.0.0.1 -A rails -c #{app_path} -d -u #{pwnerer_user}" +
+    static_cmd = "thin start -a 127.0.0.1 -c #{app_path} -d -u #{pwnerer_user}" +
                  " -g #{pwnerer_group} -e #{environment} "
     
     # TODO: start the servers simultaneously
-    Dir.chdir app_config[:app_path] do
+    Dir.chdir app_path do
+      if File.exist? 'config.ru'
+        static_cmd << '-R config.ru ' 
+      else    
+        static_cmd << '-A rails '
+      end
+      
       frontends.times do |f|
         fe_port = first_port + f
         cmd = static_cmd + "-p #{fe_port} -l log/fe.#{fe_port}.log -P tmp/pids/fe.#{fe_port}.pid"

data/lib/pwnage/app/files.rb

@@ -90,11 +90,19 @@ class RailsPwnage::App::Files
       load_files app_name, instance_name      
     when :console
       Dir.chdir(RailsPwnage::Config[app_name, instance_name][:app_path]) do
-        Kernel.system 'ruby script/console production'
+        if File.exist? 'script/rails'
+          Kernel.system 'rails console production'
+        else
+          Kernel.system 'ruby script/console production'
+        end
       end
     when :db_console
       Dir.chdir(RailsPwnage::Config[app_name, instance_name][:app_path]) do
-        Kernel.system 'ruby script/dbconsole --include-password production'
+        if File.exist? 'script/rails'
+          Kernel.system 'rails dbconsole --include-password production'
+        else
+          Kernel.system 'ruby script/dbconsole --include-password production'
+        end
       end      
     end
   end

data/lib/pwnage/app/gems.rb

@@ -6,26 +6,31 @@ class RailsPwnage::App::Gems
   def update(app_name, instance_name)
     app_config = RailsPwnage::Config[app_name, instance_name]
     
-    # Phase 1: app-directed install
-    if app_config[:gems]
-      # Can be specified as comma-separated string or array.
-      if app_config[:gems].respond_to? :to_str
-        install_gems = app_config[:gems].split(',')
-      else
-        install_gems = app_config[:gems]
-      end
-      install_gems.each do |gem_name|
-        #begin         
-          install_gem gem_name unless gem_exists? gem_name
-        #rescue Exception
-        #end
+    Dir.chdir app_config[:app_path] do
+      # Phase 1: app-directed install
+      if !File.exist?('Gemfile') && app_config[:gems]
+        # Can be specified as comma-separated string or array.
+        if app_config[:gems].respond_to? :to_str
+          install_gems = app_config[:gems].split(',')
+        else
+          install_gems = app_config[:gems]
+        end
+        install_gems.each do |gem_name|
+          begin
+            install_gem gem_name unless gem_exists? gem_name
+          rescue Exception
+          end
+        end
       end
-    end
     
-    # Phase 2: rails install
-    Dir.chdir app_config[:app_path] do
-      # install the gems needed by the app
-      system "rake gems:install RAILS_ENV=production"
+      # Phase 2: bundler / rails install
+      # Install the gems needed by the app.
+      if File.exist? 'Gemfile'
+        File.open('Gemfile', 'a') { |f| f.write "\ngem 'thin'\n"}
+        system "bundle install"
+      else
+        system "rake gems:install RAILS_ENV=production"
+      end
     end    
   end
 

data/lib/pwnage/scaffolds/gems.rb

@@ -9,7 +9,7 @@ class RailsPwnage::Scaffolds::Gems
   end
   
   def install_servers
-    install_gems %w(memcache-client rack rack-test rack-mount thin mongrel)
+    install_gems %w(memcache-client rack rack-test rack-mount unicorn thin)
   end
   
   def install_dbi

data/rails_pwnerer.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_pwnerer}
-  s.version = "0.6.53"
+  s.version = "0.6.54"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2010-02-06}
+  s.date = %q{2010-02-09}
   s.default_executable = %q{bin/rpwn}
   s.description = %q{Rails deployment tool/hack.}
   s.email = %q{victor@costan.us}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.6.53
+  version: 0.6.54
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-06 00:00:00 -05:00
+date: 2010-02-09 00:00:00 -05:00
 default_executable: bin/rpwn
 dependencies: []