webroar 0.6.1 → 0.7.0

data/doc/user-guide.txt

@@ -50,7 +50,7 @@ Currently it does not support Microsoft(R) Windows.
 - ruby 1.8-dev or 1.9-dev 
 - openssl ruby extension (On Ubuntu/Debian it is available as libopenssl-ruby1.X)
 - zlib ruby extension
-- rubygems
+- rubygems 1.3.6 or later
 - C build tools (gcc etc) (e.g. build-essential on Ubuntu, Xcode on MacOS)
 - libsqlite3
 - libsqlite3-dev
@@ -230,7 +230,7 @@ better.)
 rubygems version or any other reason), you can install the following dependent
  gems individually first:
 
- rails-2.3.9, calendar_date_select, rake, rspec, sqlite3, starling, will_paginate
+ rails-3.0.9, rake, rspec, sqlite3, starling, will_paginate
 
 - After successful installation of the webroar gem, any errors that occur
 during the setup are saved to the install.log created in the installed gem's 

data/lib/constant.rb

@@ -16,19 +16,26 @@
 # You should have received a copy of the GNU General Public License
 # along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 
-WEBROAR_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-WEBROAR_LIB_DIR = File.expand_path(File.join(WEBROAR_ROOT, 'lib'))
-WEBROAR_TEST_DIR = File.expand_path(File.join(WEBROAR_ROOT, 'test', 'unit'))
-WEBROAR_BIN_DIR = File.expand_path(File.join(WEBROAR_ROOT, 'bin'))
-ADMIN_PANEL_DIR = File.join(WEBROAR_ROOT, 'src', 'admin_panel')
-ADMIN_PANEL_LIB_DIR = File.join(ADMIN_PANEL_DIR, 'lib')
-RAILS_ROOT = ADMIN_PANEL_DIR
-GEM_BIN_DIR = File.expand_path(File.join(WEBROAR_ROOT,'..','..','bin'))
-USR_BIN_DIR = File.join('','usr','bin')
-ANALYZER_DIR = File.join(WEBROAR_ROOT, 'src', 'ruby_lib', 'analyzer')
-INTERNAL_CONF_FILE = File.join(WEBROAR_ROOT, 'conf', 'server_internal_config.yml')
-ENV["PATH"] += ":/usr/bin:/usr/sbin:/sbin:/usr/local/sbin:#{WEBROAR_BIN_DIR}"
-WEBROAR_LOG_FILE = File.join('','var','log','webroar','webroar.log')
-PIDFILE = "/var/run/webroar.pid"
-TESTFILE = "/etc/profile"
-MESSAGE_DEPLOYMENT = "This command needs to be run as root. Please try again using 'sudo'.".freeze
+# Directory constant
+WEBROAR_ROOT          = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+WEBROAR_LIB_DIR       = File.expand_path(File.join(WEBROAR_ROOT, 'lib'))
+WEBROAR_TEST_DIR      = File.expand_path(File.join(WEBROAR_ROOT, 'test', 'unit'))
+WEBROAR_BIN_DIR       = File.expand_path(File.join(WEBROAR_ROOT, 'bin'))
+ADMIN_PANEL_DIR       = File.join(WEBROAR_ROOT, 'src', 'admin_panel')
+ADMIN_PANEL_LIB_DIR   = File.join(ADMIN_PANEL_DIR, 'lib')
+#RAILS_ROOT = ADMIN_PANEL_DIR
+GEM_BIN_DIR           = File.expand_path(File.join(WEBROAR_ROOT,'..','..','bin'))
+USR_BIN_DIR           = File.join('','usr','bin')
+ANALYZER_DIR          = File.join(WEBROAR_ROOT, 'src', 'ruby_lib', 'analyzer')
+
+
+ENV["PATH"]           += ":/usr/bin:/usr/sbin:/sbin:/usr/local/sbin:#{WEBROAR_BIN_DIR}"
+
+# File constant
+INTERNAL_CONF_FILE    = File.join(WEBROAR_ROOT, 'conf', 'server_internal_config.yml')
+WEBROAR_LOG_FILE      = File.join('','var','log','webroar','webroar.log')
+PIDFILE               = "/var/run/webroar.pid"
+TESTFILE              = "/etc/profile"
+
+# Message constant
+MESSAGE_DEPLOYMENT    = "This command needs to be run as root. Please try again using 'sudo'.".freeze

data/lib/db_connect.rb

@@ -17,7 +17,7 @@
 # along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'rubygems'
-gem 'activerecord','2.3.9'
+gem 'activerecord','3.0.9'
 require 'active_record'
 
 module Webroar
@@ -38,8 +38,7 @@ module Webroar
       private
 
       def load_models
-        models = Dir.glob(File.join(ADMIN_PANEL_DIR, 'app', 'models', "{pseudo_model,application_specification,server_specification,app,url_breakup_time_sample,app_time_sample,resource_usage,url_time_sample,app_exception,exception_detail,mailer}.rb"))
-
+        models = Dir.glob(File.join(ADMIN_PANEL_DIR, 'app', 'models', "{pseudo_model,application_specification,server_specification,app,url_breakup_time_sample,app_time_sample,resource_usage,url_time_sample,app_exception,exception_detail,../mailers/mailer}.rb"))
         models.each do |f|
           begin
             require f

data/lib/installer.rb

@@ -211,8 +211,9 @@ module Webroar
 
           str << " zlib=yes" if @zlib
           str << " regex=yes" if(@zlib and @regex)
-
-          @port, @import, gem_name = UserInteraction.new(@options).user_input
+          
+          @user_interaction = UserInteraction.new(@options)
+          @port, @import, gem_name = @user_interaction.user_input
           @port = import_files(gem_name) if @import
           write_server_port if !@import
 
@@ -350,7 +351,7 @@ module Webroar
       def stop_server
         # Stop the server
         filename = File.join(WEBROAR_ROOT, 'conf', 'server_internal_config.yml')
-        pid_file = YAML.load(File.open(filename))["webroar_analyzer_script"]["pid_file"]
+        pid_file = YAML.load_file(filename)["webroar_analyzer_script"]["pid_file"]
 
         WebroarCommand.new.operation(nil, "stop") if (File.exists?(PIDFILE) or File.exists?(pid_file))
       end
@@ -650,7 +651,7 @@ exit 0"
           return
         end
 
-        info = YAML.load(File.open(File.join(import_dir,"conf","config.yml")))
+        info = YAML.load_file(File.join(import_dir,"conf","config.yml"))
         ssl = nil
         ssl = info['Server Specification']['SSL Specification'] if info and info['Server Specification'] and info['Server Specification']['SSL Specification']
 
@@ -675,18 +676,24 @@ exit 0"
         import_server_configuration(import_dir)
 
         if Webroar::SERVER.downcase == gem_name.downcase
+          unless File.exist?(File.join(import_dir,"src","admin_panel","config","user.yml"))
+            @user_interaction.setup_admin_user
+          end
           puts "done."
-          return YAML.load(File.open(WEBROAR_CONFIG_FILE))["Server Specification"]["port"]
+          return YAML.load_file(WEBROAR_CONFIG_FILE)["Server Specification"]["port"]
         end
         
         # Copy all *.yml files from older version.
-        Webroar::FileHelper.copy(File.join(import_dir,"src","admin_panel","config","user.yml"), ADMIN_USER_FILE)
+        
+        unless Webroar::FileHelper.copy(File.join(import_dir,"src","admin_panel","config","user.yml"), ADMIN_USER_FILE)
+          @user_interaction.setup_admin_user
+        end
         Webroar::FileHelper.copy(File.join(import_dir,"src","admin_panel","config","database.yml"), DB_CONFIG_FILE)
         Webroar::FileHelper.copy(File.join(import_dir,"conf","mail_conf.yml"), File.join(WEBROAR_ROOT, "conf"))
         
         # Copy conf/server_internal_config.yml file.
-        example = YAML.load(File.open(File.join(WEBROAR_ROOT, "conf", "server_internal_config.example.yml")))
-        old = YAML.load(File.open(File.join(import_dir, "conf", "server_internal_config.yml")))
+        example = YAML.load_file(File.join(WEBROAR_ROOT, "conf", "server_internal_config.example.yml"))
+        old = YAML.load_file(File.join(import_dir, "conf", "server_internal_config.yml"))
         if example and old
           new = example.merge(old).delete_if{ |key, value| !example.has_key?(key)}
           dump = YAML::dump(new).gsub(/: true/, ': on').gsub(/: false/, ': off')
@@ -695,13 +702,13 @@ exit 0"
           file.close
         end
          
-        configuration = YAML.load(File.open(DB_CONFIG_FILE))["production"]
+        configuration = YAML.load_file(DB_CONFIG_FILE)["production"]
         if configuration['adapter'] == 'sqlite3' and configuration['database'][0,1] != "/"
           db = File.join(import_dir, "src", "admin_panel", configuration['database'])
           Webroar::FileHelper.copy(db, File.join(ADMIN_PANEL_DIR, configuration['database']))
         end
         puts "done."
-        return YAML.load(File.open(WEBROAR_CONFIG_FILE))["Server Specification"]["port"]
+        return YAML.load_file(WEBROAR_CONFIG_FILE)["Server Specification"]["port"]
       end
 
       def set_install_options

data/lib/user_interaction.rb

@@ -31,35 +31,46 @@ module Webroar
     def user_input
       return nil, true, @gem_name if choose_gem_version
 
+      setup_admin_user
+      puts "Setting up server specifications ..."
+            
+      port = read_port
+      return port, false, nil
+    end
+    
+    def setup_admin_user
       puts "Setting up server admin panel ..."
 
       username = read_user_name
       password = read_password
 
       write_user(username, password)
-
-      puts "Setting up server specifications ..."
-
-      port = read_port
-
-      return port, false, nil
     end
 
   private
 
     def gem_exist?
       print "Checking for any previous installation of WebROaR ... "
-      list = Gem.source_index.find_name(/^webroar$/)
+      
+      if Gem::Specification.respond_to?('find_all_by_name')
+        list = Gem::Specification.find_all_by_name(/^webroar$/)
+      else
+        list = Gem.source_index.find_name(/^webroar$/)
+      end
 
       unless list
         puts "not found."
         return false
       end
 
-      #gem_names = list.collect {|gem| gem.full_name}
       gem_list = list.collect {|gem| gem.version}
-      gem_list.each_with_index do |item, index|
-        gem_list.delete(item) if !File.exist?(File.join(WEBROAR_ROOT,"..","webroar-#{item}","conf","config.yml"))
+      index = 0
+      while gem_list[index]
+        unless File.exist?(File.join(WEBROAR_ROOT,"..","webroar-#{gem_list[index]}","conf","config.yml"))      
+          gem_list.delete_at(index)
+        else
+          index = index + 1
+        end
       end
 
       if gem_list.length == 0

data/lib/webroar_command.rb

@@ -124,14 +124,14 @@ module Webroar
 
         if application_specification.save
           application_specification.write
-          application_specification.errors.each_full{|msg| puts msg }
+          application_specification.errors.to_a.each{|msg| puts msg }
           reply, err_log = App.start(params[:name])
           #reply = nil indicate success
           puts reply ? reply : "Application '#{params[:name]}' added successfully."
           puts "\n\e[31m" + err_log + "\e[0m" if err_log
           application_specification.remove if (err_log or reply)
         else
-          application_specification.errors.each_full{|msg| puts msg }
+          application_specification.errors.to_a.each{|msg| puts msg }
         end
 
       end
@@ -148,20 +148,18 @@ module Webroar
 
       #Check server status and load models
       def load_models
-        files = [File.join(ADMIN_PANEL_DIR, 'config','initializers','application_constants.rb'),
-          File.join(ADMIN_PANEL_DIR, 'lib','yaml_writer.rb')]
-
-        files.each do |f|
-          begin
-            require f
-          rescue NameError => e
-            puts e
-            puts e.backtrace.join("\n")
-          end
+        configuration = YAML.load_file(File.join(WEBROAR_ROOT,'conf','server_internal_config.yml'))
+        ENV['RAILS_ENV'] = configuration["webroar_analyzer_script"]["environment"]
+        
+        begin
+          require File.join(ADMIN_PANEL_DIR, 'config','environment.rb')
+        rescue NameError => e
+          puts e
+          puts e.backtrace.join("\n")
         end
 
-        configuration = YAML.load(File.open(File.join(WEBROAR_ROOT,'conf','server_internal_config.yml')))
-        DBConnect.db_up(configuration["webroar_analyzer_script"]["environment"])
+        #configuration = YAML.load_file(File.join(WEBROAR_ROOT,'conf','server_internal_config.yml'))
+        #DBConnect.db_up(configuration["webroar_analyzer_script"]["environment"])
       end
 
       def check_server_status
@@ -184,7 +182,7 @@ module Webroar
         if $? == 0
           @server_status = :up
           filename = File.join(WEBROAR_ROOT, 'conf', 'config.yml')
-          apps_spec = YAML.load(File.open(filename))["Application Specification"]
+          apps_spec = YAML.load_file(filename)["Application Specification"]
           sleep_time = (apps_spec ? 1 + apps_spec.size : 1)
           sleep(sleep_time * 1.5)
           puts "Head process started successfully."
@@ -192,7 +190,7 @@ module Webroar
           puts "An error occurred while starting head process. Please refer '#{WEBROAR_LOG_FILE}' for details."
           if @starling_status == :up
             filename = File.join(WEBROAR_ROOT, 'conf', 'starling_server_config.yml')
-            pid_file = YAML.load(File.open(filename))["starling"]["pid_file"]
+            pid_file = YAML.load_file(filename)["starling"]["pid_file"]
             puts "Aborting startup sequence"
             print "Stopping starling message queue server ..."
             pid = File.read(pid_file).chomp.to_i rescue nil
@@ -207,11 +205,11 @@ module Webroar
         return if @starling_status == :down
 
         filename = File.join(WEBROAR_ROOT, 'conf', 'server_internal_config.yml')
-        log_file = YAML.load(File.open(filename))["webroar_analyzer_script"]["log_file"]
+        log_file = YAML.load_file(filename)["webroar_analyzer_script"]["log_file"]
 
         print "Starting webroar-analyzer process ..."
 
-        pid_file = YAML.load(File.open(filename))["webroar_analyzer_script"]["pid_file"]
+        pid_file = YAML.load_file(filename)["webroar_analyzer_script"]["pid_file"]
         pid = File.read(pid_file).chomp.to_i rescue nil
 
         if pid
@@ -282,7 +280,7 @@ module Webroar
         analytics = true
 
         
-        server_conf = YAML.load(File.open(INTERNAL_CONF_FILE))
+        server_conf = YAML.load_file(INTERNAL_CONF_FILE)
         if(server_conf and server_conf["webroar"] and !server_conf["webroar"]["analyzer"].nil?)
           analytics = server_conf["webroar"]["analyzer"]
         end
@@ -292,7 +290,7 @@ module Webroar
         print "Starting message queue server ..."
 
         starling_conf_file = File.join(WEBROAR_ROOT, 'conf', 'starling_server_config.yml')
-        pid_file = YAML.load(File.open(starling_conf_file))["starling"]["pid_file"]
+        pid_file = YAML.load_file(starling_conf_file)["starling"]["pid_file"]
         pid = File.read(pid_file).chomp.to_i rescue nil
 
         if pid
@@ -304,7 +302,7 @@ module Webroar
         end
 
         filename = File.join(WEBROAR_ROOT, 'conf', 'server_internal_config.yml')
-        log_file = YAML.load(File.open(filename))["webroar_analyzer_script"]["log_file"]
+        log_file = YAML.load_file(filename)["webroar_analyzer_script"]["log_file"]
 
         system("starling -f #{starling_conf_file} >> #{log_file} 2>>#{log_file}")
         if $? == 0
@@ -326,7 +324,7 @@ module Webroar
       # Stop the server
       def stop_webroar
         begin
-          yaml_obj = YAML.load(File.open(INTERNAL_CONF_FILE))
+          yaml_obj = YAML.load_file(INTERNAL_CONF_FILE)
           pid_file = yaml_obj["webroar_analyzer_script"]["pid_file"]
           if !(File.exists?(PIDFILE) or File.exists?(pid_file))
             puts "WebROaR is not running."
@@ -357,7 +355,7 @@ module Webroar
       def restart_webroar
         puts "Restarting WebROaR ..."
         filename = File.join(WEBROAR_ROOT, 'conf', 'server_internal_config.yml')
-        pid_file = YAML.load(File.open(filename))["webroar_analyzer_script"]["pid_file"]
+        pid_file = YAML.load_file(filename)["webroar_analyzer_script"]["pid_file"]
         if File.exists?(PIDFILE) or File.exists?(pid_file)
           stop_webroar
           system("sleep 1")

data/src/admin_panel/Gemfile

@@ -0,0 +1,8 @@
+# Edit this Gemfile to bundle your application's dependencies.
+# This preamble is the current preamble for Rails 3 apps; edit as needed.
+source 'http://rubygems.org'
+
+gem 'rails', '3.0.9'
+gem 'sqlite3'
+gem 'will_paginate','~>2.3.16'
+gem 'rspec','~>1.3.1'

data/src/admin_panel/Rakefile

@@ -1,10 +1,7 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require(File.join(File.dirname(__FILE__), 'config', 'boot'))
-
+require File.expand_path('../config/application', __FILE__)
 require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
 
-require 'tasks/rails'
+AdminPanel::Application.load_tasks

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

@@ -23,7 +23,7 @@
 require 'digest/md5'
 class ApplicationController < ActionController::Base
   helper :all # include all helpers, all the time
-  filter_parameter_logging :password #This is to protect the password logging in the log files.
+  
   # See ActionController::RequestForgeryProtection for details
   # Uncomment the :secret if you're not using the cookie session store
   protect_from_forgery #:secret => '8e99f4efee54d3b72e3b675578e1403c'

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

@@ -104,36 +104,35 @@ class ExceptionsController < ApplicationController
   
   #Method is used to update the status for selected exceptions.
   def change_status    
-    if request.method == :put
-      @application_name = params[:app_name]    
-      app_id = App.get_application_data(@application_name).id
-      if params[:exception_ids] and params[:status_name]        
-        params[:exception_ids].collect! do |e|
-          e.to_i
-        end
-        case params[:status_name].downcase
-          when 'delete'
-            
-          when 'ignore'
-            AppException.update_all_status_to(IGNORED_EXCEPTION, params[:exception_ids])
-          when 'close'
-            AppException.update_all_status_to(CLOSED_EXCEPTION, params[:exception_ids])
-          when 'open'
-            AppException.update_all_status_to(OPEN_EXCEPTION, params[:exception_ids])
-        end
-      end
-      status = get_status_const(params[:current_status])
-      session[:per_page] = 5 if not session[:per_page]
-      @exceptions = AppException.get_all(status, app_id, params[:page],session[:per_page])
-      if @exceptions.out_of_bounds? and (page = params[:page].to_i - 1) > 0
-        @exceptions = AppException.get_all(status, app_id, page,session[:per_page])
+
+    @application_name = params[:app_name]
+    app_id = App.get_application_data(@application_name).id
+    if params[:exception_ids] and params[:status_name]
+      params[:exception_ids].collect! do |e|
+        e.to_i
       end
-      render :update do |page|
-        page.replace_html 'data_div', :partial => 'exception_list_partial', :locals => { :current_status => status, :status_name => params[:current_status]}  
+      case params[:status_name].downcase
+        when 'delete'
+
+        when 'ignore'
+          AppException.update_all_status_to(IGNORED_EXCEPTION, params[:exception_ids])
+        when 'close'
+          AppException.update_all_status_to(CLOSED_EXCEPTION, params[:exception_ids])
+        when 'open'
+          AppException.update_all_status_to(OPEN_EXCEPTION, params[:exception_ids])
       end
     end
+    status = get_status_const(params[:current_status])
+    session[:per_page] = 5 if not session[:per_page]
+    @exceptions = AppException.get_all(status, app_id, params[:page],session[:per_page])
+    if @exceptions.out_of_bounds? and (page = params[:page].to_i - 1) > 0
+      @exceptions = AppException.get_all(status, app_id, page,session[:per_page])
+    end
+    render :update do |page|
+      page.replace_html 'data_div', :partial => 'exception_list_partial', :locals => { :current_status => status, :status_name => params[:current_status]}  
+    end
   end
-  
+
   # This method is used to render the add_application_class_form partial with all the exception classes
   # stored in configuration file, with respect to the selected application
   def save_exception_class_form

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

@@ -20,7 +20,8 @@
 
 #This controller deals with the graph plotting and retriving the data for the graphs using models.
 #This Controller additionally neads the module for each graph type saved in /lib/graph_controller_extensions.
-Dir["#{RAILS_ROOT}/lib/graph_controller_extensions/*.rb"].each { |extension| require extension}
+
+Dir["#{File.dirname(__FILE__)}/../../lib/graph_controller_extensions/*.rb"].each { |extension| require extension}
 class GraphController < ApplicationController
   before_filter :login_required
   before_filter :clear_flash_notice

data/src/admin_panel/app/helpers/admin_helper.rb

@@ -116,7 +116,7 @@ module AdminHelper
   #To help the configuration page to display the ssl information.
   def ssl_block(info, ssl_port, certificate, key)
     if info['Server Specification']['SSL Specification']
-      block = "<table width = 95% >
+      block = "<table width = 95% align='center'>
 			      <tr>
               <th colspan='2' width = 80%>SSL Support</th>
               <th>"