@@ -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 README.markdown @@ -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 Rakefile @@ -1,11 +1,4 @@ -begin - require 'fire_hydrant' -rescue LoadError => e - gem = e.message.split("--").last.strip - puts "The #{gem} gem is required." - exit 1 -end - +require 'rubygems' require 'xmpp4r/location' module Switchboard @@ -15,6 +8,14 @@ module Switchboard 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) lib/switchboard/commands/pep/location.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) lib/switchboard/commands/pep/tune.rb @@ -21,7 +21,7 @@ module Switchboard end end - if OPTIONS["oauth"] + if defined?(OAuth) && OPTIONS["oauth"] switchboard.plug!(OAuthPubSubJack) else switchboard.plug!(PubSubJack) lib/switchboard/commands/pubsub/affiliations.rb @@ -29,7 +29,7 @@ module Switchboard end end - if OPTIONS["oauth"] + if defined?(OAuth) && OPTIONS["oauth"] switchboard.plug!(OAuthPubSubJack) else switchboard.plug!(PubSubJack) lib/switchboard/commands/pubsub/config.rb @@ -28,7 +28,7 @@ module Switchboard end end - if OPTIONS["oauth"] + if defined?(OAuth) && OPTIONS["oauth"] switchboard.plug!(OAuthPubSubJack) else switchboard.plug!(PubSubJack) lib/switchboard/commands/pubsub/create.rb @@ -19,7 +19,7 @@ module Switchboard end end - if OPTIONS["oauth"] + if defined?(OAuth) && OPTIONS["oauth"] switchboard.plug!(OAuthPubSubJack) else switchboard.plug!(PubSubJack) lib/switchboard/commands/pubsub/delete.rb @@ -35,7 +35,7 @@ module Switchboard end end - if OPTIONS["oauth"] + if defined?(OAuth) && OPTIONS["oauth"] switchboard.plug!(OAuthPubSubJack) else switchboard.plug!(PubSubJack) lib/switchboard/commands/pubsub/info.rb @@ -27,7 +27,7 @@ module Switchboard end end - if OPTIONS["oauth"] + if defined?(OAuth) && OPTIONS["oauth"] switchboard.plug!(OAuthPubSubJack) else switchboard.plug!(PubSubJack) lib/switchboard/commands/pubsub/items.rb @@ -24,7 +24,7 @@ module Switchboard end end - if OPTIONS["oauth"] + if defined?(OAuth) && OPTIONS["oauth"] switchboard.plug!(OAuthPubSubJack) else switchboard.plug!(PubSubJack) lib/switchboard/commands/pubsub/nodes.rb @@ -27,7 +27,7 @@ module Switchboard end end - if OPTIONS["oauth"] + if defined?(OAuth) && OPTIONS["oauth"] switchboard.plug!(OAuthPubSubJack) else switchboard.plug!(PubSubJack) lib/switchboard/commands/pubsub/options.rb @@ -30,7 +30,7 @@ module Switchboard end end - if OPTIONS["oauth"] + if defined?(OAuth) && OPTIONS["oauth"] switchboard.plug!(OAuthPubSubJack) else switchboard.plug!(PubSubJack) lib/switchboard/commands/pubsub/publish.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 lib/switchboard/commands/pubsub/pubsub.rb @@ -19,7 +19,7 @@ module Switchboard end end - if OPTIONS["oauth"] + if defined?(OAuth) && OPTIONS["oauth"] switchboard.plug!(OAuthPubSubJack) else switchboard.plug!(PubSubJack) lib/switchboard/commands/pubsub/purge.rb @@ -21,7 +21,7 @@ module Switchboard end end - if OPTIONS["oauth"] + if defined?(OAuth) && OPTIONS["oauth"] switchboard.plug!(OAuthPubSubJack) else switchboard.plug!(PubSubJack) lib/switchboard/commands/pubsub/subscribe.rb @@ -22,7 +22,7 @@ module Switchboard end end - if OPTIONS["oauth"] + if defined?(OAuth) && OPTIONS["oauth"] switchboard.plug!(OAuthPubSubJack) else switchboard.plug!(PubSubJack) lib/switchboard/commands/pubsub/subscriptions.rb @@ -17,7 +17,7 @@ module Switchboard end end - if OPTIONS["oauth"] + if defined?(OAuth) && OPTIONS["oauth"] switchboard.plug!(OAuthPubSubJack) else switchboard.plug!(PubSubJack) lib/switchboard/commands/pubsub/unsubscribe.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." lib/switchboard/jacks/oauth_pubsub.rb 98703a6d72d024af59d8e770387febd20952294b Seth Fitzsimmons seth@mojodna.net http://github.com/mojodna/switchboard/commit/5b3aac3bfcd61ff628bdf1d85cad6e5295f3e58e 5b3aac3bfcd61ff628bdf1d85cad6e5295f3e58e 2008-11-23T11:09:12-08:00 2008-11-23T11:09:12-08:00 removed strict dependencies on fire-hydrant, oauth, and rb-appscript 11745b29dfa979e4dbd7375e59992ff1374a3e66 Seth Fitzsimmons seth@mojodna.net