sensu-cli 0.2.3 → 0.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjBmYzYyYmQ2MzI3Y2M1YmRjNjU4OWQ5NDg3NmE3Yzg0M2UyODE4ZA==
+    YTBkNzc4ZGU4NzM5YzE5ZmFlYjI1MDc4OWVjN2FlMGUxNmMzZjE5YQ==
   data.tar.gz: !binary |-
-    YzhmYThlNmExMGM2NzlkMmMyYWZmZDY4YmY3MGY3NGVjMTExMjJjMw==
+    N2JlZGE0NmNiMjJiODFiOTUyNmQ3ZjI1NTVmZjI1NjE4NGRjMjVlNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjkxYWI5MjRlOTY1NzY2NGUxZTNhN2JhNmViYzRlYTdmYjQ3MDYwZGZhOWRm
-    NzNmZDlmMjFlY2QyMWM3ZTBkYjAzMDhhNTYxMjRkMmM4OWU0ZDBiODZkM2M2
-    MzAxODU0ZGM1MDliMzI3MDQyOWRlYWJkYWI4ZDhhMzNkNDlkYTA=
+    NDI1NWRiMTk4MjRmZWQwZTJlN2YzNGVjYTFhOGVjNGZlMjY5YjAzMDA0ZGJj
+    NjhjOTEyMjlmOTZkMzY0MGY0YjE4YTAxOWJjM2NlODk5NWE0ZTIxZjkwY2Zh
+    NmI5YTVhNDU3NTFlZjMxNTVmZmQwNGNjNGE1OTcxNWNjNTcxZWQ=
   data.tar.gz: !binary |-
-    ZDA1ZjIwYjFiYjYxOGE5YzAxNDQxNWQ3Y2M5NmFkNjk4OGM4YTVhMTAwMzg4
-    NTlkODA5YzRhNzgxNTY0NjdiOTFkZmQyZGZhNGY2NmM1N2U0YjEyYjgwMjg0
-    MDU5MWM5Y2Q2M2FmYThiOTQwZDIyOGM0ZmJiMjA2NzhhYmE0NTQ=
+    ZDQzZGM5NGVhNjhmNGRhNmEzNGJmN2IyYzQzZTk3N2E2YWE5ZmI5YzIyN2Qz
+    ZmY1MGQzZjk0MGE0MDNhMzQ1ZmVmMjJhNGVmNmZkZTI2MGI0MDg3M2FiZTRj
+    ZjY5NzVhZTI4OWQyZjBhOWNjYzJhZTg4NjdhNTZlZTVkYjJmOWQ=

data/lib/sensu-cli/base.rb

@@ -47,15 +47,16 @@ module SensuCli
         exit
       elsif @cli[:fields][:format] == 'single'
         Pretty.single(msg)
-        Pretty.count(msg)
       elsif @cli[:fields][:format] == 'table'
         endpoint = @api[:command]
         fields = nil || @cli[:fields][:fields]
         Pretty.table(msg, endpoint, fields)
+      elsif @cli[:fields][:format] == 'json'
+        Pretty.json(msg)
       else
         Pretty.print(msg)
-        Pretty.count(msg)
       end
+      Pretty.count(msg) unless @cli[:fields][:format] == 'table'
     end
 
   end

data/lib/sensu-cli/cli.rb

@@ -38,7 +38,7 @@ module SensuCli
         EOS
     EVENT_BANNER = <<-EOS.gsub(/^ {10}/, '')
           ** Event Commands **
-          sensu-cli event list
+          sensu-cli event list (OPTIONS)
           sensu-cli event show NODE (OPTIONS)
           sensu-cli event delete NODE CHECK\n\r
         EOS
@@ -139,7 +139,7 @@ module SensuCli
           opt :format, 'Available formats; single, table', :short => 'f', :type => :string
           opt :fields, 'Fields for table ouput: -F name,address,subscriptions', :short => 'F', :type => :string
         end
-        Trollop::die :format, 'Available optional formats: single, table'.color(:red) if p[:format] != 'table' && p[:format] != 'single' && p[:format]
+        Trollop::die :format, 'Available optional formats: single, table'.color(:red) if p[:format] != 'table' && p[:format] != 'single' && p[:format] != 'json' && p[:format]
         Trollop::die :fields, 'Fields must be used in conjunction with --format table'.color(:red) if p[:format] != 'table' && p[:fields]
         Trollop::die :offset, 'Offset depends on the limit option --limit ( -l )'.color(:red) if p[:offset] && !p[:limit]
         { :command => 'clients', :method => 'Get', :fields => p }
@@ -203,7 +203,7 @@ module SensuCli
         p = Trollop::options do
           opt :format, 'Available formats; single, table', :short => 'f', :type => :string
         end
-        Trollop::die :format, 'Available optional formats: single, table'.color(:red) if p[:format] != 'table' && p[:format] != 'single' && p[:format]
+        Trollop::die :format, 'Available optional formats: single, table'.color(:red) if p[:format] != 'table' && p[:format] != 'single' && p[:format] != 'json' && p[:format]
         { :command => 'events', :method => 'Get', :fields => p }
       when 'show'
         p = Trollop::options do
@@ -231,8 +231,10 @@ module SensuCli
         p = Trollop::options do
           opt :limit, 'The number of stashes to return', :short => 'l', :type => :string
           opt :offset, 'The number of stashes to offset before returning', :short => 'o', :type => :string
+          opt :format, 'Available formats; single, table', :short => 'f', :type => :string
         end
         Trollop::die :offset, 'Offset depends on the limit option --limit ( -l )'.color(:red) if p[:offset] && !p[:limit]
+        Trollop::die :format, 'Available optional formats: single, table'.color(:red) if p[:format] != 'table' && p[:format] != 'single' && p[:format] != 'json' && p[:format]
         { :command => 'stashes', :method => 'Get', :fields => p }
       when 'show'
         p = Trollop::options

data/lib/sensu-cli/pretty.rb

@@ -1,6 +1,6 @@
 require 'rainbow'
 require 'hirb'
-require 'terminfo'
+require 'json'
 
 module SensuCli
   class Pretty
@@ -29,6 +29,10 @@ module SensuCli
         end
       end
 
+      def json(res)
+        puts JSON.pretty_generate(res)
+      end
+
       def count(res)
         res.is_a?(Hash) ? count = res.length : count = res.count
         puts "#{count} total items".color(:yellow) if count
@@ -87,7 +91,7 @@ module SensuCli
       def table(res, endpoint, fields = nil)
         if !res.empty?
           if res.is_a?(Array)
-            terminal_size = TermInfo.screen_size
+            terminal_size = Hirb::Util.detect_terminal_size
             if endpoint == 'events'
               keys = %w[check client status flapping occurrences handlers issued output]
             else
@@ -97,7 +101,7 @@ module SensuCli
                 keys = res.map { |item| item.keys }.flatten.uniq
               end
             end
-            puts Hirb::Helpers::AutoTable.render(res, { :max_width => terminal_size[1], :fields => keys })
+            puts Hirb::Helpers::AutoTable.render(res, { :max_width => terminal_size[0], :fields => keys })
           end
         else
           self.no_values

data/lib/sensu-cli/version.rb

@@ -1,3 +1,3 @@
 module SensuCli
-    VERSION = '0.2.3'
+    VERSION = '0.2.4'
 end

data/sensu-cli.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
   s.add_dependency('trollop', '2.0')
   s.add_dependency('mixlib-config', '1.1.2')
   s.add_dependency('hirb', '0.7.1')
-  s.add_dependency('ruby-terminfo', '0.1.1')
 
   s.add_development_dependency('rspec')
   s.add_development_dependency('rubocop')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Bryan Brandau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -66,20 +66,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.1
-- !ruby/object:Gem::Dependency
-  name: ruby-terminfo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement