xmpp4r 0.3.2 → 0.4

data/data/doc/xmpp4r/examples/advanced/shellmgr/shellmgr_test.rb

@@ -1,8 +1,8 @@
-#!/usr/bin/ruby -w 
+#!/usr/bin/ruby -w
 
 require 'shellmgr'
 
-sh = Shell::new { |s| puts s }
+sh = Shell.new { |s| puts s }
 
 while true do
   l = gets

data/data/doc/xmpp4r/examples/advanced/versionpoll.rb

@@ -3,7 +3,7 @@
 # This script will request the version information of a list of JID given
 # on stdin.
 
-$:.unshift '../lib'
+$:.unshift '../../../../../lib'
 
 require 'optparse'
 require 'xmpp4r/client'
@@ -12,13 +12,13 @@ include Jabber
 #Jabber::debug = true
 
 # settings
-jid = JID::new('bot@localhost/Bot')
+jid = JID.new('bot@localhost/Bot')
 password = 'bot'
 domains = []
-OptionParser::new do |opts|
+OptionParser.new do |opts|
   opts.banner = 'Usage: versionpoll.rb -j jid -p password -d DOMAINS'
   opts.separator ''
-  opts.on('-j', '--jid JID', 'sets the jid') { |j| jid = JID::new(j) }
+  opts.on('-j', '--jid JID', 'sets the jid') { |j| jid = JID.new(j) }
   opts.on('-p', '--password PASSWORD', 'sets the password') { |p| password = p }
   opts.on('-d', '--domain DOMAIN', 'sets the domain') { |d| domains << d }
   opts.on_tail('-h', '--help', 'Show this message') {
@@ -28,14 +28,14 @@ OptionParser::new do |opts|
   opts.parse!(ARGV)
 end
 
-cl = Client::new(jid)
+cl = Client.new(jid)
 cl.connect
 cl.auth(password)
 sent = []
 queried = []
 activity = false
 cl.add_iq_callback do |i|
-  fjid = JID::new(i.from)
+  fjid = JID.new(i.from)
   if i.type == :result and fjid.resource == "admin"
     domain = fjid.domain
     items = i.first_element('item')
@@ -45,7 +45,7 @@ cl.add_iq_callback do |i|
       if not queried.include?(j)
         activity = true
         queried << j
-        cl.send(Iq::new_browseget.set_to(j))
+        cl.send(Iq.new_browseget.set_to(j))
       end
     end
   end
@@ -59,9 +59,9 @@ cl.add_iq_callback do |i|
         if (a = e.attribute('type'))
           if a.value == 'client'
             activity = true
-            iq = Iq::new(:get)
-            iq.query = Version::IqQueryVersion::new
-            iq.set_to(JID::new(e.attribute('jid').to_s))
+            iq = Iq.new(:get)
+            iq.query = Version::IqQueryVersion.new
+            iq.set_to(JID.new(e.attribute('jid').to_s))
             cl.send(iq)
           end
         end
@@ -76,9 +76,9 @@ cl.add_iq_callback do |iq|
     puts r.inspect
   end
 end
-cl.send(Presence::new)
+cl.send(Presence.new)
 for d in domains do
-  cl.send(Iq::new_browseget.set_to("#{d}/admin"))
+  cl.send(Iq.new_browseget.set_to("#{d}/admin"))
 end
 
 activity = true

data/data/doc/xmpp4r/examples/advanced/xmpping.rb

@@ -112,7 +112,7 @@ end
 ##
 # Main loop
 ##
-  
+
   require 'mprofiler'
   MemoryProfiler.start(:string_debug=>true)
 
@@ -132,7 +132,7 @@ loop {
         print_reply(reply, Time.new - time1)
         true
       }
-    rescue Jabber::ErrorException => e
+    rescue Jabber::ServerError => e
       puts "Error for #{iq.query.namespace} to #{iq.to}: #{e.error.to_s.inspect}"
     end
   }
@@ -144,4 +144,3 @@ loop {
 
   sleep(interval)
 }
-

data/data/doc/xmpp4r/examples/basic/change_password.rb

@@ -16,7 +16,7 @@ def with_status(str, &block)
     yield
     puts " Ok"
   rescue Exception => e
-    puts " Error: #{e.to_s}"
+    puts " Exception: #{e.to_s}"
     raise e
   end
 end
@@ -27,12 +27,12 @@ if ARGV.length != 3
   puts "Run with ./change_password.rb user@server/resource oldpassword newpassword"
   exit 1
 end
-my_jid = JID::new(ARGV[0])
+my_jid = JID.new(ARGV[0])
 my_jid.resource = 'change_password' if my_jid.resource.nil?
 old_password = ARGV[1]
 new_password = ARGV[2]
 
-cl = Client::new(my_jid)
+cl = Client.new(my_jid)
 
 with_status('Connecting') { cl.connect }
 with_status('Authenticating') { cl.auth(old_password) }

data/data/doc/xmpp4r/examples/basic/client.rb

@@ -5,6 +5,8 @@
 # connect login@server/resource password
 # auth
 
+$:.unshift '../../../../../lib'
+
 require 'xmpp4r/client'
 include Jabber
 
@@ -53,8 +55,8 @@ class BasicClient
   # connect <jid> <password>
   def do_connect(args)
     @jid, @password = args.split(' ', 2)
-    @jid = JID::new(@jid)
-    @cl = Client::new(@jid)
+    @jid = JID.new(@jid)
+    @cl = Client.new(@jid)
     @cl.connect
   end
 
@@ -65,4 +67,4 @@ class BasicClient
   end
 end
 
-BasicClient::new
+BasicClient.new

data/data/doc/xmpp4r/examples/basic/component.rb

@@ -5,7 +5,7 @@ $:.unshift '../../../../../lib'
 require 'xmpp4r'
 include Jabber
 
-c = Component::new('tada', 'localhost', 60001)
+c = Component.new('tada', 'localhost', 60001)
 c.connect
 c.auth('jabber-rocks')
 Thread.stop

data/data/doc/xmpp4r/examples/basic/{echo_threaded.rb → echo.rb}

@@ -1,7 +1,8 @@
 #!/usr/bin/ruby
 
 # This bot will reply to every message it receives. To end the game, send 'exit'
-# THREADED VERSION
+
+$:.unshift '../../../../../lib'
 
 require 'xmpp4r/client'
 include Jabber
@@ -11,21 +12,21 @@ if ARGV.length != 2
   puts "Run with ./echo_thread.rb user@server/resource password"
   exit 1
 end
-myJID = JID::new(ARGV[0])
-myPassword = ARGV[1] 
-cl = Client::new(myJID)
+myJID = JID.new(ARGV[0])
+myPassword = ARGV[1]
+cl = Client.new(myJID)
 cl.connect
 cl.auth(myPassword)
-cl.send(Presence::new)
+cl.send(Presence.new)
 puts "Connected ! send messages to #{myJID.strip.to_s}."
 mainthread = Thread.current
 cl.add_message_callback do |m|
   if m.type != :error
-    m2 = Message::new(m.from, "You sent: #{m.body}")
+    m2 = Message.new(m.from, "You sent: #{m.body}")
     m2.type = m.type
     cl.send(m2)
     if m.body == 'exit'
-      m2 = Message::new(m.from, "Exiting ...")
+      m2 = Message.new(m.from, "Exiting ...")
       m2.type = m.type
       cl.send(m2)
       mainthread.wakeup

data/data/doc/xmpp4r/examples/basic/jabbersend.rb

@@ -10,16 +10,16 @@ require 'xmpp4r'
 include Jabber
 
 # settings
-myJID = JID::new('bot@localhost/Bot')
+myJID = JID.new('bot@localhost/Bot')
 myPassword = 'bot'
 
 to = nil
 subject = ''
-OptionParser::new do |opts|
+OptionParser.new do |opts|
   opts.banner = 'Usage: jabbersend.rb -s \'subject\' -t dest@domain'
   opts.separator ''
   opts.on('-s', '--subject SUBJECT', 'sets the message\'s subject') { |s| subject = s }
-  opts.on('-t', '--to DESTJID', 'sets the receiver') { |t| to = JID::new(t) }
+  opts.on('-t', '--to DESTJID', 'sets the receiver') { |t| to = JID.new(t) }
   opts.on_tail('-h', '--help', 'Show this message') {
     puts opts
     exit
@@ -31,11 +31,11 @@ if to.nil?
   puts "No receiver specified. See jabbersend -h"
 end
 
-cl = Client::new(myJID, false)
+cl = Client.new(myJID)
 cl.connect
 cl.auth(myPassword)
 body = STDIN.readlines.join
-m = Message::new(to, body).set_type(:normal).set_id('1').set_subject(subject)
+m = Message.new(to, body).set_type(:normal).set_id('1').set_subject(subject)
 puts m.to_s
 cl.send(m)
 cl.close

data/data/doc/xmpp4r/examples/basic/mass_sender.rb

@@ -14,16 +14,16 @@ include Jabber
 # - JID list on stdin
 
 # settings
-jid = JID::new('bot@localhost/Bot')
+jid = JID.new('bot@localhost/Bot')
 password = 'bot'
 filename = 'message.txt'
 
 subject = "Message de test"
 
-OptionParser::new do |opts|
+OptionParser.new do |opts|
   opts.banner = 'Usage: mass_sender.rb -j jid -p password'
   opts.separator ''
-  opts.on('-j', '--jid JID', 'sets the jid') { |j| jid = JID::new(j) }
+  opts.on('-j', '--jid JID', 'sets the jid') { |j| jid = JID.new(j) }
   opts.on('-p', '--password PASSWORD', 'sets the password') { |p| password = p }
   opts.on('-f', '--filename MESSAGE', 'sets the filename containing the message') { |f| filename = f }
   opts.on('-s', '--subject SUBJECT', 'sets the subject') { |s| subject = s }
@@ -36,7 +36,7 @@ end
 
 body = IO::read(filename).chomp
 
-cl = Client::new(jid, false)
+cl = Client.new(jid)
 cl.connect
 cl.auth(password)
 exit = false
@@ -44,25 +44,25 @@ sent = []
 cl.add_message_callback do |m|
   if m.type != :error
     if !sent.include?(m.from)
-      cl.send(Message::new(m.from, "Je suis un robot. Si tu souhaites contacter un administrateur du serveur, envoie un message à lucas@nussbaum.fr ou rejoins la salle jabberfr@chat.jabberfr.org."))
+      cl.send(Message.new(m.from, "Je suis un robot. Si tu souhaites contacter un administrateur du serveur, envoie un message à lucas@nussbaum.fr ou rejoins la salle jabberfr@chat.jabberfr.org."))
       sent << m.from
     end
     if m.body == 'exitnowplease'
-      cl.send(Message::new(m.from, "Exiting ..."))
+      cl.send(Message.new(m.from, "Exiting ..."))
       exit = true
     end
-    cl.send(Message::new('lucas@nussbaum.fr', "From #{m.from}: #{m.body.to_s}"))
+    cl.send(Message.new('lucas@nussbaum.fr', "From #{m.from}: #{m.body.to_s}"))
   end
 end
-cl.send(Presence::new)
-m = Message::new(nil, body)
+cl.send(Presence.new)
+m = Message.new(nil, body)
 m.subject = subject
 STDIN.each_line { |l|
   l.chomp!
-  m.set_to(JID::new(l).to_s)
+  m.set_to(JID.new(l).to_s)
   cl.send(m)
 }
 while not exit do
-	cl.process(1)
+  cl.process(1)
 end
 cl.close

data/data/doc/xmpp4r/examples/basic/muc_owner_config.rb

@@ -10,4 +10,3 @@ muc.configure(
       'muc#roomconfig_roomname' => 'roomname',
       'muc#roomconfig_persistentroom' => 1
 )
-

data/data/doc/xmpp4r/examples/basic/mucinfo.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$:.unshift '../../../../../lib'
+
 require 'xmpp4r'
 require 'xmpp4r/muc/helper/mucbrowser'
 
@@ -23,7 +25,7 @@ if name.nil?
   puts " Sorry, but the queried MUC component doesn't seem to support MUC or Groupchat."
 else
   puts " #{name}"
-  
+
   print "Querying #{muc_jid} for its rooms..."; $stdout.flush
   rooms = browser.muc_rooms(muc_jid)
   puts " #{rooms.size} rooms found"

data/data/doc/xmpp4r/examples/basic/mucsimplebot.rb

@@ -80,4 +80,3 @@ m.join(ARGV[2])
 Thread.stop
 
 cl.close
-

data/data/doc/xmpp4r/examples/basic/register.rb

@@ -5,8 +5,8 @@ require 'xmpp4r'
 
 
 # Argument checking
-if ARGV.size != 2
-  puts("Usage: #{$0} <desired jid> <password>")
+if ARGV.size < 2
+  puts("Usage: #{$0} <desired jid> <password> [field1=value1] [fieldN=valueN]")
   exit
 end
 
@@ -18,8 +18,25 @@ cl.connect
 
 # Registration of the new user account
 puts "Registering..."
-cl.register(ARGV[1])
-puts "Successful"
+begin
+  fields = {}
+  ARGV[2..-1].each { |a|
+    k, v = a.split('=', 2)
+    fields[k] = v
+  }
+  cl.register(ARGV[1], fields)
+  puts "Successful"
+rescue Jabber::ServerError => e
+  puts "Error: #{e.error.text}"
+  if e.error.type == :modify
+    puts "Accepted registration information:"
+    instructions, fields = cl.register_info
+    fields.each { |info|
+      puts "* #{info}"
+    }
+    puts "(#{instructions})"
+  end
+end
 
 # Shutdown
 cl.close

data/data/doc/xmpp4r/examples/basic/roster.rb

@@ -2,18 +2,20 @@
 
 # This script can get all roster entries
 
+#$:.unshift '../../../../../lib'
+
 require 'optparse'
 require 'xmpp4r'
 require 'xmpp4r/roster/iq/roster'
 include Jabber
 
-jid = JID::new('lucastest@linux.ensimag.fr/rosterget')
+jid = JID.new('lucastest@linux.ensimag.fr/rosterget')
 password = 'lucastest'
 
-OptionParser::new do |opts|
+OptionParser.new do |opts|
   opts.banner = 'Usage: roster.rb -t get -j jid -p password'
   opts.separator ''
-  opts.on('-j', '--jid JID', 'sets the jid') { |j| jid = JID::new(j) }
+  opts.on('-j', '--jid JID', 'sets the jid') { |j| jid = JID.new(j) }
   opts.on('-p', '--password PASSWORD', 'sets the password') { |p| password = p }
   opts.on_tail('-h', '--help', 'Show this message') {
     puts opts
@@ -22,10 +24,10 @@ OptionParser::new do |opts|
   opts.parse!(ARGV)
 end
 
-cl = Client::new(jid, false)
+cl = Client.new(jid)
 cl.connect
 cl.auth(password)
-cl.send(Iq::new_rosterget)
+cl.send(Iq.new_rosterget)
 exit = false
 cl.add_iq_callback { |i|
   if i.type == :result and i.query.kind_of?(Roster::IqQueryRoster)

data/data/doc/xmpp4r/examples/basic/rosterrename.rb

@@ -18,12 +18,12 @@ end
 
 jid = Jabber::JID.new(ARGV[0])
 
-cl = Jabber::Client.new(jid, false)
+cl = Jabber::Client.new(jid)
 cl.connect
 cl.auth(ARGV[1])
 
 # The iq stanza
-iq = Jabber::Iq::new(:set)
+iq = Jabber::Iq.new(:set)
 # The new roster instance and item element
 iq.add(Jabber::Roster::IqQueryRoster.new).add(Jabber::Roster::RosterItem.new(ARGV[2], ARGV[3])).groups = ARGV[4..ARGV.size]
 

data/data/doc/xmpp4r/examples/basic/rosterwatch.rb

@@ -61,13 +61,13 @@ roster.add_update_callback { |olditem,item|
     puts("Subscribing to #{item.jid}")
     item.subscribe
   end
-  
+
   # Print the item
-  if olditem.nil?                                                    
-    # We didn't knew before:                                       
+  if olditem.nil?
+    # We didn't knew before:
     puts("#{item.iname} (#{item.jid}, #{item.subscription}) #{item.groups.join(', ')}")
-  else                                                             
-    # Showing whats different:                                     
+  else
+    # Showing whats different:
     puts("#{olditem.iname} (#{olditem.jid}, #{olditem.subscription}) #{olditem.groups.join(', ')} -> #{item.iname} (#{item.jid}, #{item.subscription}) #{item.groups.join(', ')}")
   end
 
@@ -115,7 +115,7 @@ roster.add_presence_callback { |item,oldpres,pres|
     # ...so create it:
     oldpres = Jabber::Presence.new
   end
-  
+
   # Print name and jid:
   name = "#{pres.from}"
   if item.iname
@@ -169,4 +169,3 @@ cl.send(Jabber::Presence.new.set_show(:dnd).set_status('Watching my roster chang
 Thread.stop
 
 cl.close
-