@@ -2,7 +2,7 @@ require 'switchboard' require 'optparse' -command = ARGV.clone.options do |opts| +ARGV.clone.options do |opts| # opts.banner = "Usage: example.rb [options]" command = Switchboard::Commands::Default @@ -30,6 +30,4 @@ command = ARGV.clone.options do |opts| ARGV.reject! { |v| !argv.include?(v) } command -end - -command.run! +end.run! bin/switchboard @@ -5,6 +5,7 @@ module Switchboard description "Get items from a pubsub node" def self.options(opts) + super(opts) opts.on("--item-count=count", Integer, "Specifies the number of items to retrieve.") { |v| OPTIONS["pubsub.items.count"] = v } end lib/switchboard/commands/pubsub/items.rb @@ -8,14 +8,14 @@ module Switchboard end def self.options(opts) - 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 } + 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 } end end end lib/switchboard/commands/pubsub/pubsub.rb d500953bdf8166b1fe8df5361881569993441375 Seth Fitzsimmons seth@mojodna.net http://github.com/mojodna/switchboard/commit/e2d4f967f614199755d6086d432e4e8d67b6aa8c e2d4f967f614199755d6086d432e4e8d67b6aa8c 2008-11-16T20:29:54-08:00 2008-11-16T20:29:54-08:00 cleanup d7f8b2478947c7409634a8b22163859ee78d4438 Seth Fitzsimmons seth@mojodna.net