magicmonkey 1.0.3 → 1.0.4

data/README.rdoc

@@ -19,13 +19,12 @@ Magicmonkey allows you to build in easy way the follow web server architecture:
     | Listen on port 3000           | | Listen on port 3001           | | Listen on port 3002           |
     | Site foo.com                  | | Site bar.com                  | | Site wella.com                |
     +-------------------------------+ +-------------------------------+ +-------------------------------+
-    
-    
+
+
 Every your web applications have a virtual host like this:
 
     <VirtualHost *:80>
       ServerName foo.com
-      PassengerEnabled off
       ProxyPass / http://127.0.0.1:3000/
       ProxyPassReverse / http://127.0.0.1:3000/
     </VirtualHost>
@@ -36,13 +35,13 @@ To do this you need to have install RVM to manage multiply Ruby versions.
 == Install
 
     gem install magicmonkey
-    
+
 == Usage
 
 First of all you need to say to Magicmonkey that you want manage an application in this way. To to this use the magicmonkey command 'ADD':
 
     magicmonkey add APP_NAME [options]
-    
+
 When added, you can start, stop, restart the application
 
     magicmonkey {start|stop|restart} APP_NAME1, APP_NAME2, ...
@@ -60,7 +59,7 @@ Magicmonkey save the configuration in <tt>~/.magicmonkey.yml</tt>
 You can use this email address for any questions or help: mailto:enrico@megiston.it.
 
 == Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a

data/lib/magicmonkey/app_servers/thin.rb

@@ -0,0 +1,15 @@
+module Thin
+
+  def self.start(args = {})
+    return "thin start -e production -p #{args[:port]} #{args[:app_server_options]} -d"
+  end
+
+  def self.stop(args = {})
+    return "thin stop -p #{args[:port]}"
+  end
+
+  def self.restart(args = {})
+    [self.stop(args), 'sleep 3', self.start(args)]
+  end
+
+end

data/lib/magicmonkey/magicmonkey.rb

@@ -159,7 +159,7 @@ module MagicMonkey
           exit
         end
       end
-      Conf[app_name] = o
+      Conf[app_name] = o.select{|k,v| [:ruby, :port, :app_server, :app_server_options, :app_path, :vhost_path].include?(k)}
       Conf.save
 
       puts "#{green}Application '#{app_name}' added.#{reset}"
@@ -188,17 +188,23 @@ module MagicMonkey
     end
     app_name = args.first
     if Conf[app_name]
+      self.start_stop_restart(:stop, [app_name])
+      begin
+        Cocaine::CommandLine.new("sudo a2dissite '#{app_name}'").run
+      rescue Cocaine::ExitStatusError => e
+        rputs 'Failed to disable site.'
+      end
       vh_file = "#{Conf[app_name][:vhost_path]}/#{app_name}"
       if o[:remove_vhost] && File.exist?(vh_file)
         begin
-          Cocaine::CommandLine.new("sudo a2dissite '#{app_name}' && sudo rm -f '#{vh_file}'").run
+          Cocaine::CommandLine.new("sudo rm -f '#{vh_file}'").run
         rescue Cocaine::ExitStatusError => e
           rputs 'Failed to remove virtual host file.'
-          exit
         end
       end
       Conf.delete(app_name)
       Conf.save
+      puts "Application '#{app_name}' removed."
     else
       rputs "Application '#{app_name}' does not exist."
     end
@@ -330,235 +336,3 @@ module MagicMonkey
   end
 
 end
-
-__END__
-
-  def self.start2(argv)
-    v, help = common_options(argv)
-    if help
-      puts 'Start a web application added with ADD command. If no params are given start all web applications.'
-      exit
-    end
-    applications = argv
-    applications = Conf.applications.keys if argv.empty?
-    applications.each do |app_name|
-      if Conf[app_name]
-        commands = []
-        if Conf[app_name][:ruby] != 'auto'
-          commands << "source '#{Dir.home}/.rvm/scripts/rvm'"
-          commands << "rvm #{v ? 'use ' : ''}'#{Conf[app_name][:ruby]}'"
-        end
-        commands << "cd '#{Conf[app_name][:app_path]}'"
-        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]} #{Conf[app_name][:app_server_options]} -d"
-        end
-        print "Starting '#{app_name}' application..."
-        STDOUT.flush
-        output = `bash -c "#{commands.join(' && ')}"`
-        puts ' done.'
-        print output if v
-      end
-    end
-  end
-
-  def self.stop2(argv)
-    v, help = common_options(argv)
-    if help
-      puts 'Stop a web application added with ADD command. If no params are given stop all web applications.'
-      exit
-    end
-    applications = argv
-    applications = Conf.applications.keys if argv.empty?
-    applications.each do |app_name|
-      if Conf[app_name]
-        commands = []
-        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]}'"
-        case Conf[app_name][:app_server]
-        when 'passenger'
-          commands << "passenger stop -p #{Conf[app_name][:port]}"
-        when 'thin'
-          commands << "thin stop -p #{Conf[app_name][:port]}"
-        end
-        print "Stopping '#{app_name}' application..."
-        STDOUT.flush
-        output = `bash -c "#{commands.join(' && ')}"`
-        puts ' done.'
-        print output if v
-      end
-    end
-  end
-
-  def self.restart2(argv)
-    applications = argv
-    applications = Conf.applications.keys if argv.empty?
-    applications.each do |app_name|
-      self.stop([app_name])
-      self.start([app_name])
-    end
-  end
-
-  def self.add2(argv)
-    options = {}
-    tmp = argv.join('$$').split(/\$\$--\$\$/)
-    argv = tmp[0].split('$$')
-    options[:app_server_options] = tmp[1] ? tmp[1].split('$$').join(' ') : ''
-    servers = ['passenger', 'thin']
-    ports   = (3000..4000).to_a.collect{|p| p.to_s}
-    options[:app_server] = servers.first
-    options[:app_path]   = '/var/sites/APP_NAME/current'
-    options[:port]       = nil
-    options[:ruby]       = 'auto'
-    options[:vhost_path] = '/etc/apache2/sites-available'
-    vhost_template       = "#{Dir.home}/.magicmonkey.yml"
-    force                = false
-    create_vhost         = true
-    enable_site          = true
-    reload_apache        = false
-    server_name          = nil
-
-    parser = OptionParser.new do |opts|
-      opts.banner = 'Usage: magicmonkey add APP_NAME [options] [-- application_server_options]'
-      opts.separator ''
-      opts.separator 'Options:'
-
-      opts.on('-s', '--app-server APP_SERVER', servers, "Use the given application server: #{servers.join(', ')} (default: #{options[:app_server]}).") do |s|
-        options[:app_server] = s
-      end
-      opts.on('--app-path APP_PATH', "Use the given application path (default: '#{options[:app_path]}').") do |path|
-        options[:app_path] = path
-      end
-      opts.on('--vhost-path VHOST_PATH', "Use the given virtual host path (default: '#{options[:vhost_path]}').") do |path|
-        options[:vhost_path] = path
-      end
-      opts.on('--vhost-template TEMPLATE', "Use the given virtual host template file (default: #{vhost_template}).") do |template|
-        vhost_template = template
-      end
-      opts.on('-p', '--port NUMBER', ports, "Use the given port number (min: #{ports.first}, max: #{ports.last}).") do |p|
-        options[:port] = p.to_i
-      end
-      opts.on('-r', '--ruby RUBY_VERSION', "Use the given Ruby version (default: auto).") do |r|
-        options[:ruby] = r
-      end
-      opts.on('-f', '--[no-]force', "Force mode: replace exist files (default: #{force}).") do |f|
-        force = f
-      end
-      opts.on('--[no-]create-vhost', "Create virtual host file from template (default: #{create_vhost}).") do |c|
-        create_vhost = c
-      end
-      opts.on('--[no-]enable-site', "Enable Apache virtual host (default: #{enable_site}).") do |e|
-        enable_site = e
-      end
-      opts.on('--[no-]reload-apache', "Reload apache to load virtual host (default: #{reload_apache}).") do |r|
-        reload_apache = r
-      end
-      opts.on('--server-name SERVER_NAME', "Set ServerName on virtual host (default: APP_NAME).") do |name|
-        server_name = name
-      end
-      opts.on_tail('-h', '--help', 'Show this help message.') do
-        puts opts
-        exit
-      end
-    end
-    begin
-      argv = parser.parse!(argv)
-    rescue
-      puts parser.help
-      exit
-    end
-    if argv.size != 1
-      puts parser.help
-      exit
-    end
-    app_name = argv[0]
-    #setting up default values
-    options[:app_path].gsub!('APP_NAME', app_name)
-    port = get_port(options[:port])
-    if port
-      options[:port] = port
-    else
-      puts 'This port is busy'
-      exit
-    end
-    #start
-    if Conf[app_name].nil?
-      Conf[app_name] = options
-      puts "Configuration for application '#{app_name}' is:"
-      pp Conf[app_name]
-      print 'Add this application? [Y/n]'
-      input = STDIN.gets
-      if input.upcase == "Y\n" || input == "\n"
-        if create_vhost
-          vh = YAML.load_file(vhost_template)[:vhost_template]
-          vh.gsub!('$APP_NAME', app_name)
-          vh.gsub!('$SERVER_NAME', server_name || app_name)
-          #vh.gsub!('$DOCUMENT_ROOT', Conf[app_name][:app_path])
-          vh.gsub!('$PORT', Conf[app_name][:port].to_s)
-          vh_file = "#{Conf[app_name][:vhost_path]}/#{app_name}"
-          if !File.exist?(vh_file) || force
-            #File.open(vh_file, 'w') { |f| f.write(vh) }
-            print `sudo bash -c "echo '#{vh}' > #{vh_file}"`
-          else
-            puts "Virtual host file '#{vh_file}' already exist. Use option '-f' to replace it."
-            exit
-          end
-          print `sudo a2ensite '#{app_name}'` if enable_site
-          print `sudo /etc/init.d/apache2 reload` if enable_site && reload_apache
-        end
-        Conf.save
-        puts 'Application added.'
-      else
-        puts 'Application rejected.'
-      end
-    else
-      puts "Application '#{app_name}' already added. You can remove it with 'remove' command."
-    end
-  end
-
-  def self.remove(argv)
-    argv.each do |app_name|
-      if Conf[app_name]
-        vh_file = "#{Conf[app_name][:vhost_path]}/#{app_name}"
-        if File.exist?(vh_file)
-          print `sudo a2dissite '#{app_name}'`
-          print `sudo rm -f #{vh_file}`
-        end
-        Conf.delete(app_name)
-        Conf.save
-      else
-        puts "Application '#{app_name}' does not exist. You can add it with 'add' command."
-      end
-    end
-  end
-
-  private
-
-  def self.rputs(message)
-    puts "#{red}#{message}#{reset}"
-  end
-
-  def self.get_port(port = nil)
-    ports = Conf.ports
-    return 3000 if ports.nil? || ports.empty?
-    return false if ports.include?(port)
-    return ((3000..5000).to_a - ports).first if port.nil?
-    return port
-  end
-
-  def self.common_options(argv)
-    verbose = argv.include?('-v') || argv.include?('--version')
-    help = argv.include?('-h') || argv.include?('--help')
-    argv.delete('-v')
-    argv.delete('--version')
-    argv.delete('-h')
-    argv.delete('--help')
-    return verbose, help
-  end
-
-end

data/lib/magicmonkey/version.rb

@@ -1,3 +1,3 @@
 module Magicmonkey
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magicmonkey
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocaine
-  requirement: &70316082426460 !ruby/object:Gem::Requirement
+  requirement: &70166973463740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70316082426460
+  version_requirements: *70166973463740
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70316082426040 !ruby/object:Gem::Requirement
+  requirement: &70166973463280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70316082426040
+  version_requirements: *70166973463280
 description: ! 'Manage your Rails applications: different Ruby versions and different
   application servers.'
 email:
@@ -49,6 +49,7 @@ files:
 - Rakefile
 - bin/magicmonkey
 - lib/magicmonkey/app_servers/passenger.rb
+- lib/magicmonkey/app_servers/thin.rb
 - lib/magicmonkey/configuration.rb
 - lib/magicmonkey/magicmonkey.rb
 - lib/magicmonkey/version.rb