pe-razor-client 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6c2760d424fcb90751a22b65217172feab26b6c
-  data.tar.gz: 51cca0cde398a43684ed9398eb709322874a817d
+  metadata.gz: 699354279b91bfa3600d9b7c0cda040067a5b9f8
+  data.tar.gz: 929d073ad3f2272b1c5175bf5e664d09d273aba6
 SHA512:
-  metadata.gz: 455603cb50328105b7fdf55e7e5454c01eab1d7f1043494f5619a98615cf9dd646c1d5ff3884a828e59a7ac569ad44af120e0e9e66332d37b6b4627471b18b5c
-  data.tar.gz: 26a4ba1316f72362e66501b9d7595b72886f4b1665dee5ef5a90d53235486f3574a209671e011e42fd88a027b3b9c76469fe3e409db2ba12b233f6865cc1b6dc
+  metadata.gz: 1c82a4c3b8c71c37a7f660fa638cb753801d41700f25f7d136c3a8a1229d74e94b068929da845cc5bbae97718897ccd881102251ea55459b7acd8d61fac6747d
+  data.tar.gz: a6f7638bfd1af09182b9f25273e90d3e5a80cd21c711d7f4df4b9797c6faf6f9bf2bdbcaf74b41fd67425d93943dfa9d2891271e12bd3e7f7d8872d163097c81

data/NEWS.md

@@ -1,9 +1,23 @@
 # Razor Client Release Notes
 
-## Next - TBD
+## Next - Next
 
+* IMPROVEMENT: By default, `razor` will point to port 8151.
+
+## 1.0.0 - 2015-06-08
+
+* NEW: Fit collection output to STDIN size for easier viewing.
 * NEW: RAZOR_CA_FILE environment variable allows TLS/SSL certificate
   verification for requests.
+* NEW: The default API protocol and port are HTTPS over TLS/SSL on port 8151.
+* NEW: Utilizes `aliases` property in command metadata to better guess datatypes
+  for aliases.
+* IMPROVEMENT: `razor hooks` now displays as a table.
+* IMPROVEMENT: Better output for `razor events ##`.
+* IMPROVEMENT: Exits with an error code of 1 when a `razor` command fails.
+* BUGFIX: `razor events` no longer causes exception.
+* BUGFIX: `razor commands ## errors` no longer causes exception.
+* BUGFIX: Hook output message can now be any datatype.
 
 ## 0.16.0 - 2015-01-05
 

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/table_format.rb

@@ -8,7 +8,7 @@ class Razor::CLI::TableFormat
       headings = (column_overrides or get_headers(doc))
       row do
         headings.each do |header|
-          column(header, :width => get_width(header, doc))
+          column(header, :width => column_width!(headings, header, doc))
         end
       end
       doc.each do |page|
@@ -23,12 +23,52 @@ class Razor::CLI::TableFormat
     capture_output.strip
   end
 
-  def get_width(header, doc)
+  # This method has the side effect of modifying the remaining extra_width.
+  # It pulls everything together to come up with a single value for the column.
+  def column_width!(headings, header, doc)
+    content_width = content_width(header, doc)
+    average_width = average_width(headings)
+    # Is the column too wide and can we do anything about it?
+    if content_width > average_width && extra_width(headings, doc) > 0
+      # Determine how much room we'd need to make to accommodate the content.
+      remaining = content_width - average_width
+      # Add back in what we can.
+      width = average_width + [@extra_width, remaining].min
+      # The new width can't be negative.
+      @extra_width = [@extra_width - remaining, 0].max
+      width
+    else
+      [content_width, average_width].min
+    end
+  end
+
+  # This calculates how much leeway would exist in all columns if we were to
+  # use an auto-sized fixed width for the whole table.
+  def extra_width(headings, doc)
+    @extra_width ||= headings.map do |header|
+                       [average_width(headings) - content_width(header, doc), 0].max
+                     end.inject(:+)
+  end
+
+  # This calculates what an auto-sized fixed-width table's column width would be.
+  def average_width(headings)
+    # The 3 here = 2 for width gap + 1 for the column separator.
+    # The 1 is for the last separator.
+    console_width = `stty size | cut -d ' ' -f 2 2>/dev/null`
+    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)
+    # Find longest item, including the header
     (doc.map do |page|
       (page[header] or '').to_s.length
     end << header.to_s.length).max
   end
 
+  # Traverse all headers to compile a unique list.
   def get_headers(doc)
     [].tap do |headers|
       doc.map do |page|

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pe-razor-client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -80,7 +80,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- NEWS.md
+- README.md
 - bin/razor
+- lib/razor.rb
 - lib/razor/cli.rb
 - lib/razor/cli/command.rb
 - lib/razor/cli/document.rb
@@ -93,10 +97,6 @@ files:
 - lib/razor/cli/version.rb
 - lib/razor/cli/views.rb
 - lib/razor/cli/views.yaml
-- lib/razor.rb
-- NEWS.md
-- README.md
-- LICENSE
 - spec/cli/command_spec.rb
 - spec/cli/format_spec.rb
 - spec/cli/navigate_spec.rb
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Razor is an advanced provisioning application