dragoon 0.0.1 → 0.0.2

data/Gemfile

@@ -1,4 +1,3 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in ..gemspec
 gemspec

data/README.md

@@ -1,7 +1,7 @@
 Dragoon
 ============
 
-An IRC bot that notifies you of keyword occurences in your favorite chatrooms. You can listen to multiple channels but right now, i've only tested it on freenode.net. Support for multiple networks will be done soon.
+An IRC bot that alerts you whenever certain keywords pop up in your favorite channels. You can listen to multiple channels but right now, you can only connect to one network at a time. And I've only tested it on freenode.net. Support for multiple networks will be done soon.
 
 
 Dependencies
@@ -15,13 +15,19 @@ P.S. You can still run the program even without growl, you'll only see the keywo
 Usage
 -----
 
-1. `git clone git://github.com/redgetan/dragoon.git`
-2. Create a configuration file under config/ directory and name it "config.yml". See "config.yml.example" for reference.
-3. If you have growl support, make sure it's turned on
-4. To start the program, type `./bin/dragoon`
+  gem install dragoon
+
+  dragoon
+
+Once you run dragoon, A default config file would be created under your home directory called .dragoon if it doesnt exist. You will have to edit it accordingly. Once the file exists, the program will automatically load the config file on startup.
+
+If you have growl support, make sure it's turned on
 
-P.S. will gemify this soon so you only have to do 'gem install dragoon', then 'dragoon'
 
 Screenshot
 ---------
 http://farm8.staticflickr.com/7027/6733543233_6f354d61d0_b.jpg
+
+Questions and Feedback
+---------
+I would love to hear any suggestions for improvement. You can email me at redge.tan@gmail.com. I'm also looking for mentors that can help me improve as a software developer. if you're interested in helping me, I'd love to hear from you.

data/dragoon.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "rspec"
-  s.add_runtime_dependency "term/ansicolor"
+  s.add_dependency "term-ansicolor"
 end

data/lib/dragoon.rb

@@ -1,7 +1,7 @@
 require 'socket'
 require 'ostruct'
 require 'forwardable'
-require 'yaml'
+require 'json'
 
 require 'term/ansicolor'
 
@@ -19,11 +19,12 @@ module Dragoon
     include Commands
     include Color
 
-    attr_accessor :nickname, :networks, :channels, :keywords
+    attr_accessor :nickname, :network, :channels, :keywords
 
     def_delegators :@event_manager, :on, :dispatch
 
     DEFAULT_PORT = 6667
+    CONFIG_FILE = File.expand_path("~/.dragoon")
 
     def initialize(&blk)
       @event_manager = EventManager.new
@@ -33,13 +34,27 @@ module Dragoon
 
     def load_config
       begin
-        config = YAML.load_file(File.expand_path(File.join(File.dirname(__FILE__), "./../config/config.yml")))
+        if File.exist?(CONFIG_FILE)
+          puts("*** Loading config file ~/.dragoon")
+          config = JSON.parse(File.read(CONFIG_FILE))
+        else
+          config = {
+            "nickname" => "your_nick",
+            "network"  => "irc.freenode.net",
+            "channels" => %w[ #ubuntu #ruby #rubyonrails #linux #programming #javascript ],
+            "keywords" => %w[ and how who ]
+          }
+          File.open(CONFIG_FILE,'w+') {|f| f.write(JSON.pretty_generate(config)) }
+          puts("Config file does not exist...created one at #{CONFIG_FILE}".red)
+          puts("Please modify it according to your preference".red)
+          exit 1
+        end
       rescue => e
         $stderr.puts e.message
         exit 1
       end
       @nickname = config["nickname"]
-      @networks = config["networks"]
+      @network = config["network"]
       @channels = config["channels"]
       @keywords = config["keywords"]
     end
@@ -59,7 +74,7 @@ module Dragoon
       end
 
       on :mode do |msg|
-        puts "*** Logged in as #{@nickname}"
+        puts "*** Logged in as #{self.nickname}"
         join_channels
       end
 
@@ -68,7 +83,13 @@ module Dragoon
       end
 
       on :err do |msg|
-        puts "err: #{msg.text}" unless msg.error_code == '470' # channel forwarding
+        $stderr.puts msg.text.red unless msg.error_code == '470' # channel forwarding
+        if msg.error_code == '433' # nick already in use
+          print("Enter another nickname: ")
+          self.nickname = gets.chomp
+          user(self.nickname)
+          nick(self.nickname)
+        end
       end
 
       on :privmsg do |msg|
@@ -86,20 +107,28 @@ module Dragoon
     def run
       @socket = connect
       while line = @socket.gets
+        trap('INT') { stop }
         @event = Event.parse(line)
         dispatch(@event)
       end
     end
 
     def connect
-      puts "*** Connecting to #{@networks.first} on port #{DEFAULT_PORT}"
-      TCPSocket.new(@networks.first, DEFAULT_PORT)
+      puts "*** Connecting to #{@network} on port #{DEFAULT_PORT}"
+      TCPSocket.new(@network, DEFAULT_PORT)
     end
 
     def escape_double_quotes(text)
       text.gsub("\"", "\\\"")
     end
 
+    def stop
+      @socket.close
+      puts
+      puts "*** Program stopped"
+      exit
+    end
+
   end
 end
 

data/lib/dragoon/commands.rb

@@ -24,6 +24,7 @@ module Dragoon
     private
 
       def write(text)
+        $stdout.puts text
         @socket.write "#{text}\r\n"
       end
 

data/lib/dragoon/version.rb

@@ -1,3 +1,3 @@
 module Dragoon
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dragoon
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Reginald Tan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-22 00:00:00 Z
+date: 2012-01-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -32,7 +32,7 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: term/ansicolor
+  name: term-ansicolor
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -62,8 +62,6 @@ files:
 - Rakefile
 - TODO
 - bin/dragoon
-- config/config.yml
-- config/config.yml.example
 - dragoon.gemspec
 - lib/dragoon.rb
 - lib/dragoon/color.rb

data/config/config.yml

@@ -1,4 +0,0 @@
-nickname:  fenix45
-networks:  [ irc.freenode.net ]
-channels:  [ '#ubuntu', '#ruby', '#rubyonrails', '#linux', '#javascript', '#programming' ]
-keywords:  [ why, how, who, and ]

data/config/config.yml.example

@@ -1,4 +0,0 @@
-nickname:  fenix45
-networks:  [ irc.freenode.net ]
-channels:  [ '#ubuntu', '#ruby', '#rubyonrails', '#linux', '#javascript', '#programming' ]
-keywords:  [ why, how, who, and ]