razor-client 1.0.0 → 1.1.0

data/NEWS.md

@@ -1,5 +1,10 @@
 # Razor Client Release Notes
 
+## 1.1.0 - 2015-11-12
+
+* IMPROVEMENT: By default, `razor` will point to port 8150.
+* IMPROVEMENT: Better display of several views/collections.
+
 ## 1.0.0 - 2015-06-08
 
 * NEW: Fit collection output to STDIN size for easier viewing.

data/lib/razor/cli/document.rb

@@ -42,9 +42,13 @@ module Razor::CLI
               # Allow both '+column' as overrides.
               item_spec = (item_format_spec[1] or {})
               item_label = item_format_spec[0]
-              item_column = (item_spec['+column'] or item_label)
               begin
-                value = Razor::CLI::Views.transform(item[item_column], item_spec['+format'])
+                value = if item_spec.has_key?('+all-columns')
+                          Razor::CLI::Views.transform(item, item_spec['+format'])
+                        else
+                          item_column = (item_spec['+column'] or item_label)
+                          Razor::CLI::Views.transform(item[item_column], item_spec['+format'])
+                        end
                 [item_label, value]
               rescue Razor::CLI::HideColumnError
                 nil

data/lib/razor/cli/navigate.rb

@@ -3,6 +3,42 @@ require 'multi_json'
 require 'yaml'
 require 'forwardable'
 
+# Needed to make the client work on Ruby 1.8.7
+unless URI.respond_to?(:encode_www_form)
+  module URI
+    def self.encode_www_form_component(str)
+      str = str.to_s
+      if HTML5ASCIIINCOMPAT.include?(str.encoding)
+        str = str.encode(Encoding::UTF_8)
+      else
+        str = str.dup
+      end
+      str.force_encoding(Encoding::ASCII_8BIT)
+      str.gsub!(/[^*\-.0-9A-Z_a-z]/, TBLENCWWWCOMP_)
+      str.force_encoding(Encoding::US_ASCII)
+    end
+    def self.encode_www_form(enum)
+      enum.map do |k,v|
+        if v.nil?
+          encode_www_form_component(k)
+        elsif v.respond_to?(:to_ary)
+          v.to_ary.map do |w|
+            str = encode_www_form_component(k)
+            unless w.nil?
+              str << '='
+              str << encode_www_form_component(w)
+            end
+          end.join('&')
+        else
+          str = encode_www_form_component(k)
+          str << '='
+          str << encode_www_form_component(v)
+        end
+      end.join('&')
+    end
+  end
+end
+
 module Razor::CLI
   class Navigate
     extend Forwardable

data/lib/razor/cli/parse.rb

@@ -2,11 +2,21 @@ require 'uri'
 require 'optparse'
 require 'forwardable'
 
+# Needed to make the client work on Ruby 1.8.7
+unless URI::Generic.method_defined?(:hostname)
+  module URI
+    def hostname
+      v = self.host
+      /\A\[(.*)\]\z/ =~ v ? $1 : v
+    end
+  end
+end
+
 module Razor::CLI
 
   class Parse
     extend Forwardable
-    DEFAULT_RAZOR_API = "http://localhost:8080/api"
+    DEFAULT_RAZOR_API = "http://localhost:8150/api"
 
     def_delegator 'navigate', 'query?'
 

data/lib/razor/cli/table_format.rb

@@ -54,7 +54,11 @@ class Razor::CLI::TableFormat
   def average_width(headings)
     # The 3 here = 2 for width gap + 1 for the column separator.
     # The 1 is for the last separator.
-    @average_width ||= (((`stty size | cut -d ' ' -f 2` || 80).to_i - (headings.count * 3) - 1) / headings.count)
+    console_width = `stty size | cut -d ' ' -f 2`
+    if console_width.nil? || console_width.to_i <= 0
+      console_width = 80
+    end
+    @average_width ||= ((console_width.to_i - (headings.count * 3) - 1) / headings.count)
   end
 
   def content_width(header, doc)

data/lib/razor/cli/transforms.rb

@@ -58,10 +58,15 @@ module Razor::CLI
       obj['msg']
     end
     def event_entities(hash)
+      hash ||= {}
       shallow_hash(Hash[hash].keep_if {|k,_| ['task', 'policy', 'broker', 'repo', 'node', 'command'].include?(k)})
     end
     def event_misc(hash)
+      hash ||= {}
       shallow_hash(Hash[hash].delete_if {|k,_|['task', 'policy', 'broker', 'repo', 'node', 'msg', 'command'].include?(k)})
     end
+    def node_log_entry(hash)
+      shallow_hash(Hash[hash].delete_if {|k,_|['event', 'timestamp', 'severity'].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 = '1.0.0'
+    version = '1.1.0'
 
     if version == "DEVELOPMENT"
       root = File.expand_path("../../..", File.dirname(__FILE__))

data/lib/razor/cli/views.yaml

@@ -52,6 +52,8 @@ collections:
           dhcp_mac:
             +format: mac
           state:
+          policy:
+            +format: select_name
           last_checkin:
             +format: if_present
           metadata:
@@ -75,10 +77,14 @@ collections:
     log:
       +short:
         +layout: table
-#        +show:
-#          event:
-#          task:
-#          timestamp:
+        +show:
+          name:
+          timestamp:
+          severity:
+          event:
+          entry:
+            +all-columns:
+            +format: node_log_entry
   policies:
     +short:
       +layout: table
@@ -201,6 +207,7 @@ collections:
       +show:
         name:
         timestamp:
+        severity:
         message:
           +column: entry
           +format: event_msg
@@ -215,6 +222,7 @@ collections:
         +show:
           name:
           timestamp:
+          severity:
           message:
             +column: entry
             +format: full_event_msg

data/spec/cli/format_spec.rb

@@ -84,9 +84,11 @@ describe Razor::CLI::Format do
 
   context 'tabular display' do
     it "works right when columns do not match up" do
-      doc = {"spec"=>"http://api.puppetlabs.com/razor/v1/collections/nodes/log",
+      doc = {"spec"=>"http://api.puppetlabs.com/razor/v1/collections/some/table",
              "items"=>[{'a' => 'b', 'c' => 'd'},
                        {'b' => 'c', 'e' => 'f'}]}
+      Razor::CLI::Views.instance_variable_set('@views',
+            {'collections' => {'some' => {'table' => {'+short' => {'+layout' => 'table'}}}}})
       result = format doc
       result.should ==
           # The framework seems to be adding unnecessary spaces at the end of each data line;
@@ -113,8 +115,10 @@ describe Razor::CLI::Format do
     end
 
     it "works right with unicode" do
-      doc = {"spec"=>"http://api.puppetlabs.com/razor/v1/collections/nodes/log",
+      doc = {"spec"=>"http://api.puppetlabs.com/razor/v1/collections/some/table",
              "items"=>[{'a' => 'ᓱᓴᓐ ᐊᒡᓗᒃᑲᖅ'}]}
+      Razor::CLI::Views.instance_variable_set('@views',
+          {'collections' => {'some' => {'table' => {'+short' => {'+layout' => 'table'}}}}})
       result = format doc
       result.should ==
           # The framework seems to be adding unnecessary spaces at the end of each data line;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: razor-client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types