sensu-cli 0.2.0 → 0.2.1

data/lib/sensu-cli/base.rb

@@ -4,6 +4,7 @@ module SensuCli
     def setup
       clis = Cli.new
       cli = clis.global
+      @format = cli[:fields][:format] || "long"
       settings
       api_path(cli)
       make_call
@@ -43,7 +44,13 @@ module SensuCli
       api = Api.new
       res = api.request(opts)
       msg = api.response(res.code, res.body, @api[:command])
-      res.code != '200' ? exit : Pretty.print(msg)
+      if res.code != '200'
+        exit
+      elsif @format == "single"
+        Pretty.table(msg)
+      else
+        Pretty.print(msg)
+      end
       Pretty.count(msg)
     end
 

data/lib/sensu-cli/cli.rb

@@ -137,7 +137,9 @@ module SensuCli
         p = Trollop::options do
           opt :limit, "The number if clients to return", :short => "l", :type => :string
           opt :offset, "The number of clients to offset before returning", :short => "o", :type => :string
+          opt :format, "Available formats; single (single line formatting)", :short => "f", :type => :string
         end
+        Trollop::die :format, "Available optional formats: single".color(:red) if p[:format] && p[:format] != "single"
         Trollop::die :offset, "Offset depends on the limit option --limit ( -l )".color(:red) if p[:offset] && !p[:limit]
         cli = {:command => 'clients', :method => 'Get', :fields => p}
       when 'delete'
@@ -197,7 +199,10 @@ module SensuCli
       explode_if_empty(opts,command)
       case command
       when 'list'
-        p = Trollop::options
+        p = Trollop::options do
+          opt :format, "Available formats; single (single line formatting)", :short => "f", :type => :string
+        end
+        Trollop::die :format, "Available optional formats: single".color(:red) if p[:format] && p[:format] != "single"
         cli = {:command => 'events', :method => 'Get', :fields => p}
       when 'show'
         p = Trollop::options do

data/lib/sensu-cli/pretty.rb

@@ -31,5 +31,47 @@ module SensuCli
       puts "#{count} total items".color(:yellow) if count
     end
 
+    def self.clean(thing)
+      thing = thing.gsub("\n",'/\n') if thing.is_a?(String)
+      thing
+    end
+
+    def self.table(res)
+      if !res.empty?
+        if res.is_a?(Array)
+          keys = res.map{|item| item.keys}.flatten.uniq.sort
+
+          # Remove fields with spaces (breaks awkage)
+          keys.select! do |key|
+            res.none?{|item| item[key].to_s.include?(' ')}
+          end
+
+          # Find max value lengths
+          value_lengths = {}
+          keys.each do |key|
+            max_value_length = res.map{|item| item[key].to_s.length}.max
+            value_lengths[key] = [max_value_length, key.length].max
+          end
+
+          # Print header
+          format = keys.map {|key| "%-#{value_lengths[key]}s"}.join(' ')
+          puts sprintf(format, *keys)
+
+          # Print value rows
+          res.each do |item|
+            if item.is_a?(Hash)
+              values = keys.map {|key| item[key]}
+              format = keys.map {|key| "%-#{value_lengths[key]}s"}.join(' ')
+              puts sprintf(format, *values)
+            else
+              puts item.to_s.color(:cyan)
+            end
+          end
+        end
+      else
+        puts "no values for this request".color(:cyan)
+      end
+    end
+
   end
 end

data/lib/sensu-cli/version.rb

@@ -1,3 +1,3 @@
 module SensuCli
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
 end

data/sensu-cli.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |s|
   s.add_dependency('trollop', '2.0')
   s.add_dependency('mixlib-config', '1.1.2')
 
+  s.add_development_dependency('rspec')
+
   s.files         = Dir.glob('{bin,lib}/**/*') + %w[sensu-cli.gemspec README.md settings.example.rb]
   s.executables   = Dir.glob('bin/**/*').map { |file| File.basename(file) }
   s.require_paths = ['lib']

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: sensu-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
+  prerelease: 
 platform: ruby
 authors:
 - Bryan Brandau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-02 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -48,10 +54,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A command line utility for interacting with the Sensu api.
 email: agent462@gmail.com
 executables:
@@ -78,25 +101,26 @@ homepage: http://github.com/agent462/sensu-cli
 licenses:
 - MIT
 - APACHE
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A command line utility for Sensu.
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTNkNGJlNWUzNzViYjgwYTYyYmVkOGQ0MzdkMzM5YjAyY2Q1ODdjMw==
-  data.tar.gz: !binary |-
-    NzJlM2Q0MmRmOTg2YjA1ZGY2YmYxNzY2MjAwYzIwNDEwMTBiM2U4NQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MDcyNDdhYTRhOWUwZmNlOWNiZTA2Y2I4ZTU4Y2NkZWNkNTliYmFkOTk4NTlh
-    M2M2YzMxNWJlZGRkN2Q1MGNlMGJhNzcyZGUwNzM5MzFlZWY2NDhhYzZkNDZh
-    OTE2Y2M4MDg4OWZmNjJiOGM0NTkxMDQyMmM5YTcwYzlhYTdiMGM=
-  data.tar.gz: !binary |-
-    MmIxZWZhYzc3MmI5MjI0OTcxMjY0ZjkzMGRjYzAxYTkwNmZmZTIyZjU2ODg0
-    YzE5YjlhZjMxNWY0MjUyNDc2YmZiNTQ3MWYyOWRlZWI3MjFjYWUxMWYwZjIz
-    ZGY0NDQ1MWJhOWRkNTMyYmJjYTFkZDU5ODNkMWJiNzg3MTJhZDY=