magicmonkey 2.0.1 → 3.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d62a15ccec8260c8fb74146f164e5c2c11eb6fb0
+  data.tar.gz: 961b1e9cf089ee7b6ac8039a65259a5a4b662c92
+SHA512:
+  metadata.gz: 1da5ad79b0ae7a1ba7132b689142e1f5d927ffc3286dadd5a2117ccb4a110cd29b62c033af8716b3b6d1f517e078a9bd9b16ebb439dca73e7ef6b0d12e977fbb
+  data.tar.gz: f41c8009ac15c5ed3933b159444aebc92ae5e6a471d06088d3578481567a9769c576a6f218beaeb54b233d0add7f53f823eb6f3c1529e624c8e123fce28420ae

data/lib/magicmonkey/app_servers/passenger.rb

@@ -5,7 +5,7 @@ module Passenger
   end
 
   def self.stop(args = {})
-    ["passenger stop -p #{args[:port]}"]
+    ["passenger stop -p #{args[:port]} || true"]
   end
 
 end

data/lib/magicmonkey/app_servers/thin.rb

@@ -5,7 +5,7 @@ module Thin
   end
 
   def self.stop(args = {})
-    ["thin stop -p #{args[:port]}"]
+    ["thin stop -p #{args[:port]} || true"]
   end
 
 end

data/lib/magicmonkey/app_servers/unicorn_rails.rb

@@ -5,7 +5,7 @@ module UnicornRails
   end
 
   def self.stop(args = {})
-    ["kill `ps ax | grep -v grep | grep -e 'unicorn_rails .*-p #{args[:port]}' | awk 'NR==1{print $1}'`"]
+    ["kill `ps ax | grep -v grep | grep -e 'unicorn_rails .*-p #{args[:port]}' | awk 'NR==1{print $1}'` || true"]
   end
 
 end

data/lib/magicmonkey/configuration.rb

@@ -5,26 +5,15 @@ class Conf
   include Singleton
   attr_reader :config
 
-  VHT = <<EOT
-<VirtualHost *:80>
-  ServerName $SERVER_NAME
-  ProxyPass / http://127.0.0.1:$PORT/
-  ProxyPassReverse / http://127.0.0.1:$PORT/
-</VirtualHost>
-EOT
-
   DEFAULT = {
     :app_server => nil,
     :app_server_options => nil,
     :ruby => 'default',
     :app_path => '/var/sites/$APP/current',
     :bundle_exec => true,
-    :vhost_template => VHT,
-    :vhost_path => '/etc/apache2/sites-available',
     :overwrite_file => false,
-    :enable_site => false,
-    :reload_apache => false,
     :editor => 'nano',
+    :enabled => true,
     :verbose => false
   }
 
@@ -64,7 +53,7 @@ EOT
   end
 
   def self.applications
-    Conf.instance.config.keys.select{|k| ![:default, :uid].include?(k)}
+    apps = Conf.instance.config.keys.select{|k| ![:default, :uid].include?(k)}
   end
 
   def self.ports

data/lib/magicmonkey/magicmonkey.rb

@@ -11,7 +11,7 @@ module Magicmonkey
 
   @o = {}
 
-  COMMANDS = %w(configure deconfigure show vhost start stop restart)
+  COMMANDS = %w(configure deconfigure enable disable show vhost start stop restart)
 
   def self.main
     #Process::UID.change_privilege(Conf[:uid] || Process.uid)
@@ -88,6 +88,28 @@ module Magicmonkey
     end
   end
 
+  ##################
+  # ENABLE COMMAND #
+  ##################
+  def self.enable(args)
+    applications = help2('enable', 'Enable the selected applications', args)
+    applications.each do |app|
+      Conf[app][:enabled] = true
+    end
+    Conf.save
+  end
+
+  ###################
+  # DISABLE COMMAND #
+  ###################
+  def self.disable(args)
+    applications = help2('disable', 'Disable the selected applications', args)
+    applications.each do |app|
+      Conf[app][:enabled] = false
+    end
+    Conf.save
+  end
+
   ################
   # SHOW COMMAND #
   ################
@@ -100,139 +122,32 @@ module Magicmonkey
     end
   end
 
-  #################
-  # VHOST COMMAND #
-  #################
-  def self.vhost(args)
-    app = self.help('vhost', 'Creates the Apache virtual host file for an application.', args) do |opts|
-      opts.on('-s', '--server-name SERVER_NAME', 'The server name') do |s|
-        @o[:server_name] = s
-      end
-      opts.on('--path VHOST_PATH', "Use the given virtual host path (default: '#{@o[:vhost_path]}')") do |path|
-        @o[:vhost_path] = path
-      end
-      opts.on('-f', '--[no-]overwrite-file', "Replace exist file (default: #{@o[:overwrite_file]})") do |f|
-        @o[:overwrite_file] = f
-      end
-      opts.on('--[no-]enable-site', "Enable Apache virtual host (default: #{@o[:enable_site]})") do |e|
-        @o[:enable_site] = e
-      end
-      opts.on('--[no-]reload-apache', "Reload apache to load virtual host (default: #{@o[:reload_apache]})") do |r|
-        @o[:reload_apache] = r
-      end
-    end
-
-    app_conf = Conf[app.to_sym]
-    unless app_conf
-      rputs "Application '#{app}' does not configured."
-      puts  "Use 'magicmonkey configure #{app}' to configure it."
-      exit
-    end
-
-    @o[:vhost_template].gsub!('$SERVER_NAME', @o[:server_name] || app)
-    @o[:vhost_template].gsub!('$PORT', app_conf[:port].to_s)
-
-    vh_file = File.join(@o[:vhost_path], app)
-    if (!File.exist?(vh_file) || @o[:overwrite_file])
-      begin
-        Cocaine::CommandLine.new("sudo echo '#{@o[:vhost_template]}' > '#{vh_file}'").run
-      rescue Cocaine::ExitStatusError => e
-        rputs 'Failed to write virtual host file.'
-      end
-    else
-      rputs 'Failed to write virtual host file.'
-      puts "Virtual host file '#{vh_file}' already exist. Use option '-f' to replace it."
-    end
-    if @o[:enable_site]
-      begin
-        Cocaine::CommandLine.new("sudo a2ensite '#{app}'").run
-      rescue Cocaine::ExitStatusError => e
-        rputs 'Failed to enable the site.'
-      end
-    end
-    if @o[:enable_site] && @o[:reload_apache]
-      begin
-        Cocaine::CommandLine.new('sudo /etc/init.d/apache2 reload').run
-      rescue Cocaine::ExitStatusError => e
-        rputs 'Failed to reload Apache.'
-      end
-    end
-  end
-
   #################
   # START COMMAND #
   #################
   def self.start(args)
-    applications = help2('start', 'Starts the selected applications.', args)
-    applications.each do |app|
-      app_conf = Conf[app.to_sym]
-      unless app_conf
-        rputs "Application '#{app}' does not configured."
-        puts  "Use 'magicmonkey configure #{app}' to configure it."
-        exit
-      end
-      check_ruby_version!(app_conf[:ruby])
-      server = check_app_server!(app_conf[:app_server])
-      lines = []
-      lines << "source '#{Dir.home}/.rvm/scripts/rvm'"
-      lines << "rvm use #{app_conf[:ruby]}"
-      lines += server.start(app_conf)
-      command = "bash -c \"#{lines.join(' && ')}\""
-      if app_conf[:bundle_exec]
-        command.gsub!(" && #{app_conf[:app_server]} ", " && bundle exec #{app_conf[:app_server]} ")
-      end
-      begin
-        print "Calling #{bold}start#{reset} for '#{app}' application..."
-        Dir.chdir(app_conf[:app_path]) do
-          Cocaine::CommandLine.new(command).run
-        end
-        puts " #{green}#{bold}done#{reset}."
-      rescue Cocaine::ExitStatusError => e
-        rputs "Failed to start application '#{app}'"
-      end
-    end
+    self.run('start', args)
   end
 
   ################
   # STOP COMMAND #
   ################
   def self.stop(args)
-    applications = help2('stop', 'Stops the selected applications.', args)
-    applications.each do |app|
-      app_conf = Conf[app.to_sym]
-      unless app_conf
-        rputs "Application '#{app}' does not configured."
-        puts  "Use 'magicmonkey configure #{app}' to configure it."
-        exit
-      end
-      check_ruby_version!(app_conf[:ruby])
-      server = check_app_server!(app_conf[:app_server])
-      lines = []
-      lines << "source '#{Dir.home}/.rvm/scripts/rvm'"
-      lines << "rvm use #{app_conf[:ruby]}"
-      lines += server.stop(app_conf)
-      command = "bash -c \"#{lines.join(' && ')}\""
-      if app_conf[:bundle_exec]
-        command.gsub!(" && #{app_conf[:app_server]} ", " && bundle exec #{app_conf[:app_server]} ")
-      end
-      begin
-        print "Calling #{bold}stop#{reset} for '#{app}' application..."
-        Dir.chdir(app_conf[:app_path]) do
-          Cocaine::CommandLine.new(command).run
-        end
-        puts " #{green}#{bold}done#{reset}."
-      rescue Cocaine::ExitStatusError => e
-        rputs "Failed to stop application '#{app}'"
-      end
-    end
+    self.run('stop', args)
   end
 
   ###################
   # RESTART COMMAND #
   ###################
   def self.restart(args)
-    applications = help2('restart', 'Restart the selected applications.', args)
-    applications.each do |app|
+    self.run('restart', args)
+  end
+
+  private
+
+  def self.run(action, args)
+    applications = help2(action, "#{action.capitalize} the selected applications.", args)
+    applications.select{|k| Conf[k.to_sym][:enabled]}.each do |app|
       app_conf = Conf[app.to_sym]
       unless app_conf
         rputs "Application '#{app}' does not configured."
@@ -241,29 +156,37 @@ module Magicmonkey
       end
       check_ruby_version!(app_conf[:ruby])
       server = check_app_server!(app_conf[:app_server])
-      lines = []
-      lines << "source '#{Dir.home}/.rvm/scripts/rvm'"
-      lines << "rvm use #{app_conf[:ruby]}"
-      lines += server.stop(app_conf)
-      lines << 'sleep 3'
-      lines += server.start(app_conf)
-      command = "bash -c \"#{lines.join(' && ')}\""
-      if app_conf[:bundle_exec]
-        command.gsub!(" && #{app_conf[:app_server]} ", " && bundle exec #{app_conf[:app_server]} ")
+      command = self.build_command(app) do
+        if action == 'restart'
+          [server.stop(app_conf), 'sleep 3', server.start(app_conf)]
+        else
+          server.send(action, app_conf)
+        end
       end
       begin
-        print "Calling #{bold}restart#{reset} for '#{app}' application..."
+        print "Calling #{bold}#{action}#{reset} for '#{app}' application..."
         Dir.chdir(app_conf[:app_path]) do
           Cocaine::CommandLine.new(command).run
         end
         puts " #{green}#{bold}done#{reset}."
       rescue Cocaine::ExitStatusError => e
-        rputs "Failed to restart application '#{app}'"
+        rputs "Failed to #{action} application '#{app}'"
       end
     end
   end
 
-  private
+  def self.build_command(app)
+    app_conf = Conf[app.to_sym]
+    lines = []
+    lines << "source '#{Dir.home}/.rvm/scripts/rvm'"
+    lines << "rvm use #{app_conf[:ruby]}"
+    lines += yield if block_given?
+    command = "bash -c \"#{lines.join(' && ')}\""
+    if app_conf[:bundle_exec]
+      command.gsub!(" && #{app_conf[:app_server]} ", " && bundle exec #{app_conf[:app_server]} ")
+    end
+    return command
+  end
 
   def self.check_port!(port)
     if Conf.ports.include?(port)

data/lib/magicmonkey/version.rb

@@ -1,3 +1,3 @@
 module Magicmonkey
-  VERSION = '2.0.1'
+  VERSION = '3.0.0'
 end

metadata

@@ -1,39 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: magicmonkey
 version: !ruby/object:Gem::Version
-  version: 2.0.1
-  prerelease: 
+  version: 3.0.0
 platform: ruby
 authors:
 - Enrico Pilotto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocaine
-  requirement: &70266680750820 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70266680750820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70266680749920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70266680749920
-description: ! 'Manage your Rails applications: different Ruby versions and different
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: 'Manage your Rails applications: different Ruby versions and different
   application servers.'
 email:
 - enrico@megiston.it
@@ -59,29 +64,28 @@ files:
 - test/test_magic_monkey.rb
 homepage: https://github.com/pioz/magicmonkey
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: magicmonkey
-rubygems_version: 1.8.15
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: ! 'Manage your Rails applications: different Ruby versions and different
-  application servers'
+specification_version: 4
+summary: 'Manage your Rails applications: different Ruby versions and different application
+  servers'
 test_files:
 - test/helper.rb
 - test/test_magic_monkey.rb