Changeset 6415

Timestamp:

02/09/08 13:07:12 (5 years ago)

Author:

cho45

Message:

lang/ruby/chokan/branches/citrus/plugins/system.rb,
lang/ruby/chokan/branches/citrus/lib/citrus/core.rb,
lang/ruby/chokan/branches/citrus/spec/core_spec.rb,
lang/ruby/chokan/branches/citrus/spec/spec_helper.rb:

最近 trunk にコミットしたやつをこっちにもとかいろいろ

Location:

lang/ruby/chokan/branches/citrus

Files:

• lib/citrus/core.rb (modified) (1 diff)
• plugins/system.rb (modified) (2 diffs)
• spec/core_spec.rb (modified) (1 diff)
• spec/spec_helper.rb (modified) (1 diff)

lang/ruby/chokan/branches/citrus/lib/citrus/core.rb

@@ -136 +136 @@
                                 if args[1] && args[1][0] == ?# # when channel
                                         channel  = args[1]
-                                        enabled  = @config.plugins[n]["enabled"]
-                                        disabled = @config.plugins[n]["disabled"]
+                                        config   = @config.plugins[n] || {}
+                                        enabled  = config["enabled"]
+                                        disabled = config["disabled"]
 
                                         case

lang/ruby/chokan/branches/citrus/plugins/system.rb

@@ -32 +32 @@
                                 notice channel, "Reloaded: " + reloaded
                         end
+
+                when /^chokan: join to (\S+)(?: (\S+))?/
+                        chan, pass = Regexp.last_match.captures
+                        log "Joining to '#{chan}' with '#{pass}'"
+                        join(chan.to_s, pass.to_s)
+
+                when "chokan: part"
+                        part(channel, "lambda....")
 
                 when "operator?"
@@ -81 +89 @@
                 end
 
+                it "can operate join/part" do
+                        @socket.string = ""
+                        @plugin.on_privmsg(@prefixop, "#test", "chokan: part")
+                        @socket.string.should match(/^PART #test /)
+
+                        @socket.string = ""
+                        @plugin.on_privmsg(@prefixop, "#test", "chokan: join to #foobar")
+                        @socket.string.should match(/^JOIN #foobar /)
+
+                        @socket.string = ""
+                        @plugin.on_privmsg(@prefixop, "#test", "chokan: join to #foobar password")
+                        @socket.string.should match(/^JOIN #foobar password/)
+                end
+
                 it "can Gem.clear_paths" do
                         @socket.string = ""

lang/ruby/chokan/branches/citrus/spec/core_spec.rb

@@ -154 +154 @@
                 @core.plugins["Bar"].results[:on_privmsg].should_not == ["foo!bar@localhost", "#bar", "message"]
         end
-
-#       @core = Core.new(YAML.load(<<-YAML.gsub(/^\t/, "")))
-#       ---
-#       general:
-#         server: charlotte
-#         port: 6669
-#         user: chokan
-#         nick: chokan
-#         real: chokan bot via tiarra
-#         error: "#chokan@ircnet"
-#         plugin_dir: plugins
-#         charset:
-#           default: iso-2022-jp
-#           "#test": utf-8
-#       plugins:
-#         Core:
-#           operator: "cho!cho45@localhost"
-#         SimpleReply:
-#           replies:
-#             - words:
-#                - "ping: chokan"
-#               channels: []
-#               reply: "pong"
-#             - words:
-#                - Nice
-#               channel:
-#                - "#foo"
-#                - "#bar"
-#               reply: boat.
-#
-#       YAML
 end
 

lang/ruby/chokan/branches/citrus/spec/spec_helper.rb

@@ -45 +45 @@
                                 "Foo"   => { "disabled" => ["#foo"], },
                                 "Bar"   => { "enabled" => ["#foo"], },
+                                "Baz"   => nil,
                         }
                 }.merge(config)