webroar 0.2.2 → 0.2.3

data/lib/installer.rb

@@ -1,5 +1,5 @@
 # WebROaR - Ruby Application Server - http://webroar.in/
-# Copyright (C) 2009  WebROaR
+# Copyright (C) 2009  Goonj LLC
 #
 # This file is part of WebROaR.
 #
@@ -15,9 +15,16 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+require "fileutils"
 
 class Installer
   include Webroar
+  include Webroar::UserInteraction                  
+  ADMIN_USER_FILE = File.join(ADMIN_PANEL_DIR,'config','user.yml')
+  WEBROAR_CONFIG_FILE = File.join(WEBROAR_ROOT, 'conf', 'config.yml')
+  DB_CONFIG_FILE = File.join(ADMIN_PANEL_DIR, 'config', 'database.yml')
   if RUBY_PLATFORM =~ /linux/
     REQUIRED_DEPENDENCIES = [
       Dependencies::Ruby,
@@ -62,6 +69,38 @@ class Installer
     return flag
   end
   
+  def import_files(gem_name)
+    print "Importing configuration, logs and admin panel data from the previous #{gem_name} install ... "
+    require File.join(WEBROAR_ROOT, 'src', 'ruby_lib', 'ruby_interface','version.rb')
+    if Webroar::SERVER.downcase == gem_name.downcase
+      puts "done."
+      return YAML.load(File.open(WEBROAR_CONFIG_FILE))["Server Specification"]["port"]
+    end
+    import_dir = File.expand_path(File.join(WEBROAR_ROOT, "..", gem_name.downcase))
+    FileUtils.copy(File.join(import_dir,"conf","config.yml"), WEBROAR_CONFIG_FILE)    
+    FileUtils.copy(File.join(import_dir,"src","admin_panel","config","user.yml"), ADMIN_USER_FILE)
+    FileUtils.copy(File.join(import_dir,"src","admin_panel","config","database.yml"), DB_CONFIG_FILE)
+    configuration = YAML.load(File.open(DB_CONFIG_FILE))["production"]
+    if configuration['adapter'] == 'sqlite3' and !configuration['database'].start_with?('/')
+      db = File.join(import_dir, "src", "admin_panel", configuration['database'])
+      FileUtils.copy(db, File.join(ADMIN_PANEL_DIR, configuration['database'])) if File.exist?(db)
+    end
+    puts "done."
+    return YAML.load(File.open(WEBROAR_CONFIG_FILE))["Server Specification"]["port"]
+  end
+  
+  def create_service_link(level, link_name, script_file)
+    system("find /etc/ -name rc#{level}.d > /tmp/search_result 2>>#{WEBROAR_ROOT}/install.log")
+    file = File.open("/tmp/search_result")
+    line = file.readline.chomp
+    file.close()
+    link_file = File.join(line,link_name)
+    
+    if line != nil and script_file != nil and !File.symlink?(link_file)
+      system("ln -s #{script_file} #{link_file} >>#{WEBROAR_ROOT}/install.log 2>>#{WEBROAR_ROOT}/install.log")
+    end
+  end
+
   def create_service
     script = nil
     script_file = nil
@@ -71,7 +110,7 @@ class Installer
       script = get_service_script()
     end
     
-    system("find /etc/ -name init.d > /tmp/search_result")
+    system("find /etc/ -name init.d > /tmp/search_result 2>>#{WEBROAR_ROOT}/install.log")
     file = File.open("/tmp/search_result")
     line = file.readline.chomp
     file.close()
@@ -80,64 +119,16 @@ class Installer
       file = File.open(script_file,"w")
       file.puts(script)
       file.close
-      system("chmod +x #{script_file}")
-    end
-    
-    system("find /etc/ -name rc0.d > /tmp/search_result")
-    file = File.open("/tmp/search_result")
-    line = file.readline.chomp
-    file.close()
-    if line != nil and script_file != nil
-      system("ln -s #{script_file} #{File.join("#{line}",'K15webroar')}")
-    end
-    
-    system("find /etc/ -name rc1.d > /tmp/search_result")
-    file = File.open("/tmp/search_result")
-    line = file.readline.chomp
-    file.close()
-    if line != nil and script_file != nil
-      system("ln -s #{script_file} #{File.join("#{line}",'K15webroar')}")
-    end
-    
-    system("find /etc/ -name rc6.d > /tmp/search_result")
-    file = File.open("/tmp/search_result")
-    line = file.readline.chomp
-    file.close()
-    if line != nil and script_file != nil
-      system("ln -s #{script_file} #{File.join("#{line}",'K15webroar')}")
+      system("chmod +x #{script_file} 2>>#{WEBROAR_ROOT}/install.log")
     end
     
-    system("find /etc/ -name rc2.d > /tmp/search_result")
-    file = File.open("/tmp/search_result")
-    line = file.readline.chomp
-    file.close()
-    if line != nil and script_file != nil
-      system("ln -s #{script_file} #{File.join("#{line}",'S85webroar')}")
-    end
-    
-    system("find /etc/ -name rc3.d > /tmp/search_result")
-    file = File.open("/tmp/search_result")
-    line = file.readline.chomp
-    file.close()
-    if line != nil and script_file != nil
-      system("ln -s #{script_file} #{File.join("#{line}",'S85webroar')}")
-    end
-    
-    system("find /etc/ -name rc4.d > /tmp/search_result")
-    file = File.open("/tmp/search_result")
-    line = file.readline.chomp
-    file.close()
-    if line != nil and script_file != nil
-      system("ln -s #{script_file} #{File.join("#{line}",'S85webroar')}")
-    end
-    
-    system("find /etc/ -name rc5.d > /tmp/search_result")
-    file = File.open("/tmp/search_result")
-    line = file.readline.chomp
-    file.close()
-    if line != nil and script_file != nil
-      system("ln -s #{script_file} #{File.join("#{line}",'S85webroar')}")
-    end
+    create_service_link("0", 'K15webroar', script_file)
+    create_service_link("1", 'K15webroar', script_file)
+    create_service_link("6", 'K15webroar', script_file)
+    create_service_link("2", 'S85webroar', script_file)
+    create_service_link("3", 'S85webroar', script_file)
+    create_service_link("4", 'S85webroar', script_file)
+    create_service_link("5", 'S85webroar', script_file)
     
   end
 
@@ -148,85 +139,30 @@ class Installer
     }
   end
 
-  # User input to install WebROaR
-  def user_input(ssl)
-    puts "Setting up server admin panel ..."
-    while(true)
-      print "Please enter a username for the administrator account of server's admin panel: "
-      username = STDIN.gets.chomp("\n")
-      if(username.length < 1)
-        #puts "Please enter a username."
-        redo
-      else
-        break
-      end
-    end
-    while(true)
-      print "Please enter a password(minimum 6 characters) for the administrator account of server's admin panel: "
-      system("stty -echo")
-      pswd = STDIN.gets.chomp("\n")
-      if(pswd.length < 6)
-        puts "\nPlease enter a password with at least 6 characters."
-        redo
-      end 
-      print "\nConfirm password: "
-      re_pswd = STDIN.gets.chomp("\n")
-      system("stty echo")
-      print "\n"
-      if(re_pswd  == pswd)
-        write_user(username, pswd)
-        break
-      else
-        puts "\nPasswords do not match. Please try again."
-        redo
-      end
-    end
-    puts "Setting up server specifications ..."
-    
-    while(true)
-      print "Enter server port (default is 3000): "
-      port_s = STDIN.gets.chomp
-      if port_s == ""
-        port = 3000
-        break
-      else
-        unless port_s=~/^\d+$/
-          puts "\nInvalid port number. Valid port is a number between 1 and 65535. Please try again ..."
-          redo
-        end
-        port = port_s.to_i
-        if(port < 1 or port > 65535)
-          puts "\nInvalid port number. Valid port is a number between 1 and 65535. Please try again ..."
-          redo
-        else
-          break
-        end
-      end
-    end
-    write_server_port(port, ssl)
-    port
-  end
-  
   def install(options, args)
-    ssl = 0
+    ssl = false
     str = ""
     
     if options[:ssl]
-      ssl = 1
+      ssl = true
       str = "ssl=yes "
     end
     
     if CheckUser.new.check == 0
       
-      if File.exist?(File.join(WEBROAR_BIN_DIR,"webroar-head")) && File.exist?(File.join(WEBROAR_BIN_DIR,"webroar-worker"))
-        puts "WebROaR is already installed on this machine. Please uninstall it with *sudo webroar uninstall* and run install command again."
-        return
-      end
+#      if File.exist?(File.join(WEBROAR_BIN_DIR,"webroar-head")) && File.exist?(File.join(WEBROAR_BIN_DIR,"webroar-worker"))
+#        system("webroar stop")
+#        puts "WebROaR is already installed on this machine. Please uninstall it with *sudo webroar uninstall* and run install command again."
+#        return
+#      end
       
       puts "Checking for the dependencies ..."
       check_dependencies(ssl) || exit(1)
       
-      port = user_input(ssl)
+      port, import, gem_name = user_input
+      port = import_files(gem_name) if import
+      write_server_port(port, ssl) if !import
+      
       print 'Creating directory structure ...'
       Dir.chdir(WEBROAR_ROOT)
       
@@ -241,12 +177,16 @@ class Installer
       end
       if($?==0)
         puts " done."
-        puts "Installing server ..."
-        system("rake create_install_dirs  >>install.log 2>>install.log")
+        puts "Installing server ..."        
+        system("rake create_install_dirs  >>install.log 2>>install.log") 
         if($?==0)
           print "Setting up server admin panel application database ..."
           Dir.chdir(ADMIN_PANEL_DIR)
-          system("rake db:create >>#{WEBROAR_ROOT}/install.log 2>>#{WEBROAR_ROOT}/install.log")
+          if !import
+            # delete existing database if any
+            system("rake db:drop >>#{WEBROAR_ROOT}/install.log 2>>#{WEBROAR_ROOT}/install.log")
+            system("rake db:create >>#{WEBROAR_ROOT}/install.log 2>>#{WEBROAR_ROOT}/install.log")
+          end 
           if($? == 0)
             system("rake db:migrate >>#{WEBROAR_ROOT}/install.log 2>>#{WEBROAR_ROOT}/install.log")
             if($? == 0)
@@ -254,13 +194,13 @@ class Installer
               # Creating soft link for WebROaR and starling process. In most debian system, secure 
               # sudo path fails to locate it.
               create_softlink()
-              if RUBY_PLATFORM =~ /linux/
+              if RUBY_PLATFORM =~ /linux/ and !import
                 file=File.open(File.join('','etc','logrotate.d','webroar'),"w")
-                logrotate_string=get_logrotate()
+                logrotate_string = get_logrotate()
                 file.puts(logrotate_string)
                 file.close
               end
-              if RUBY_PLATFORM =~ /darwin/
+              if RUBY_PLATFORM =~ /darwin/ and !import
                 # read file into an array
                 f = File.open("/etc/newsyslog.conf")
                 saved = File.open("tmp.conf", "a")
@@ -274,7 +214,7 @@ class Installer
                   end
                 end
                 
-                saved.puts("/var/log/webroar/*.log   644  5     10   *     GJ")
+                saved.puts("/var/log/webroar/*.log   644  5     10   *     GJ") 
                 
                 # Close the archive file
                 saved.close
@@ -282,7 +222,7 @@ class Installer
                 FileUtils.mv("tmp.conf", "/etc/newsyslog.conf")
               end
               
-              if RUBY_PLATFORM =~ /linux/
+              if RUBY_PLATFORM =~ /linux/ and !import
                 print "Generating service script ..."
                 # Add service script in '/etc/init.d/' folder
                 create_service()
@@ -291,6 +231,9 @@ class Installer
               
               puts"WebROaR installed successfully."
               
+              # Stop WebROaR if already running.
+              system("webroar stop") if File.exist?(PIDFILE)
+              
               # Start WebROaR
               puts"Starting WebROaR ... "
               system("webroar start")
@@ -446,10 +389,10 @@ class Installer
   
   def write_server_port(port, ssl)
     info = Array.new
-    if ssl == 1
-      s = {'port' => port, 'min_worker' => 4, 'max_worker' => 8, 'log_level' => "SEVERE",'access_log'=>'disabled','SSL Specification' => {'ssl_port' => 443, 'ssl_support' => "disabled", 'certificate_file' => nil, 'key_file' => nil}}
+    if ssl
+      s = {'port' => port, 'min_worker' => 4, 'max_worker' => 8, 'log_level' => "SEVERE",'access_log'=>'enabled','SSL Specification' => {'ssl_port' => 443, 'ssl_support' => "disabled", 'certificate_file' => nil, 'key_file' => nil}}
     else
-      s = {'port' => port, 'min_worker' => 4, 'max_worker' => 8, 'log_level' => "SEVERE",'access_log'=>'disabled'}
+      s = {'port' => port, 'min_worker' => 4, 'max_worker' => 8, 'log_level' => "SEVERE",'access_log'=>'enabled'}
     end
     info = {'Server Specification' => s}
     yaml_obj=YAML::dump(info)
@@ -463,7 +406,7 @@ class Installer
   def check_dependencies(ssl)
     failed_dependencies =[]    
     REQUIRED_DEPENDENCIES.each do |dep|
-      if (dep.name=="gnutls/gnutls.h" and ssl == 1) or dep.name != "gnutls/gnutls.h"
+      if (dep.name=="gnutls/gnutls.h" and ssl) or dep.name != "gnutls/gnutls.h"
         print "Checking for #{dep.name}........"
         status = dep.find
         if status == nil
@@ -570,48 +513,46 @@ exit 0"
   
   def get_header
     return "######################################################################################
-#                             WebROaR Configuration file
+#                             WebROaR Configuration file                               
 ######################################################################################
 
 ######################################################################################
-# Configuration file has two YAML formatted component
-# Order of component does not matter.
+# Configuration file has three YAML formatted components
+# Order of components does not matter.
 #   a) Server Specification
-#        It defines WebROaR specifications and default application specification.
-#        Parameters:
+#        Elements:
 #          1) Server Port(optional)(default port = 3000)
 #          2) Minimum number of workers(optional)(default min_worker = 4)
 #          3) Maximum number of workers(optional)(default max_worker = 8)
 #          4) Logging level(optional)(default log_level = SEVERE)
-#          5) Access Log flag(optional)(values must be 'enabled' or 'disabled'(default))
-#          6) SSL Specification(optional)
+#          5) SSL Specification(optional)
 #             It defines SSL specification.
 #             Parameters:
 #               I) SSL Support(optional)(values must be 'enabled' or 'disabled'(default))
 #              II) SSL Certificate File(optional)(Path to SSL certificate file. Default is empty)
 #             III) SSL Key File(optional)(Path to SSL key file. Default is empty)
-#              IV) SSL Port(optional)(Default port number 443)
-#        Order of parameters does not matter.
+#              IV) SSL Port(optional)(Default port number 443) 
+#          6) Access log(optional)(values must be 'enabled'(default) or 'disabled')
+#        Order of the above elements does not matter.
 #        Example:
 #          Server Specification:
 #            port: 3000
 #            min_worker: 4
 #            max_worker: 8
 #            log_level: SEVERE
-#            access_log: disabled
+#            access_log: enabled
 #            SSL Specification:
 #              ssl_support: enabled
 #              certificate_file: /home/smartuser/ca-cert.pem
 #              key_file: /home/smartuser/ca-key.pem
 #              ssl_port: 443
-#
+#                                     
 #   b) Application Specification (optional)
-#        It defines list of application specifications
-#        Parameters:
+#        Elements:
 #          1) Application name(mandatory)
 #          2) Application baseuri(optional)
 #          3) Application path(mandatory)
-#          4) Application type(mandatory)(example rails or rack etc.)
+#          4) Application type(mandatory)(example rails or rack)
 #          5) Application environment(optional)(default environment = production)
 #          6) Application analytics(mandatory)(values must be 'enabled' or 'disabled')
 #          7) Minimum number of workers(optional)(default is 'Server Specification/min_worker')
@@ -619,36 +560,51 @@ exit 0"
 #          9) Logging level(optional)(default is 'Server Specification/log_level')
 #         10) Run as user (mandatory)
 #         11) Hostnames(optional)
-#        Order of parameters does not matter.
+#        Order of the above elements does not matter.
 #        Base-uri 'admin-panel' is reserved for 'Admin Panel'.
 #        Either host_names or baseuri(not both) must present to resolve HTTP request.
 #        Hostnames can have multiple values, each separated by spaces.(e.g. host_names: server.com server.co.in)
-#        Hostnames can be defined using wildcard(*), but wildcard can be at start of name or at end of name, not inbetween(valid hostnames are (i) *.server.com (ii) www.server.* (iii) *.server.*).
-#        Prefix Hostname with tild(~), if wildcard is used in defining Hostname. e.g. (i) ~*.server.com  (ii) ~www.server.*  (iii) ~*.server.*
-#        Exaimple with baseuri:
+#        Hostnames can be defined using wildcard(*), but wildcard can only be at start of name or at end of name (valid hostnames are (i) *.server.com (ii) www.server.* (iii) *.server.*).
+#        Prefix Hostname with tilde(~), if wildcard is used in defining Hostname. e.g. (i) ~*.server.com  (ii) ~www.server.*  (iii) ~*.server.* 
+#        Example with baseuri:
 #          Application Specification:
-#            - name: Planning Poker
-#              baseuri: /pp
-#              path: /home/smartuser/work/rails_workspace/planning_poker
+#            - name: Mephisto
+#              baseuri: /blog
+#              path: /home/smartuser/work/rails_workspace/mephisto
 #              type: rails
 #              run_as_user: smartuser
 #              analytics: enabled
 #              environment: production
 #              min_worker: 2
 #              max_worker: 5
-#              log_level: DEBUG
+#              log_level: SEVERE
 #        Example with host_names:
 #          Application Specification:
-#            - name: Planning Poker
-#              host_names: planningpoker.com ~*.planningpoker.com
-#              path: /home/smartuser/work/rails_workspace/planning_poker
+#            - name: Mephisto
+#              host_names: myblog.com ~*.myblog.com
+#              path: /home/smartuser/work/rails_workspace/mephisto
 #              type: rails
 #              run_as_user: smartuser
 #              analytics: enabled
 #              environment: production
 #              min_worker: 2
 #              max_worker: 5
-#              log_level: DEBUG
+#              log_level: SEVERE
+#  (c)  Headers (optional)
+#         It allows adding or changing the Expires and Cache-Control in the response headers for static assets (e.g. *.js, *.gif etc). 
+#         Elements:
+#           1) Expires header for all static assets (optional) (default is 'off')
+#           2) Specific expires header for specific file types (optional)
+#              Elements:
+#                 I) File Extensions(mandatory)
+#                II) Expires value(mandatory) (No of seconds)
+#         Possible value for expires is off or no. of seconds. 
+#         Example:
+#           Header:
+#             expires: 3600
+#             expires_by_type:
+#             - ext: png, jpg, gif
+#               expires: 31536000
 #
 ######################################################################################"
     

data/lib/user_interaction.rb

@@ -0,0 +1,132 @@
+# WebROaR - Ruby Application Server - http://webroar.in/
+# Copyright (C) 2009  Goonj LLC
+#
+# This file is part of WebROaR.
+#
+# WebROaR is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# WebROaR is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+require 'rubygems'
+
+module Webroar
+  module UserInteraction
+    def choose_gem_version
+      print "Checking for any previous installation of WebROaR ... "
+      list = Gem.source_index.find_name(/^webroar$/)
+
+      unless list
+        puts "not found."
+        return nil
+      end
+
+      #gem_names = list.collect {|gem| gem.full_name}
+      gem_list = list.collect {|gem| gem.version}
+      gem_list.each_with_index do |item, index|
+        if !File.exist?(File.join(WEBROAR_ROOT,"..","webroar-#{item}","conf","config.yml"))
+          gem_list.delete(item)
+        end
+      end
+
+      if gem_list.length == 0
+        puts "not found."
+        return nil
+      end
+
+      puts "found."
+      gem_name = "WebROaR-" + gem_list[gem_list.length - 1].to_s
+      require File.join(WEBROAR_ROOT, 'src', 'ruby_lib', 'ruby_interface','version.rb')
+      choice_list = [ "Import configuration, logs and admin panel data from the previous installation – #{gem_name}.",
+        "No import required, install #{Webroar::SERVER} afresh."]
+
+      puts ""
+      puts "Please enter your choice from the options below:"
+
+      choice_list.each_with_index do |item, index|
+        puts " #{index+1}. #{item}"
+      end
+      print "> "
+
+      result = STDIN.gets.chomp("\n")
+      return nil unless result =~ /^\d+$/
+      result = result.to_i
+      return gem_name if result == 1
+      return nil
+      
+      #return nil if result < 1 or (gem_names.length - 1) < result
+      #return gem_names[result-1]
+    end
+    
+    # User input to install WebROaR
+    def user_input
+      import_from = choose_gem_version
+      return nil, true, import_from if import_from
+      
+      puts "Setting up server admin panel ..."
+      
+      while(true)
+        print "Please enter a username for the administrator account of server's admin panel: "
+        username = STDIN.gets.chomp("\n")
+        if(username.length < 1)
+          #puts "Please enter a username."
+          redo
+        else
+          break
+        end
+      end
+      while(true)
+        print "Please enter a password(minimum 6 characters) for the administrator account of server's admin panel: "
+        system("stty -echo")
+        pswd = STDIN.gets.chomp("\n")
+        if(pswd.length < 6)
+          puts "\nPlease enter a password with at least 6 characters."
+          redo
+        end 
+        print "\nConfirm password: "
+        re_pswd = STDIN.gets.chomp("\n")
+        system("stty echo")
+        print "\n"
+        if(re_pswd  == pswd)
+          write_user(username, pswd)
+          break
+        else
+          puts "\nPasswords do not match. Please try again."
+          redo
+        end
+      end
+      puts "Setting up server specifications ..."
+    
+      while(true)
+        print "Enter server port (default is 3000): "
+        port_s = STDIN.gets.chomp
+        if port_s == ""
+          port = 3000
+          break
+        else
+          unless port_s=~/^\d+$/
+            puts "\nInvalid port number. Valid port is a number between 1 and 65535. Please try again ..."
+            redo
+          end
+          port = port_s.to_i
+          if(port < 1 or port > 65535)
+            puts "\nInvalid port number. Valid port is a number between 1 and 65535. Please try again ..."
+            redo
+          else
+            break
+          end
+        end
+      end
+      return port, false, nil
+    end  
+  end
+end

data/lib/webroar_command.rb

@@ -1,5 +1,5 @@
 # WebROaR - Ruby Application Server - http://webroar.in/
-# Copyright (C) 2009  WebROaR
+# Copyright (C) 2009  Goonj LLC
 #
 # This file is part of WebROaR.
 #

data/src/admin_panel/app/controllers/admin_controller.rb

@@ -1,6 +1,6 @@
 #--
 # WebROaR - Ruby Application Server - http://webroar.in/
-# Copyright (C) 2009  WebROaR
+# Copyright (C) 2009  Goonj LLC
 #
 # This file is part of WebROaR.
 #

data/src/admin_panel/app/controllers/application_controller.rb

@@ -1,6 +1,6 @@
 #--
 # WebROaR - Ruby Application Server - http://webroar.in/
-# Copyright (C) 2009  WebROaR
+# Copyright (C) 2009  Goonj LLC
 #
 # This file is part of WebROaR.
 #