naginata 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a8ceb909d5af735d4415f2a4b2b510b3ef9cc96
-  data.tar.gz: 137468f15fcd645b7a4b114b69845ccfb3fab30b
+  metadata.gz: 296d63cea8244f8e1ef896897968fd395333b3b9
+  data.tar.gz: 3ab61aaceb73e324c45d9fcfbf2f296ff6b4964e
 SHA512:
-  metadata.gz: bf65f48fb8b918f22e9eac4051605a2e039b1acbd35b656d919a1ff5965a09b77dde38f59672892f15dfde595866ae5359d132d933763a6ab681d54020ef2897
-  data.tar.gz: 631c3ac537362cbd5ac31be6ea675921905fa7547480f810b7eea19fe2da7658cfd607afe84d463db25168f9d0b36041e5cddcef092bbf2bca3071a9851a8d14
+  metadata.gz: 9041cf3dfa2fc4662319611d9eb574004c0926f112a582fe3956762fdc9b80d1ea319aa8d80ee8f906fff15b6b824ea71f9cafddddbd9cd54f4d0f23df94d0b4
+  data.tar.gz: 878b29c91d420a0e2cd2b121622b14f8d17435d0d2c0966e6ee52e645c1c971af4cf46a2686be8632fe817b9a205579bb592fb4c0e6c7d9fc67319a7c7d423e8

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 0.1.6 - 2015/08/05
+
+CLI:
+
+* Support any Naginatafile location other than cwd
+  * Add --naginatafile CLI option and NAGINATAFILE environment variable
+  * Naginatafile can be located at ~/.naginata/Naginatafile or /etc/Naginatafile
+
+Fixes:
+
+* Remove the params examples of nagios_server dsl from the template
+
 ### 0.1.5 - 2015/06/09
 
 CLI:
@@ -16,6 +28,10 @@ CLI:
 * Add shorter aliases -N for --nagios option
 * Add -w option wide output for hosts and services view
 
+Fixes:
+
+* Filter nagios servers before loading cached status file
+
 ### 0.1.3 - 2015/04/06
 
 Fixes:

data/lib/naginata/cli.rb

@@ -29,6 +29,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 :naginatafile, desc: "The location of Naginatafile. This defaults to a Naginatafile on the current working directory."
     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
@@ -46,6 +47,7 @@ module Naginata
     method_option :disable, aliases: "-d", desc: "Disable active checks", 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 :naginatafile, desc: "The location of Naginatafile. This defaults to a Naginatafile on the current working directory."
     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
@@ -66,6 +68,7 @@ module Naginata
     end
 
     desc 'hosts [hostpattern ..]', 'View host status'
+    method_option :naginatafile, desc: "The location of Naginatafile. This defaults to a Naginatafile on the current working directory."
     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
@@ -79,6 +82,7 @@ module Naginata
     end
 
     desc 'services [hostpattern ..]', 'View service status'
+    method_option :naginatafile, desc: "The location of Naginatafile. This defaults to a Naginatafile on the current working directory."
     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

data/lib/naginata/cli/remote_abstract.rb

@@ -9,6 +9,7 @@ module Naginata
     end
 
     def execute
+      set_custom_naginatafile
       load_configuration
       set_log_level
       set_nagios_filter
@@ -17,6 +18,14 @@ module Naginata
       run
     end
 
+    def set_custom_naginatafile
+      if custom_path = @options[:naginatafile] || ENV['NAGINATAFILE']
+        custom_path = File.expand_path(custom_path)
+        raise NaginatafileNotFound, "Could not locate Naginatafile" unless File.file?(custom_path)
+        ::Naginata::Configuration.env.set(:naginatafile, custom_path)
+      end
+    end
+
     def set_log_level
       if @options[:debug]
         ::Naginata::Configuration.env.set(:log_level, :debug)

data/lib/naginata/loader.rb

@@ -1,4 +1,6 @@
 require 'naginata/dsl'
+require 'naginata/configuration'
+require 'naginata/shared_helpers'
 
 module Naginata
   class Loader
@@ -6,11 +8,18 @@ module Naginata
 
     class << self
       include Naginata::DSL
+      include SharedHelpers
 
       def load_configuration
+        # Load defaults.rb
         instance_eval File.read(File.join(File.dirname(__FILE__), 'defaults.rb'))
-        naginatafile_path = find_naginatafile
-        instance_eval File.read naginatafile_path
+        # Load Naginatafile
+        naginatafile_path = ::Naginata::Configuration.env.fetch(:naginatafile) || find_naginatafile
+        if naginatafile_path.nil? or !File.file?(naginatafile_path)
+          raise NaginatafileNotFound, 'Could not locate Naginatafile'
+        else
+          instance_eval File.read naginatafile_path
+        end
       end
 
       def load_remote_objects(fetch_options = {})
@@ -26,18 +35,6 @@ module Naginata
             Configuration.env.host(host, services: services, on: nagios_server.hostname)
           end
         end
-
-      end
-
-      private
-
-      def find_naginatafile
-        naginatafile_path = File.expand_path('Naginatafile')
-        if File.file?(naginatafile_path)
-          return naginatafile_path
-        else
-          raise NaginatafileNotFound, 'Could not locate Naginatafile'
-        end
       end
 
     end

data/lib/naginata/shared_helpers.rb

@@ -0,0 +1,16 @@
+module Naginata
+  module SharedHelpers
+ 
+    def find_naginatafile
+      file = %w(
+        Naginatafile
+        ~/.naginata/Naginatafile
+        /etc/naginata/Naginatafile
+      ).map{ |path| File.expand_path(path) }.find { |path| File.file?(path) }
+      raise NaginatafileNotFound, "Could not locate Gemfile" unless file
+      return file
+    end
+
+  end
+end
+

data/lib/naginata/templates/Naginatafile

@@ -2,11 +2,9 @@
 # ========================
 # Defines nagios servers with multiple properties.
 
-# nagios_server 'nagios.tokyo.example.com', user: 'nagios'
-# nagios_server 'nagios.ny.example.com', user: 'nagios', port: '10022'
+# nagios_server 'nagios.tokyo.example.com'
 # nagios_server 'admin@nagios.sf.example.com'
 # nagios_server 'admin@nagios.sha.example.com:10022'
-# nagios_server 'nagios.uk.example.com', keys: %w(/path/to/private_key)
 
 # Global Nagios Server Options
 # ============================

data/lib/naginata/version.rb

@@ -1,3 +1,3 @@
 module Naginata
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: naginata
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Nobuhiro Nikushi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -133,6 +133,7 @@ files:
 - lib/naginata/dsl.rb
 - lib/naginata/loader.rb
 - lib/naginata/runner.rb
+- lib/naginata/shared_helpers.rb
 - lib/naginata/status.rb
 - lib/naginata/status_decorator.rb
 - lib/naginata/templates/Naginatafile