naginata 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae0efd9a15d8b81f26114f2543bfda2174d49477
-  data.tar.gz: 99bb8cb5573bc988e7af37b53205a06eb367733f
+  metadata.gz: 32af873ea80b3b5ade9260449bb08f15d45fda41
+  data.tar.gz: 232bd48d820d0d500f3a5ac7a26e90564768e8f6
 SHA512:
-  metadata.gz: 9302334fe18fd4e010531cecadf009632dd97c54b69f853316ce429a4a36ef64e5ca4daf77e7ecf35b90e00f6e1856992a35b1c22e28bb5a253eadb9d46a8a20
-  data.tar.gz: b43419293e29760ae3905ecf2d234462dbb64560fdae1a800e2b846c61b01797f7ac4834e29dc8adaa446778badf2b399c3559813f7e4050e75a6e695428c4b8
+  metadata.gz: 1c00459ebef2245b3b73d2d97e53a5d5003ff5fd1b0711b5d693d07ddd32fe181288edb76a628265b0ec0473327e11662a8bc60bbe158f93b4132333efadd72a
+  data.tar.gz: 9553c604ea5bcfe803e05a8a17ca70ecdec19865dca3caaf1382268107efd7e1a6c8e23db1d357e944d8bd2227dbdd05937b2785aa610c798ceb56cec837b16b

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+### 0.1.1
+
+Enhancement:
+
+* Introduce `naginata init`
+
+Fixes:
+
+* --dry-run was broken
+
 ### 0.1.0
 
 * First release

data/README.md

@@ -33,22 +33,26 @@ And then execute:
 
 ## Configuration
 
-Naginatafile
+Next, create a configuration file from the template. The below command creates _Naginatafile_ on the current working directory.
+
+    $ naginata init
+
+And then edit Naginatafile
 
 ```
 # Define nagios servers
-nagios 'foo@nagios1.example.com'
-nagios 'bar@nagios2.example.com'
-nagios 'baz@nagios3.example.com'
+nagios_server 'foo@nagios1.example.com'
+nagios_server 'bar@nagios2.example.com'
+nagios_server 'baz@nagios3.example.com'
 
-# nagios server global options 
+# Global nagios server options 
 set :nagios_server_options, {
   command_file: '/usr/local/nagios/var/rw/nagios.cmd',
   status_file: '/usr/local/nagios/var/status.cmd',
   run_command_as: 'nagios',
 }
 
-# Global options
+# Global SSH options
 set :ssh_options, {
   keys: %w(/home/nikushi/.ssh/id_rsa),
 }
@@ -56,7 +60,6 @@ set :ssh_options, {
 
 ## Usage
 
-
 ### Notification
 
 #### Enable(Disable) host and service notifications of server001

data/bin/naginata

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 $:.unshift File.expand_path("../../lib", __FILE__)
+require 'naginata'
 require 'naginata/cli'
 
 Naginata::CLI.start

data/lib/naginata.rb

@@ -9,6 +9,9 @@ require "naginata/ui"
 require "naginata/version"
 
 module Naginata
+
+  class NaginatafileNotFound < StandardError; end
+
   class << self
     def ui
       @ui ||= UI::Shell.new

data/lib/naginata/cli.rb

@@ -9,27 +9,14 @@ module Naginata
     class_option :verbose, aliases: "-v", type: :boolean
     class_option :debug, type: :boolean
 
-    def initialize(args = [], opts = [], config = {})
-      super(args, opts, config)
-
-      Loader.load_configuration
-
-      if options[:debug]
-        ::Naginata::Configuration.env.set(:log_level, :debug)
-      elsif options[:verbose]
-        ::Naginata::Configuration.env.set(:log_level, :info)
-      end
-
-      # @Note This has a problem, in nap CLI::Base class is initialied multiple
-      # time,  below add same filter every time. This should be fixed but not
-      # critical.
-      if options[:nagios]
-        ::Naginata::Configuration.env.add_filter(:nagios_server, options[:nagios])
-      end
-
-      configure_backend
-
-      Loader.load_remote_objects
+    #def initialize(args = [], opts = [], config = {})
+    #  super(args, opts, config)
+    #end
+
+    desc 'init', 'Init generates a default Nagipfile into current directory'
+    def init
+      require 'naginata/cli/init'
+      CLI::Init.new(options).execute
     end
 
     desc 'notification [hostpattern ..]', 'Control notification'
@@ -40,25 +27,13 @@ module Naginata
     method_option :all_hosts, aliases: "-a", desc: "Target all hosts", type: :boolean, default: false
     def notification(*patterns)
       require 'naginata/cli/notification'
-      CLI::Notification.new(options.merge(patterns: patterns)).run
+      CLI::Notification.new(options.merge(patterns: patterns)).execute
     end
 
     desc 'fetch', 'Download remote status.dat and create cache on local'
     def fetch
       require 'naginata/cli/fetch'
-      CLI::Fetch.new.run
-    end
-
-    no_tasks do
-
-      def configure_backend
-        if options[:dry_run]
-          require 'sshkit/backends/printer'
-          ::Naginata::Configuration.env.set(:sshkit_backend, SSHKit::Backend::Printer)
-        end
-        ::Naginata::Configuration.env.configure_backend
-      end
-
+      CLI::Fetch.new(options).execute
     end
 
   end

data/lib/naginata/cli/fetch.rb

@@ -1,13 +1,10 @@
+require 'naginata/cli/remote_abstract'
 require 'naginata/configuration'
 require 'naginata/status'
 require 'naginata/runner'
 
 module Naginata
-  class CLI::Fetch
-
-    def initialize(options = {})
-      @options = options
-    end
+  class CLI::Fetch < CLI::RemoteAbstract
 
     def run
       Naginata::Runner.run do |backend, nagios_server, services|
@@ -24,6 +21,10 @@ module Naginata
       end
 
     end
+
+    def load_remote_objects
+    end
+
   end
 end
  

data/lib/naginata/cli/init.rb

@@ -0,0 +1,18 @@
+require 'naginata/cli/local_abstract'
+
+module Naginata
+  class CLI::Init < CLI::LocalAbstract
+    def run
+      if File.exist?("Naginatafile")
+        Naginata.ui.error "Naginatafile already exists at #{Dir.pwd}/Naginatafile"
+        exit 1
+      end
+      Naginata.ui.info "Writing new Naginatafile to #{Dir.pwd}/Naginatafile", true
+      FileUtils.cp(File.expand_path('../../templates/Naginatafile', __FILE__), 'Naginatafile')
+    end
+
+    def load_configuration
+      # Skip loading configuration because Nagipfile does not exist yet.
+    end
+  end
+end

data/lib/naginata/cli/local_abstract.rb

@@ -0,0 +1,12 @@
+require 'naginata/cli/remote_abstract'
+
+module Naginata
+  class CLI::LocalAbstract < CLI::RemoteAbstract
+
+    def configure_backend; end
+    def load_remote_objects; end
+
+  end
+end
+
+ 

data/lib/naginata/cli/notification.rb

@@ -1,14 +1,11 @@
 require 'naginata'
+require 'naginata/cli/remote_abstract'
 require 'naginata/command/external_command'
 require 'naginata/configuration'
 require 'naginata/runner'
 
 module Naginata
-  class CLI::Notification
-
-    def initialize(options)
-      @options = options
-    end
+  class CLI::Notification < CLI::RemoteAbstract
 
     def run
       if !@options[:enable] and !@options[:disable]

data/lib/naginata/cli/remote_abstract.rb

@@ -0,0 +1,56 @@
+require 'naginata/configuration'
+require 'naginata/loader'
+
+module Naginata
+  class CLI::RemoteAbstract
+
+    def initialize(options = {})
+      @options = options
+    end
+
+    def execute
+      load_configuration
+      set_log_level
+      set_nagios_filter
+      configure_backend
+      load_remote_objects
+      run
+    end
+
+    def set_log_level
+      if @options[:debug]
+        ::Naginata::Configuration.env.set(:log_level, :debug)
+      elsif @options[:verbose]
+        ::Naginata::Configuration.env.set(:log_level, :info)
+      end
+    end
+
+    def set_nagios_filter
+      if @options[:nagios]
+        ::Naginata::Configuration.env.add_filter(:nagios_server, @options[:nagios])
+      end
+    end
+
+    def load_configuration
+      Loader.load_configuration
+    end
+
+    def configure_backend
+      if @options[:dry_run]
+        require 'sshkit/backends/printer'
+        ::Naginata::Configuration.env.set(:sshkit_backend, SSHKit::Backend::Printer)
+      end
+      ::Naginata::Configuration.env.configure_backend
+    end
+
+    def load_remote_objects
+      Loader.load_remote_objects(@options)
+    end
+
+    def run
+      raise NotImplementedError, 'Called abstract method'
+    end
+  end
+end
+
+

data/lib/naginata/loader.rb

@@ -9,13 +9,14 @@ module Naginata
 
       def load_configuration
         instance_eval File.read(File.join(File.dirname(__FILE__), 'defaults.rb'))
-        instance_eval File.read 'Naginatafile'
+        naginatafile_path = find_naginatafile
+        instance_eval File.read naginatafile_path
       end
 
-      def load_remote_objects
+      def load_remote_objects(fetch_options = {})
         require 'naginata/cli/fetch'
         # Refresh cached status.dat
-        CLI::Fetch.new.run
+        CLI::Fetch.new(fetch_options).run
 
         # Load status.dat
         #
@@ -33,6 +34,17 @@ module Naginata
 
       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
   end
 end

data/lib/naginata/templates/Naginatafile

@@ -0,0 +1,37 @@
+# Nagios server definition
+# ========================
+# 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 '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
+# ============================
+# You can set global properties for all nagios servers here.
+# `run_command_as` is a user who execute external commands on a remote nagios
+# server. By default external commands are as the same user who is log-in.
+# This means naginata executes sudo -u `run_command_as sh -c ...` on remote
+# servers if `run_command_as` is set.
+
+# set :nagios_server_options, {
+#   command_file: '/var/spool/nagios/cmd/nagios.cmd',
+#   status_file: '/var/log/nagios/status.dat',
+#   run_command_as: 'nagios',
+# }
+
+#
+# Custom SSH Options
+# ==================
+# You may pass any option but keep in mind that net/ssh understands a
+# limited set of options, consult the Net::SSH documentation.
+# http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start
+#
+# Global options
+# --------------
+# set :ssh_options, {
+#   user: 'admin',
+#   keys: %w(/path/to/private_key),
+# }

data/lib/naginata/version.rb

@@ -1,3 +1,3 @@
 module Naginata
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: naginata
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Nobuhiro Nikushi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -117,7 +117,10 @@ files:
 - lib/naginata.rb
 - lib/naginata/cli.rb
 - lib/naginata/cli/fetch.rb
+- lib/naginata/cli/init.rb
+- lib/naginata/cli/local_abstract.rb
 - lib/naginata/cli/notification.rb
+- lib/naginata/cli/remote_abstract.rb
 - lib/naginata/command/external_command.rb
 - lib/naginata/configuration.rb
 - lib/naginata/configuration/filter.rb
@@ -128,6 +131,7 @@ files:
 - lib/naginata/loader.rb
 - lib/naginata/runner.rb
 - lib/naginata/status.rb
+- lib/naginata/templates/Naginatafile
 - lib/naginata/ui.rb
 - lib/naginata/ui/shell.rb
 - lib/naginata/version.rb