naginata 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2561fc701669bc413ed8bbcc48f46aa054b2cd65
-  data.tar.gz: 8c9672f7ef3bafe0cdb60fd05f40062e19fb0565
+  metadata.gz: b5153f8a4699719891f2a79d83eb4b66c1cca2a1
+  data.tar.gz: 8ceceddd2a134409b7fed9a382311342dd6ca783
 SHA512:
-  metadata.gz: 7c971bc2a2efa363a82696a4f7cfaae08532d22627af1007679dd41b90b9dbbd711f06f32d192b170c364261faedd1bbec6d928c6fbbc2a1fd10dd91eeb53d92
-  data.tar.gz: 6e51ccf9cb2e4015b3aa9e5a7ffc5ad91a23ce2377b6c7c405cb05e368392f12fe6d8d358055b81ba13e573e63637c273058cb2f210f114dba990348829c0f56
+  metadata.gz: 0c5a5b08495929ea05708b73bb00036114f30b7264788f9b10ce2266822ec9385e867c70e7f8e83703a848e5565c7538b3dc6cfb3a533fa936c8417f58b99020
+  data.tar.gz: 3863bc85efbb2bafc139427b8b323e3230e81b1aeddea2beed36d27172f93bc41d6aa593e0406d4987116c779ec071429f7110b3f7745b5612366a5bbc3f96e1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 0.1.4 - 2015/04/08
+
+CLI:
+
+* Add shorter aliases -N for --nagios option
+* Add -w option wide output for hosts and services view
+
 ### 0.1.3 - 2015/04/06
 
 Fixes:

data/README.md

@@ -5,7 +5,7 @@ Naginata is multi nagios server control tool. If you have multiple nagios server
 Naginata includes `naginata` command executable. `naginata` command can be done by just single command execution from workstation host.
 
 * Enable/Disable notifications of hosts and services.
-* Display current host and service status. (will be added)
+* Display current host and service status.
 * and more
 
 If you already have nagios servers, it's easy to try out Naginata! It does not require to install ruby and Naginata on remote nagio servers.
@@ -111,7 +111,7 @@ Output example:
 ```
 $ naginata services -a
 NAGIOS   HOST                 SERVICE          STATUS   FLAGS  OUTPUT
-nagios0  localhost            HTTP             WARNING  AC,nt  HTTP WARNING: HTTP/1.1 403 Forbidden - 5152 bytes in 0.001 second response time
+nagios0  localhost            HTTP             WARNING  AC,nt  HTTP WARNING: HTTP/1.1 403 Forbidden - 5152 bytes ...
 nagios0  localhost            Current Load     OK       AC,NT  OK - load average: 0.00, 0.00, 0.00
 nagios0  localhost            PING             OK       AC,NT  PING OK - Packet loss = 0%, RTA = 0.04 ms
 nagios0  redis01.tokyo.local  Load             CRITICAL AC,NT  Too high load average 15
@@ -167,9 +167,9 @@ $ naginata hosts web01.example.com db01.example.com
 ```
 
 
-### Filtering by nagios servers
+### Nagios server filter
 
-You can limit target nagios server with `--nagios=server1,..` option.
+You can filter targeted nagios servers with `--nagios=nagiosserver1,..` (or `-N=` shortly) option.
 
 For example:
 
@@ -189,9 +189,7 @@ naginata command with `--debug`
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+After checking out the repo, run `bundle install` to install dependencies. Then, run `bundle exec rake console` for an interactive prompt that will allow you to experiment.
 
 ## Contributing
 

data/lib/naginata/cli.rb

@@ -22,7 +22,7 @@ module Naginata
     method_option :disable, aliases: "-d", desc: "Disable notification", type: :boolean
     method_option :dry_run, aliases: "-n", type: :boolean
     method_option :force, aliases: "-f", desc: "Run without prompting for confirmation", type: :boolean
-    method_option :nagios, desc: "Filter hosts by nagios server names", type: :array
+    method_option :nagios, aliases: "-N", desc: "Filter targeted nagios servers by their hostname", type: :array
     method_option :services, aliases: "-s", desc: "Services to be enabled|disabled", type: :array
     method_option :all_hosts, aliases: "-a", desc: "Target all hosts", type: :boolean
     def notification(*patterns)
@@ -34,7 +34,7 @@ module Naginata
       CLI::Notification.new(options.merge(patterns: patterns)).execute
     end
 
-    method_option :nagios, desc: "Filter hosts by nagios server names", type: :array
+    method_option :nagios, aliases: "-N", desc: "Filter targeted nagios servers by their hostname", type: :array
     desc 'fetch', 'Download remote status.dat and create cache on local'
     def fetch
       require 'naginata/cli/fetch'
@@ -42,8 +42,9 @@ module Naginata
     end
 
     desc 'hosts [hostpattern ..]', 'View host status'
-    method_option :nagios, desc: "Filter hosts by nagios server names", type: :array
+    method_option :nagios, aliases: "-N", desc: "Filter targeted nagios servers by their hostname", type: :array
     method_option :all_hosts, aliases: "-a", desc: "Target all hosts", type: :boolean
+    method_option :wide, aliases: "-w", desc: "Wide output", type: :boolean
     def hosts(*patterns)
       if patterns.empty? and !options[:all_hosts]
         help(:hosts)
@@ -54,9 +55,10 @@ module Naginata
     end
 
     desc 'services [hostpattern ..]', 'View service status'
-    method_option :nagios, desc: "Filter hosts by nagios server names", type: :array
+    method_option :nagios, aliases: "-N", desc: "Filter targeted nagios servers by their hostname", type: :array
     method_option :services, aliases: "-s", desc: "Filter by service description", type: :array
     method_option :all_hosts, aliases: "-a", desc: "Target all hosts", type: :boolean
+    method_option :wide, aliases: "-w", desc: "Wide output", type: :boolean
     def services(*patterns)
       if patterns.empty? and !options[:all_hosts]
         help(:services)

data/lib/naginata/cli/hosts.rb

@@ -24,7 +24,7 @@ module Naginata
         }
         table.concat(status.decorate.hosts_table)
       end
-      Naginata.ui.print_table table
+      Naginata.ui.print_table(table, truncate: !@options[:wide])
     end
 
   end

data/lib/naginata/cli/services.rb

@@ -31,7 +31,7 @@ module Naginata
         }
         table.concat(status.decorate.services_table)
       end
-      Naginata.ui.print_table table
+      Naginata.ui.print_table(table, truncate: !@options[:wide])
     end
 
   end

data/lib/naginata/status.rb

@@ -41,7 +41,7 @@ module Naginata
     #
     # @return [StatusDecorator]
     def decorate
-      StatusDecorator.new(self)
+      @decorator ||= StatusDecorator.new(self)
     end
 
     # Create a new instance from raw status.dat string

data/lib/naginata/templates/Naginatafile

@@ -35,3 +35,6 @@
 #   user: 'admin',
 #   keys: %w(/path/to/private_key),
 # }
+
+# Default value for :pty is false
+# set :pty, true

data/lib/naginata/version.rb

@@ -1,3 +1,3 @@
 module Naginata
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/nagios_analyzer/section_decorator.rb

@@ -4,7 +4,7 @@ module NagiosAnalyzer
   class Section
 
     def decorate
-      SectionDecorator.new(self)
+      @decorator ||= SectionDecorator.new(self)
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: naginata
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Nobuhiro Nikushi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit