pandur 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a65c44db60d3634ce6a602513da833ef62b4d85
-  data.tar.gz: 3b5380493d3c5fd6c2b119fe7854c4928e299e62
+  metadata.gz: 614232ea0b450bf6210f2f05435d76d9ce170cdf
+  data.tar.gz: 662cd1e5d5060a9b49fb4ebba82c32d87fe2d37d
 SHA512:
-  metadata.gz: 668c7e031650ef7cee1b87915c991e57075ce7aa623796f49e7434b407b1eb14c6ad418ef8f47d2448df054833617a7d9c256aa61d074873da0fe7d4418ab4d4
-  data.tar.gz: bcd8baf4122461d2fcae872230fcd7827413705a9bed434f1b2d027669cd768798958067c341c69e324175e868aba87b316507bf4a2dc72b6e30d2555155615d
+  metadata.gz: 07cf4fb25e3c2d67ac4bfbcd64c869858e9e896b412def997996ec2af2f11f77b86aa56db33c6fac98dfbf40fbc9afac756f56738dd8c558541ba992b8afaa53
+  data.tar.gz: f7e967d63c53d551421cd24152e74b225db7d5cd30e52084d527a399bf505491239e60c370ac384db1dba7096b8da348172052ab3526f7e3c3684b7384871be4

data/README.md

@@ -6,10 +6,9 @@ This gem is yet alpha, so please don't expect to much.
 Usage
 -----
 
-To use run
-
-    pandur [status]  # query status
-    pandur init      # create configuration (not working yet)
+    Usage: pandur [options]
+        -c, --config [FILE]              Define config-file
+        -h, --help                       Show this message
 
 To install run
 
@@ -18,15 +17,16 @@ To install run
 Configuration
 -------------
 
-You need to create a configuration (a yaml-file) of all hosts to connect to, and
-wich processes are meant to monitor. Here's a simple example:
+You need to create a configuration (`~/.pandur.yaml` by default) of all hosts
+to connect to, and wich processes are meant to monitor.
+Here's a simple example:
 
     ---
     hosts:
-    - name: web
-      username: "www-data"
+    - name: 'web'
+      username: 'www-data'
       check:
-      - name: "Elastic Search"
+      - name: 'Elastic Search'
         pid_file: /var/run/elasticsearch.pid
       - name: Memcached
         pid_file: /var/run/memcached.pid

data/bin/pandur

@@ -1,4 +1,23 @@
 #!/usr/bin/env ruby
 
 require 'pandur'
-Pandur.run
+require 'optparse'
+
+options = {}
+
+OptionParser.new do |opts|
+  opts.banner = 'Usage: pandur [options]'
+
+  options[:config_file] = '~/.pandur.yaml'
+  #options[:log_level] = Logger::DEBUG
+  opts.on('-c', '--config [FILE]', 'Define config-file') do |config_file|
+    options[:config_file] = config_file
+  end
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+end.parse!
+
+Pandur.new(options).run

data/lib/pandur/check.rb

@@ -1,4 +1,4 @@
-module Pandur
+class Pandur
   class Check
     include Pandur::Config
 

data/lib/pandur/config.rb

@@ -9,16 +9,29 @@
 #     end
 #   end
 
-module Pandur
+class Pandur
   module Config
-    @config = {}
+    @@config = {}
+
+    def load_config(file)
+      logger.debug("Loading configuration from #{file.to_s}")
+      @@config = YAML::load_file(File.expand_path(file))
+    end
 
     def logger
-      Pandur.logger
+      @@logger ||= Logger.new(STDERR)
     end
 
-    def config(conf)
-      Pandur.config(conf)
+    def config(*params)
+      @@config ||= {}
+      case params.length()
+      when 0
+        @@config
+      when 1
+        @@config[params.first]
+      else
+        @@config[params[0]] = params[1]
+      end
     end
   end
 end

data/lib/pandur/host.rb

@@ -1,7 +1,7 @@
 require 'net/ssh'
 require 'pandur/check'
 
-module Pandur
+class Pandur
   class Host
     include Pandur::Config
 

data/lib/pandur/version.rb

@@ -1,3 +1,3 @@
-module Pandur
-  VERSION = '0.0.0'
+class Pandur
+  VERSION = '0.0.1'
 end

data/lib/pandur.rb

@@ -5,46 +5,28 @@ require 'net/ssh/errors'
 require 'logger'
 require 'yaml'
 
-module Pandur
+class Pandur
+  include Pandur::Config
 
-  class << self
-
-    def run(conf = 'pandur.yaml')
-      logger.debug("#{name} running ..")
-      load_config(conf)
-      config('hosts').each do |host|
-        check(host)
-      end
-      logger.debug("#{name} .. finished")
-    end
-
-    def check(target)
-      Pandur::Host.new(target).check
-    rescue Net::SSH::AuthenticationFailed
-      puts "Failed to connect: #{$!.message}"
-    end
-
-    def load_config(file)
-      logger.debug("Loading configuration from #{file.to_s}")
-      @@config = YAML::load_file(file)
-    end
+  def initialize(conf = {})
+    logger.level = conf[:log_level] || Logger::ERROR
+    load_config(conf[:config_file] || '~/.pandur.yaml')
+  end
 
-    def config(*params)
-      @@config ||= {}
-      case params.length()
-      when 0
-        @@config
-      when 1
-        @@config[params.first]
-      else
-        @@config[params[0]] = params[1]
-      end
+  def run(conf = {})
+    logger.debug("running ..")
+    config('hosts').each do |host|
+      check(host)
     end
+    logger.debug(".. finished")
+  end
 
-    def logger
-      @@logger ||= Logger.new(STDERR)
-    end
+  private
 
+  def check(target)
+    Pandur::Host.new(target).check
+  rescue Net::SSH::AuthenticationFailed
+    puts "Failed to connect: #{$!.message}"
   end
 
 end

data/spec/spec_helper.rb

@@ -1 +1,9 @@
 require File.join(File.dirname(__FILE__), '..', 'lib', 'pandur')
+
+module Helpers
+
+  def test_config_file
+    File.join(File.dirname(__FILE__), 'config.yaml')
+  end
+
+end

data/spec/units/pandur_config_spec.rb

@@ -1,26 +1,38 @@
 require 'spec_helper'
 
 describe Pandur::Config do
+  include Helpers
 
   class PandurLoggerRspecTest; include Pandur::Config; end
+  class SecondPandurLoggerRspecTest; include Pandur::Config; end
 
   before(:each) do
-    @sut = PandurLoggerRspecTest.new
+    @sut1 = PandurLoggerRspecTest.new
+    @sut2 = SecondPandurLoggerRspecTest.new
   end
 
-  it 'uses Pandur.logger' do
-    Pandur.should_receive(:logger)
-    @sut.logger
+  it 'provides logger' do
+    @sut1.logger.is_a? ::Logger
   end
 
-  it 'uses Pandur.config' do
-    Pandur.should_receive(:config).with('conf-name')
-    @sut.config('conf-name')
+  it 'shares logger' do
+    @sut1.logger.should eq(@sut2.logger)
+  end
+
+  it 'loads config via YAML' do
+    File.should_receive(:expand_path).with('config').and_return('expanded')
+    YAML.should_receive(:load_file).with('expanded').and_return({})
+    @sut1.load_config('config')
   end
 
   it 'gets config' do
-    Pandur.load_config(File.join(File.dirname(__FILE__), '..', 'config.yaml'))
-    @sut.config('config_to_be_tested_by_pandur_spec.rb').should eql('success')
+    @sut1.load_config(test_config_file)
+    @sut1.config('config_to_be_tested_by_pandur_spec.rb').should eql('success')
+  end
+
+  it 'shares config' do
+    @sut1.load_config(test_config_file)
+    @sut2.config('config_to_be_tested_by_pandur_spec.rb').should eql('success')
   end
 
 end

data/spec/units/pandur_spec.rb

@@ -1,14 +1,17 @@
 require 'spec_helper'
 
 describe Pandur do
+  include Helpers
 
-  it 'can get logger' do
-    Pandur.logger.should_not be(:nil)
+  before(:each) do
+    @sut = Pandur.new :config_file => test_config_file
   end
 
-  it 'can load config from file' do
-    Pandur.load_config(File.join(File.dirname(__FILE__), '..', 'config.yaml'))
-    Pandur.config('config_to_be_tested_by_pandur_spec.rb').should eql('success')
+  it 'checks each configured host' do
+    @sut.should_receive(:config).with('hosts').and_return(['host1', 'host2'])
+    @sut.should_receive(:check).with('host1')
+    @sut.should_receive(:check).with('host2')
+    @sut.run
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pandur
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - Rainer Jung <Rainer.Jung@gmail.com>