mojodna-switchboard 0.0.10 → 0.0.11

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

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'xmpp4r/location'
 
 module Switchboard
@@ -11,8 +10,8 @@ module Switchboard
           begin
             require 'fire_hydrant'
           rescue LoadError => e
-            gem = e.message.split("--").last.strip
-            puts "The #{gem} gem is required for this command to work."
+            lib = e.message.split("--").last.strip
+            puts "#{lib} is required for this command to work."
             exit 1
           end
 
@@ -27,15 +26,14 @@ module Switchboard
           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 })
+            name = user.locations.first
+            timestamp = user.locations.first.located_at
 
             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 }
+              level = loc.level_name
+              normal_name = loc.normal_name
               case level
               when "exact"
                 street = normal_name

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

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'xmpp4r/tune'
 
 module Switchboard
@@ -11,8 +10,8 @@ module Switchboard
           begin
             require 'appscript'
           rescue LoadError => e
-            gem = e.message.split("--").last.strip
-            puts "The #{gem} gem is required for this command to work."
+            lib = e.message.split("--").last.strip
+            puts "#{lib} is required for this command to work."
             exit 1
           end
 

data/lib/switchboard/core.rb

@@ -1,9 +1,8 @@
-require 'rubygems'
 begin
   require 'xmpp4r'
 rescue LoadError => e
-  gem = e.message.split("--").last.strip
-  puts "The #{gem} gem is required."
+  lib = e.message.split("--").last.strip
+  puts "#{lib} is required."
   exit 1
 end
 
@@ -150,8 +149,11 @@ module Switchboard
 
       shutdown!
 
-      timeout(15) do
-        sleep 0.1 until shutdown_complete?
+      if Thread.current != @main_thread
+        timeout(15) do
+          puts "Waiting for shutdown to complete."
+          sleep 0.1 until shutdown_complete?
+        end
       end
 
     rescue Timeout::Error

data/lib/switchboard/helpers/oauth_pubsub.rb

@@ -1,9 +1,14 @@
-require 'rubygems'
 begin
   require 'oauth'
 rescue LoadError => e
-  gem = e.message.split("--").last.strip
-  puts "The #{gem} gem is required."
+  lib = e.message.split("--").last.strip
+  puts "#{lib} is required."
+  exit 1
+end
+
+require 'oauth/version'
+if OAuth::VERSION < "0.3.1.1"
+  puts "The OAuth library must be at least version 0.3.1.1."
   exit 1
 end
 

data/lib/switchboard/settings.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Switchboard
   class Settings
     DEFAULT_PATH = File.join(ENV["HOME"], ".switchboardrc")

data/lib/switchboard/switchboard.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 begin
   require 'oauth'
 rescue LoadError => e

data/lib/switchboard/version.rb

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

data/switchboard.gemspec

@@ -1,13 +1,13 @@
 # this file is automatically generated
 Gem::Specification.new do |s|
   s.name = "switchboard"
-  s.version = "0.0.10"
+  s.version = "0.0.11"
   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/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.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/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"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojodna-switchboard
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - Seth Fitzsimmons
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-27 00:00:00 -07:00
+date: 2009-02-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,7 +93,6 @@ files:
 - 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
@@ -104,7 +103,6 @@ files:
 - lib/switchboard.rb
 - Rakefile
 - README.markdown
-- switchboard-0.0.8.gem
 - switchboard.gemspec
 has_rdoc: false
 homepage: 

data/lib/switchboard/oauth/request_proxy/mock_request.rb

@@ -1,21 +0,0 @@
-require 'oauth/request_proxy/base'
-
-module OAuth
-  module RequestProxy
-    class MockRequest < OAuth::RequestProxy::Base
-      proxies Hash
-
-      def parameters
-        @request["parameters"]
-      end
-
-      def method
-        @request["method"]
-      end
-
-      def uri
-        @request["uri"]
-      end
-    end
-  end
-end