monit 0.3.0 → 0.3.1

data/Rakefile

@@ -3,3 +3,5 @@ require "bundler/gem_tasks"
 
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/monit/httpd.rb

@@ -2,11 +2,11 @@ module Monit
   # The HTTPD section from the Monit XML
   class HTTPD
     attr_reader :address, :port, :ssl
-        
+
     def initialize(options = {})
       @address = options["address"]
-      @port = options["port"].to_i
-      @ssl = options["ssl"] == "1" ? true : false
+      @port    = options["port"]
+      @ssl     = options["ssl"] == "1" ? true : false
     end
   end
 end

data/lib/monit/platform.rb

@@ -2,7 +2,7 @@ module Monit
   # The platform section from the Monit XML
   class Platform
     attr_reader :name, :release, :version, :machine, :cpu, :memory
-    
+
     def initialize(options = {})
       @name = options["name"]
       @release = options["release"]

data/lib/monit/server.rb

@@ -1,18 +1,18 @@
 module Monit
   # The server section from the Monit XML
   class Server
-      attr_reader :id, :incarnation, :version, :uptime, :poll, :startdelay, :localhostname, :controlfile, :httpd
-      
-      def initialize(options = {})
-        @id = options["id"]
-        @incarnation = options["incarnation"]
-        @version = options["version"]
-        @uptime = options["uptime"].to_i
-        @poll = options["poll"].to_i
-        @startdelay = options["startdelay"].to_i
-        @localhostname = options["localhostname"]
-        @controlfile = options["controlfile"]
-        @httpd = options["httpd"].is_a?(HTTPD) ? options["httpd"] : HTTPD.new(options["httpd"])
-      end
+    attr_reader :id, :incarnation, :version, :uptime, :poll, :startdelay, :localhostname, :controlfile, :httpd
+
+    def initialize(options = {})
+      @id = options["id"]
+      @incarnation = options["incarnation"]
+      @version = options["version"]
+      @uptime = options["uptime"].to_i
+      @poll = options["poll"].to_i
+      @startdelay = options["startdelay"].to_i
+      @localhostname = options["localhostname"]
+      @controlfile = options["controlfile"]
+      @httpd = options["httpd"].is_a?(HTTPD) ? options["httpd"] : HTTPD.new(options["httpd"])
+    end
   end
 end

data/lib/monit/service.rb

@@ -5,10 +5,10 @@ module Monit
     TYPES = { 0 => "Filesystem", 1 => "Directory", 2 => "File", 3 => "Daemon", 4 => "Connection", 5 => "System" }
 
     def initialize(hash = nil, options = {})
-      @host ||= options[:host] ||= "localhost"
-      @port ||= options[:port] ||= 2812
-      @ssl  ||= options[:ssl]  ||= false
-      @auth ||= options[:auth] ||= false
+      @host     ||= options[:host] || "localhost"
+      @port     ||= options[:port] || 2812
+      @ssl      ||= options[:ssl]  || false
+      @auth     ||= options[:auth] || false
       @username = options[:username]
       @password = options[:password]
 
@@ -21,24 +21,10 @@ module Monit
       @ssl ? URI::HTTPS.build(url_params) : URI::HTTP.build(url_params)
     end
 
-    def start!
-      self.do :start
-    end
-
-    def stop!
-      self.do :stop
-    end
-
-    def restart!
-      self.do :restart
-    end
-
-    def monitor!
-      self.do :monitor
-    end
-
-    def unmonitor!
-      self.do :unmonitor
+    [:start, :stop, :restart, :monitor, :unmonitor].each do |action|
+      define_method "#{action}!" do
+        self.do action
+      end
     end
 
     def do(action)
@@ -46,17 +32,14 @@ module Monit
       http = Net::HTTP.new(uri.host, uri.port)
 
       if @ssl
-        http.use_ssl = true
+        http.use_ssl     = true
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
 
-      request = Net::HTTP::Post.new(uri.request_uri)
+      request      = Net::HTTP::Post.new(uri.request_uri)
       request.body = "action=#{action}"
 
-      if @auth
-        request.basic_auth(@username, @password)
-      end
-
+      request.basic_auth(@username, @password) if @auth
       request["User-Agent"] = "Monit Ruby client #{Monit::VERSION}"
 
       begin

data/lib/monit/status.rb

@@ -27,10 +27,10 @@ module Monit
     # * +username+ - username for authentication
     # * +password+ - password for authentication
     def initialize(options = {})
-      @host ||= options[:host] ||= "localhost"
-      @port ||= options[:port] ||= 2812
-      @ssl  ||= options[:ssl]  ||= false
-      @auth ||= options[:auth] ||= false
+      @host     = options[:host]    || "localhost"
+      @port     = (options[:port]   || 2812).to_i
+      @ssl      = options[:ssl]     || false
+      @auth     = options[:auth]    || false
       @username = options[:username]
       @password = options[:password]
       @services = []
@@ -72,17 +72,18 @@ module Monit
 
     # Parse the XML from Monit into a hash and into a Ruby representation.
     def parse(xml)
-      @hash = Hash.from_xml(xml)
-      @server = Server.new(@hash["monit"]["server"])
+      @hash     = Hash.from_xml(xml)
+      @server   = Server.new(@hash["monit"]["server"])
       @platform = Platform.new(@hash["monit"]["platform"])
 
-      options = { 
-        :host => @host, 
-        :port => @port, 
-        :ssl => @ssl, 
-        :auth => @auth, 
-        :username => @username, 
-        :password => @password }
+      options = {
+        :host     => @host,
+        :port     => @port,
+        :ssl      => @ssl,
+        :auth     => @auth,
+        :username => @username,
+        :password => @password
+      }
 
       if @hash["monit"]["service"].is_a? Array
         @services = @hash["monit"]["service"].map do |service|

data/lib/monit/version.rb

@@ -1,3 +1,3 @@
 module Monit
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/monit_spec.rb

@@ -17,7 +17,7 @@ describe Monit do
       lambda { @status.password }.should raise_error(NoMethodError)
       @status.services.should == []
     end
-    
+
     it "should generate the correct URL" do
       @status = Monit::Status.new
       @status.url.should be_kind_of URI
@@ -29,7 +29,7 @@ describe Monit do
       @status.port = 8080
       @status.url.to_s.should == "https://rails.fi:8080/_status?format=xml"
     end
-    
+
     it "should parse XML into a Hash" do
       status = Monit::Status.new
       status.stub!(:xml).and_return(File.read(SMALLISH_STATUS_PATH))
@@ -39,7 +39,7 @@ describe Monit do
       status.hash["monit"]["server"].should_not be_nil
       status.hash["monit"]["platform"].should_not be_nil
       status.hash["monit"]["service"].should_not be_nil
-      
+
       status.stub!(:xml).and_return(File.read(LARGISH_STATUS_PATH))
       status.parse(status.xml)
       status.hash.should be_kind_of Hash
@@ -48,22 +48,22 @@ describe Monit do
       status.hash["monit"]["platform"].should_not be_nil
       status.hash["monit"]["service"].should_not be_nil
     end
-    
+
     it "should parse XML into a Ruby representation" do
       status = Monit::Status.new
       status.stub!(:xml).and_return(File.read(SMALLISH_STATUS_PATH))
       status.parse(status.xml)
-      
+
       status.server.should be_kind_of Monit::Server
       status.server.httpd.should be_kind_of Monit::HTTPD
       status.platform.should be_kind_of Monit::Platform
       status.services.should be_kind_of Array
       status.services.first.should be_kind_of Monit::Service
       status.services.first.should be_kind_of OpenStruct
-      
+
       status.stub!(:xml).and_return(File.read(LARGISH_STATUS_PATH))
       status.parse(status.xml)
-      
+
       status.server.should be_kind_of Monit::Server
       status.server.httpd.should be_kind_of Monit::HTTPD
       status.platform.should be_kind_of Monit::Platform
@@ -72,20 +72,20 @@ describe Monit do
       status.services.first.should be_kind_of OpenStruct
     end
   end
-  
+
   describe "Server" do
     it "should create a new instance of Monit::Server from a hash" do
       hash = {         "id" => "52255a0b8999c46c98de9697a8daef67",
-              "incarnation" => "1283946152",
-                  "version" => "5.1.1",
-                   "uptime" => "4",
-                     "poll" => "30",
-               "startdelay" => "0",
-            "localhostname" => "Example.local",
-              "controlfile" => "/etc/monitrc",
-                    "httpd" => { "address" => nil,
-                                    "port" => "2812",
-                                     "ssl" => "0" } }
+        "incarnation" => "1283946152",
+        "version" => "5.1.1",
+        "uptime" => "4",
+        "poll" => "30",
+        "startdelay" => "0",
+        "localhostname" => "Example.local",
+        "controlfile" => "/etc/monitrc",
+        "httpd" => { "address" => nil,
+          "port" => "2812",
+          "ssl" => "0" } }
       server = Monit::Server.new(hash)
       server.id.should == "52255a0b8999c46c98de9697a8daef67"
       server.incarnation.should == "1283946152"
@@ -98,27 +98,27 @@ describe Monit do
       server.httpd.should be_kind_of Monit::HTTPD
     end
   end
-  
+
   describe "HTTPD" do
     it "should create a new instance of Monit::HTTPD from a hash" do
       hash = { "address" => nil,
-                  "port" => "2812",
-                   "ssl" => "0" }
+        "port" => 2812,
+        "ssl" => "0" }
       httpd = Monit::HTTPD.new(hash)
       httpd.address.should be_nil
       httpd.port.should == 2812
       httpd.ssl.should be_false
     end
   end
-  
+
   describe "Platform" do
     it "should create a new instance of Monit::Platform from a hash" do
       hash = { "name" => "Darwin",
-            "release" => "10.4.0",
-            "version" => "Darwin Kernel Version 10.4.0: Fri Apr 23 18:28:53 PDT 2010; root:xnu-1504.7.4~1/RELEASE_I386",
-            "machine" => "i386",
-                "cpu" => "2",
-             "memory" => "4194304" }
+        "release" => "10.4.0",
+        "version" => "Darwin Kernel Version 10.4.0: Fri Apr 23 18:28:53 PDT 2010; root:xnu-1504.7.4~1/RELEASE_I386",
+        "machine" => "i386",
+        "cpu" => "2",
+        "memory" => "4194304" }
       platform = Monit::Platform.new(hash)
       platform.name.should == "Darwin"
       platform.release.should == "10.4.0"
@@ -128,27 +128,27 @@ describe Monit do
       platform.memory.should == 4194304
     end
   end
-  
+
   describe "Service" do
     let(:service) do
       hash = { "collected_sec" => "1283946152",
-              "collected_usec" => "309973",
-                        "name" => "Example.local",
-                      "status" => "0",
-                 "status_hint" => "0",
-                     "monitor" => "1",
-                 "monitormode" => "0",
-               "pendingaction" => "0",
-                      "groups" => { "name" => "server" },
-                      "system" => { "load" => { "avg01" => "0.28",
-                                                "avg05" => "0.43",
-                                                "avg15" => "0.48" },
-                                     "cpu" => {   "user" => "10.0",
-                                                "system" => "4.1" },
-                                  "memory" => { "percent" => "44.1",
-                                               "kilobyte" => "1850152" }
-                                  },
-                        "type" => "5" }
+        "collected_usec" => "309973",
+        "name" => "Example.local",
+        "status" => "0",
+        "status_hint" => "0",
+        "monitor" => "1",
+        "monitormode" => "0",
+        "pendingaction" => "0",
+        "groups" => { "name" => "server" },
+        "system" => { "load" => { "avg01" => "0.28",
+          "avg05" => "0.43",
+          "avg15" => "0.48" },
+          "cpu" => {   "user" => "10.0",
+            "system" => "4.1" },
+            "memory" => { "percent" => "44.1",
+              "kilobyte" => "1850152" }
+      },
+        "type" => "5" }
       Monit::Service.new(hash) 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-14 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -127,10 +127,6 @@ files:
 - lib/monit/server.rb
 - lib/monit/service.rb
 - lib/monit/status.rb
-- lib/monit/status/httpd.rb
-- lib/monit/status/platform.rb
-- lib/monit/status/server.rb
-- lib/monit/status/service.rb
 - lib/monit/version.rb
 - monit.gemspec
 - spec/monit_spec.rb
@@ -149,21 +145,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2454781035396715959
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2454781035396715959
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Connect to Monit

data/lib/monit/status/httpd.rb

@@ -1,12 +0,0 @@
-module Monit
-  # The HTTPD section from the Monit XML
-  class HTTPD
-    attr_reader :address, :port, :ssl
-        
-    def initialize(options = {})
-      @address = options["address"]
-      @port = options["port"].to_i
-      @ssl = options["ssl"] == "1" ? true : false
-    end
-  end
-end

data/lib/monit/status/platform.rb

@@ -1,15 +0,0 @@
-module Monit
-  # The platform section from the Monit XML
-  class Platform
-    attr_reader :name, :release, :version, :machine, :cpu, :memory
-    
-    def initialize(options = {})
-      @name = options["name"]
-      @release = options["release"]
-      @version = options["version"]
-      @machine = options["machine"]
-      @cpu = options["cpu"].to_i
-      @memory = options["memory"].to_i
-    end
-  end
-end

data/lib/monit/status/server.rb

@@ -1,18 +0,0 @@
-module Monit
-  # The server section from the Monit XML
-  class Server
-      attr_reader :id, :incarnation, :version, :uptime, :poll, :startdelay, :localhostname, :controlfile, :httpd
-      
-      def initialize(options = {})
-        @id = options["id"]
-        @incarnation = options["incarnation"]
-        @version = options["version"]
-        @uptime = options["uptime"].to_i
-        @poll = options["poll"].to_i
-        @startdelay = options["startdelay"].to_i
-        @localhostname = options["localhostname"]
-        @controlfile = options["controlfile"]
-        @httpd = options["httpd"].is_a?(HTTPD) ? options["httpd"] : HTTPD.new(options["httpd"])
-      end
-  end
-end

data/lib/monit/status/service.rb

@@ -1,79 +0,0 @@
-require "ostruct"
-module Monit
-  # The service section from the Monit XML. Inherits from OpenStruct.
-  class Service < OpenStruct
-    TYPES = { 0 => "Filesystem", 1 => "Directory", 2 => "File", 3 => "Daemon", 4 => "Connection", 5 => "System" }
-
-    def initialize(hash = nil, options = {})
-      @host ||= options[:host] ||= "localhost"
-      @port ||= options[:port] ||= 2812
-      @ssl  ||= options[:ssl]  ||= false
-      @auth ||= options[:auth] ||= false
-      @username = options[:username]
-      @password = options[:password]
-
-      hash = rename_service_type(hash) if hash
-      super(hash)
-    end
-
-    def url path
-      url_params = { :host => @host, :port => @port, :path => "/#{path}" }
-      @ssl ? URI::HTTPS.build(url_params) : URI::HTTP.build(url_params)
-    end
-
-    def start
-      return self.do :start
-    end
-
-    def stop
-      return self.do :stop
-    end
-
-    def restart
-      return self.do :restart
-    end
-
-    def monitor
-      return self.do :monitor
-    end
-
-    def unmonitor
-      return self.do :unmonitor
-    end
-
-    def do(action)
-      uri = self.url self.name
-      http = Net::HTTP.new(uri.host, uri.port)
-
-      if @ssl
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-
-      request = Net::HTTP::Post.new(uri.request_uri)
-      request.body = "action=#{action}"
-
-      if @auth
-        request.basic_auth(@username, @password)
-      end
-
-      request["User-Agent"] = "Monit Ruby client #{Monit::VERSION}"
-
-      response = http.request(request)
-
-      if response.code == "200"
-        return true
-      else
-        return false
-      end
-    end
-
-    private
-    # Renames the Service type from "type" to "service_type" to avoid conflicts
-    def rename_service_type(hash)
-      hash["service_type"] = hash["type"]
-      hash.delete("type")
-      hash
-    end
-  end
-end