@@ -1,5 +1,3 @@ -# Based on the merb-core Rakefile. Thanks. - require "rake" require "rake/clean" require "rake/gempackagetask" @@ -24,6 +22,7 @@ begin s.description = s.summary s.authors = ["Tyler McMullen"] s.add_dependency 'xmpp4r' + s.files = FileList["[A-Z]*.*", "{bin,generators,lib,test,spec,examples}/**/*"] end rescue LoadError puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com" Rakefile @@ -1,4 +1,4 @@ --- -patch: 1 +patch: 2 major: 0 minor: 6 VERSION.yml @@ -102,7 +102,9 @@ class Uppercut @roster.accept_subscription(presence.from) dispatch_presence(item, presence) end - @roster.add_subscription_callback { |item, presence| dispatch_presence(item, presence) } + @roster.add_subscription_callback do |item, presence| + dispatch_presence(item, presence) + end sleep } end @@ -129,7 +131,8 @@ class Uppercut private def dispatch(msg) - block = @redirects[msg.from].respond_to?(:shift) && @redirects[msg.from].shift + bare_from = msg.from.bare + block = @redirects[bare_from].respond_to?(:shift) && @redirects[bare_from].shift return block[msg.body] if block self.methods.grep(/^__uc/).sort.detect { |m| send(m,msg) != :no_match } lib/uppercut/agent.rb @@ -21,7 +21,7 @@ class Uppercut # end # end def wait_for(&block) - @base.redirect_from(@to,&block) + @base.redirect_from(@to.bare,&block) end end lib/uppercut/conversation.rb @@ -158,6 +158,7 @@ describe Uppercut::Agent do it "calls the first matching command" do msg = Jabber::Message.new(nil) msg.body = 'hi' + msg.from = Jabber::JID.fake_jid @agent.send(:dispatch, msg) @agent.instance_eval { @called_hi_regex }.should_not == true @@ -167,6 +168,7 @@ describe Uppercut::Agent do it "matches by regular expression" do msg = Jabber::Message.new(nil) msg.body = 'high' + msg.from = Jabber::JID.fake_jid @agent.send(:dispatch, msg) @agent.instance_eval { @called_hi }.should_not == true spec/agent_spec.rb @@ -31,6 +31,8 @@ class Jabber def add_message_callback(&block) @on_message = block end + + # TESTING HELPER METHODS @@ -44,6 +46,8 @@ class Jabber end class Presence + attr_accessor :from + def initialize(a,b) end @@ -71,6 +75,29 @@ class Jabber def add_subscription_request_callback(&block) @on_subscription_request = block end + + def add_presence_callback(&block) + @on_presence = block + end + + def add_subscription_callback(&block) + @on_subscription = block + end + end + end + + class JID + def self.fake_jid + new 'foo', 'bar.com', 'baz' + end + + def initialize(node,domain,res) + @node, @domain, @res = node, domain, res + end + + def bare + self.class.new @node, @domain, nil end end -end \ No newline at end of file +end + spec/jabber_stub.rb @@ -1,12 +1,13 @@ Gem::Specification.new do |s| s.name = %q{uppercut} - s.version = "0.6.1" + s.version = "0.6.2" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Tyler McMullen"] - s.date = %q{2008-11-07} + s.date = %q{2008-12-02} s.description = %q{A DSL for writing agents and notifiers for Jabber.} s.email = %q{tbmcmullen@gmail.com} + s.files = ["README.textile", "VERSION.yml", "lib/uppercut", "lib/uppercut/agent.rb", "lib/uppercut/base.rb", "lib/uppercut/conversation.rb", "lib/uppercut/message.rb", "lib/uppercut/notifier.rb", "lib/uppercut.rb", "spec/agent_spec.rb", "spec/conversation_spec.rb", "spec/jabber_stub.rb", "spec/notifier_spec.rb", "spec/spec_helper.rb"] s.homepage = %q{http://github.com/tyler/uppercut} s.require_paths = ["lib"] s.rubygems_version = %q{1.2.0} @@ -24,13 +25,4 @@ Gem::Specification.new do |s| else s.add_dependency(%q<xmpp4r>, [">= 0"]) end - - s.files = [ - "LICENSE", - "Rakefile", - "README.textile" - ] - s.files += Dir["examples/*.rb"] - s.files += Dir["lib/**/*.rb"] - s.files += Dir["spec/**/*.rb"] end uppercut.gemspec 85970031932b4c0f769c0223bbcf9db981244306 Tyler McMullen tbmcmullen@gmail.com http://github.com/tyler/uppercut/commit/2df8d7557aea06c73350baf9baa92c0e7d289cb8 2df8d7557aea06c73350baf9baa92c0e7d289cb8 2008-12-02T23:09:12-08:00 2008-12-02T23:09:12-08:00 A bunch of bug fixes. Empty gem issue is gone. Tweaks to thewordnerd's changes. New specs. 6cf092e9bc23b55d400ae8c946fef95b1aa4c735 Tyler McMullen tbmcmullen@gmail.com