mojodna-switchboard 0.0.8 → 0.0.9

data/Rakefile

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.executables = ["switchboard"]
   s.require_paths = ["lib"]
 
-  s.add_dependency("xmpp4r")
+  s.add_dependency("mojodna-xmpp4r", ">=", "0.4.0.1")
 end
   EOF
 

data/bin/switchboard

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require 'switchboard'
+require 'switchboard/commands'
 require 'optparse'
 
 ARGV.clone.options do |opts|

data/lib/switchboard/commands/disco/disco.rb

@@ -0,0 +1,13 @@
+module Switchboard
+  module Commands
+    class Disco < Switchboard::Command
+      description "Service discovery"
+
+      def self.options(opts)
+        super(opts)
+        opts.on("--node=node", String, "Specifies the node to query.") { |v| OPTIONS["disco.node"] = v }
+        opts.on("--target=target", String, "Specifies the target to query.") { |v| OPTIONS["disco.target"] = v }
+      end
+    end
+  end
+end

data/lib/switchboard/commands/disco/info.rb

@@ -0,0 +1,39 @@
+require 'xmpp4r/discovery'
+
+module Switchboard
+  module Commands
+    class Disco
+      class Info < Switchboard::Command
+        description "Basic service discovery"
+
+        def self.run!
+          switchboard = Switchboard::Client.new do
+            helper = Jabber::Discovery::Helper.new(client)
+            resp = helper.get_info_for(settings["disco.target"], settings["disco.node"])
+
+            if resp.identities.any? || resp.features.any?
+              puts "Discovery Info for #{settings["disco.target"]}#{settings["disco.node"] ? " (#{settings["disco.node"]})" : ""}"
+
+              if resp.identities.any?
+                puts "Identities:"
+                resp.identities.each do |identity|
+                  puts "  #{identity.category}/#{identity.type}: #{identity.iname ? identity.iname : "n/a"}"
+                end
+                puts
+              end
+
+              puts "Features:" if resp.features.any?
+              resp.features.each do |feature|
+                puts "  #{feature}"
+              end
+            else
+              puts "No information was discoverable for #{settings["disco.target"]}"
+            end
+          end
+
+          switchboard.run!
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/commands/disco/items.rb

@@ -0,0 +1,30 @@
+require 'xmpp4r/discovery'
+
+module Switchboard
+  module Commands
+    class Disco
+      class Items < Switchboard::Command
+        description "Item discovery"
+
+        def self.run!
+          switchboard = Switchboard::Client.new do
+            helper = Jabber::Discovery::Helper.new(client)
+            resp = helper.get_items_for(settings["disco.target"], settings["disco.node"])
+
+            if resp.items.any?
+              puts "Item Discovery for #{settings["disco.target"]}#{settings["disco.node"] ? " (#{settings["disco.node"]})" : ""}"
+              resp.items.each do |item|
+                name = "#{item.iname}#{item.node ? " (#{item.node})" : ""}"
+                puts "  " + [item.jid, name].reject { |x| x == "" } * ": "
+              end
+            else
+              puts "No items were discoverable for #{settings["disco.target"]}."
+            end
+          end
+
+          switchboard.run!
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/commands/disco.rb

@@ -0,0 +1,3 @@
+require 'switchboard/commands/disco/disco'
+require 'switchboard/commands/disco/items'
+require 'switchboard/commands/disco/info'

data/lib/switchboard/commands/last/last.rb

@@ -0,0 +1,34 @@
+require 'xmpp4r/last'
+
+module Switchboard
+  module Commands
+    class Last < Switchboard::Command
+      description "Last Activity (XEP-0012)"
+
+      def self.options(opts)
+        super(opts)
+        opts.on("--target=target", String, "Specifies the target to query.") { |v| OPTIONS["last.target"] = v }
+      end
+
+      def self.run!
+        switchboard = Switchboard::Client.new do
+          helper = Jabber::LastActivity::Helper.new(client)
+          resp = helper.get_last_activity_from(jid = Jabber::JID.new(settings["last.target"]))
+
+          status = " (#{resp.status})" if resp.status
+          status ||= ""
+
+          if jid.resource
+            puts "#{jid} idle: #{resp.seconds} seconds" << status
+          elsif jid.node
+            puts "#{jid} last disconnected: " << (Time.new - resp.seconds).to_s << status
+          else
+            puts "#{jid} uptime: #{resp.seconds} seconds" << status
+          end
+        end
+
+        switchboard.run!
+      end
+    end
+  end
+end

data/lib/switchboard/commands/last.rb

@@ -0,0 +1 @@
+require 'switchboard/commands/last/last'

data/lib/switchboard/commands/pubsub/publish.rb

@@ -22,8 +22,9 @@ module Switchboard
             end
 
             def item_published(success)
+              # puts "Result: #{success.to_s}"
               if success
-                puts "Item was published."
+                puts "Item was published." # TODO include id
               else
                 puts "Item could not be published."
               end

data/lib/switchboard/commands/pubsub/retract.rb

@@ -0,0 +1,38 @@
+module Switchboard
+  module Commands
+    class PubSub
+      class Retract < Switchboard::Command
+        description "Retracts an item from a pubsub node"
+
+        def self.options(opts)
+          super(opts)
+          opts.on("--item-id=id", String, "Specifies the item id to retract.") { |v| OPTIONS["pubsub.retract.id"] = v }
+        end
+
+        def self.run!
+          switchboard = Switchboard::Client.new do
+            defer :item_retracted do
+              delete_item_from(OPTIONS["pubsub.node"], OPTIONS["pubsub.retract.id"])
+            end
+
+            def item_retracted(success)
+              # puts "Result: #{success.to_s}"
+              if success
+                puts "Item was retracted." # TODO with id?
+              else
+                puts "Item could not be retracted."
+              end
+            end
+          end
+
+          if defined?(OAuth) && OPTIONS["oauth"]
+            switchboard.plug!(OAuthPubSubJack)
+          else
+            switchboard.plug!(PubSubJack)
+          end
+          switchboard.run!
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/commands/pubsub.rb

@@ -10,6 +10,7 @@ require 'switchboard/commands/pubsub/nodes'
 require 'switchboard/commands/pubsub/options'
 require 'switchboard/commands/pubsub/publish'
 require 'switchboard/commands/pubsub/purge'
+require 'switchboard/commands/pubsub/retract'
 require 'switchboard/commands/pubsub/subscribe'
 require 'switchboard/commands/pubsub/subscriptions'
 require 'switchboard/commands/pubsub/unsubscribe'

data/lib/switchboard/commands/roster/online.rb

@@ -0,0 +1,28 @@
+module Switchboard
+  module Commands
+    class Roster
+      class Online < Switchboard::Command
+        description "List online members of your roster"
+
+        def self.run!
+          switchboard = Switchboard::Client.new do
+            puts "Collecting presences..."
+            sleep 5
+            roster.items.each do |jid, item|
+              next unless item.online?
+              puts "#{item.jid}:"
+              item.each_presence do |presence|
+                status = [presence.show, presence.status].compact * " - "
+                status = "available" if status == ""
+                puts "  /#{presence.from.resource} (#{status}) [#{presence.priority}]"
+              end
+            end
+          end
+
+          switchboard.plug!(AutoAcceptJack)
+          switchboard.run!
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/commands/roster.rb

@@ -1,4 +1,5 @@
 require 'switchboard/commands/roster/roster'
 require 'switchboard/commands/roster/add'
 require 'switchboard/commands/roster/list'
-require 'switchboard/commands/roster/remove'
+require 'switchboard/commands/roster/online'
+require 'switchboard/commands/roster/remove'

data/lib/switchboard/commands.rb

@@ -1,7 +1,9 @@
 require 'switchboard/commands/command'
 require 'switchboard/commands/config'
 require 'switchboard/commands/default'
+require 'switchboard/commands/disco'
 require 'switchboard/commands/help'
+require 'switchboard/commands/last'
 require 'switchboard/commands/pep'
 require 'switchboard/commands/pubsub'
 require 'switchboard/commands/register'

data/lib/switchboard/component.rb

@@ -23,7 +23,7 @@ module Switchboard
       auth!
       puts "Component connected." if debug?
     rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT
-      puts "Couldn't connect to Jabber server at #{settings["component.host"]}:#{settings["component.host"]}.
+      puts "Couldn't connect to Jabber server at #{settings["component.host"]}:#{settings["component.port"]}.
             That may mean the Jabber server isn't running or listening on that port,
             or there might be firewall issues. Exiting."
       exit 1

data/lib/switchboard/core.rb

@@ -65,7 +65,7 @@ module Switchboard
       if @main
         instance_eval(&@main)
       elsif loop?
-        sleep 5 while !shutdown?
+        sleep 1 while !shutdown?
       end
 
       shutdown
@@ -96,8 +96,7 @@ module Switchboard
         rescue
           puts "An error occurred while running a deferred: #{$!}"
           puts $!.backtrace * "\n"
-          puts "Initiating shutdown..."
-          @shutdown = true
+          shutdown!
         end
       end
     end
@@ -174,7 +173,7 @@ module Switchboard
       puts "An error occurred while running the hook; shutting down..."
       puts $!
       puts $!.backtrace * "\n"
-      shutdown
+      shutdown!
       raise
     end
 
@@ -245,6 +244,12 @@ module Switchboard
     end
 
     def shutdown(run_hooks = true)
+      if Thread.current != Thread.main
+        $stderr.puts "Wrong thread! You should be using #shutdown! instead."
+        shutdown!
+        return
+      end
+
       while (pending = @deferreds.select { |k,d| d.alive? }.length) > 0
         puts "Waiting for #{pending} thread(s) to finish" if debug?
         sleep 1

data/lib/switchboard/helpers/oauth_pubsub.rb

@@ -22,9 +22,10 @@ module Switchboard
 
       # TODO most/all of these need to be implemented in OAuthServiceHelper
       delegate :create_node, :create_collection_node, :delete_node,
-        :get_config_from, :get_options_from, :get_items_from, :publish_item_to,
-        :publish_item_with_id_to, :purge_items_from, :set_config_for,
-        :subscribe_to, :unsubscribe_from, :to => :pubsub,
+        :delete_item_from, :get_config_from, :get_options_from, :get_items_from,
+        :publish_item_to, :publish_item_with_id_to, :purge_items_from,
+        :set_config_for, :subscribe_to, :unsubscribe_from,
+        :to   => :pubsub,
         :with => [:oauth_consumer, :oauth_token]
 
       def subscriptions(node = nil)

data/lib/switchboard/helpers/pubsub.rb

@@ -8,9 +8,10 @@ module Switchboard
       attr_reader :pubsub
 
       delegate :create_node, :create_collection_node, :delete_node,
-        :get_config_from, :get_options_from, :get_items_from, :publish_item_to,
-        :publish_item_with_id_to, :purge_items_from, :set_config_for,
-        :subscribe_to, :unsubscribe_from, :to => :pubsub
+        :delete_item_from, :get_config_from, :get_options_from, :get_items_from,
+        :publish_item_to, :publish_item_with_id_to, :purge_items_from,
+        :set_config_for, :subscribe_to, :unsubscribe_from,
+        :to => :pubsub
 
       Switchboard::Core.hook(:pubsub_event)
 

data/lib/switchboard/switchboard.rb

@@ -7,7 +7,6 @@ end
 require 'switchboard/core'
 require 'switchboard/client'
 require 'switchboard/component'
-require 'switchboard/commands'
 require 'switchboard/jacks'
 require 'switchboard/settings'
 require 'switchboard/version'

data/lib/switchboard/version.rb

@@ -1,3 +1,3 @@
 module Switchboard
-  VERSION = [0, 0, 8]
+  VERSION = [0, 0, 9]
 end

data/switchboard.gemspec

@@ -1,15 +1,15 @@
 # this file is automatically generated
 Gem::Specification.new do |s|
   s.name = "switchboard"
-  s.version = "0.0.8"
+  s.version = "0.0.9"
   s.summary = "XMPP toolkit."
   s.description = "A toolkit for assembling XMPP clients and interacting with XMPP servers."
   s.authors = ["Seth Fitzsimmons"]
   s.email = ["seth@mojodna.net"]
 
-  s.files = ["bin/switchboard", "examples/election_results.rb", "lib/switchboard/client.rb", "lib/switchboard/colors.rb", "lib/switchboard/commands/command.rb", "lib/switchboard/commands/config/config.rb", "lib/switchboard/commands/config.rb", "lib/switchboard/commands/default.rb", "lib/switchboard/commands/help/help.rb", "lib/switchboard/commands/help.rb", "lib/switchboard/commands/pep/location.rb", "lib/switchboard/commands/pep/pep.rb", "lib/switchboard/commands/pep/tune.rb", "lib/switchboard/commands/pep.rb", "lib/switchboard/commands/pubsub/affiliations.rb", "lib/switchboard/commands/pubsub/config.rb", "lib/switchboard/commands/pubsub/create.rb", "lib/switchboard/commands/pubsub/delete.rb", "lib/switchboard/commands/pubsub/info.rb", "lib/switchboard/commands/pubsub/items.rb", "lib/switchboard/commands/pubsub/listen.rb", "lib/switchboard/commands/pubsub/nodes.rb", "lib/switchboard/commands/pubsub/options.rb", "lib/switchboard/commands/pubsub/publish.rb", "lib/switchboard/commands/pubsub/pubsub.rb", "lib/switchboard/commands/pubsub/purge.rb", "lib/switchboard/commands/pubsub/subscribe.rb", "lib/switchboard/commands/pubsub/subscriptions.rb", "lib/switchboard/commands/pubsub/unsubscribe.rb", "lib/switchboard/commands/pubsub.rb", "lib/switchboard/commands/register.rb", "lib/switchboard/commands/roster/add.rb", "lib/switchboard/commands/roster/list.rb", "lib/switchboard/commands/roster/remove.rb", "lib/switchboard/commands/roster/roster.rb", "lib/switchboard/commands/roster.rb", "lib/switchboard/commands/unregister.rb", "lib/switchboard/commands.rb", "lib/switchboard/component.rb", "lib/switchboard/core.rb", "lib/switchboard/ext/delegate.rb", "lib/switchboard/ext/instance_exec.rb", "lib/switchboard/helpers/oauth_pubsub.rb", "lib/switchboard/helpers/pubsub.rb", "lib/switchboard/jacks/auto_accept.rb", "lib/switchboard/jacks/debug.rb", "lib/switchboard/jacks/notify.rb", "lib/switchboard/jacks/oauth_pubsub.rb", "lib/switchboard/jacks/pubsub.rb", "lib/switchboard/jacks/roster_debug.rb", "lib/switchboard/jacks.rb", "lib/switchboard/oauth/request_proxy/mock_request.rb", "lib/switchboard/settings.rb", "lib/switchboard/switchboard.rb", "lib/switchboard/version.rb", "lib/switchboard/xmpp4r/location/helper/helper.rb", "lib/switchboard/xmpp4r/location/location.rb", "lib/switchboard/xmpp4r/location.rb", "lib/switchboard/xmpp4r/pubsub/helper/oauth_service_helper.rb", "lib/switchboard.rb", "Rakefile", "README.markdown", "switchboard.gemspec"]
+  s.files = ["bin/switchboard", "examples/election_results.rb", "lib/switchboard/client.rb", "lib/switchboard/colors.rb", "lib/switchboard/commands/command.rb", "lib/switchboard/commands/config/config.rb", "lib/switchboard/commands/config.rb", "lib/switchboard/commands/default.rb", "lib/switchboard/commands/disco/disco.rb", "lib/switchboard/commands/disco/info.rb", "lib/switchboard/commands/disco/items.rb", "lib/switchboard/commands/disco.rb", "lib/switchboard/commands/help/help.rb", "lib/switchboard/commands/help.rb", "lib/switchboard/commands/last/last.rb", "lib/switchboard/commands/last.rb", "lib/switchboard/commands/pep/location.rb", "lib/switchboard/commands/pep/pep.rb", "lib/switchboard/commands/pep/tune.rb", "lib/switchboard/commands/pep.rb", "lib/switchboard/commands/pubsub/affiliations.rb", "lib/switchboard/commands/pubsub/config.rb", "lib/switchboard/commands/pubsub/create.rb", "lib/switchboard/commands/pubsub/delete.rb", "lib/switchboard/commands/pubsub/info.rb", "lib/switchboard/commands/pubsub/items.rb", "lib/switchboard/commands/pubsub/listen.rb", "lib/switchboard/commands/pubsub/nodes.rb", "lib/switchboard/commands/pubsub/options.rb", "lib/switchboard/commands/pubsub/publish.rb", "lib/switchboard/commands/pubsub/pubsub.rb", "lib/switchboard/commands/pubsub/purge.rb", "lib/switchboard/commands/pubsub/retract.rb", "lib/switchboard/commands/pubsub/subscribe.rb", "lib/switchboard/commands/pubsub/subscriptions.rb", "lib/switchboard/commands/pubsub/unsubscribe.rb", "lib/switchboard/commands/pubsub.rb", "lib/switchboard/commands/register.rb", "lib/switchboard/commands/roster/add.rb", "lib/switchboard/commands/roster/list.rb", "lib/switchboard/commands/roster/online.rb", "lib/switchboard/commands/roster/remove.rb", "lib/switchboard/commands/roster/roster.rb", "lib/switchboard/commands/roster.rb", "lib/switchboard/commands/unregister.rb", "lib/switchboard/commands.rb", "lib/switchboard/component.rb", "lib/switchboard/core.rb", "lib/switchboard/ext/delegate.rb", "lib/switchboard/ext/instance_exec.rb", "lib/switchboard/helpers/oauth_pubsub.rb", "lib/switchboard/helpers/pubsub.rb", "lib/switchboard/jacks/auto_accept.rb", "lib/switchboard/jacks/debug.rb", "lib/switchboard/jacks/notify.rb", "lib/switchboard/jacks/oauth_pubsub.rb", "lib/switchboard/jacks/pubsub.rb", "lib/switchboard/jacks/roster_debug.rb", "lib/switchboard/jacks.rb", "lib/switchboard/oauth/request_proxy/mock_request.rb", "lib/switchboard/settings.rb", "lib/switchboard/switchboard.rb", "lib/switchboard/version.rb", "lib/switchboard/xmpp4r/location/helper/helper.rb", "lib/switchboard/xmpp4r/location/location.rb", "lib/switchboard/xmpp4r/location.rb", "lib/switchboard/xmpp4r/pubsub/helper/oauth_service_helper.rb", "lib/switchboard.rb", "Rakefile", "README.markdown", "switchboard-0.0.8.gem", "switchboard.gemspec"]
   s.executables = ["switchboard"]
   s.require_paths = ["lib"]
 
-  s.add_dependency("xmpp4r")
+  s.add_dependency("mojodna-xmpp4r", ">=", "0.4.0.1")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojodna-switchboard
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Seth Fitzsimmons
@@ -13,13 +13,16 @@ date: 2008-10-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: xmpp4r
+  name: mojodna-xmpp4r
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.4.0.1
     version: 
 description: A toolkit for assembling XMPP clients and interacting with XMPP servers.
 email: 
@@ -39,8 +42,14 @@ files:
 - lib/switchboard/commands/config/config.rb
 - lib/switchboard/commands/config.rb
 - lib/switchboard/commands/default.rb
+- lib/switchboard/commands/disco/disco.rb
+- lib/switchboard/commands/disco/info.rb
+- lib/switchboard/commands/disco/items.rb
+- lib/switchboard/commands/disco.rb
 - lib/switchboard/commands/help/help.rb
 - lib/switchboard/commands/help.rb
+- lib/switchboard/commands/last/last.rb
+- lib/switchboard/commands/last.rb
 - lib/switchboard/commands/pep/location.rb
 - lib/switchboard/commands/pep/pep.rb
 - lib/switchboard/commands/pep/tune.rb
@@ -57,6 +66,7 @@ files:
 - lib/switchboard/commands/pubsub/publish.rb
 - lib/switchboard/commands/pubsub/pubsub.rb
 - lib/switchboard/commands/pubsub/purge.rb
+- lib/switchboard/commands/pubsub/retract.rb
 - lib/switchboard/commands/pubsub/subscribe.rb
 - lib/switchboard/commands/pubsub/subscriptions.rb
 - lib/switchboard/commands/pubsub/unsubscribe.rb
@@ -64,6 +74,7 @@ files:
 - lib/switchboard/commands/register.rb
 - lib/switchboard/commands/roster/add.rb
 - lib/switchboard/commands/roster/list.rb
+- lib/switchboard/commands/roster/online.rb
 - lib/switchboard/commands/roster/remove.rb
 - lib/switchboard/commands/roster/roster.rb
 - lib/switchboard/commands/roster.rb
@@ -93,6 +104,7 @@ files:
 - lib/switchboard.rb
 - Rakefile
 - README.markdown
+- switchboard-0.0.8.gem
 - switchboard.gemspec
 has_rdoc: false
 homepage: