oauth-cli 0.0.5 → 0.0.6

data/CHANGELOG

@@ -1,7 +1,24 @@
 // planned: 0.0.X
 // ---------------------------
 // on exit, ask if connection data should be saved to profile
-// show list of example profiles
+
+0.0.6
+---------------------------
+updated & cleanedup profile managment
+introduced profile creator to setup new profiles easily
+updated first journey UX: start profile creator if no profile avail and no params given
+added preset auth profiles for Qype, Twitter
+better support for getting authkeys with auto save to current profile
+streamlined output messages and prompts
+
+
+0.0.5
+---------------------------
+show list of example profiles
+equalsign for params is now optional (e.g. 'oauthc -p bbc' now works )
+show auth token and secret after successful auth
+updated config params
+
 
 0.0.4
 ---------------------------
@@ -9,6 +26,7 @@ introduced easy auth (by now for Qype API only)
 added tests
 "http://" for any host options got optional
 
+
 0.0.3
 ---------------------------
 minor fix to resolve dependencies 

data/Manifest

@@ -5,6 +5,7 @@ Rakefile
 bin/oauthc
 lib/oauth_cli.rb
 oauth-cli.gemspec
+profiles.yaml
 test/helper.rb
 test/test_oauth_cli.rb
 test/test_oauthc.rb

data/README.rdoc

@@ -11,7 +11,7 @@ oauthc [options] [http_method_verb uri [body]]
 
 Options:
   --help             Display this message
-  --profile          Name of preset profile to load, put profiles to a .yml file in ~/.oauthconfig
+  --profile          Name of preset profile to load, put profiles to a yaml file in ~/.oauthconfig
   --host             Host to connect to
   --consumer_key     Consumer Key
   --consumer_secret  Consumer Secret
@@ -54,18 +54,15 @@ 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")
 
-
 * Bug reports, suggestions, updates: http://github.com/rngtng/oauth-cli/issues
 
 
 == Todos
-* save given keys to config, e.g. introduce 'save' command
-* go into config mode, if no profiles found and no params specified
-* better support for getting authkeys
+* check if host is valid
 * testing + better docs
 * check oauth client, streamline!?
 * add autocomplete for interactive commands
-* add auth profiles for Qype, Twitter etc!?
+* profile delete and rename
 
 == FAQ
 

data/Rakefile

@@ -2,12 +2,12 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('oauth-cli', '0.0.5') do |p|
+Echoe.new('oauth-cli', '0.0.6') 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"]
+  p.development_dependencies = ["mocha >=0", "echoe >=0"]
   p.runtime_dependencies = ["highline >=1.5.1", "json >=1.1.9", "oauth >=0.3.6"]
 end

data/bin/oauthc

@@ -2,24 +2,25 @@
 
 require 'rubygems'
 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
 
-CFG_FILE = ENV['OAUTHC_CONFIG_FILE'] || File.expand_path('~/.oauthconfig')
-
-#http://api.betterbecool.com/v1/places/1197081
+PROFILE_CFG_FILE = ENV['OAUTHC_CONFIG_FILE'] || File.expand_path('~/.oauthconfig')
+PROFILE_TMP_FILE = "#{File.dirname(File.dirname(File.expand_path(__FILE__)))}/profiles.yaml"
 
 def show_help
   say <<-help
-oauthc version 0.0.5
+oauthc version 0.0.6
 Usage: oauthc [options] [http_method_verb uri [body]]
 
 Options:
   --help             Display this message
-  --profile          Name of preset profile to load, put profiles to a .yml file in ~/.oauthconfig
+  --profile          Name of preset profile to load, put profiles to a yaml file in ~/.oauthconfig
   --host             Host to connect to
   --consumer_key     Consumer Key
   --consumer_secret  Consumer Secret
@@ -56,46 +57,59 @@ if ARGV.any? { |arg| %w(-h --help -help help).include?(arg) }
   show_help
 end
 
-#parse CLI input
-method, uri, body, opt, profile = OauthCli.parse_args(ARGV)
-
-@profiles = YAML.load_file(CFG_FILE) if File.exists?(CFG_FILE)
-
-#find default profile
-if @profiles && (profile.nil? || @profiles[profile].nil?)
-  @profiles.each do |key, values|
-    profile = key if values['default']
-  end
-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}' %>"
+### Read profiles
+OauthCli.load_profiles(PROFILE_CFG_FILE, PROFILE_TMP_FILE)
+
+### parse CLI input
+method, uri, body, profile = OauthCli.parse_args(ARGV)
+
+### Create client
+@client = OauthCli.new(profile)
+
+if !@client.connected?
+  say_message("Welcome to Oauth Commandline Client.", 'YELLOW') 
+    
+  #give profile selection
+  if OauthCli.profiles.keys.any?
+    profile = choose do |menu|
+      menu.header = "Choose profile to load"
+      menu.prompt = ">> "
+      menu.choices(*(OauthCli.profiles.keys << 'create new') )
+    end
+    @client.connect(profile) unless profile == 'create new'
   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
-
-@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?
+  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]
+    
+    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
 end
 
-#    unless cfg_options[profile]
-#      say " <%= color('#  ERROR: Profile #{profile} not found', RED) %>"
-#      show_help
-#    end
-#
-
-######## CREATE client
-
-@client = OauthCli.new(opt)
-
 if method && uri
   @client.request(method, uri, body)
   exit
@@ -103,7 +117,7 @@ end
 
 ######## START Interactive mode
 
-## following lines are shameless stolen from repl ->  http://http://github.com/defunkt/repl
+## 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 !~ /^-/ }
@@ -133,17 +147,38 @@ if !ENV['__REPL_WRAPPED'] && system("which rlwrap > /dev/null 2> /dev/null")
   exec "rlwrap #{rlargs} #$0 #{ARGV.join(' ')}"
 end
 
+prompt = ENV['REPL_PROMPT'] || "#{profile} >>"
 
 loop do
-  print ENV['REPL_PROMPT'] || "#{opt[:name] || profile} >> "
-
   begin
-    command, uri, body = $stdin.gets.chomp.split(' ')
+    input = ask "<%= color('#{prompt}', BOLD) %> "
+    command, uri, body = input.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)
+    if command =~ /auth/
+      say_message "Starting Authorization", 'YELLOW'
+      say "\n"
+      say " <%= 'Go to ' + color('#{@client.access_request_url}', BOLD, UNDERLINE) + ' to retrieve token verifier' %>\n\n"
+      verifier = ask_prompt "verifier"
+
+      begin
+        @access_token = @client.access_token(verifier)
+        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      
+    else
+      @client.request(command, uri, body)
+    end
+    
     next
   rescue NoMethodError, Interrupt
     #save_config unless profile

data/lib/oauth_cli.rb

@@ -1,6 +1,7 @@
 require 'highline/import'
 require 'oauth'
 require 'json'
+require 'yaml'
 
 begin
   require 'ap' #try to load awesome_print for nice json output
@@ -13,18 +14,14 @@ class OauthCli
 
   attr_reader :options
   
-  def initialize(options = {})
-    @options = options
-
-    if options[:consumer_key].to_s.empty?
-      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('# -------------------------------------------------------------------------', #{color}) %>"
-      #please get a key here: #{options[:host]}/api_consumers"
-      return
-    end
+  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|
@@ -33,59 +30,38 @@ class OauthCli
     
     @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]
+
+    connected?
   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))]
+  def connected?
+    # TODO check if host available?
+    @options[:consumer_key] && @options[:consumer_secret] && @options[:host]
+  end
+  
+  def auth?
+    @access_token
   end
 
+  def access_request_url
+    @request_token = @consumer.get_request_token({}, "oauth_callback" => "oob")
+    @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)
-    if method =~ /auth/
-      @request_token = @consumer.get_request_token({}, "oauth_callback" => "oob")
-      @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_url]}?oauth_token=#{@request_token.token}', BOLD, UNDERLINE) %>\n"
-      say " <%= color('#  ... and enter given token verifier:', #{color}) %>"
-      verifier = ask " |-- verifier >> "
-
-      begin
-        @access_token = @request_token.get_access_token({}, "oauth_verifier" => verifier)
-
-        @options[:token] = @access_token.token
-        @options[:token_secret] = @access_token.secret
-
-        color = 'GREEN'
-        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}) %>"
-        say " <%= color('# Authorization FAILED', BOLD, #{color}) %>"
-        say " <%= color('# -------------------------------------------------------------------------', #{color}) %>"
-      end
-      return
-    end
-
     unless %w(get post put delete).include? method.to_s
-      color = 'RED'
-      say " <%= color('# -------------------------------------------------------------------------', #{color}) %>"
-      say " <%= color('# Wrong HTTP Method: #{method}  - calling #{@options[:host]}#{uri}', BOLD, #{color}) %>"
-      say " <%= color('# -------------------------------------------------------------------------', #{color}) %>"
+      say_message "Wrong HTTP Method: #{method}  - calling #{@options[:host]}#{uri}", 'RED'
       return
     end
 
-    uri  = ask " |-- request uri >> " if !uri
-    body = ask " |-- request body >> " if !body && (method == "post" || method == "put")
+    uri  = ask_prompt "request uri" if !uri
+    body = ask_prompt "request body" if !body && (method == "post" || method == "put")
     
     url = @options[:host] + uri
 
@@ -97,9 +73,7 @@ class OauthCli
     header = response.header
 
     color = (response.code.to_i < 400) ? 'GREEN' : 'RED'
-    say " <%= color('# -------------------------------------------------------------------------', #{color}) %>"
-    say " <%= color('# Status: #{header.code} #{header.message}  - calling #{@options[:host]}#{uri}', BOLD, #{color}) %>"
-    say " <%= color('# -------------------------------------------------------------------------', #{color}) %>"
+    say_message "Status: #{header.code} #{header.message}  - calling #{@options[:host]}#{uri}", color
 
     body = response.body
     if header.content_type =~ /json/
@@ -112,4 +86,96 @@ class OauthCli
     say body
   end
 
-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|
+       YAML.dump(@profiles, out)
+    end
+  end
+
+  def self.add_profile(name, values)
+    @profiles[name] = values
+    name
+  end
+    
+  def self.profiles
+    @profiles || {}
+  end
+
+  def self.templates
+    @templates || {}
+  end
+
+  def self.parse_args(args, opt = {}, last_arg = nil)
+    @profiles ||= {}
+    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
+    
+    profile = opt.delete(:profile) || opt.delete(:p)
+
+    if !@profiles[profile] && opt.any?
+      profile ||= 'commandline'
+      @profiles[profile] = opt
+      save_profiles unless profile == 'commandline'
+    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| 
+        hash[profile][key.to_sym] = hash[profile].delete(key)
+        @default_profile = profile if key.to_sym == :default
+      end
+    end
+    hash
+  end
+  
+end
+
+
+def say_message(message, color = 'WHITE')
+  say "<%= color('# -------------------------------------------------------------------------', #{color}) %>"
+  say "<%= color('# #{message}', BOLD, #{color} ) %>"
+  say "<%= color('# -------------------------------------------------------------------------', #{color}) %>"
+end
+
+def say_error(error)
+  say_message "ERROR: #{error}", 'RED'
+end
+
+def ask_prompt(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.5"
+  s.version = "0.0.6"
 
   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-28}
+  s.cert_chain = ["/Users/ted/.ssh/gem-public_cert.pem"]
+  s.date = %q{2010-06-09}
   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", "test/helper.rb", "test/test_oauth_cli.rb", "test/test_oauthc.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.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/tobiasb/.ssh/gem-private_key.pem}
+  s.signing_key = %q{/Users/ted/.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"]
 
@@ -32,16 +32,19 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<json>, [">= 1.1.9"])
       s.add_runtime_dependency(%q<oauth>, [">= 0.3.6"])
       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<mocha>, [">= 0"])
+      s.add_dependency(%q<echoe>, [">= 0"])
     end
   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<mocha>, [">= 0"])
+    s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/profiles.yaml

@@ -0,0 +1,9 @@
+twitter:
+  :host:            https://twitter.com/
+  :reg_url:         twitter.com/oauth_clients
+  :auth_url:        twitter.com/oauth/authorize
+  
+qype:   
+  :host:            api.qype.com/v1
+  :reg_url:         www.qype.com/api_consumers
+  :auth_url:        www.qype.com/mobile/authorize

data/test/test_oauth_cli.rb

@@ -3,27 +3,38 @@ require 'helper'
 class TestOauthCli < Test::Unit::TestCase 
   
   def test_should_init_oauth
-    opt = {}
-    @client = OauthCli.new(opt)
-    assert @client
+    assert OauthCli.new
   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)
+    assert_equal ['get', '/users?name=test', 'my_body', 'test'], OauthCli.parse_args(args)
+  end
+
+  def test_should_parse_args_with_equal_no_profile
+    args = %w(-host=http://host.com get /users?name=test my_body)
+    assert_equal ['get', '/users?name=test', 'my_body', 'commandline'], 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)
+    assert_equal ['get', '/users?name=test', nil, '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"}
+  def test_should_not_be_connected_on_empty_args
+    assert !OauthCli.new.connected?
+  end
+  
+  def test_should_be_connected
+    assert OauthCli.new( :consumer_key => 'key', :consumer_secret => 'secret', :host => 'host' ).connected?
+  end
+    
+  def test_should_add_http_to_url
+    opt = { :host => "api.bbc.com", :auth_url => "http://test.domain", :reg_url => "https://test.domain", :consumer_key => "dummy_key"}
     @client = OauthCli.new(opt)
     
     assert_equal "http://api.bbc.com", @client.options[:host]
-    assert_equal "http://test.domain", @client.options[:auth_host]
-    assert_equal "https://test.domain", @client.options[:reg_host]
+    assert_equal "http://test.domain", @client.options[:auth_url]
+    assert_equal "https://test.domain", @client.options[:reg_url]
   end  
 end

data/test/test_oauthc.rb

@@ -12,7 +12,12 @@ class TestOauthCli < Test::Unit::TestCase
   end
   
   def _test_should_show_error_on_profile
-    output = `#{@oauthc} -p unknown`
+    require 'highline/import'
+    HighLine.any_instance.stubs(:choose).returns("")
+    
+    OauthCli.stubs(:parse_args).returns(['get', '/asd', '', 'unknown', {}])
+    OauthCli.any_instance.stubs(:request).returns("")
+    load "../bin/oauthc"
     assert output =~ /Profile unknown not found/
   end
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - rngtng - Tobias Bielohlawek
@@ -34,7 +34,7 @@ cert_chain:
   I5mOkC+DmQeKRCyukHoWnysL5IyK+l7JEPymkOlNWkl006u5rNu/d7LJJW19+ZvC
   -----END CERTIFICATE-----
 
-date: 2010-04-28 00:00:00 +02:00
+date: 2010-06-09 00:00:00 +02:00
 default_executable: oauthc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,6 +91,18 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: echoe
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: A simple CLI client to test your oauth API easily
 email: tobi @nospam@ rngtng.com
 executables: 
@@ -110,6 +122,7 @@ files:
 - bin/oauthc
 - lib/oauth_cli.rb
 - oauth-cli.gemspec
+- profiles.yaml
 - test/helper.rb
 - test/test_oauth_cli.rb
 - test/test_oauthc.rb