mojodna-switchboard 0.0.2 → 0.0.3

data/lib/switchboard/commands/default.rb

@@ -18,7 +18,8 @@ module Switchboard
         opts.banner = "Usage: #{opts.program_name} [options] COMMAND [options] [args]"
 
         # opts.on("-d", "--daemon", "Make server run as a daemon.") { OPTIONS[:detach] = true }
-        # opts.on("-l", "--log=path", String, "Specifies a path to log script output.") { |v| OPTIONS[:log] = v }
+        opts.on("-j", "--jid=jid", String, "Specifies the JID to use.") { |v| OPTIONS["jid"] = v }
+        opts.on("-p", "--password=password", String, "Specifies the password to use.") { |v| OPTIONS["password"] = v }
         # opts.on("-p", "--pidfile=path", String,
         #         "Specifies a pidfile to use.") { |v| OPTIONS[:pidfile] = v }
         # opts.on("-v", "--[no-]verbose", "Run verbosely") { |v| OPTIONS[:verbose] = v }

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

@@ -9,7 +9,14 @@ module Switchboard
 
       def self.options(opts)
         super(opts)
-        # opts.on("--oauth", "Sign requests using OAuth.") { OPTIONS[:oauth] = true }
+        opts.on("--node=node", String, "Specifies the PubSub node to use.") { |v| OPTIONS["pubsub.node"] = v }
+        opts.on("--oauth", "Sign requests using OAuth.") { OPTIONS["oauth"] = true }
+        opts.on("--oauth-consumer-key=consumer-key", String, "Specifies the OAuth consumer key to use.") { |v| OPTIONS["oauth.consumer_key"] = v }
+        opts.on("--oauth-consumer-secret=consumer-secret", String, "Specifies the OAuth consumer secret to use.") { |v| OPTIONS["oauth.consumer_secret"] = v }
+        opts.on("--oauth-token=token", String, "Specifies the OAuth token to use.") { |v| OPTIONS["oauth.token"] = v }
+        opts.on("--oauth-token-secret=token-secret", String, "Specifies the OAuth token secret to use.") { |v| OPTIONS["oauth.token_secret"] = v }
+        opts.on("--node=node", String, "Specifies the PubSub node to use.") { |v| OPTIONS["pubsub.node"] = v }
+        opts.on("--server=server", String, "Specifies the PubSub server to use.") { |v| OPTIONS["pubsub.server"] = v }
       end
     end
   end

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

@@ -5,12 +5,11 @@ module Switchboard
         description "Subscribe to a pubsub node"
 
         def self.run!
-          # TODO override settings with values from the command line
           switchboard = Switchboard::Core.new do
             # this executes in the main loop, so it doesn't really matter that this runs in a different thread
             defer :subscribed do
               begin
-                pubsub.subscribe_to("/api/0.1/user/#{settings["oauth.token"]}", oauth_consumer, oauth_token)
+                subscribe_to(settings["pubsub.node"])
               rescue Jabber::ServerError => e
                 puts e
               end
@@ -26,7 +25,11 @@ module Switchboard
             end
           end
 
-          switchboard.plug!(OAuthPubSubJack)
+          if OPTIONS["oauth"]
+            switchboard.plug!(OAuthPubSubJack)
+          else
+            switchboard.plug!(PubSubJack)
+          end
           switchboard.run!
         end
       end

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

@@ -5,12 +5,11 @@ module Switchboard
         description "List pubsub subscriptions"
 
         def self.run!
-          # TODO override settings with values from the command line
           switchboard = Switchboard::Core.new do
             # this executes in the main loop, so it doesn't really matter that this runs in a different thread
             defer :subscriptions_received do
               begin
-                pubsub.get_subscriptions_from_all_nodes(oauth_consumer, general_token)
+                subscriptions
               rescue Jabber::ServerError => e
                 puts e
               end
@@ -18,12 +17,20 @@ module Switchboard
 
             # define here or as hydrant.subscriptions_received
             def subscriptions_received(subscriptions)
-              puts "Subscriptions:"
-              puts subscriptions.collect { |subscription| "#{subscription.jid} => #{subscription.node}" } * "\n"
+              if subscriptions && subscriptions.any?
+                puts "Subscriptions:"
+                puts subscriptions.collect { |subscription| "#{subscription.jid} => #{subscription.node}" } * "\n"
+              else
+                puts "No subscriptions."
+              end
             end
           end
 
-          switchboard.plug!(OAuthPubSubJack)
+          if OPTIONS["oauth"]
+            switchboard.plug!(OAuthPubSubJack)
+          else
+            switchboard.plug!(PubSubJack)
+          end
           switchboard.run!
         end
       end

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

@@ -5,12 +5,11 @@ module Switchboard
         description "Unsubscribe from a pubsub node"
 
         def self.run!
-          # TODO override settings with values from the command line
           switchboard = Switchboard::Core.new do
             # this executes in the main loop, so it doesn't really matter that this runs in a different thread
             defer :unsubscribed do
               begin
-                pubsub.unsubscribe_from("/api/0.1/user/#{settings["oauth.token"]}", oauth_consumer, oauth_token)
+                unsubscribe_from(settings["pubsub.node"])
               rescue Jabber::ServerError => e
                 puts e
               end
@@ -22,7 +21,11 @@ module Switchboard
             end
           end
 
-          switchboard.plug!(OAuthPubSubJack)
+          if OPTIONS["oauth"]
+            switchboard.plug!(OAuthPubSubJack)
+          else
+            switchboard.plug!(PubSubJack)
+          end
           switchboard.run!
         end
       end

data/lib/switchboard/commands/register.rb

@@ -0,0 +1,36 @@
+module Switchboard
+  module Commands
+    class Register < Switchboard::Command
+      description "Register a JID"
+
+      class Registration < Switchboard::Core
+      protected
+
+        def auth!
+          unless settings["jid"] && settings["password"]
+            puts "A JID and password are required to register a new account."
+            shutdown(false)
+            exit
+          end
+
+          # TODO consider using client.register_info.inspect
+          begin
+            puts "Registering #{settings["jid"]} with password '#{settings["password"]}'."
+            puts client.register(settings["password"])
+          rescue Jabber::ServerError => e
+            puts "Could not register: #{e}"
+            shutdown(false)
+            exit 1
+          end
+
+          # now log in
+          super
+        end
+      end
+
+      def self.run!
+        Registration.new.run!
+      end
+    end
+  end
+end

data/lib/switchboard/commands/unregister.rb

@@ -0,0 +1,21 @@
+module Switchboard
+  module Commands
+    class Unregister < Switchboard::Command
+      description "Unregister a JID"
+
+      def self.run!
+        switchboard = Switchboard::Core.new do
+          begin
+            client.remove_registration
+          rescue Jabber::ServerError => e
+            puts "Could not unregister #{settings["jid"]}: #{e}"
+            shutdown(false)
+            exit 1
+          end
+        end
+
+        switchboard.run!
+      end
+    end
+  end
+end

data/lib/switchboard/commands.rb

@@ -3,4 +3,6 @@ require 'switchboard/commands/config'
 require 'switchboard/commands/default'
 require 'switchboard/commands/help'
 require 'switchboard/commands/pubsub'
-require 'switchboard/commands/roster'
+require 'switchboard/commands/register'
+require 'switchboard/commands/roster'
+require 'switchboard/commands/unregister'

data/lib/switchboard/core.rb

@@ -157,10 +157,18 @@ module Switchboard
 
   protected
 
-    def connect!
-      client.connect
+    def auth!
       client.auth(settings["password"])
       @roster = Jabber::Roster::Helper.new(client)
+    rescue Jabber::ClientAuthenticationFailure => e
+      puts "Could not authenticate as #{settings["jid"]}"
+      shutdown(false)
+      exit 1
+    end
+
+    def connect!
+      client.connect
+      auth!
     end
 
     def connected?

data/lib/switchboard/jacks/oauth_pubsub.rb

@@ -11,6 +11,7 @@ require 'oauth/request_proxy/mock_request'
 require 'xmpp4r/pubsub'
 require 'xmpp4r/pubsub/helper/oauth_service_helper'
 
+# TODO subclass PubSubJack
 class OAuthPubSubJack
   def self.connect(switchboard, settings)
     # TODO generalize this pattern for required settings
@@ -24,14 +25,24 @@ class OAuthPubSubJack
 
       @oauth_consumer = OAuth::Consumer.new(settings["oauth.consumer_key"], settings["oauth.consumer_secret"])
       @oauth_token = OAuth::Token.new(settings["oauth.token"], settings["oauth.token_secret"])
-      # this is Fire Eagle-specific
-      @general_token = OAuth::Token.new(settings["oauth.general_token"], settings["oauth.general_token_secret"])
 
       @pubsub.add_event_callback do |event|
         on(:pubsub_event, event)
       end
     end
 
+    def switchboard.subscribe_to(node)
+      pubsub.subscribe_to(node, oauth_consumer, oauth_token)
+    end
+
+    def switchboard.subscriptions
+      pubsub.get_subscriptions_from_all_nodes(oauth_consumer, oauth_token)
+    end
+
+    def switchboard.unsubscribe_from(node)
+      pubsub.unsubscribe_from(node, oauth_consumer, oauth_token)
+    end
+
     # TODO add the ability to define accessors
     def switchboard.general_token
       @general_token

data/lib/switchboard/jacks/pubsub.rb

@@ -16,6 +16,18 @@ class PubSubJack
       end
     end
 
+    def switchboard.subscribe_to(node)
+      pubsub.subscribe_to(node)
+    end
+
+    def switchboard.subscriptions
+      pubsub.get_subscriptions_from_all_nodes
+    end
+
+    def switchboard.unsubscribe_from(node)
+      pubsub.unsubscribe_from(node)
+    end
+
     # TODO add the ability to define accessors
     def switchboard.general_token
       @general_token

data/lib/switchboard/settings.rb

@@ -19,10 +19,18 @@ module Switchboard
     alias_method :[], :get
 
     def set!(key, value)
-      @config[key] = value
+      set(key, value)
       write
     end
 
+    def set(key, value)
+      @config[key] = value
+    end
+
+    def []=(key, value)
+      set(key, value)
+    end
+
     def write
       open(@path, "w") do |f|
         f << @config.to_yaml

data/lib/switchboard/version.rb

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

data/switchboard.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = "switchboard"
-  s.version = "0.0.2"
-  s.summary = "XMPP toolkit"
+  s.version = "0.0.3"
+  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", "bin/switchboard", "examples/election_results.rb", "github-test.rb", "lib", "lib/switchboard", "lib/switchboard/colors.rb", "lib/switchboard/commands", "lib/switchboard/commands/command.rb", "lib/switchboard/commands/config", "lib/switchboard/commands/config/config.rb", "lib/switchboard/commands/config.rb", "lib/switchboard/commands/default.rb", "lib/switchboard/commands/help", "lib/switchboard/commands/help/help.rb", "lib/switchboard/commands/help.rb", "lib/switchboard/commands/pubsub", "lib/switchboard/commands/pubsub/pubsub.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/roster", "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.rb", "lib/switchboard/core.rb", "lib/switchboard/instance_exec.rb", "lib/switchboard/jacks", "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", "lib/switchboard/oauth/request_proxy", "lib/switchboard/oauth/request_proxy/mock_request.rb", "lib/switchboard/settings.rb", "lib/switchboard/switchboard.rb", "lib/switchboard/version.rb", "lib/switchboard/xmpp4r", "lib/switchboard/xmpp4r/pubsub", "lib/switchboard/xmpp4r/pubsub/helper", "lib/switchboard/xmpp4r/pubsub/helper/oauth_service_helper.rb", "lib/switchboard.rb", "README.markdown", "switchboard-0.0.1.gem", "switchboard.gemspec"]
+  s.files = ["bin/switchboard", "examples/election_results.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/pubsub/pubsub.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/core.rb", "lib/switchboard/instance_exec.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/pubsub/helper/oauth_service_helper.rb", "lib/switchboard.rb", "README.markdown", "switchboard.gemspec"]
   s.executables = ["switchboard"]
   s.require_paths = ["lib"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojodna-switchboard
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Seth Fitzsimmons
@@ -31,38 +31,30 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- bin
 - bin/switchboard
 - examples/election_results.rb
-- github-test.rb
-- lib
-- lib/switchboard
 - lib/switchboard/colors.rb
-- lib/switchboard/commands
 - lib/switchboard/commands/command.rb
-- lib/switchboard/commands/config
 - lib/switchboard/commands/config/config.rb
 - lib/switchboard/commands/config.rb
 - lib/switchboard/commands/default.rb
-- lib/switchboard/commands/help
 - lib/switchboard/commands/help/help.rb
 - lib/switchboard/commands/help.rb
-- lib/switchboard/commands/pubsub
 - lib/switchboard/commands/pubsub/pubsub.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/roster
+- 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/core.rb
 - lib/switchboard/instance_exec.rb
-- lib/switchboard/jacks
 - lib/switchboard/jacks/auto_accept.rb
 - lib/switchboard/jacks/debug.rb
 - lib/switchboard/jacks/notify.rb
@@ -70,19 +62,13 @@ files:
 - lib/switchboard/jacks/pubsub.rb
 - lib/switchboard/jacks/roster_debug.rb
 - lib/switchboard/jacks.rb
-- lib/switchboard/oauth
-- lib/switchboard/oauth/request_proxy
 - lib/switchboard/oauth/request_proxy/mock_request.rb
 - lib/switchboard/settings.rb
 - lib/switchboard/switchboard.rb
 - lib/switchboard/version.rb
-- lib/switchboard/xmpp4r
-- lib/switchboard/xmpp4r/pubsub
-- lib/switchboard/xmpp4r/pubsub/helper
 - lib/switchboard/xmpp4r/pubsub/helper/oauth_service_helper.rb
 - lib/switchboard.rb
 - README.markdown
-- switchboard-0.0.1.gem
 - switchboard.gemspec
 has_rdoc: false
 homepage: 
@@ -109,6 +95,6 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: XMPP toolkit
+summary: XMPP toolkit.
 test_files: []