rails_pwnerer 0.5.12 → 0.5.14

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.5.14. App-directed gem installation (because Rails 2.1.0 doesn't quite work yet).
+
+v0.5.13. Writable dirs are created if they didn't exist before.
+
 v0.5.12. Scaffolding sets up sshd for tunneling.
 
 v0.5.11. Added check for Rails application root on SVN checkout.

data/lib/pwnage/app/cluster_config.rb

@@ -12,12 +12,13 @@ class RailsPwnage::App::ClusterConfig
     pwnerer_group = group_for_username(pwnerer_user)
     
     writable_dirs = %w(log tmp public)
-    if app_config[:writable_dirs]
+    if app_config[:writable_dirs]      
       writable_dirs += app_config[:writable_dirs].split ','
     end
     
     Dir.chdir app_config[:app_path] do
       writable_dirs.each do |writable_dir|
+        FileUtils.mkpath writable_dir unless File.exists? writable_dir
         FileUtils.chown_R(pwnerer_uid, pwnerer_group, writable_dir)
       end
     end

data/lib/pwnage/app/config.rb

@@ -35,6 +35,8 @@ class RailsPwnage::App::Config
     app_db[:max_request_mb] = 48
     # comma-separated directories that should be writable by the application user
     app_db[:writable_dirs] = ''
+    # comma-separated gems that should be installed for the application
+    app_db[:gems] = ''
     
     RailsPwnage::Config.flush_db app_db    
     return app_path

data/lib/pwnage/app/gems.rb

@@ -4,8 +4,21 @@ class RailsPwnage::App::Gems
   include RailsPwnage::Base
   
   def update(app_name, instance_name)
-    app_path = RailsPwnage::Config[app_name, instance_name][:app_path]
-    Dir.chdir app_path do
+    app_config = RailsPwnage::Config[app_name, instance_name]
+    
+    # Phase 1: app-directed install
+    if app_config[:gems]
+      install_gems = app_config[:gems].split(',')
+      install_gems.each do |gem_name|
+        #begin         
+          install_gem gem_name unless gem_exists? gem_name
+        #rescue Exception
+        #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"
     end    

data/lib/pwnage/base/gems.rb

@@ -15,6 +15,17 @@ module RailsPwnage::Base
   def update_gems()
     system "gem update --system"
   end
+
+  # checks if a gem exists
+  def gem_exists?(gem_name)
+    begin
+      output = `gem specification --local #{gem_name} 2> /dev/null`
+      return output =~ /$\-\-\- \!ruby\/object\:Gem\:\:Specification/
+    rescue
+      # we get here if gem exits with an error code
+      return false
+    end
+  end
   
   # locates the main file in a gem (used to locate the gem)
   def path_to_gem(gem_name, discard_suffix = '')
@@ -22,7 +33,7 @@ module RailsPwnage::Base
     
     # method 1: peek inside rubygems' treasure chest
     begin
-      gem_pattern = File.join `gem environment gemdir`.strip, 'gems', gem_name
+      gem_pattern = (File.join `gem environment gemdir`.strip, 'gems', gem_name) + '-'
       gem_path = Dir.glob(gem_pattern + '*').max
     rescue
       gem_path = nil

data/rails_pwnerer.gemspec

@@ -1,11 +1,11 @@
 
-# Gem::Specification for Rails_pwnerer-0.5.12
+# Gem::Specification for Rails_pwnerer-0.5.14
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.5.12
+  version: 0.5.14
 platform: ruby
 authors: 
 - Victor Costan

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.5.12
+  version: 0.5.14
 platform: ruby
 authors: 
 - Victor Costan