Merge pull request #78 from Namasteh/v7.0alpha2.1.0

v7.0alpha2.1.0

Author: Namasteh

Eve.rb

@@ -4,26 +4,42 @@
 require_relative 'lib/utils/config_checks'
 require_relative 'lib/helpers/file_handler'
 
-$eve_version = "7.0"
+$eve_version = "7.0alpha2.1.0"
+
+# Find out of there is a config file, if
+# there is a config file then it pulls
+# the IRC server from the settings file.
+# Otherwise, the bot will default to it's
+# home server of Sinsira.
 
 if $settings_file.nil?
-  botnick = "Eve"
+  irc_server  = "irc.sinsira.net"
+  server_port = "6667"
+  server_ssl  = "false"
+  ssl_verify  = "false"
+  botnick     = "Eve"
 else
-  botnick = $settings_file['nick'].to_s
+  irc_server  = $settings_file['irc_server'].to_s
+  server_port = $settings_file['server_port'].to_s
+  server_ssl  = $settings_file['server_ssl'].to_s
+  ssl_verify  = $settings_file['ssl_verify'].to_s
+  botnick     = $settings_file['nick']
 end
 
 bot = Cinch::Bot.new do
   configure do |c|
-    c.server = "irc.catiechat.net"
-    c.channels = [
-                  "#Eve"
-                 ]
-    c.nick = "#{botnick}"
-    c.user = "Eve"
-    c.realname = "Eve 7"
-    c.password = "foo"
-    c.encoding = "UTF-8"
-    f = open("config/settings/constants.rb")
+    c.server          = "#{irc_server}"
+    c.port            = "#{server_port}"
+    c.ssl.use         = server_ssl
+    c.ssl.verify      = false
+    c.channels        = [
+                         "#Eve"
+                        ]
+    c.nick            = "#{botnick}"
+    c.user            = "Eve"
+    c.realname        = "Eve #{$eve_version}"
+    c.encoding        = "UTF-8"
+    f                 = open("config/settings/constants.rb")
     c.plugins.plugins = []
                         f.each_line {|line|
                                      line = Object.const_get(line.chomp)

VERSION

@@ -1 +1 @@
-7.0.0.1
+7.0.0.2

lib/utils/config_checks.rb

@@ -6,7 +6,7 @@ module Cinch
   module Plugins
     class ConfigChecks
       include Cinch::Plugin
-      
+
       # This block checks for several files, and
       # if they are not there it will run the first-
       # run wizard for the associated core plugin.
@@ -35,6 +35,8 @@ def initialize(*args)
         else
           load 'lib/utils/plugins_first_run.rb'
           PluginsFirstRun.new(*args)
+          puts "Restarting bot to apply first run changes..."
+          system("kill #{Process.pid}&& ruby Eve.rb")
         end
       end
     end

lib/utils/first_run.rb

@@ -46,6 +46,29 @@ def initialize(*args)
           pf = "~"
         end
 
+        irc_server = ask("Please enter the server address you would like the bot to connect to: ") {|server|
+          server.responses[:ask_on_error] = "Please specify the IRC server address you'd like the bot to connect to: "
+          server.confirm = "Are you sure that you'd like to set <%= @answer %> as the IRC server the bot will connect to? [yes/no]: "
+          }
+        @settings['irc_server'] = irc_server.to_s
+
+        server_port = ask("What port would you like the bot to connect through? [6667]") {|port|
+          port.default = "6667"
+          port.responses[:ask_on_error] = "Please specify a port that you'd like the bot to connect through: "
+          port.confirm = "Are you sure you want to set connect to #{irc_server} through port <%= @answer %>?"
+          }
+        @settings['server_port'] = server_port.to_s
+
+        if agree("Does #{irc_server}'s port #{server_port} use SSL? [yes/no]: ")
+          @settings['server_ssl'] = true
+          if agree("Does #{irc_server} use a self-signed SSL certificate? [yes/no]: ")
+            @settings['ssl_verify'] = false
+          else
+            @settings['ssl_verify'] = true
+          end
+        else
+          @settings['server_ssl'] = false
+        end
 
         # Attempt to get e-mail from user for NickServ registration
         say("#{botnick} will need an e-mail for certain things, like registering for NickServ. Please take note that the e-mail won't necessarily be publicly available, but that option is available for support!")

plugins/core/admin_handler.rb

@@ -25,7 +25,7 @@ def status(m)
       match /login$/i, method: :login
 
       def login(m)
-        if authentication
+        if authentication(m)
           m.reply "You are currently logged into the bot."
           timeout_handler(m)
         else

plugins/core/bot_control.rb

@@ -12,10 +12,9 @@ class BotControl
 
       def off(m)
         return unless authentication(m)
-        quit_safely
         plugin_name = "BotControl"
         log_message("message", "Received 'off' command from #{m.user.nick}...", plugin_name)
-        exit_normally
+        quit_safely
         bot.quit("on command of #{m.user.nick}. Exiting normally...")
       end
 

setup.rb

@@ -25,6 +25,6 @@ def install_check(gem)
 puts "Checking if 'activesupport' is installed..."
 install_check("activesupport")
 puts "Required dependencies for eve7 now installed."
-puts "Opening install script..."
+puts "You can now run the Install Wizard by typing: ruby install.rb"
 system("kill #{Process.pid}")