leif 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d21327777d65dd1e53077d2ee7f800dac2c93a6
-  data.tar.gz: ed6d1bf362b4eaa69bc2ddcc416f9164e7d5022d
+  metadata.gz: 803bf425951a72e2a0a26354c63479fb7a18da26
+  data.tar.gz: 0f024f19bb334ef1a8c21e5211e9407af9082ce1
 SHA512:
-  metadata.gz: 2f8e3aa4056db2da381cb4cad711ed3cc63868457b0cfc3fec1bdc93b98f730632d1a305d1d2868bdb21a769486e9d35c9ec9e1f5b12cfbe485283ec2e6393fc
-  data.tar.gz: 04cb8df37f9aa1cf0410ad4695fde9b601cbb841a4e7574cc639338eab634b2849fac3df64bf616fa5002a67030f3857dee7fcdb2e9ead4f5a4d1a66df3159cd
+  metadata.gz: 81c1c298807283bc86d597974cb3a8f5581182683a7686d772b552d6dd517b37996670a31896b30f13294fb0354f66a727e00b1149a58fe98891d44871ea4c26
+  data.tar.gz: 125bb032ca4e458fd6cc907a34d2312271d32b5869a4a7f36539b5d94a2f1700ae72e4ffa3eaa05f1ff1f93d59284e9fc653525ec817061cc93a9b60262ad580

data/README.md

@@ -67,9 +67,6 @@ $ gem man leif
   - `token` <u>token</u>:
     Authenticate using the given token and reload the current resource.
 
-  - `debug`:
-    Print debug output from the previous HTTP request and response.
-
   - `help`:
     Print available commands.
 

data/bin/leif

@@ -3,7 +3,8 @@ require 'leif/cli'
 require 'leif/collection_json'
 require 'leif/section'
 
-Leif::Cli.new.tap do |cli|
+insecure = !!ARGV.delete('--insecure')
+Leif::Cli.new(ssl_verify: !insecure).tap do |cli|
   cli.get_root
   loop do
     cli.print_overview

data/lib/leif/cli.rb

@@ -1,55 +1,51 @@
-require 'faraday'
-require 'faraday_middleware'
 require 'highline/import'
 require 'json'
-require 'logger'
-require 'stringio'
+require 'leif/connection'
 
 module Leif
   class Cli
-    def conn
-      @conn ||= Faraday.new(url: 'https://api.getcloudapp.com') do |config|
-        config.request  :url_encoded
-        config.response :logger, logger
-        config.response :json, :content_type => /\bjson$/
-        config.adapter  Faraday.default_adapter
-      end
+    ENDPOINT = 'https://api.getcloudapp.com'
+    attr_reader :last_exchange, :connection
+
+    def initialize(connection_options = {})
+      @connection_options = connection_options
+      @connection = Connection.to_url(ENDPOINT, connection_options)
     end
 
-    def logger
-      @logger ||= Logger.new(debug_output)
+    def basic_auth(username, password)
+      @connection = Connection.to_url(ENDPOINT,
+                                      connection_options(username: username,
+                                                         password: password))
     end
 
-    def debug_output
-      @debug_output ||= StringIO.new
+    def token_auth(token)
+      @connection = Connection.to_url(ENDPOINT,
+                                      connection_options(token: token))
     end
 
-    def banner(banner, &message)
-      puts
-      Section.banner(banner, &message)
+    def connection_options(options = {})
+      @connection_options.merge(options)
     end
 
-    def reset_debug_output
-      debug_output.rewind
-      debug_output.truncate 0
+    def request(*args)
+      @last_exchange = connection.request(*args)
     end
 
-    def make_request(uri, data = {}, method = :unset)
-      method = data.empty? ? :get : :post if method == :unset
-      reset_debug_output
-      @response = conn.send(method, uri, data)
+    def banner(banner, &message)
+      puts
+      Section.banner(banner, &message)
     end
 
     def collection
-      Leif::CollectionJson::Collection.new(@response.body)
+      Leif::CollectionJson::Collection.new(last_exchange.response_body)
     end
 
     def get_root
-      make_request '/'
+      request '/'
     end
 
-    def retry_request
-      make_request @response.env[:url].request_uri
+    def reload
+      request last_exchange.uri
     end
 
     def print_overview
@@ -59,21 +55,21 @@ module Leif
       print_links collection
     end
 
-    def request_basic_authentication(username = :ask, password = :ask)
+    def set_basic_auth(username = :ask, password = :ask)
       username = ask('Username: ')                     if username == :ask
       password = ask('Password: ') {|q| q.echo = '*' } if password == :ask
-      conn.basic_auth username, password
-      retry_request
+      basic_auth username, password
+      reload
     end
 
-    def request_token_authentication(token = '2x033S09401z300E')
-      conn.headers['Authorization'] = "Token token=#{token.inspect}"
-      retry_request
+    def set_token_auth(token = '2x033S09401z300E')
+      token_auth token
+      reload
     end
 
     def follow_link(subject, relation = :ask)
       relation = ask('Relation: ') if relation == :ask
-      make_request subject.link_href(relation)
+      request subject.link_href(relation)
     end
 
     def fill_and_submit_template(template, label)
@@ -88,7 +84,7 @@ module Leif
         template  = template.fill_field name, new_value
       end
 
-      make_request template.href, template.convert_to_json, template.method
+      request template.href, template.convert_to_json, template.method
     end
 
     def create_item
@@ -103,8 +99,8 @@ module Leif
 
     def print_request
       banner 'Request' do |out|
-        out.print "#{@response.env[:method].upcase} #{@response.env[:url]}"
-        out.print @response.env[:request_headers].map {|header, value|
+        out.print "#{last_exchange.method} #{last_exchange.uri}"
+        out.print last_exchange.request_headers.map {|header, value|
           "#{header}: #{value}"
         }
       end
@@ -112,7 +108,7 @@ module Leif
 
     def print_response
       banner 'Response' do |out|
-        out.print @response.headers.map {|header, value|
+        out.print last_exchange.response_headers.map {|header, value|
           "#{header}: #{value}"
         }
       end
@@ -120,7 +116,7 @@ module Leif
 
     def print_body
       banner 'Body' do |out|
-        out.print JSON.pretty_generate(@response.body).lines
+        out.print JSON.pretty_generate(last_exchange.response_body).lines
       end
     end
 
@@ -171,13 +167,6 @@ module Leif
       end
     end
 
-    def print_debug
-      banner 'Debug' do |out|
-        debug_output.rewind
-        out.print debug_output.readlines
-      end
-    end
-
     def print_help
       banner 'Help' do |out|
         out.print <<EOS.lines
@@ -210,9 +199,6 @@ basic [<username> [<password>]]:
 token <token>:
   Authenticate using the given token and reload the current resource.
 
-debug:
-  Print debug output from the previous HTTP request and response.
-
 quit:
   Exit leif.
 EOS
@@ -258,7 +244,8 @@ EOS
     def get_next_action
       command, args = ask_for_action
       case command
-      when 'r', 'root'   then get_root
+      when      'root'   then get_root
+      when      'reload' then reload
       when 'f', 'follow' then follow_link(collection, *args)
       when      'create' then create_item
 
@@ -269,10 +256,9 @@ EOS
       when 'template'    then print_template;   get_next_action
       when 'items'       then print_items
 
-      when 'b', 'basic'  then request_basic_authentication(*args)
-      when 't', 'token'  then request_token_authentication(*args)
+      when 'b', 'basic'  then set_basic_auth(*args)
+      when 't', 'token'  then set_token_auth(*args)
 
-      when 'd', 'debug'  then print_debug; get_next_action
       when '?', 'help'   then print_help; get_next_action
       when 'q', 'quit'   then exit
       else puts 'Try again.'; get_next_action

data/lib/leif/connection.rb

@@ -0,0 +1,69 @@
+require 'faraday'
+require 'faraday_middleware'
+
+module Leif
+  class Connection
+    attr_reader :connection
+
+    def initialize(connection)
+      @connection = connection
+    end
+
+    def self.to_url(url, options = {})
+      connection = default_connection(url, options)
+      if options.has_key?(:username) and options.has_key?(:password)
+        connection.basic_auth options.fetch(:username),
+                              options.fetch(:password)
+      elsif options.has_key?(:token)
+        connection.token_auth options.fetch(:token)
+      end
+      new(connection)
+    end
+
+    def self.default_connection(url, options = {})
+      ssl_verify = options.fetch(:ssl_verify, true)
+      Faraday.new(url: url, ssl: { verify: ssl_verify }) do |config|
+        config.request  :url_encoded
+        config.response :json, :content_type => /\bjson$/
+        config.adapter  Faraday.default_adapter
+      end
+    end
+
+    def request(path, data = {}, method = :unset)
+      method = data.empty? ? :get : :post if method == :unset
+      Exchange.new(connection.send(method, path, data))
+    end
+
+    class Exchange
+      attr_reader :exchange
+
+      def initialize(exchange)
+        @exchange = exchange
+      end
+
+      def method
+        exchange.env[:method].upcase
+      end
+
+      def uri
+        exchange.env[:url].request_uri
+      end
+
+      def request_headers
+        exchange.env[:request_headers]
+      end
+
+      def request_body
+        exchange.env[:body]
+      end
+
+      def response_headers
+        exchange.headers
+      end
+
+      def response_body
+        exchange.body
+      end
+    end
+  end
+end

data/lib/leif/version.rb

@@ -1,3 +1,3 @@
 module Leif
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/man/leif.1

@@ -19,6 +19,10 @@
 Go back to the root\.
 .
 .TP
+\fBreload\fR
+Make a GET request to the last request URI\.
+.
+.TP
 \fBfollow\fR \fIrel\fR
 Follow link with the relation \fIrel\fR on the collection or selected item\.
 .
@@ -67,10 +71,6 @@ Authenticate with HTTP Basic and reload the current resource\. Will be prompted
 Authenticate using the given token and reload the current resource\.
 .
 .TP
-\fBdebug\fR
-Print debug output from the previous HTTP request and response\.
-.
-.TP
 \fBhelp\fR
 Print available commands\.
 .

data/man/leif.1.html

@@ -91,6 +91,7 @@ programs.</p>
 
 <dl>
 <dt class="flush"><code>root</code></dt><dd><p>Go back to the root.</p></dd>
+<dt class="flush"><code>reload</code></dt><dd><p>Make a GET request to the last request URI.</p></dd>
 <dt><code>follow</code> <var>rel</var></dt><dd><p>Follow link with the relation <var>rel</var> on the collection or selected item.</p></dd>
 <dt class="flush"><code>create</code></dt><dd><p>Begin editing the template to create a new item.</p></dd>
 <dt class="flush"><code>update</code></dt><dd><p>Begin editing the template to update the item selected with <code>items</code>.</p></dd>
@@ -105,7 +106,6 @@ or <code>follow</code> an item's link.</p></dd>
 <dt><code>basic</code> [<var>username</var> [<var>password</var>]]</dt><dd><p>Authenticate with HTTP Basic and reload the current resource. Will be
 prompted for username and password if omitted.</p></dd>
 <dt><code>token</code> <var>token</var></dt><dd><p>Authenticate using the given token and reload the current resource.</p></dd>
-<dt class="flush"><code>debug</code></dt><dd><p>Print debug output from the previous HTTP request and response.</p></dd>
 <dt class="flush"><code>help</code></dt><dd><p>Print available commands.</p></dd>
 <dt class="flush"><code>quit</code></dt><dd><p>Exit <code>leif</code>.</p></dd>
 </dl>

data/man/leif.1.ronn

@@ -15,6 +15,9 @@ programs.
   - `root`:
     Go back to the root.
 
+  - `reload`:
+    Make a GET request to the last request URI.
+
   - `follow` <rel>:
     Follow link with the relation <rel> on the collection or selected item.
 
@@ -53,9 +56,6 @@ programs.
   - `token` <token>:
     Authenticate using the given token and reload the current resource.
 
-  - `debug`:
-    Print debug output from the previous HTTP request and response.
-
   - `help`:
     Print available commands.
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leif
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Larry Marburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -93,6 +93,7 @@ files:
 - bin/leif
 - lib/leif/cli.rb
 - lib/leif/collection_json.rb
+- lib/leif/connection.rb
 - lib/leif/section.rb
 - lib/leif/version.rb
 - man/leif.1