magicmonkey 1.0.6 → 1.0.7

data/lib/magicmonkey/app_servers/passenger.rb

@@ -1,11 +1,13 @@
 module Passenger
 
   def self.start(args = {})
-    return "bundle exec passenger start -e production -p #{args[:port]} #{args[:app_server_options]} -d"
+    bundle_exec = 'bundle exec ' if args[:bundle_exec]
+    return "#{bundle_exec}passenger start -e production -p #{args[:port]} #{args[:app_server_options]} -d"
   end
 
   def self.stop(args = {})
-    return "bundle exec passenger stop -p #{args[:port]}"
+    bundle_exec = 'bundle exec ' if args[:bundle_exec]
+    return "#{bundle_exec}passenger stop -p #{args[:port]}"
   end
 
   def self.restart(args = {})

data/lib/magicmonkey/app_servers/thin.rb

@@ -1,11 +1,13 @@
 module Thin
 
   def self.start(args = {})
-    return "bundle exec thin start -e production -p #{args[:port]} #{args[:app_server_options]} -d"
+    bundle_exec = 'bundle exec ' if args[:bundle_exec]
+    return "#{bundle_exec}thin start -e production -p #{args[:port]} #{args[:app_server_options]} -d"
   end
 
   def self.stop(args = {})
-    return "bundle exec thin stop -p #{args[:port]}"
+    bundle_exec = 'bundle exec ' if args[:bundle_exec]
+    return "#{bundle_exec}thin stop -p #{args[:port]}"
   end
 
   def self.restart(args = {})

data/lib/magicmonkey/configuration.rb

@@ -25,7 +25,8 @@ EOT
     :overwrite_files => false,
     :create_vhost => true,
     :enable_site => false,
-    :reload_apache => false
+    :reload_apache => false,
+    :bundle_exec => true
   }
 
   def initialize

data/lib/magicmonkey/magicmonkey.rb

@@ -95,6 +95,9 @@ module MagicMonkey
       opts.on('--[no-]reload-apache', "Reload apache to load virtual host (default: #{o[:reload_apache]}).") do |r|
         o[:reload_apache] = r
       end
+      opts.on('--[no-]bundle-exec', "Use bundle exec to run application server (default: #{o[:bundle_exec]}).") do |b|
+        o[:bundle_exec] = b
+      end
       opts.on_tail('-v', '--version', 'Print version') { puts Magicmonkey::VERSION; exit }
       opts.on_tail('-h', '--help', 'Show this help message') { puts opts; exit }
     end

data/lib/magicmonkey/version.rb

@@ -1,3 +1,3 @@
 module Magicmonkey
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magicmonkey
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocaine
-  requirement: &70361736383400 !ruby/object:Gem::Requirement
+  requirement: &70180865465020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361736383400
+  version_requirements: *70180865465020
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70361736382980 !ruby/object:Gem::Requirement
+  requirement: &70180865464600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361736382980
+  version_requirements: *70180865464600
 description: ! 'Manage your Rails applications: different Ruby versions and different
   application servers.'
 email: