razor-client 0.15.1 → 0.16.0

data/lib/razor/cli/parse.rb

@@ -18,12 +18,12 @@ module Razor::CLI
           @dump = true
         end
 
-        opts.on "-f", "--full", "Show full details when viewing entities" do
-          @format = 'full'
+        opts.on "-a", "--api", "Show API help for a command" do
+          @api_help = true
         end
 
-        opts.on "-s", "--short", "Show shortened details when viewing entities" do
-          @format = 'short'
+        opts.on "-k", "--insecure", "Allow SSL connections without verified certificates" do
+          @verify_ssl = false
         end
 
         opts.on "-u", "--url URL",
@@ -93,6 +93,10 @@ ERR
       !!@show_version
     end
 
+    def show_api_help?
+      !!@api_help
+    end
+
     def show_help?
       !!@option_help
     end
@@ -105,12 +109,21 @@ ERR
       !!@dump
     end
 
-    attr_reader :api_url, :format, :args
+    def verify_ssl?
+      !!@verify_ssl
+    end
+
+    attr_reader :api_url, :args
+    # The format can be determined from later segments.
+    attr_accessor :format, :stripped_args
 
     def initialize(args)
       parse_and_set_api_url(ENV["RAZOR_API"] || DEFAULT_RAZOR_API, :env)
       @args = args.dup
+      # To be populated externally.
+      @stripped_args = []
       @format = 'short'
+      @verify_ssl = true
       @args = get_optparse.order(@args)
       @args = set_help_vars(@args)
       if @args == ['version'] or @show_version
@@ -150,6 +163,9 @@ ERR
     private
     def parse_and_set_api_url(url, source)
       begin
+        unless url.start_with?('http:') or url.start_with?('https:')
+          raise Razor::CLI::InvalidURIError.new(url, source)
+        end
         @api_url = URI.parse(url)
       rescue URI::InvalidURIError => e
         raise Razor::CLI::InvalidURIError.new(url, source)

data/lib/razor/cli/query.rb

@@ -0,0 +1,68 @@
+class Razor::CLI::Query
+  def initialize(parse, navigate, collections, segments)
+    @parse = parse
+    @navigate = navigate
+    @collections = collections
+    @segments = segments
+    @stripped_segments = []
+    @options = {}
+  end
+
+  def stripped_segments
+    @stripped_segments.join
+  end
+
+  def get_optparse(doc, nav)
+    # If the last document is an Array, we need to find
+    # which element matches the given query. Once found,
+    # return the 'params' section, if it has one.
+    if doc.is_a?(Array)
+      query = doc.find {|coll| coll['name'] == nav}
+      params = (query && query['params']) || {}
+    elsif doc.is_a?(Hash)
+      params = (doc[nav] && doc[nav]['params']) || {}
+    end
+    @queryoptparse = OptionParser.new do |opts|
+      opts.on "-f", "--full", "Show full details when viewing entities" do
+        @parse.format = 'full'
+      end
+
+      opts.on "-s", "--short", "Show shortened details when viewing entities" do
+        @parse.format = 'short'
+      end
+
+      params.each do |param, args|
+        if args['type'] == 'boolean'
+          opts.on "--#{param}" do
+            @options[param] = true
+          end
+        else
+          opts.on "--#{param} VALUE" do |value|
+            @options[param] = value
+          end
+        end
+      end
+    end
+  end
+
+  def run
+    @doc = @collections
+    while @segments.any?
+      nav = @segments.shift
+      @parse.stripped_args << nav
+      @segments = get_optparse(@doc, nav).order(@segments)
+      @doc = @navigate.move_to nav, @doc, @options
+    end
+
+    # Get the next level if it's a list of objects.
+    if @doc.is_a?(Hash) and @doc['items'].is_a?(Array)
+      # Cache doc_resource since these queries are just for extra detail.
+      temp_doc_resource = @navigate.doc_resource
+      @doc['items'] = @doc['items'].map do |item|
+        item.is_a?(Hash) && item.has_key?('id') ? @navigate.json_get(URI.parse(item['id'])) : item
+      end
+      @navigate.doc_resource = temp_doc_resource
+    end
+    @doc
+  end
+end

data/lib/razor/cli/table_format.rb

@@ -0,0 +1,41 @@
+require 'command_line_reporter'
+class Razor::CLI::TableFormat
+  include CommandLineReporter
+
+  def run(doc, column_overrides)
+    suppress_output
+    table(:border => true, :encoding => :ascii) do
+      headings = (column_overrides or get_headers(doc))
+      row do
+        headings.each do |header|
+          column(header, :width => get_width(header, doc))
+        end
+      end
+      doc.each do |page|
+        row do
+          headings.each do |heading|
+            column(page[heading])
+          end
+        end
+      end
+    end
+    # Capturing stores the string, rather than printing to STDOUT (default).
+    capture_output.strip
+  end
+
+  def get_width(header, doc)
+    (doc.map do |page|
+      (page[header] or '').to_s.length
+    end << header.to_s.length).max
+  end
+
+  def get_headers(doc)
+    [].tap do |headers|
+      doc.map do |page|
+        page.map do |item|
+          headers << item[0] unless headers.include?(item[0])
+        end
+      end
+    end
+  end
+end

data/lib/razor/cli/transforms.rb

@@ -26,6 +26,10 @@ module Razor::CLI
     def name(obj)
       obj ? obj['name'] : "---"
     end
+    def name_hide_nil(obj)
+      raise Razor::CLI::HideColumnError if obj.nil?
+      obj['name']
+    end
     def name_if_present(obj)
       obj ? obj['name'] : "---"
     end
@@ -38,5 +42,19 @@ module Razor::CLI
     def count_hash(hash)
       hash.is_a?(Hash) ? hash.keys.size : 0
     end
+    def event_msg(obj)
+      raise Razor::CLI::HideColumnError if obj['msg'].nil?
+      obj['msg'][0..50] + ('...' if obj['msg'].size > 50) if obj['msg']
+    end
+    def full_event_msg(obj)
+      raise Razor::CLI::HideColumnError if obj['msg'].nil?
+      obj['msg']
+    end
+    def event_entities(hash)
+      shallow_hash(Hash[hash].keep_if {|k,_| ['task', 'policy', 'broker', 'repo', 'node', 'command'].include?(k)})
+    end
+    def event_misc(hash)
+      shallow_hash(Hash[hash].delete_if {|k,_|['task', 'policy', 'broker', 'repo', 'node', 'msg', 'command'].include?(k)})
+    end
   end
 end

data/lib/razor/cli/version.rb

@@ -18,7 +18,7 @@ module Razor
     #
     # The next line is the one that our packaging tools modify, so please make
     # sure that any change to it is discussed and agreed first.
-    version = '0.15.1'
+    version = '0.16.0'
 
     if version == "DEVELOPMENT"
       root = File.expand_path("../../..", File.dirname(__FILE__))

data/lib/razor/cli/views.yaml

@@ -9,6 +9,7 @@
 # `+show`: This section configures which attributes are shown in the output.
 # `+layout`: This configures whether to use 'list' or 'table' output.
 # `+column`: This changes which column is used in the field formatting.
+# `+format`: This references a method inside `transforms.rb` which will mutate the column's value.
 collections:
   brokers:
     +short:
@@ -194,3 +195,40 @@ collections:
             +format: count
           status:
           submitted_at:
+  events:
+    +short:
+      +layout: table
+      +show:
+        name:
+        timestamp:
+        message:
+          +column: entry
+          +format: event_msg
+        entities:
+          +column: entry
+          +format: event_entities
+        entry:
+          +column: entry
+          +format: event_misc
+    member:
+      +short:
+        +show:
+          name:
+          timestamp:
+          message:
+            +column: entry
+            +format: full_event_msg
+          broker:
+            +format: name_hide_nil
+          node:
+            +format: name_hide_nil
+          policy:
+            +format: name_hide_nil
+          repo:
+            +format: name_hide_nil
+          command:
+            +format: name_hide_nil
+          task:
+            +format: name_hide_nil
+          entry:
+            +format: event_misc

data/lib/razor/cli.rb

@@ -19,7 +19,7 @@ module Razor
         when :env
           super "URL '#{url}' in ENV variable RAZOR_API is not valid"
         when :opts
-          super "URL '#{url}' provided by -U or --url is not valid"
+          super "URL '#{url}' provided by -u or --url is not valid"
         else
           super "URL '#{url}' is not valid"
         end
@@ -39,6 +39,9 @@ require_relative 'cli/version'
 require_relative 'cli/navigate'
 require_relative 'cli/parse'
 require_relative 'cli/format'
+require_relative 'cli/table_format'
 require_relative 'cli/document'
 require_relative 'cli/views'
-require_relative 'cli/transforms'
+require_relative 'cli/transforms'
+require_relative 'cli/query'
+require_relative 'cli/command'

data/spec/cli/format_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 # Needed to make the client work on Ruby 1.8.7
 unless Kernel.respond_to?(:require_relative)
   module Kernel
@@ -14,7 +15,8 @@ describe Razor::CLI::Format do
   include described_class
 
   def format(doc, args = {})
-    args = {:format => 'short', :args => ['something', 'else'], :query? => true, :show_command_help? => false}.merge(args)
+    args = {:format => 'short', :stripped_args => ['something', 'else'], :query? => true, :show_command_help? => false,
+        :show_api_help? => false}.merge(args)
     parse = double(args)
     format_document doc, parse
   end
@@ -86,14 +88,102 @@ describe Razor::CLI::Format do
              "items"=>[{'a' => 'b', 'c' => 'd'},
                        {'b' => 'c', 'e' => 'f'}]}
       result = format doc
-      result.should == <<-OUTPUT.rstrip
+      result.should ==
+          # The framework seems to be adding unnecessary spaces at the end of each data line;
+          # Working around this by adding \s to the expectation.
+
+          # Unicode:
+#┏━━━┳━━━┳━━━┳━━━┓
+#┃ a ┃ c ┃ b ┃ e ┃\s
+#┣━━━╊━━━╊━━━╊━━━┫
+#┃ b ┃ d ┃   ┃   ┃\s
+#┣━━━╊━━━╊━━━╊━━━┫
+#┃   ┃   ┃ c ┃ f ┃\s
+#┗━━━┻━━━┻━━━┻━━━┛
+          # ASCII:
+          <<-OUTPUT.rstrip
++---+---+---+---+
+| a | c | b | e |\s
 +---+---+---+---+
-| a | c | b | e |
+| b | d |   |   |\s
 +---+---+---+---+
-| b | d |   |   |
-|   |   | c | f |
+|   |   | c | f |\s
 +---+---+---+---+
+          OUTPUT
+    end
+
+    it "works right with unicode" do
+      doc = {"spec"=>"http://api.puppetlabs.com/razor/v1/collections/nodes/log",
+             "items"=>[{'a' => 'ᓱᓴᓐ ᐊᒡᓗᒃᑲᖅ'}]}
+      result = format doc
+      result.should ==
+          # The framework seems to be adding unnecessary spaces at the end of each data line;
+          # Working around this by adding \s to the expectation.
+
+          # Unicode:
+#┏━━━━━━━━━━━━┓
+#┃ a          ┃\s
+#┣━━━━━━━━━━━━┫
+#┃ ᓱᓴᓐ ᐊᒡᓗᒃᑲᖅ ┃\s
+#┗━━━━━━━━━━━━┛
+          # ASCII:
+          <<-OUTPUT.rstrip
++------------+
+| a          |\s
++------------+
+| ᓱᓴᓐ ᐊᒡᓗᒃᑲᖅ |\s
++------------+
 OUTPUT
     end
   end
+
+  context 'api help' do
+    it "displays the CLI help by default" do
+      doc = {"name"=>"some-help", "help" => {"summary"=>"summary here",
+                                             "examples"=>{"api"=>"api example is here", "cli"=>"cli example is here"},
+                                             "full" => "shouldn't show this"},
+             "schema" => {"name"=>{"type"=>"string"}}}
+      result = format doc, show_command_help?: true
+      result.should =~ /cli example is here/
+    end
+
+    it "displays the API help when the --api flag is true" do
+      doc = {"name"=>"some-help", "help" => {"summary"=>"summary here",
+          "examples"=>{"api"=>"api example is here", "cli"=>"cli example is here"},
+          "full" => "shouldn't show this"},
+          "schema" => {"name"=>{"type"=>"string"}}}
+      result = format doc, show_api_help?: true, show_command_help?: true
+      result.should =~ /api example is here/
+    end
+
+    it "displays the full help if on an older server" do
+      doc = {"name"=>"some-help", "help" => {"full" => "full help is here"},
+             "schema" => {"name"=>{"type"=>"string"}}}
+      result = format doc, show_command_help?: true
+      result.should =~ /full help is here/
+    end
+
+    it "displays the full help if on an older server and api is specified" do
+      doc = {"name"=>"some-help", "help" => {"full" => "full help is here"},
+             "schema" => {"name"=>{"type"=>"string"}}}
+      result = format doc, show_api_help?: true, show_command_help?: true
+      result.should =~ /full help is here/
+    end
+
+    it "skips the 'Examples' section if cli examples are not included" do
+      doc = {"name"=>"some-help", "help" => {"summary"=>"summary here",
+                                             "examples"=>{"api"=>"api example is here"},
+                                             "full" => "shouldn't show this"},
+             "schema" => {"name"=>{"type"=>"string"}}}
+      result = format doc, show_cli_help?: true, show_command_help?: true
+      result.should =~ /summary here/
+      result.should_not =~ /EXAMPLES/
+    end
+
+    it "errors if help does not exist" do
+      doc = {"name"=>"some-help", "schema" => {"name"=>{"type"=>"string"}}}
+      expect { format doc, show_cli_help?: true, show_command_help?: true }.
+          to raise_error(Razor::CLI::Error, /Could not find help for that entry/)
+    end
+  end
 end

data/spec/cli/navigate_spec.rb

@@ -38,7 +38,7 @@ describe Razor::CLI::Navigate do
   context "with invalid parameter", :vcr do
     it "should fail with bad JSON" do
       nav = Razor::CLI::Parse.new(['create-broker', '--name', 'broker', '--type', 'puppet', '--configuration', 'not-json']).navigate
-      expect{nav.get_document}.to raise_error(ArgumentError, /Invalid JSON for argument 'configuration'/)
+      expect{nav.get_document}.to raise_error(ArgumentError, /Invalid object for argument 'configuration'/)
     end
 
     it "should fail with malformed argument" do
@@ -107,13 +107,13 @@ describe Razor::CLI::Navigate do
         nav = Razor::CLI::Parse.new(['create-broker', '--name', 'broker2', '--broker-type', 'puppet',
                                      '--configuration', '["server"]',
                                      '--configuration', 'environment=production']).navigate
-        expect {nav.get_document}.to raise_error(ArgumentError, "Cannot handle mixed types for argument configuration")
+        expect {nav.get_document}.to raise_error(ArgumentError, "Invalid object for argument 'configuration'")
       end
       it "should fail with mixed types (hash then array)" do
         nav = Razor::CLI::Parse.new(['create-broker', '--name', 'broker3', '--broker-type', 'puppet',
                                      '--configuration', 'environment=production',
                                      '--configuration', '["server"]']).navigate
-        expect {nav.get_document}.to raise_error(ArgumentError, "Cannot handle mixed types for argument configuration")
+        expect {nav.get_document}.to raise_error(ArgumentError, "Invalid object for argument 'configuration'")
       end
     end
   end
@@ -124,6 +124,10 @@ describe Razor::CLI::Navigate do
       Razor::CLI::Parse.new(['create-repo', '--name="double-quote with spaces"', '--url', 'http://url.com/some.iso', '--task', 'noop']).navigate.get_document
       Razor::CLI::Parse.new(['create-repo', '--name=\'single-quote with spaces\'', '--url', 'http://url.com/some.iso', '--task', 'noop']).navigate.get_document
     end
+
+    it "should allow '=' in string" do
+      Razor::CLI::Parse.new(['create-repo', '--name=\'with=equals\'', '--url', 'http://url.com/some.iso', '--task', 'noop']).navigate.get_document['name'].should =~ /with=equals/
+    end
   end
 
   context "for command help", :vcr do
@@ -149,13 +153,53 @@ describe Razor::CLI::Navigate do
     it "should supply that to the API service" do
       nav = Razor::CLI::Parse.new(AuthArg).navigate
       nav.get_document.should be_an_instance_of Hash
-      URI.parse(nav.last_url.to_s).userinfo.should == "fred:dead"
+      nav.last_url.user.should == 'fred'
+      nav.last_url.password.should == 'dead'
     end
 
     it "should preserve that across navigation" do
       nav = Razor::CLI::Parse.new(AuthArg + ['tags']).navigate
       nav.get_document['items'].should == []
-      URI.parse(nav.last_url.to_s).userinfo.should == "fred:dead"
+      nav.last_url.user.should == 'fred'
+      nav.last_url.password.should == 'dead'
+    end
+  end
+
+  context "with query parameters", :vcr do
+    it "should append limit" do
+      nav = Razor::CLI::Parse.new(%w[-u http://fred:dead@localhost:8080/api events --limit 1]).navigate
+      nav.get_document.should be_an_instance_of Hash
+      nav.last_url.to_s.should =~ /limit=1/
+    end
+    it "should append start" do
+      nav = Razor::CLI::Parse.new(%w[-u http://fred:dead@localhost:8080/api events --start 1]).navigate
+      nav.get_document.should be_an_instance_of Hash
+      nav.last_url.to_s.should =~ /start=1/
+    end
+    it "should throw an error if the query parameter is not in the API" do
+      nav = Razor::CLI::Parse.new(%w[-u http://fred:dead@localhost:8080/api events --not-in-api 1]).navigate
+      expect {nav.get_document}.to raise_error(OptionParser::InvalidOption, 'invalid option: --not-in-api')
+    end
+    it "should not fail when query returns details for one item" do
+      nav = Razor::CLI::Parse.new(['register-node', '--installed', 'true', '--hw-info', 'net0=78:31:c1:be:c8:00']).navigate.get_document
+      name = nav['name']
+      nav = Razor::CLI::Parse.new(['-u', 'http://fred:dead@localhost:8080/api', 'nodes', name]).navigate
+      nav.get_document['name'].should == name
+    end
+    it "should throw an error if the query parameter is not in the API from a single item" do
+      nav = Razor::CLI::Parse.new(['register-node', '--installed', 'true', '--hw-info', 'net0=78:31:c1:be:c8:00']).navigate.get_document
+      name = nav['name']
+      expect {Razor::CLI::Parse.new(['-u', 'http://fred:dead@localhost:8080/api', 'nodes', name, '--limit', '1']).
+          navigate.get_document}.to raise_error(OptionParser::InvalidOption, 'invalid option: --limit')
+    end
+    it "should store query without query parameters" do
+      name = Razor::CLI::Parse.new(['register-node', '--installed', 'true', '--hw-info', 'net0=78:31:c1:be:c8:00']).
+          navigate.get_document['name']
+      Razor::CLI::Parse.new(['register-node', '--installed', 'true', '--hw-info', 'net0=78:31:c1:be:c8:01']).
+          navigate.get_document
+      parse = Razor::CLI::Parse.new(['-u', 'http://fred:dead@localhost:8080/api', 'nodes', name, 'log', '--limit', '1'])
+      parse.navigate.get_document
+      parse.stripped_args.should == ['nodes', name, 'log']
     end
   end
 end