add lib/

Author: colwem

Rakefile

@@ -34,8 +34,8 @@ task :start do
       c.nick = nick
       c.plugins.plugins = [ClockPlugin, LoggerPlugin, ChannelChangerPlugin]
     end
-
 
+    #just to check if he's responding
     on :message, "hello" do |m|
       m.reply "Hello, #{m.user.nick}"
     end

lib/percival/channel_changer.rb

@@ -1 +1,2 @@
 require 'percival/channel_changer/plugin'
+require 'percival/channel_changer/user_role'

lib/percival/channel_changer/plugin.rb

@@ -2,29 +2,31 @@
 class ChannelChangerPlugin
   include Cinch::Plugin
 
-  @@roles = {channel: ["colwem", "jfredett"]}  
 
   match /join-channel\s+(\S+)/, :method => :join
-  match /leave-channel(\s+(\S+))?/, :method => :leave
+  match /leave-channel(?:\s+(\S+))?/, :method => :leave
+
+  listen_to :error, method: :error
+
+  # TODO: respond to error codes
+  def error irc
+    debug( irc.to_s )
+  end
+  
 
   #TODO: get rid of the 'space' var
   #TODO: inform if there is an error
-  def leave irc, space, channel
-    if role? irc.user, :channel
-      channel = channel.nil? ? irc.channel : Channel(channel)
-      bot.part(channel) 
+  def leave irc, channel
+    if UserRole.approved? irc.user, :channel
+      channel ||= irc.channel
+      Channel(channel).part 
     end
   end
 
   #TODO: confirm success or failure
   #TODO: inform if there is an error
   def join irc, channel
-    Channel(channel).join() if role? irc.user, :channel
-  end
-
-
-  def role? user, role
-    @@roles[role].map {|u| User(u)}.include? user
+    Channel(channel).join() if UserRole.approved? irc.user, :channel
   end
 end
 

lib/percival/channel_changer/user_role.rb

@@ -0,0 +1,16 @@
+class UserRole
+
+  @@roles = {channel: ["colwem", "jfredett"]}
+
+  #TODO: figure out how the various names work on irc (authname, nick,
+  #realname )  Whats the difference between a user and his nick and authname
+  def self.approved?(user, role)
+    if user.is_a? Cinch::User
+      user = user.name
+    elsif ! user.is_? String
+      throw "user was not a valid type [String, User]" # TODO: raise
+      # better Exception
+    end
+    @@roles[role].include? user 
+  end
+end