agile-isaac 0.0.4 → 0.0.5

data/isaac.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "isaac"
-  s.version  = "0.0.4"
-  s.date     = "2008-12-17"
+  s.version  = "0.0.5"
+  s.date     = "2008-12-18"
   s.summary  = "The smallish DSL for writing IRC bots"
   s.email    = "mike@cryingwhilecoding.com"
   s.homepage = "http://github.com/agile/isaac"

data/lib/isaac.rb

@@ -1,6 +1,7 @@
 require 'socket'
-require 'isaac/config'
 require 'logger'
+$:.unshift File.dirname(__FILE__)
+require 'isaac/config'
 
 module Isaac
 
@@ -18,10 +19,13 @@ module Isaac
   end
 
   def self.logger
-    @logger ||= Logger.new(Config.log_file || "isaac.log")
+    unless @logger
+      @logger = Logger.new(Config.log_file || "isaac.log")
+      logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+    end
+    @logger
   end
 
-  #Config = Struct.new(:nick, :server, :port, :server_pass, :username, :realname, :version, :verbose, :nick_pass)
 
   # These are top level methods you use to construct your bot.
   class Application
@@ -113,8 +117,34 @@ module Isaac
       end
     end
 
+    def required_config
+      %w(nick server port username realname)
+    end
+
+    def have_required_config?
+      required_config.all? do |r|
+        !config[r].nil?
+      end
+    end
+
     def connect
       begin
+        unless have_required_config?
+          msg = "Required configuration data is missing: #{required_config.delete_if {|c| !config[c].nil? }.join(', ')}\n"
+          msg += "you need to either add them to your config.yml or in a config block, eg:\n"
+          msg +=<<-CODE
+            config do |c|
+              c.nick      = 'foo'
+              c.server    = 'irc.example.com'
+              c.port      = 6667
+              c.username  = 'foo'
+              c.realname  = 'foo'
+            end
+          CODE
+          puts msg
+          logger.error msg
+          exit
+        end
         logger.info "Connecting to #{config.server} at port #{config.port}"
         @irc = TCPSocket.open(config.server, config.port)
         logger.info "Connection established."
@@ -130,7 +160,7 @@ module Isaac
           handle line
         end
       rescue Interrupt => e
-        puts "Disconnected! An error occurred: #{e.inspect}"
+        logger.info "Disconnected! An error occurred: #{e.inspect}"
       #rescue Timeout::Error => e
       #  puts "Timeout: #{e}. Reconnecting."
       #  connect
@@ -144,7 +174,7 @@ module Isaac
 
     # This is one hell of a nasty method. Something should be done, I suppose.
     def handle(line)
-      puts "> #{line}" if config.verbose
+      logger.info "> #{line}" if config.verbose
 
       case line
       when /^:(\S+)!\S+ PRIVMSG \S+ :?\001VERSION\001/

data/lib/isaac/config.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Isaac
   module Config
     class << self
@@ -13,11 +15,11 @@ module Isaac
 
       def config(network=nil)
         network ||= default_network
-        @data.config[network] || {}
+        @data && @data.config[network] || {}
       end
 
       def networks
-        @data.networks
+        @data && @data.networks || []
       end
 
       def default_network
@@ -36,6 +38,14 @@ module Isaac
         @dirty = bool
       end
 
+      def [](arg)
+        config[arg]
+      end
+
+      def []=(arg,val)
+        config[arg] = val
+      end
+
       def write_config(filename=nil)
         File.open(filename || data.config_filename, 'w') do |file|
           file << data.to_yaml
@@ -55,9 +65,9 @@ module Isaac
     class Data
       attr_accessor :config, :config_filename
 
-      def initialize(config=nil)
-        self.config = read_config(config)
-        self.config_filename = config || default_config_file
+      def initialize(filename=nil)
+        self.config_filename = filename || default_config_file
+        @config = read_config(config_filename)
       end
 
       def config_dir
@@ -72,28 +82,18 @@ module Isaac
         config.keys
       end
 
-      def read_config(config=nil)
-        begin
-          require 'erb'
-          require 'yaml'
-        rescue LoadError
-          retry if require 'rubygems'
-        end
-        begin
-          config ||= config_filename
-          self.config_filename = config unless config == config_filename
-          YAML::load(ERB.new(IO.read(config)).result)
-        rescue
-          {"default" => {}}
-        end
+      def read_config(filename=nil)
+        self.config_filename = filename if filename
+        Isaac.logger.debug "Loading config from #{config_filename}"
+        YAML.load_file(config_filename) rescue {"default" => {}}
       end
 
       def to_yaml
         config.to_yaml
       end
 
-      def self.load(config=nil)
-        Isaac::Config.data = new(config)
+      def self.load(filename=nil)
+        Isaac::Config.data = new(filename)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: agile-isaac
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Harry Vangberg
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-17 00:00:00 -08:00
+date: 2008-12-18 00:00:00 -08:00
 default_executable: 
 dependencies: []