mojodna-switchboard 0.0.6 → 0.0.7

data/README.markdown

@@ -9,6 +9,12 @@ Install it:
 
     $ sudo gem install mojodna-switchboard -s http://gems.github.com
 
+Install optional dependencies for additional functionality:
+
+    $ sudo gem install oauth # (for OAuth PubSub support)
+    $ sudo gem install fire-hydrant # (for User Location support)
+    $ sudo gem install rb-appscript # (for User Tune support)
+
 Configure it:
 
     $ switchboard config jid jid@example.com

data/Rakefile

@@ -3,6 +3,7 @@ require File.join("lib", "switchboard", "version")
 desc "Generate the gemspec"
 task :gemspec do
   gemspec =<<-EOF
+# this file is automatically generated
 Gem::Specification.new do |s|
   s.name = "switchboard"
   s.version = "#{Switchboard::VERSION * "."}"
@@ -16,9 +17,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("xmpp4r")
-  s.add_dependency("oauth")
-  s.add_dependency("rb-appscript")
-
 end
   EOF
 

data/lib/switchboard/client.rb

@@ -24,29 +24,9 @@ module Switchboard
       end
     end
 
-    def on_roster_presence(&block)
-      register_hook(:roster_presence, &block)
-    end
-
-    def on_roster_query(&block)
-      register_hook(:roster_query, &block)
-    end
-
-    def on_roster_subscription(&block)
-      register_hook(:roster_subscription, &block)
-    end
-
-    def on_roster_subscription_request(&block)
-      register_hook(:roster_subscription_request, &block)
-    end
-
-    def on_roster_loaded(&block)
-      register_hook(:roster_loaded, &block)
-    end
-
-    def on_roster_update(&block)
-      register_hook(:roster_update, &block)
-    end
+    hook \
+      :roster_presence, :roster_query, :roster_subscription,
+      :roster_subscription_request, :roster_loaded, :roster_update
 
   protected
 
@@ -66,7 +46,7 @@ module Switchboard
 
     def disconnect!
       presence(:unavailable)
-      client.close
+      super
     end
 
     def presence(status = nil, to = nil)

data/lib/switchboard/commands/pep/location.rb

@@ -0,0 +1,96 @@
+require 'rubygems'
+require 'xmpp4r/location'
+
+module Switchboard
+  module Commands
+    class PEP
+      class Location < Switchboard::Command
+        description "Broadcasting UserLocation (XEP-0080)"
+
+        def self.run!
+          begin
+            require 'fire_hydrant'
+          rescue LoadError => e
+            gem = e.message.split("--").last.strip
+            puts "The #{gem} gem is required for this command to work."
+            exit 1
+          end
+
+          switchboard = Switchboard::Client.new
+          switchboard.plug!(AutoAcceptJack, FireEagleJack)
+
+          switchboard.on_startup do
+            @location_helper = Jabber::UserLocation::Helper.new(client, nil)
+          end
+
+          switchboard.on_location_update do |user|
+            # for some reason the Fire Eagle gem doesn't work when I access #name directly
+            name = user.locations[0].instance_eval { @doc.at("//name").innerText }
+            timestamp = Time.parse(user.locations[0].instance_eval { @doc.at("//located-at").innerText })
+
+            area, postalcode, locality, region, country = nil
+
+            user.locations.each do |loc|
+              level = loc.instance_eval { @doc.at("//level-name").innerText }
+              normal_name = loc.instance_eval { @doc.at("//normal-name").innerText }
+              case level
+              when "exact"
+                street = normal_name
+              when "postal"
+                postalcode = normal_name
+              when "neighborhood"
+                area = normal_name
+              when "city"
+                locality = normal_name
+              when "state"
+                region = normal_name
+              when "country"
+                country = normal_name
+              end
+              puts "level: #{level}"
+            end
+
+            puts "Current location: #{name}."
+
+            geom = user.locations[0].geom
+            if geom.is_a?(GeoRuby::SimpleFeatures::Envelope)
+              pt = geom.center
+              accuracy = geom.upper_corner.spherical_distance(geom.lower_corner) / 2
+            else
+              pt = geom
+              accuracy = 0
+            end
+
+            location = Jabber::UserLocation::Location.new \
+              "accuracy"    => accuracy,
+              "area"        => area,
+              "country"     => country,
+              "description" => name,
+              "lat"         => pt.lat,
+              "locality"    => locality,
+              "lon"         => pt.lon,
+              "postalcode"  => postalcode,
+              "region"      => region,
+              "street"      => street,
+              "timestamp"   => timestamp
+
+            # parsing thread is still running, so the send needs to be deferred
+            defer :location_sent do
+              @location_helper.current_location(location)
+            end
+          end
+
+          switchboard.on_shutdown do
+            begin
+              @location_helper.stop_publishing
+            rescue Jabber::ServerError => e
+              puts e
+            end
+          end
+
+          switchboard.run!
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/commands/pep/tune.rb

@@ -1,10 +1,4 @@
-begin
-  require 'appscript'
-rescue LoadError => e
-  gem = e.message.split("--").last.strip
-  puts "The #{gem} gem is required."
-  exit 1
-end
+require 'rubygems'
 require 'xmpp4r/tune'
 
 module Switchboard
@@ -14,6 +8,14 @@ module Switchboard
         description "Broadcasting UserTune (XEP-0118)"
 
         def self.run!
+          begin
+            require 'appscript'
+          rescue LoadError => e
+            gem = e.message.split("--").last.strip
+            puts "The #{gem} gem is required for this command to work."
+            exit 1
+          end
+
           switchboard = Switchboard::Client.new do
             @tune_helper = Jabber::UserTune::Helper.new(client, nil)
 

data/lib/switchboard/commands/pep.rb

@@ -1,2 +1,3 @@
 require 'switchboard/commands/pep/pep'
+require 'switchboard/commands/pep/location'
 require 'switchboard/commands/pep/tune'

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

@@ -21,7 +21,7 @@ module Switchboard
             end
           end
 
-          if OPTIONS["oauth"]
+          if defined?(OAuth) && OPTIONS["oauth"]
             switchboard.plug!(OAuthPubSubJack)
           else
             switchboard.plug!(PubSubJack)

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

@@ -29,7 +29,7 @@ module Switchboard
             end
           end
 
-          if OPTIONS["oauth"]
+          if defined?(OAuth) && OPTIONS["oauth"]
             switchboard.plug!(OAuthPubSubJack)
           else
             switchboard.plug!(PubSubJack)

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

@@ -28,7 +28,7 @@ module Switchboard
             end
           end
 
-          if OPTIONS["oauth"]
+          if defined?(OAuth) && OPTIONS["oauth"]
             switchboard.plug!(OAuthPubSubJack)
           else
             switchboard.plug!(PubSubJack)

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

@@ -19,7 +19,7 @@ module Switchboard
             end
           end
 
-          if OPTIONS["oauth"]
+          if defined?(OAuth) && OPTIONS["oauth"]
             switchboard.plug!(OAuthPubSubJack)
           else
             switchboard.plug!(PubSubJack)

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

@@ -35,7 +35,7 @@ module Switchboard
             end
           end
 
-          if OPTIONS["oauth"]
+          if defined?(OAuth) && OPTIONS["oauth"]
             switchboard.plug!(OAuthPubSubJack)
           else
             switchboard.plug!(PubSubJack)

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

@@ -27,7 +27,7 @@ module Switchboard
             end
           end
 
-          if OPTIONS["oauth"]
+          if defined?(OAuth) && OPTIONS["oauth"]
             switchboard.plug!(OAuthPubSubJack)
           else
             switchboard.plug!(PubSubJack)

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

@@ -24,7 +24,7 @@ module Switchboard
             end
           end
 
-          if OPTIONS["oauth"]
+          if defined?(OAuth) && OPTIONS["oauth"]
             switchboard.plug!(OAuthPubSubJack)
           else
             switchboard.plug!(PubSubJack)

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

@@ -27,7 +27,7 @@ module Switchboard
             end
           end
 
-          if OPTIONS["oauth"]
+          if defined?(OAuth) && OPTIONS["oauth"]
             switchboard.plug!(OAuthPubSubJack)
           else
             switchboard.plug!(PubSubJack)

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

@@ -30,7 +30,7 @@ module Switchboard
             end
           end
 
-          if OPTIONS["oauth"]
+          if defined?(OAuth) && OPTIONS["oauth"]
             switchboard.plug!(OAuthPubSubJack)
           else
             switchboard.plug!(PubSubJack)

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

@@ -11,11 +11,13 @@ module Switchboard
         super(opts)
         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 }
-        opts.on("--oauth", "Sign requests using OAuth.") { OPTIONS["oauth"] = true }
-        opts.on("--oauth-consumer-key=key", String, "Specifies the OAuth consumer key to use.") { |v| OPTIONS["oauth.consumer_key"] = v }
-        opts.on("--oauth-consumer-secret=secret", String, "Specifies the OAuth consumer secret to use.") { |v| OPTIONS["oauth.consumer_secret"] = v }
-        opts.on("--oauth-token =oken", String, "Specifies the OAuth token to use.") { |v| OPTIONS["oauth.token"] = v }
-        opts.on("--oauth-token-secret=secret", String, "Specifies the OAuth token secret to use.") { |v| OPTIONS["oauth.token_secret"] = v }
+        if defined?(OAuth)
+          opts.on("--oauth", "Sign requests using OAuth.") { OPTIONS["oauth"] = true }
+          opts.on("--oauth-consumer-key=key", String, "Specifies the OAuth consumer key to use.") { |v| OPTIONS["oauth.consumer_key"] = v }
+          opts.on("--oauth-consumer-secret=secret", String, "Specifies the OAuth consumer secret to use.") { |v| OPTIONS["oauth.consumer_secret"] = v }
+          opts.on("--oauth-token =oken", String, "Specifies the OAuth token to use.") { |v| OPTIONS["oauth.token"] = v }
+          opts.on("--oauth-token-secret=secret", String, "Specifies the OAuth token secret to use.") { |v| OPTIONS["oauth.token_secret"] = v }
+        end
       end
     end
   end

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

@@ -19,7 +19,7 @@ module Switchboard
             end
           end
 
-          if OPTIONS["oauth"]
+          if defined?(OAuth) && OPTIONS["oauth"]
             switchboard.plug!(OAuthPubSubJack)
           else
             switchboard.plug!(PubSubJack)

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

@@ -21,7 +21,7 @@ module Switchboard
             end
           end
 
-          if OPTIONS["oauth"]
+          if defined?(OAuth) && OPTIONS["oauth"]
             switchboard.plug!(OAuthPubSubJack)
           else
             switchboard.plug!(PubSubJack)

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

@@ -22,7 +22,7 @@ module Switchboard
             end
           end
 
-          if OPTIONS["oauth"]
+          if defined?(OAuth) && OPTIONS["oauth"]
             switchboard.plug!(OAuthPubSubJack)
           else
             switchboard.plug!(PubSubJack)

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

@@ -17,7 +17,7 @@ module Switchboard
             end
           end
 
-          if OPTIONS["oauth"]
+          if defined?(OAuth) && OPTIONS["oauth"]
             switchboard.plug!(OAuthPubSubJack)
           else
             switchboard.plug!(PubSubJack)

data/lib/switchboard/component.rb

@@ -0,0 +1,36 @@
+module Switchboard
+  class Component < Core
+    attr_reader :component
+
+    def initialize(settings = Switchboard::Settings.new, spin = true)
+      super(settings, spin)
+
+      @component = Jabber::Component.new(settings["component.domain"])
+    end
+
+  protected
+
+    def auth!
+      component.auth(settings["component.secret"])
+    rescue Jabber::AuthenticationFailure
+      puts "Component authentication failed. Check your secret."
+      shutdown(false)
+      exit 1
+    end
+
+    def connect!
+      component.connect(settings["component.host"], settings["component.port"])
+      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"]}.
+            That may mean the Jabber server isn't running or listening on that port,
+            or there might be firewall issues. Exiting."
+      exit 1
+    end
+
+    def stream
+      component
+    end
+  end
+end

data/lib/switchboard/core.rb

@@ -20,6 +20,21 @@ module Switchboard
 
     attr_reader :jacks, :settings
 
+    # Register a hook
+    def self.hook(*events)
+      events.each do |event|
+        module_eval(<<-EOS, __FILE__, __LINE__)
+          def on_#{event}(method = nil, &block)
+            if block_given?
+              register_hook(:#{event}, &block)
+            elsif method
+              register_hook(:#{event}, method)
+            end
+          end
+        EOS
+      end
+    end
+
     def initialize(settings = Switchboard::Settings.new, spin = true, &block)
       # register a handler for SIGINTs
       trap(:INT) do
@@ -87,6 +102,10 @@ module Switchboard
       end
     end
 
+    def hook(*events)
+      self.class.hook(*events)
+    end
+
     # Connect a jack to the switchboard
     def plug!(*jacks)
       @jacks ||= []
@@ -101,39 +120,7 @@ module Switchboard
       end
     end
 
-    # Register a hook to run when the Jabber::Stream encounters an exception.
-    def on_exception(&block)
-      register_hook(:exception, &block)
-    end
-
-    # Register a hook to run when iq stanzas are received.
-    def on_iq(&block)
-      register_hook(:iq, &block)
-    end
-
-    # Register a hook to run when message stanzas are received.
-    def on_message(&block)
-      register_hook(:message, &block)
-    end
-
-    # Register a hook to run when presence stanzas are received.
-    def on_presence(&block)
-      register_hook(:presence, &block)
-    end
-
-    # Register a startup hook.
-    def on_startup(&block)
-      register_hook(:startup, &block)
-    end
-
-    def on_stream_connected(&block)
-      register_hook(:stream_connected, &block)
-    end
-
-    # Register a shutdown hook.
-    def on_shutdown(&block)
-      register_hook(:shutdown, &block)
-    end
+    hook(:exception, :iq, :message, :presence, :startup, :stream_connected, :shutdown)
 
   protected
 
@@ -150,21 +137,29 @@ module Switchboard
     end
 
     def disconnect!
-      raise NotImplementedError, "subclasses of Switchboard::Core must implement disconnect!"
+      stream.close
     end
 
-    def register_hook(name, &block)
+    def register_hook(name, method = nil, &block)
       @hooks ||= {}
-      @hooks[name.to_sym] ||= []
+      name = name.to_sym
+      @hooks[name] ||= []
 
       puts "Registering #{name} hook" if debug?
-      @hooks[name.to_sym] << block
+      if block_given?
+        @hooks[name] << block
+      else
+        @hooks[name] << lambda do |*args|
+          send(method.to_sym, *args)
+        end
+      end
     end
 
     def on(name, *args)
       @hooks ||= {}
       @hooks[name.to_sym] ||= []
       @hooks[name.to_sym].each do |hook|
+        puts "Executing hook '#{name}'" if debug?
         execute_hook(hook, *args)
       end
     end
@@ -192,7 +187,11 @@ module Switchboard
         on(:exception, e, stream, where)
 
         case where
-        when :something
+        when :disconnected
+          puts "Jabber service disconnected.  Shutting down."
+          exit 1
+        when :exit
+          puts "Shutting down."
         else
           puts "Caught #{e.inspect} on #{stream} at #{where}.  You might want to consider handling this."
           raise e
@@ -215,10 +214,11 @@ module Switchboard
     def startup
       begin
         timeout(30) do
+          register_default_callbacks
+
           connect!
           @connected = true
 
-          register_default_callbacks
           on(:stream_connected)
         end
       rescue Timeout::Error

data/lib/switchboard/helpers/pubsub.rb

@@ -12,9 +12,7 @@ module Switchboard
         :publish_item_with_id_to, :purge_items_from, :set_config_for,
         :subscribe_to, :unsubscribe_from, :to => :pubsub
 
-      def on_pubsub_event(&block)
-        register_hook(:pubsub_event, &block)
-      end
+      Switchboard::Core.hook(:pubsub_event)
 
       def subscriptions(node = nil)
         # NOTE: node-specific subscriptions do not appear to work in ejabberd 2.0.2

data/lib/switchboard/jacks/oauth_pubsub.rb

@@ -1,8 +1,7 @@
-require 'switchboard/helpers/oauth_pubsub'
-
-# TODO subclass PubSubJack
 class OAuthPubSubJack
   def self.connect(switchboard, settings)
+    require 'switchboard/helpers/oauth_pubsub'
+
     # TODO generalize this pattern for required settings
     unless settings["pubsub.server"]
       puts "A pubsub server must be specified."

data/lib/switchboard/switchboard.rb

@@ -1,5 +1,6 @@
 require 'switchboard/core'
 require 'switchboard/client'
+require 'switchboard/component'
 require 'switchboard/commands'
 require 'switchboard/jacks'
 require 'switchboard/settings'

data/lib/switchboard/version.rb

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

data/lib/switchboard/xmpp4r/location/helper/helper.rb

@@ -0,0 +1,56 @@
+# =XMPP4R - XMPP Library for Ruby
+# License:: Ruby's license (see the LICENSE file) or GNU GPL, at your option.
+# Website::http://home.gna.org/xmpp4r/
+
+require 'xmpp4r'
+require 'xmpp4r/pubsub'
+require 'xmpp4r/location/location'
+
+module Jabber
+  module UserLocation
+    ##
+    # A Helper for XEP-0080 User Location
+    #
+    # Use this helper to send a user's location, or receive them from a
+    # specified jid. Described at http://www.xmpp.org/extensions/xep-0080.html
+    #
+    # For example:
+    # <pre>
+    # h = UserLocation::Helper( @client, 'radio1@hug.hellomatty.com' )
+    # h.add_userlocation_callback do |location|
+    #   puts "Now in: #{location.locality}"
+    # end
+    # </pre>
+    class Helper < PubSub::ServiceHelper
+      ##
+      # Send out the current location.
+      #
+      # location:: [Jabber::UserLocation::Location] current_location
+      def current_location(location)
+        item = Jabber::PubSub::Item.new()
+        item.add(location)
+
+        publish_item_to(NS_USERLOCATION, item)
+      end
+
+      ##
+      # Use this method to indicate that you wish to stop publishing
+      # a location.
+      def stop_publishing
+        current_location(Jabber::UserLocation::Location.new())
+      end
+
+      ##
+      # Add a callback that will be invoked when a location is received
+      # from the jid specified when you constructed the Helper.
+      def add_userlocation_callback(prio = 200, ref = nil, &block)
+        add_event_callback(prio, ref) do |event|
+          location = event.first_element('items/item/location')
+          if location
+            block.call(location)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/switchboard/xmpp4r/location/location.rb

@@ -0,0 +1,179 @@
+# =XMPP4R - XMPP Library for Ruby
+# License:: Ruby's license (see the LICENSE file) or GNU GPL, at your option.
+# Website::http://home.gna.org/xmpp4r/
+
+require 'time'
+require 'xmpp4r/xmppelement'
+require 'rexml/element'
+
+module Jabber
+  module UserLocation
+    NS_USERLOCATION = 'http://jabber.org/protocol/geoloc'
+    ALLOWABLE_ATTRIBUTES = %w(accuracy alt area bearing building country
+      datum description floor lat locality lon postalcode region room
+      speed street text timestamp uri)
+
+    ##
+    # The <geoloc> XMPP element, as defined in XEP-0080 User Location
+    #
+    # See http://xmpp.org/extensions/xep-0080.html - this element
+    # encapsulates data about a user's current location. These are
+    # expressed as child elements such as <locality>, <lat>, etc.
+    # which are also managed by this class.
+    #
+    # If the element has no children then it indicates that the user
+    # has stopped publishing their location.
+    class Location < XMPPElement
+      name_xmlns 'geoloc', NS_USERLOCATION
+      force_xmlns true
+
+      ##
+      # Construct a new <location> element.
+      #
+      # Supply no arguments to make an empty element to indicate that
+      # location is no longer being published.
+      #
+      # attributes:: [Hash] location attributes
+      def initialize(attributes = {})
+        super()
+
+        # validate attributes
+        attributes = attributes.select do |k,v|
+          ALLOWABLE_ATTRIBUTES.include?(k) && !v.nil?
+        end
+
+        attributes.each do |k,v|
+          v = x.xmlschema if v.is_a?(Time)
+          add_element(REXML::Element.new(k)).text = v.to_s
+        end
+      end
+
+
+      ##
+      # Returns true if a location is currently being published, otherwise false.
+      def published?
+        (elements.size > 0)
+      end
+
+      ##
+      # Get the accuracy attribute of this location.
+      def accuracy
+        first_element('accuracy').text if first_element('accuracy')
+      end
+
+      ##
+      # Get the alt attribute of this location.
+      def alt
+        first_element('alt').text if first_element('alt')
+      end
+
+      ##
+      # Get the area attribute of this location.
+      def area
+        first_element('area').text if first_element('area')
+      end
+
+      ##
+      # Get the bearing attribute of this location.
+      def bearing
+        first_element('bearing').text if first_element('bearing')
+      end
+
+      ##
+      # Get the building attribute of this location.
+      def building
+        first_element('building').text if first_element('building')
+      end
+
+      ##
+      # Get the country attribute of this location.
+      def country
+        first_element('country').text if first_element('country')
+      end
+
+      ##
+      # Get the datum attribute of this location.
+      def datum
+        first_element('datum').text if first_element('datum')
+      end
+
+      ##
+      # Get the description attribute of this location.
+      def description
+        first_element('description').text if first_element('description')
+      end
+
+      ##
+      # Get the floor attribute of this location.
+      def floor
+        first_element('floor').text if first_element('floor')
+      end
+
+      ##
+      # Get the lat attribute of this location.
+      def lat
+        first_element('lat').text if first_element('lat')
+      end
+
+      ##
+      # Get the locality attribute of this location.
+      def locality
+        first_element('locality').text if first_element('locality')
+      end
+
+      ##
+      # Get the lon attribute of this location.
+      def lon
+        first_element('lon').text if first_element('lon')
+      end
+
+      ##
+      # Get the postalcode attribute of this location.
+      def postalcode
+        first_element('postalcode').text if first_element('postalcode')
+      end
+
+      ##
+      # Get the region attribute of this location.
+      def region
+        first_element('region').text if first_element('region')
+      end
+
+      ##
+      # Get the room attribute of this location.
+      def room
+        first_element('room').text if first_element('room')
+      end
+
+      ##
+      # Get the speed attribute of this location.
+      def speed
+        first_element('speed').text if first_element('speed')
+      end
+
+      ##
+      # Get the street attribute of this location.
+      def street
+        first_element('street').text if first_element('street')
+      end
+
+      ##
+      # Get the text attribute of this location.
+      def text
+        first_element('text').text if first_element('text')
+      end
+
+      ##
+      # Get the timestamp attribute of this location.
+      def timestamp
+        first_element('timestamp').text if first_element('timestamp')
+      end
+
+      ##
+      # Get the uri attribute of this location.
+      def uri
+        first_element('uri').text if first_element('uri')
+      end
+    end
+  end
+end

data/lib/switchboard/xmpp4r/location.rb

@@ -0,0 +1,2 @@
+require 'xmpp4r/location/location'
+require 'xmpp4r/location/helper/helper'

data/switchboard.gemspec

@@ -1,17 +1,15 @@
+# this file is automatically generated
 Gem::Specification.new do |s|
   s.name = "switchboard"
-  s.version = "0.0.6"
+  s.version = "0.0.7"
   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/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/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/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/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.executables = ["switchboard"]
   s.require_paths = ["lib"]
 
   s.add_dependency("xmpp4r")
-  s.add_dependency("oauth")
-  s.add_dependency("rb-appscript")
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojodna-switchboard
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Seth Fitzsimmons
@@ -21,24 +21,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: oauth
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rb-appscript
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: A toolkit for assembling XMPP clients and interacting with XMPP servers.
 email: 
 - seth@mojodna.net
@@ -59,6 +41,7 @@ files:
 - 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
@@ -86,6 +69,7 @@ files:
 - 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
@@ -102,6 +86,9 @@ files:
 - 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