monit 0.2.2 → 0.3.0

data/.gitignore

@@ -3,3 +3,4 @@ pkg/*
 .bundle
 .yardoc
 doc/*
+Gemfile.lock

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/.travis.yml

@@ -1,11 +1,10 @@
-before_install:
-  - gem install bundler
 script: "bundle exec rake spec"
 language: ruby
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-18mode
   - jruby-19mode
   - rbx-18mode

data/Gemfile

@@ -1,4 +1,4 @@
-source :gemcutter
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in monit.gemspec
 gemspec

data/README.md

@@ -11,20 +11,25 @@ Just like any other gem:
 
 ## Usage
 
-    status = Monit::Status.new({ :host => "monit.myserver.com", 
-                                 :auth => true, 
-                                 :username => "foo", 
+    status = Monit::Status.new({ :host => "monit.myserver.com",
+                                 :auth => true,
+                                 :username => "foo",
                                  :password => "bar" })
     status.get              # => true
     status.platform         # => <Monit::Platform:0x00000003673dd0 ... >
     status.platform.cpu     # => 2
     status.platform.memory  # => 4057712
 
+    # => start/stop/restart/monitor/unmonitor
+    status.services.each do |service|
+      service.stop!
+    end
+
 For more options see the API documentation
 
 ## Compatibility and Build Status
 
-[![Build Status](https://secure.travis-ci.org/k33l0r/monit.png)](http://travis-ci.org/k33l0r/monit)
+[![Build Status](https://travis-ci.org/k33l0r/monit.png)](https://travis-ci.org/k33l0r/monit) [![Code Climate](https://codeclimate.com/github/k33l0r/monit.png)](https://codeclimate.com/github/k33l0r/monit)
 
 The gem is only compatible with Ruby 1.8.7 and above, including JRuby 1.6+.
 For the build status, check [Travis CI][travis].
@@ -33,6 +38,6 @@ For the build status, check [Travis CI][travis].
 
 ## License and copyright
 
-Copyright (c) 2010 - 2012 Matias Korhonen & contributors
+Copyright © 2010 - 2013 Matias Korhonen & contributors
 
 Licensed under the MIT license, see the LICENSE file for details.

data/lib/monit/service.rb

@@ -4,13 +4,70 @@ module Monit
   class Service < OpenStruct
     TYPES = { 0 => "Filesystem", 1 => "Directory", 2 => "File", 3 => "Daemon", 4 => "Connection", 5 => "System" }
 
-    def initialize(hash = nil)
+    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
 
-    private
+    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!
+      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
+    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}"
+
+      begin
+        response = http.request(request)
+        !!(response.code =~ /\A2\d\d\z/)
+      rescue Errno::ECONNREFUSED => e
+        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"]

data/lib/monit/status.rb

@@ -1,4 +1,5 @@
 #require "crack/xml"
+require "active_support/json"
 require "active_support/xml_mini"
 require "active_support/core_ext/hash/conversions"
 require "net/http"
@@ -61,7 +62,7 @@ module Monit
 
       response = http.request(request)
 
-      if response.code == "200"
+      if (response.code =~ /\A2\d\d\z/)
         @xml = response.body
         return self.parse(@xml)
       else
@@ -74,12 +75,21 @@ module Monit
       @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 }
+
       if @hash["monit"]["service"].is_a? Array
         @services = @hash["monit"]["service"].map do |service|
-          Service.new(service)
+          Service.new(service, options)
         end
       else
-        @services = [Service.new(@hash["monit"]["service"])]
+        @services = [Service.new(@hash["monit"]["service"], options)]
       end
       true
     rescue

data/lib/monit/status/httpd.rb

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,15 @@
+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

@@ -0,0 +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
+  end
+end

data/lib/monit/status/service.rb

@@ -0,0 +1,79 @@
+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

data/lib/monit/version.rb

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

data/monit.gemspec

@@ -4,7 +4,7 @@ require "monit/version"
 
 Gem::Specification.new do |gem|
   gem.authors     = ["Matias Korhonen"]
-  gem.email       = ["matias@kiskolabgem.com"]
+  gem.email       = ["me@matiaskorhonen.fi"]
   gem.homepage    = "http://github.com/k33l0r/monit"
   gem.summary     = "Connect to Monit"
   gem.description = "Retrieve server information from Monit."
@@ -19,7 +19,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake"
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rspec", "~> 2.9.0"
+  gem.add_development_dependency "webmock", "~> 1.11.0"
 
   gem.add_runtime_dependency "nokogiri", "~> 1.5.2"
-  gem.add_runtime_dependency "activesupport", "~> 3.2.2"
+  gem.add_runtime_dependency "activesupport", "~> 3.2.12"
 end

data/spec/monit_spec.rb

@@ -5,7 +5,7 @@ SMALLISH_STATUS_PATH  = File.expand_path("../samples/smallish_status.xml", __FIL
 LARGISH_STATUS_PATH   = File.expand_path("../samples/largish_status.xml", __FILE__)
 
 describe Monit do
-  context "Status" do
+  describe "Status" do
     it "should be possible to instatiate it with no options" do
       @status = Monit::Status.new
       @status.should be_kind_of Monit::Status
@@ -73,7 +73,7 @@ describe Monit do
     end
   end
   
-  context "Server" do
+  describe "Server" do
     it "should create a new instance of Monit::Server from a hash" do
       hash = {         "id" => "52255a0b8999c46c98de9697a8daef67",
               "incarnation" => "1283946152",
@@ -99,7 +99,7 @@ describe Monit do
     end
   end
   
-  context "HTTPD" do
+  describe "HTTPD" do
     it "should create a new instance of Monit::HTTPD from a hash" do
       hash = { "address" => nil,
                   "port" => "2812",
@@ -111,7 +111,7 @@ describe Monit do
     end
   end
   
-  context "Platform" do
+  describe "Platform" do
     it "should create a new instance of Monit::Platform from a hash" do
       hash = { "name" => "Darwin",
             "release" => "10.4.0",
@@ -129,8 +129,8 @@ describe Monit do
     end
   end
   
-  context "Service" do
-    it "should create a new instance of Monit::Platform from a hash" do
+  describe "Service" do
+    let(:service) do
       hash = { "collected_sec" => "1283946152",
               "collected_usec" => "309973",
                         "name" => "Example.local",
@@ -149,7 +149,10 @@ describe Monit do
                                                "kilobyte" => "1850152" }
                                   },
                         "type" => "5" }
-      service = Monit::Service.new(hash)
+      Monit::Service.new(hash) 
+    end
+
+    it "should create a new instance of Monit::Platform from a hash" do
       service.should be_kind_of OpenStruct
       service.should be_kind_of Monit::Service
       service.collected_sec.should == "1283946152"
@@ -164,5 +167,58 @@ describe Monit do
       service.system.should be_kind_of Hash
       service.service_type.should == "5"
     end
+
+    describe "#start!" do
+      it "sends :start to #do" do
+        service.stub(:do).with(:start)
+        service.start!
+      end
+    end
+
+    describe "#stop!" do
+      it "sends :stop to #do" do
+        service.stub(:do).with(:stop)
+        service.stop!
+      end
+    end
+
+    describe "#restart!" do
+      it "sends :restart to #do" do
+        service.stub(:do).with(:restart)
+        service.restart!
+      end
+    end
+
+    describe "#monitor!" do
+      it "sends :monitor to #do" do
+        service.stub(:do).with(:monitor)
+        service.monitor!
+      end
+    end
+
+    describe "#unmonitor!" do
+      it "sends :unmonitor to #do" do
+        service.stub(:do).with(:unmonitor)
+        service.unmonitor!
+      end
+    end
+
+    describe "#do" do
+      it "returns true if the response code is 2xx" do
+        stub_request(:any, /localhost/).to_return(:status => 200)
+        service.do(:start).should == true
+        stub_request(:any, /localhost/).to_return(:status => 201)
+        service.do(:start).should == true
+      end
+
+      it "returns false if the response code is not 2xx" do
+        stub_request(:any, /localhost/).to_return(:status => 500)
+        service.do(:start).should == false
+        stub_request(:any, /localhost/).to_return(:status => 400)
+        service.do(:start).should == false
+        stub_request(:any, /localhost/).to_return(:status => 302)
+        service.do(:start).should == false
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -3,4 +3,5 @@ require "bundler"
 Bundler.setup
 
 require "rspec"
+require "webmock/rspec"
 require "monit"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monit
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
+date: 2013-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70169996912740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169996912740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70169996912320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169996912320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70169996911820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,31 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70169996911820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70169996911260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,29 +85,39 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70169996911260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70169996910660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.2.12
   type: :runtime
   prerelease: false
-  version_requirements: *70169996910660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.12
 description: Retrieve server information from Monit.
 email:
-- matias@kiskolabgem.com
+- me@matiaskorhonen.fi
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -86,6 +127,10 @@ 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
@@ -106,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3171063330755817441
+      hash: -2454781035396715959
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,10 +160,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3171063330755817441
+      hash: -2454781035396715959
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Connect to Monit

data/Gemfile.lock

@@ -1,36 +0,0 @@
-PATH
-  remote: .
-  specs:
-    monit (0.2.2)
-      activesupport (~> 3.2.2)
-      nokogiri (~> 1.5.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.2.3)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    diff-lcs (1.1.3)
-    i18n (0.6.0)
-    multi_json (1.3.4)
-    nokogiri (1.5.2)
-    rake (0.8.7)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  bundler
-  monit!
-  rake
-  rspec (~> 2.9.0)