magicmonkey 0.1.1 → 0.1.2

data/Rakefile

@@ -5,14 +5,14 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "magicmonkey"
-		gem.version = File.exist?('VERSION') ? File.read('VERSION').strip : ''
+    gem.version = File.exist?('VERSION') ? File.read('VERSION').strip : ''
     gem.summary = %Q{Manage your Rails applications: different Ruby versions and different application servers}
-    gem.description = %Q{Manage your Rails applications: different Ruby versions and different application servers}
+    gem.description = %Q{Manage your Rails applications: different Ruby versions and different application servers.}
     gem.email = "enrico@megiston.it"
     gem.homepage = "http://github.com/pioz/magicmonkey"
     gem.authors = ["pioz"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-		#gem.add_dependency 'nokogiri'
+    #gem.add_dependency 'nokogiri'
     #gem.add_dependency 'activerecord'
     #gem.add_dependency 'sqlite3-ruby'
   end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/magic_monkey.rb

@@ -65,14 +65,16 @@ module MagicMonkey
     applications.each do |app_name|
       if Conf[app_name]
         commands = []
-        commands << "source '#{Etc.getpwuid.dir}/.rvm/scripts/rvm'" if Conf[app_name][:ruby] != 'auto'
+        if Conf[app_name][:ruby] != 'auto'
+          commands << "source '#{Etc.getpwuid.dir}/.rvm/scripts/rvm'"
+          commands << "rvm #{v ? 'use ' : ''}'#{Conf[app_name][:ruby]}'"
+        end
         commands << "cd '#{Conf[app_name][:app_path]}'"
-        commands << "rvm #{v ? 'use ' : ''}'#{Conf[app_name][:ruby]}'" if Conf[app_name][:ruby] != 'auto'
         case Conf[app_name][:app_server]
         when 'passenger'
           commands << "passenger start -e production -p #{Conf[app_name][:port]} #{Conf[app_name][:app_server_options]} -d"
         when 'thin'
-          commands << "thin start -e production -p #{Conf[app_name][:port]} -d"
+          commands << "thin start -e production -p #{Conf[app_name][:port]} #{Conf[app_name][:app_server_options]} -d"
         end
         print "Starting '#{app_name}' application..."
         STDOUT.flush
@@ -94,9 +96,11 @@ module MagicMonkey
     applications.each do |app_name|
       if Conf[app_name]
         commands = []
-        commands << "source '#{Etc.getpwuid.dir}/.rvm/scripts/rvm'" if Conf[app_name][:ruby] != 'auto'
+        if Conf[app_name][:ruby] != 'auto'
+          commands << "source '#{Etc.getpwuid.dir}/.rvm/scripts/rvm'"
+          commands << "rvm #{v ? 'use ' : ''}'#{Conf[app_name][:ruby]}'"
+        end
         commands << "cd '#{Conf[app_name][:app_path]}'"
-        commands << "rvm #{v ? 'use ' : ''}'#{Conf[app_name][:ruby]}'" if Conf[app_name][:ruby] != 'auto'
         case Conf[app_name][:app_server]
         when 'passenger'
           commands << "passenger stop -p #{Conf[app_name][:port]}"

metadata

@@ -2,7 +2,7 @@
 name: magicmonkey
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - pioz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 +02:00
+date: 2011-06-24 00:00:00 +02:00
 default_executable: magicmonkey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id001
-description: "Manage your Rails applications: different Ruby versions and different application servers"
+description: "Manage your Rails applications: different Ruby versions and different application servers."
 email: enrico@megiston.it
 executables: 
 - magicmonkey