oauth-cli 0.0.6 → 0.0.7

data/CHANGELOG

@@ -2,6 +2,13 @@
 // ---------------------------
 // on exit, ask if connection data should be saved to profile
 
+0.0.7
+--------------------------
+open url directly in browser via launchy gem (thx @pht for pointing me)
+added soundcloud profile
+add autocomplete for interactive commands (get, put, post, delete, auth, help)
+
+
 0.0.6
 ---------------------------
 updated & cleanedup profile managment

data/Manifest

@@ -3,6 +3,7 @@ Manifest
 README.rdoc
 Rakefile
 bin/oauthc
+completion
 lib/oauth_cli.rb
 oauth-cli.gemspec
 profiles.yaml

data/README.rdoc

@@ -21,7 +21,7 @@ Options:
   --content_type     Set content type, default: application/xml
 
 Request params (leave blank for interactive mode)
-   http_method_verb  nay method of get, post, put or delete
+   http_method_verb  any method of get, post, put or delete
    uri               Uri to request
    body              Body attached to request
 
@@ -52,7 +52,7 @@ oauthc was originally developed to test the {Qype API}[http://www.qype.com/devel
 
 
 == Hints
-* make sure to have rlwrap installed, to get CLI history support: http://utopia.knoware.nl/~hlub/rlwrap (or "port install rlwarp")
+* make sure to have rlwrap installed, to get CLI history support: http://utopia.knoware.nl/~hlub/rlwrap (or "port install rlwarp" or "brew install rlwrap")
 
 * Bug reports, suggestions, updates: http://github.com/rngtng/oauth-cli/issues
 
@@ -61,8 +61,10 @@ oauthc was originally developed to test the {Qype API}[http://www.qype.com/devel
 * check if host is valid
 * testing + better docs
 * check oauth client, streamline!?
-* add autocomplete for interactive commands
+* add autocomplete for API commands
 * profile delete and rename
+* history scope of profile name
+* support for urlencoded in post/put body -> set correct mime type
 
 == FAQ
 

data/Rakefile

@@ -2,12 +2,12 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('oauth-cli', '0.0.6') do |p|
+Echoe.new('oauth-cli', '0.0.7') 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"
   p.email          = "tobi @nospam@ rngtng.com"
   p.ignore_pattern = ["tmp/*", "script/*"]
   p.development_dependencies = ["mocha >=0", "echoe >=0"]
-  p.runtime_dependencies = ["highline >=1.5.1", "json >=1.1.9", "oauth >=0.3.6"]
+  p.runtime_dependencies = ["highline >=1.5.1", "json >=1.1.9", "oauth >=0.3.6", "launchy"]
 end

data/bin/oauthc

@@ -5,17 +5,18 @@ require 'pp'
 
 #workaround to make it work in dev & production mode, any better solutions here??
 begin
-  require "#{File.dirname(File.dirname(File.expand_path(__FILE__)))}/lib/oauth_cli"  
+  require "#{File.dirname(File.dirname(File.expand_path(__FILE__)))}/lib/oauth_cli"
 rescue LoadError
   require "oauth_cli"
 end
 
 PROFILE_CFG_FILE = ENV['OAUTHC_CONFIG_FILE'] || File.expand_path('~/.oauthconfig')
 PROFILE_TMP_FILE = "#{File.dirname(File.dirname(File.expand_path(__FILE__)))}/profiles.yaml"
+COMPLETION_FILE  = "#{File.dirname(File.dirname(File.expand_path(__FILE__)))}/completion"
 
 def show_help
   say <<-help
-oauthc version 0.0.6
+oauthc version 0.0.7
 Usage: oauthc [options] [http_method_verb uri [body]]
 
 Options:
@@ -67,8 +68,8 @@ method, uri, body, profile = OauthCli.parse_args(ARGV)
 @client = OauthCli.new(profile)
 
 if !@client.connected?
-  say_message("Welcome to Oauth Commandline Client.", 'YELLOW') 
-    
+  say_message("Welcome to Oauth Commandline Client.", 'YELLOW')
+
   #give profile selection
   if OauthCli.profiles.keys.any?
     profile = choose do |menu|
@@ -81,30 +82,33 @@ if !@client.connected?
 
   while !@client.connected?
     say("No profiles setups were found, please create one first.") if OauthCli.profiles.empty?
-    
+
     profile = template = choose do |menu|
       menu.header = "Choose profile template"
       menu.prompt = ">> "
       menu.choices(*(OauthCli.templates.keys << 'custom') )
     end
-    
+
     say_message "Creating #{template} profile", 'YELLOW'
-    
+
     say "Profile '#{profile}' already exists, please choose another name." if OauthCli.profiles[profile]
     profile = ask_prompt "Profile name" if !OauthCli.templates[profile] || OauthCli.profiles[profile]
-    
+
     OauthCli.add_profile(profile, OauthCli.templates[template] || {})
-    
-    say "\n <%= 'Go to ' + color('#{OauthCli.profiles[profile][:reg_url]}', BOLD, UNDERLINE) + ' to register and retrieve your oauth consumer key and secret' %>\n\n" if OauthCli.profiles[profile][:reg_url]
-    
+
+    if OauthCli.profiles[profile][:reg_url]
+      say "\n <%= 'Go to ' + color('#{OauthCli.profiles[profile][:reg_url]}', BOLD, UNDERLINE) + ' to register and retrieve your oauth consumer key and secret' %>\n\n"
+      Launchy.open(OauthCli.profiles[profile][:reg_url])
+    end
+
     OauthCli.profiles[profile][:host] ||= ask_prompt "Oauth Host"
     OauthCli.profiles[profile][:auth_url] ||= ask_prompt "Authorization Url"
     OauthCli.profiles[profile][:consumer_key] = ask_prompt "Consumer Key"
     OauthCli.profiles[profile][:consumer_secret] = ask_prompt "Consumer Secret"
-    
+
     @client.connect(profile)
     OauthCli.save_profiles
-  
+
     say_message "Profile Setup SUCCESSFUL - saved as: #{profile}", 'GREEN'
     say "Type 'auth' ot authorize profile, type 'help' for more"
   end
@@ -117,16 +121,7 @@ end
 
 ######## START Interactive mode
 
-## following lines are shamelessly stolen from repl ->  http://http://github.com/defunkt/repl
-# completion_dir = ENV['REPL_COMPLETION_DIR'] || "~/.repl"
-# if File.exists?(cdir = File.expand_path(completion_dir))
-#   script = ARGV.detect { |a| a !~ /^-/ }
-#   if script
-#     cfile = Dir[cdir + '/' + File.basename(script)].first
-#     cfile = nil if cfile && !File.exists?(cfile)
-#   end
-# end
-
+## following lines are shamelessly stolen from repl ->  http://github.com/defunkt/repl
 history_dir = ENV['OAUTHC_HISTORY_DIR'] || "~/"
 if File.exists?(hdir = File.expand_path(history_dir))
   if script = ARGV.detect { |a| a !~ /^-/ }
@@ -138,20 +133,21 @@ end
 if !ENV['__REPL_WRAPPED'] && system("which rlwrap > /dev/null 2> /dev/null")
   ENV['__REPL_WRAPPED'] = '0'
 
-  rlargs = ""
-  #rlargs << " -f #{cfile}" if cfile
+  rlargs = ''  #"-r " <- to remember input, unfortunately, it remember output to
+  rlargs << " -f #{COMPLETION_FILE}" if File.exists?(COMPLETION_FILE)
   rlargs << " -H #{hfile}" if hfile
-  
+
   ARGV << "-p=#{profile}" if profile
 
   exec "rlwrap #{rlargs} #$0 #{ARGV.join(' ')}"
 end
 
-prompt = ENV['REPL_PROMPT'] || "#{profile} >>"
+
 
 loop do
   begin
-    input = ask "<%= color('#{prompt}', BOLD) %> "
+    auth = @client.auth? ? "'(authorized)', GREEN)" : "color('(unauthorized)', RED)"
+    input = ask "<%= color('#{profile}', BOLD) %> <%= color( #{auth} %> >> "
     command, uri, body = input.chomp.split(' ')
 
     next warn(show_commands) if command =~ /^(help|\?)$/
@@ -161,6 +157,7 @@ loop do
       say_message "Starting Authorization", 'YELLOW'
       say "\n"
       say " <%= 'Go to ' + color('#{@client.access_request_url}', BOLD, UNDERLINE) + ' to retrieve token verifier' %>\n\n"
+      Launchy.open(@client.access_request_url)
       verifier = ask_prompt "verifier"
 
       begin
@@ -168,24 +165,21 @@ loop do
         OauthCli.profiles[profile][:token] = @access_token.token
         OauthCli.profiles[profile][:secret] = @access_token.secret
         OauthCli.save_profiles
-        
+
         say_message "Authorization SUCCESSFUL and saved to profile: #{profile}", 'GREEN'
         say " token:  #{@access_token.token}"
         say " secret: #{@access_token.secret}"
       rescue => message
         say_message "Authorization FAILED: #{message}", 'RED'
-      end      
+      end
     else
       @client.request(command, uri, body)
     end
-    
+
     next
   rescue NoMethodError, Interrupt
-    #save_config unless profile
-    puts
+    #TODO save_config unless profile
     exit
-  #rescue
   end
 
 end
-

data/completion

@@ -0,0 +1 @@
+get post put delete auth help

data/lib/oauth_cli.rb

@@ -2,6 +2,7 @@ require 'highline/import'
 require 'oauth'
 require 'json'
 require 'yaml'
+require 'launchy'
 
 begin
   require 'ap' #try to load awesome_print for nice json output
@@ -13,21 +14,21 @@ HighLine.track_eof = false #hotfix to make highline work
 class OauthCli
 
   attr_reader :options
-  
+
   def initialize(profile = nil)
     @options = {}
     connect(profile)
   end
-  
+
   def connect(profile)
     return false if !profile.is_a?(Hash) && !OauthCli.profiles[profile]
     @options = OauthCli.profiles[profile] || profile
-    
+
     #add http if missing
     [:host, :reg_url, :auth_url].each do |key|
       @options[key] = "http://#{@options[key]}" unless @options[key] =~ /^http/
     end
-    
+
     @consumer     = OAuth::Consumer.new(@options[:consumer_key], @options[:consumer_secret], :site => @options[:host])
     @access_token = OAuth::AccessToken.new(@consumer, @options[:token], @options[:token_secret]) if @options[:token]
 
@@ -38,7 +39,7 @@ class OauthCli
     # TODO check if host available?
     @options[:consumer_key] && @options[:consumer_secret] && @options[:host]
   end
-  
+
   def auth?
     @access_token
   end
@@ -48,12 +49,12 @@ class OauthCli
     @options[:auth_url] ||= "#{@options[:host].gsub('api.', 'www.').gsub('v1/', '')}/mobile/authorize" #That's for Qype only!!
     url = "#{@options[:auth_url]}?oauth_token=#{@request_token.token}"
   end
-  
+
   def access_token(verifier)
     request_url unless @request_token
     @access_token = @request_token.get_access_token({}, "oauth_verifier" => verifier)
   end
-  
+
   def request(method, uri, body = nil)
     unless %w(get post put delete).include? method.to_s
       say_message "Wrong HTTP Method: #{method}  - calling #{@options[:host]}#{uri}", 'RED'
@@ -62,8 +63,8 @@ class OauthCli
 
     uri  = ask_prompt "request uri" if !uri
     body = ask_prompt "request body" if !body && (method == "post" || method == "put")
-    
-    url = @options[:host] + uri
+
+    url = @options[:host] + uri.match(/^\/?(.+)/)[1] #removes trailing slash
 
     @options[:mime_type]    ||= (url =~ /\.json/) ? "application/json" : "application/xml"
     @options[:content_type] ||= (url =~ /\.json/) ? "application/json" : "application/xml"
@@ -73,7 +74,7 @@ class OauthCli
     header = response.header
 
     color = (response.code.to_i < 400) ? 'GREEN' : 'RED'
-    say_message "Status: #{header.code} #{header.message}  - calling #{@options[:host]}#{uri}", color
+    say_message "Status: #{header.code} #{header.message}  - calling #{url}", color
 
     body = response.body
     if header.content_type =~ /json/
@@ -87,17 +88,17 @@ class OauthCli
   end
 
   ####### Static Setup Mehtods
-  
+
   def self.inialize
     @profiles || {}
   end
-  
+
   def self.load_profiles(cfg_file, tmp_file)
     @cfg_file = cfg_file #keep so we can save back to file
     @profiles = load(cfg_file)
     @templates = load(tmp_file)
   end
-  
+
   def self.save_profiles
     return unless @cfg_file
     File.open(@cfg_file, 'w') do |out|
@@ -109,7 +110,7 @@ class OauthCli
     @profiles[name] = values
     name
   end
-    
+
   def self.profiles
     @profiles || {}
   end
@@ -126,43 +127,43 @@ class OauthCli
       next last_arg = $1.to_sym if kv =~ /^-?-(.+)$/          #catches --param
       false
     end
-    
+
     profile = opt.delete(:profile) || opt.delete(:p)
 
     if !@profiles[profile] && opt.any?
       profile ||= 'commandline'
       @profiles[profile] = opt
       save_profiles unless profile == 'commandline'
-    end        
-      
+    end
+
     if !@profiles[profile] && @default_profile
       profile = @default_profile
       say "Using default profile: #{profile}"
     end
-    
+
     if profile && !@profiles[profile]
       say_error "Profile #{profile} not found"
       profile = nil
     end
-    
+
     [method, uri, body, profile]
   end
-  
+
   private
   def self.load(file)
     hash = YAML.load_file(file) if File.exists?(file)
     return {} unless hash.is_a?(Hash)
-    
+
     #symbolises keys and finde default profile
     hash.each do |profile, options|
-      options.keys.each do |key| 
+      options.keys.each do |key|
         hash[profile][key.to_sym] = hash[profile].delete(key)
         @default_profile = profile if key.to_sym == :default
       end
     end
     hash
   end
-  
+
 end
 
 
@@ -177,5 +178,5 @@ def say_error(error)
 end
 
 def ask_prompt(question)
-  ask " |-- #{question} >> "  
+  ask " |-- #{question} >> "
 end

data/oauth-cli.gemspec

@@ -2,24 +2,24 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth-cli}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   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/ted/.ssh/gem-public_cert.pem"]
-  s.date = %q{2010-06-09}
+  s.cert_chain = ["/Users/tobi/.ssh/gem-public_cert.pem"]
+  s.date = %q{2010-09-04}
   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}
   s.executables = ["oauthc"]
   s.extra_rdoc_files = ["CHANGELOG", "README.rdoc", "bin/oauthc", "lib/oauth_cli.rb"]
-  s.files = ["CHANGELOG", "Manifest", "README.rdoc", "Rakefile", "bin/oauthc", "lib/oauth_cli.rb", "oauth-cli.gemspec", "profiles.yaml", "test/helper.rb", "test/test_oauth_cli.rb", "test/test_oauthc.rb"]
+  s.files = ["CHANGELOG", "Manifest", "README.rdoc", "Rakefile", "bin/oauthc", "completion", "lib/oauth_cli.rb", "oauth-cli.gemspec", "profiles.yaml", "test/helper.rb", "test/test_oauth_cli.rb", "test/test_oauthc.rb"]
   s.homepage = %q{http://github.com/rngtng/oauth-cli}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Oauth-cli", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{oauth-cli}
-  s.rubygems_version = %q{1.3.6}
-  s.signing_key = %q{/Users/ted/.ssh/gem-private_key.pem}
+  s.rubygems_version = %q{1.3.7}
+  s.signing_key = %q{/Users/tobi/.ssh/gem-private_key.pem}
   s.summary = %q{A simple CLI client to test your oauth API easily}
   s.test_files = ["test/test_oauth_cli.rb", "test/test_oauthc.rb"]
 
@@ -27,16 +27,18 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<highline>, [">= 1.5.1"])
       s.add_runtime_dependency(%q<json>, [">= 1.1.9"])
       s.add_runtime_dependency(%q<oauth>, [">= 0.3.6"])
+      s.add_runtime_dependency(%q<launchy>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
     else
       s.add_dependency(%q<highline>, [">= 1.5.1"])
       s.add_dependency(%q<json>, [">= 1.1.9"])
       s.add_dependency(%q<oauth>, [">= 0.3.6"])
+      s.add_dependency(%q<launchy>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<echoe>, [">= 0"])
     end
@@ -44,6 +46,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<highline>, [">= 1.5.1"])
     s.add_dependency(%q<json>, [">= 1.1.9"])
     s.add_dependency(%q<oauth>, [">= 0.3.6"])
+    s.add_dependency(%q<launchy>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<echoe>, [">= 0"])
   end

data/profiles.yaml

@@ -7,3 +7,8 @@ qype:
   :host:            api.qype.com/v1
   :reg_url:         www.qype.com/api_consumers
   :auth_url:        www.qype.com/mobile/authorize
+
+soundcloud:
+  :host:            https://api.soundcloud.com/
+  :reg_url:         http://soundcloud.com/you/apps
+  :auth_url:        http://soundcloud.com/oauth/authorize

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oauth-cli
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - rngtng - Tobias Bielohlawek
@@ -34,16 +35,18 @@ cert_chain:
   I5mOkC+DmQeKRCyukHoWnysL5IyK+l7JEPymkOlNWkl006u5rNu/d7LJJW19+ZvC
   -----END CERTIFICATE-----
 
-date: 2010-06-09 00:00:00 +02:00
-default_executable: oauthc
+date: 2010-09-04 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 5
@@ -55,9 +58,11 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 1
@@ -69,9 +74,11 @@ dependencies:
   name: oauth
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 0
         - 3
@@ -80,29 +87,47 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: launchy
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: echoe
+  name: mocha
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: echoe
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: A simple CLI client to test your oauth API easily
 email: tobi @nospam@ rngtng.com
 executables: 
@@ -120,6 +145,7 @@ files:
 - README.rdoc
 - Rakefile
 - bin/oauthc
+- completion
 - lib/oauth_cli.rb
 - oauth-cli.gemspec
 - profiles.yaml
@@ -141,16 +167,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
       segments: 
       - 1
       - 2
@@ -158,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: oauth-cli
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A simple CLI client to test your oauth API easily