oauth-cli 0.0.4 → 0.0.5

data/README.rdoc

@@ -72,6 +72,10 @@ oauthc was originally developed to test the {Qype API}[http://www.qype.com/devel
 ==== What's the difference to the client provided by oauth gem?
 problem with oauth cli client provided with the gem is the lack of post request with body content as well as easy usage with repl to have proper CLI options
 
+==== Are there other clients of similar manner?
+Yes: http://github.com/marcel/twurl
+Very similar but Twitter specific. I whish I'd spot this project earlier ;-)
+
 
 == Copyright
 The MIT License

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('oauth-cli', '0.0.4') do |p|
+Echoe.new('oauth-cli', '0.0.5') do |p|
   p.description    = "A simple CLI client to test your oauth API easily"
   p.url            = "http://github.com/rngtng/oauth-cli"
   p.author         = "rngtng - Tobias Bielohlawek"

data/bin/oauthc

@@ -14,7 +14,7 @@ CFG_FILE = ENV['OAUTHC_CONFIG_FILE'] || File.expand_path('~/.oauthconfig')
 
 def show_help
   say <<-help
-oauthc version 0.0.4
+oauthc version 0.0.5
 Usage: oauthc [options] [http_method_verb uri [body]]
 
 Options:
@@ -52,36 +52,46 @@ Interactive Commands:
 help
 end
 
-if ARGV.empty? || ARGV.any? { |arg| %w( -h --help -help help ).include?(arg) }
+if ARGV.any? { |arg| %w(-h --help -help help).include?(arg) }
   show_help
 end
 
 #parse CLI input
-opt = {}
-method, uri, body = ARGV.clone.delete_if do |kv|
-  next opt[$1.to_sym] = $2 if kv =~ /-?-([^=]+)=(.+)$/
-  false
-end
-profile = opt[:profile] || opt[:p] #shortcut for profile
+method, uri, body, opt, profile = OauthCli.parse_args(ARGV)
+
+@profiles = YAML.load_file(CFG_FILE) if File.exists?(CFG_FILE)
 
-#load external config if profile given
-if profile 
-  unless File.exists?(CFG_FILE)
-    say " <%= color('#  ERROR: Profile File #{CFG_FILE} not found', RED) %>"
-    show_help
+#find default profile
+if @profiles && (profile.nil? || @profiles[profile].nil?)
+  @profiles.each do |key, values|
+    profile = key if values['default']
   end
-  
-  cfg_options = YAML.load_file(CFG_FILE)
-  profile = 'default' if !cfg_options[profile] && cfg_options['default']
-  
-  unless cfg_options[profile]
-    say " <%= color('#  ERROR: Profile #{profile} not found', RED) %>"
-    show_help
+end
+
+#give profile selection
+if @profiles && (profile.nil? || @profiles[profile].nil?)
+  say " <%= 'Select one of the available profiles" #" or leave empty to create new one' %>"
+  @nr_profiles = @profiles.map
+  #say " <%= ' 0.  - create new one -' %>"
+  @nr_profiles.each_with_index do |profile, index|
+    say " <%= ' #{index+1}. #{profile.first}' %>"
   end
+  profile = ask ' >> '
+  profile  = @nr_profiles[profile.to_i-1].first if profile == profile.to_i.to_s && @nr_profiles[profile.to_i-1]
+end
 
-  cfg_options[profile].each { |key, value| opt[key.to_sym] = value }  #symbolize_keys  
+@profiles[profile].each { |key, value| opt[key.to_sym] = value }  if @profiles[profile] #symbolize_keys
+
+if opt[:host].to_s.empty? || opt[:consumer_key].to_s.empty? || opt[:consumer_secret].to_s.empty?
+  
 end
 
+#    unless cfg_options[profile]
+#      say " <%= color('#  ERROR: Profile #{profile} not found', RED) %>"
+#      show_help
+#    end
+#
+
 ######## CREATE client
 
 @client = OauthCli.new(opt)
@@ -117,6 +127,8 @@ if !ENV['__REPL_WRAPPED'] && system("which rlwrap > /dev/null 2> /dev/null")
   rlargs = ""
   #rlargs << " -f #{cfile}" if cfile
   rlargs << " -H #{hfile}" if hfile
+  
+  ARGV << "-p=#{profile}" if profile
 
   exec "rlwrap #{rlargs} #$0 #{ARGV.join(' ')}"
 end
@@ -127,10 +139,10 @@ loop do
 
   begin
     command, uri, body = $stdin.gets.chomp.split(' ')
-    
+
     next warn(show_commands) if command =~ /^(help|\?)$/
     next warn("Use Ctrl-D (i.e. EOF) to exit") if command =~ /^(exit|quit)$/
-        
+
     @client.request(command, uri, body)
     next
   rescue NoMethodError, Interrupt

data/lib/oauth_cli.rb

@@ -20,14 +20,14 @@ class OauthCli
       color = 'YELLOW'
       say " <%= color('# -------------------------------------------------------------------------', #{color}) %>"
       say " <%= color('# no consumer_key provided, please create a profile or call the script with:', #{color}) %>"
-      say " <%= color('# oauthc --consumer_key=<consumer_key> --consumer_secret=<consumer_secret>', #{color}) %>"
+      say " <%= color('# oauthc --consumer_key <consumer_key> --consumer_secret <consumer_secret>', #{color}) %>"
       say " <%= color('# -------------------------------------------------------------------------', #{color}) %>"
       #please get a key here: #{options[:host]}/api_consumers"
       return
     end
     
     #add http if missing
-    [:host, :reg_host, :auth_host].each do |key|
+    [:host, :reg_url, :auth_url].each do |key|
       @options[key] = "http://#{@options[key]}" unless @options[key] =~ /^http/
     end
     
@@ -35,13 +35,23 @@ class OauthCli
     @access_token = OAuth::AccessToken.new(@consumer, @options[:token], @options[:token_secret]) if @options[:token]
   end
 
+  def self.parse_args(args, opt = {}, last_arg = nil)
+    method, uri, body  = args.clone.delete_if do |kv|
+      next opt[$1.to_sym] = $2  if kv =~ /-?-([^=]+)=(.+)$/   #catches --param=value
+      next opt[last_arg] = kv   if last_arg && !opt[last_arg] #catches value
+      next last_arg = $1.to_sym if kv =~ /^-?-(.+)$/          #catches --param
+      false
+    end
+    [method, uri, body, opt, (opt.delete(:profile) || opt.delete(:p))]
+  end
+
   def request(method, uri, body = nil)
     if method =~ /auth/
       @request_token = @consumer.get_request_token({}, "oauth_callback" => "oob")
-      @options[:auth_host] ||= "#{@options[:host].gsub('api.', 'www.').gsub('v1/', '')}/mobile/authorize?oauth_token=" #That's for Qype only!!
+      @options[:auth_url] ||= "#{@options[:host].gsub('api.', 'www.').gsub('v1/', '')}/mobile/authorize" #That's for Qype only!!
       color = 'YELLOW'
       say " <%= color('# To authorize, go to ...', #{color}) %>"
-      say " <%= '#   ' + color('#{@options[:auth_host]}#{@request_token.token}', BOLD, UNDERLINE) %>\n"
+      say " <%= '#   ' + color('#{@options[:auth_url]}?oauth_token=#{@request_token.token}', BOLD, UNDERLINE) %>\n"
       say " <%= color('#  ... and enter given token verifier:', #{color}) %>"
       verifier = ask " |-- verifier >> "
 
@@ -55,6 +65,8 @@ class OauthCli
         say " <%= color('# -------------------------------------------------------------------------', #{color}) %>"
         say " <%= color('# Authorization SUCCESSFUL', BOLD, #{color}) %>"
         say " <%= color('# -------------------------------------------------------------------------', #{color}) %>"
+        say " <%= color(' token:        #{@access_token.token}', #{color}) %>"
+        say " <%= color(' token_secret: #{@access_token.secret}', #{color}) %>"
       rescue
         color = 'RED'
         say " <%= color('# -------------------------------------------------------------------------', #{color}) %>"

data/oauth-cli.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth-cli}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["rngtng - Tobias Bielohlawek"]
   s.cert_chain = ["/Users/tobiasb/.ssh/gem-public_cert.pem"]
-  s.date = %q{2010-04-23}
+  s.date = %q{2010-04-28}
   s.default_executable = %q{oauthc}
   s.description = %q{A simple CLI client to test your oauth API easily}
   s.email = %q{tobi @nospam@ rngtng.com}

data/test/test_oauth_cli.rb

@@ -8,6 +8,16 @@ class TestOauthCli < Test::Unit::TestCase
     assert @client
   end
   
+  def test_should_parse_args_with_equal
+    args = %w(--profile=test -host=http://host.com get /users?name=test my_body)
+    assert_equal ['get', '/users?name=test', 'my_body', {:host => 'http://host.com'}, 'test'], OauthCli.parse_args(args)
+  end
+  
+  def test_should_parse_args_without_equal_and_body
+    args = %w(-p test --host http://host.com get /users?name=test)
+    assert_equal ['get', '/users?name=test', nil, {:host => 'http://host.com'}, 'test'], OauthCli.parse_args(args)
+  end
+  
   def test_should_add_http_to_host
     opt = { :host => "api.bbc.com", :auth_host => "http://test.domain", :reg_host => "https://test.domain", :consumer_key => "dummy_key"}
     @client = OauthCli.new(opt)

data/test/test_oauthc.rb

@@ -5,14 +5,14 @@ class TestOauthCli < Test::Unit::TestCase
   def setup
     @oauthc = File.dirname(File.dirname(__FILE__)) + "/bin/oauthc"
   end
-  
+    
   def test_should_show_help
-    output = `#{@oauthc}`
+    output = `#{@oauthc} -h`
     assert output =~ /Usage: oauthc/
   end
   
-  def test_should_show_error_on_profile
-    output = `#{@oauthc} -p=unknown`
+  def _test_should_show_error_on_profile
+    output = `#{@oauthc} -p unknown`
     assert output =~ /Profile unknown not found/
   end
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - rngtng - Tobias Bielohlawek
@@ -34,7 +34,7 @@ cert_chain:
   I5mOkC+DmQeKRCyukHoWnysL5IyK+l7JEPymkOlNWkl006u5rNu/d7LJJW19+ZvC
   -----END CERTIFICATE-----
 
-date: 2010-04-23 00:00:00 +02:00
+date: 2010-04-28 00:00:00 +02:00
 default_executable: oauthc
 dependencies: 
 - !ruby/object:Gem::Dependency