mojodna-switchboard 0.0.1 → 0.0.2

data/README.markdown

@@ -7,19 +7,12 @@ command-line tools for interacting with XMPP servers.
 
 Install it:
 
-    $ gem install mojodna-switchboard -s http://gems.github.com
+    $ sudo gem install mojodna-switchboard -s http://gems.github.com
 
 Configure it:
 
     $ switchboard config jid jid@example.com
     $ switchboard config password pa55word
-    $ switchboard config oauth.consumer_key asdf
-    $ switchboard config oauth.consumer_secret qwerty
-    $ switchboard config oauth.token asdf
-    $ switchboard config oauth.token_secret qwerty
-    $ switchboard config oauth.general_token asdf
-    $ switchboard config oauth.general_token_secret qwerty
-    $ switchboard config pubsub.server fireeagle.com
 
 _Settings will be stored in `$HOME/.switchboardrc`_
 
@@ -28,4 +21,4 @@ Run it:
     $ switchboard <command> <args>
     $ switchboard roster list
     $ switchboard roster add fireeagle.com
-    $ ...
+    $ ...

data/lib/switchboard/core.rb

@@ -91,7 +91,11 @@ module Switchboard
       jacks.each do |jack|
         puts "Connecting jack: #{jack}" if debug?
         @jacks << jack
-        jack.connect(self)
+        if jack.connect(self, settings) == false
+          puts "A jack was unable to connect. Shutting down..."
+          shutdown(false)
+          exit 1
+        end
       end
     end
 

data/lib/switchboard/jacks.rb

@@ -1,5 +1,6 @@
 require 'jacks/auto_accept'
+require 'jacks/debug'
 require 'jacks/notify'
+require 'jacks/oauth_pubsub'
+require 'jacks/pubsub'
 require 'jacks/roster_debug'
-require 'jacks/debug'
-require 'jacks/oauth_pubsub'

data/lib/switchboard/jacks/auto_accept.rb

@@ -1,5 +1,5 @@
 class AutoAcceptJack
-  def self.connect(switchboard)
+  def self.connect(switchboard, settings)
     # complain if subscription requests were denied
     switchboard.on_roster_subscription do |item, subscription|
       unless subscription.type == :subscribed

data/lib/switchboard/jacks/debug.rb

@@ -1,7 +1,7 @@
 require 'switchboard/colors'
 
 class DebugJack
-  def self.connect(switchboard)
+  def self.connect(switchboard, settings)
     switchboard.on_presence do |presence|
       puts "<< #{presence.to_s}".green
     end

data/lib/switchboard/jacks/notify.rb

@@ -1,5 +1,5 @@
 class NotifyJack
-  def self.connect(switchboard)
+  def self.connect(switchboard, settings)
     switchboard.on_roster_loaded do
       roster.items.each do |jid, item|
         presence(nil, jid)

data/lib/switchboard/jacks/oauth_pubsub.rb

@@ -12,7 +12,13 @@ require 'xmpp4r/pubsub'
 require 'xmpp4r/pubsub/helper/oauth_service_helper'
 
 class OAuthPubSubJack
-  def self.connect(switchboard)
+  def self.connect(switchboard, settings)
+    # TODO generalize this pattern for required settings
+    unless settings["pubsub.server"]
+      puts "A pubsub server must be specified."
+      return false
+    end
+
     switchboard.on_startup do
       @pubsub = Jabber::PubSub::OAuthServiceHelper.new(client, settings["pubsub.server"])
 

data/lib/switchboard/jacks/pubsub.rb

@@ -0,0 +1,40 @@
+require 'xmpp4r/pubsub'
+
+class PubSubJack
+  def self.connect(switchboard, settings)
+    # TODO generalize this pattern for required settings
+    unless settings["pubsub.server"]
+      puts "A pubsub server must be specified."
+      return false
+    end
+
+    switchboard.on_startup do
+      @pubsub = Jabber::PubSub::ServiceHelper.new(client, settings["pubsub.server"])
+
+      @pubsub.add_event_callback do |event|
+        on(:pubsub_event, event)
+      end
+    end
+
+    # TODO add the ability to define accessors
+    def switchboard.general_token
+      @general_token
+    end
+
+    def switchboard.oauth_consumer
+      @oauth_consumer
+    end
+
+    def switchboard.oauth_token
+      @oauth_token
+    end
+
+    def switchboard.pubsub
+      @pubsub
+    end
+
+    def switchboard.on_pubsub_event(&block)
+      register_hook(:pubsub_event, &block)
+    end
+  end
+end

data/lib/switchboard/jacks/roster_debug.rb

@@ -1,5 +1,5 @@
 class RosterDebugJack
-  def self.connect(switchboard)
+  def self.connect(switchboard, settings)
     switchboard.on_roster_presence do |item, old_presence, new_presence|
       puts "[presence] << #{item.inspect}: #{old_presence.to_s}, #{new_presence.to_s}"
     end

data/lib/switchboard/version.rb

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

data/switchboard.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = "switchboard"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
   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/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", "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.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.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Seth Fitzsimmons
@@ -67,6 +67,7 @@ files:
 - 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