monit 0.1.2 → 0.2.0

data/.travis.yml

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

data/Gemfile.lock

@@ -1,37 +1,40 @@
 PATH
   remote: .
   specs:
-    monit (0.1.2)
-      crack (~> 0.1.8)
-      curb (~> 0.7.8)
+    monit (0.2.0)
+      activesupport (~> 3.2.2)
+      jruby-openssl (~> 0.7.6.1)
+      nokogiri (~> 1.5.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    awesome_print (0.2.1)
-    crack (0.1.8)
-    curb (0.7.8)
-    diff-lcs (1.1.2)
+    activesupport (3.2.2)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    bouncy-castle-java (1.5.0146.1)
+    diff-lcs (1.1.3)
+    i18n (0.6.0)
+    jruby-openssl (0.7.6.1)
+      bouncy-castle-java (>= 1.5.0146.1)
+    multi_json (1.1.0)
+    nokogiri (1.5.2-java)
     rake (0.8.7)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
+    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
-  awesome_print
-  bundler (~> 1.0.0)
-  crack (~> 0.1.8)
-  curb (~> 0.7.8)
+  bundler
   monit!
   rake
-  rspec (~> 2.0.0.beta.20)
+  rspec (~> 2.9.0)

data/README.md

@@ -22,12 +22,17 @@ Just like any other gem:
 
 For more options see the API documentation
 
-## Compatibility
+## Compatibility and Build Status
 
-At the moment the gem is only compatible with Ruby 1.9.2.
+[![Build Status](https://secure.travis-ci.org/k33l0r/monit.png)](http://travis-ci.org/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].
+
+[travis]: http://travis-ci.org/k33l0r/monit
 
 ## License and copyright
 
-Copyright (c) 2010 Matias Korhonen
+Copyright (c) 2010 - 2012 Matias Korhonen
 
 Licensed under the MIT license, see the LICENSE file for details.

data/Rakefile

@@ -1,14 +1,5 @@
-require "bundler"
-Bundler::GemHelper.install_tasks
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
 
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
-
-gemspec = eval(File.read("monit.gemspec"))
-
-task :build => "#{gemspec.full_name}.gem"
-
-file "#{gemspec.full_name}.gem" => gemspec.files + ["monit.gemspec"] do
-  system "gem build monit.gemspec"
-  system "gem install monit-#{Monit::VERSION}.gem"
-end

data/lib/monit/service.rb

@@ -3,5 +3,19 @@ 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)
+      hash = rename_service_type(hash) if hash
+      super(hash)
+    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/status.rb

@@ -1,18 +1,23 @@
-require "curb"
+#require "crack/xml"
+require "active_support/xml_mini"
+require "active_support/core_ext/hash/conversions"
+require "net/http"
+require "net/https"
 require "uri"
-require "crack/xml"
 
 # A Ruby interface for Monit
 module Monit
   # The +Status+ class is used to get data from the Monit instance. You should not
   # need to manually instantiate any of the other classes.
   class Status
+    ::ActiveSupport::XmlMini.backend = "Nokogiri"
+
     attr_reader :url, :hash, :xml, :server, :platform, :services
     attr_accessor :username, :auth, :host, :port, :ssl, :auth, :username
     attr_writer :password
-    
+
     # Create a new instance of the status class with the given options
-    # 
+    #
     # <b>Options:</b>
     # * +host+ - the host for monit, defaults to +localhost+
     # * +port+ - the Monit port, defaults to +2812+
@@ -29,35 +34,44 @@ module Monit
       @password = options[:password]
       @services = []
     end
-    
+
     # Construct the URL
     def url
       url_params = { :host => @host, :port => @port, :path => "/_status", :query => "format=xml" }
       @ssl ? URI::HTTPS.build(url_params) : URI::HTTP.build(url_params)
     end
-    
+
     # Get the status from Monit.
     def get
-      c = Curl::Easy.new(self.url.to_s) do |curl|
-        if @auth
-          curl.password = @password
-          curl.username = @username
-        end
-        curl.headers["User-Agent"] = "Monit Ruby client #{Monit::VERSION}"
+      uri = self.url
+      http = Net::HTTP.new(uri.host, uri.port)
+
+      if @ssl
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
-      c.perform
-      
-      if c.response_code == 200
-        @xml = c.body_str
+
+      request = Net::HTTP::Get.new(uri.request_uri)
+
+      if @auth
+        request.basic_auth(@username, @password)
+      end
+
+      request["User-Agent"] = "Monit Ruby client #{Monit::VERSION}"
+
+      response = http.request(request)
+
+      if response.code == "200"
+        @xml = response.body
         return self.parse(@xml)
       else
         return false
       end
     end
-    
+
     # Parse the XML from Monit into a hash and into a Ruby representation.
     def parse(xml)
-      @hash = Crack::XML.parse(xml)
+      @hash = Hash.from_xml(xml)
       @server = Server.new(@hash["monit"]["server"])
       @platform = Platform.new(@hash["monit"]["platform"])
       if @hash["monit"]["service"].is_a? Array

data/lib/monit/version.rb

@@ -1,3 +1,3 @@
 module Monit
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/monit.gemspec

@@ -1,28 +1,25 @@
 # -*- encoding: utf-8 -*-
 require File.expand_path("../lib/monit/version", __FILE__)
 
-Gem::Specification.new do |s|
-  s.name        = "monit"
-  s.version     = Monit::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Matias Korhonen"]
-  s.email       = ["matias@kiskolabs.com"]
-  s.homepage    = "http://github.com/k33l0r/monit"
-  s.summary     = "Connect to Monit"
-  s.description = "Retrieve server information from Monit."
+Gem::Specification.new do |gem|
+  gem.authors     = ["Matias Korhonen"]
+  gem.email       = ["matias@kiskolabgem.com"]
+  gem.homepage    = "http://github.com/k33l0r/monit"
+  gem.summary     = "Connect to Monit"
+  gem.description = "Retrieve server information from Monit."
 
-  s.required_rubygems_version = ">= 1.3.6"
-  s.rubyforge_project         = "monit"
+  gem.name        = "monit"
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.require_paths = ["lib"]
+  gem.version     = Monit::VERSION
 
-  s.add_development_dependency "bundler", "~> 1.0.0"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec", "~> 2.0.0.beta.20"
-  s.add_development_dependency "awesome_print"
-  
-  s.add_dependency "crack", "~> 0.1.8"
-  s.add_dependency "curb", "~> 0.7.8"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "bundler"
+  gem.add_development_dependency "rspec", "~> 2.9.0"
 
-  s.files        = `git ls-files`.split("\n")
-  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
-  s.require_path = 'lib'
+  gem.add_runtime_dependency "nokogiri", "~> 1.5.2"
+  gem.add_runtime_dependency "activesupport", "~> 3.2.2"
+  gem.add_runtime_dependency "jruby-openssl", "~> 0.7.6.1" if RUBY_PLATFORM =~  /java/
 end

data/spec/monit_spec.rb

@@ -1,6 +1,9 @@
 # -*- encoding: utf-8 -*-
 require "spec_helper"
 
+SMALLISH_STATUS_PATH  = File.expand_path("../samples/smallish_status.xml", __FILE__)
+LARGISH_STATUS_PATH   = File.expand_path("../samples/largish_status.xml", __FILE__)
+
 describe Monit do
   context "Status" do
     it "should be possible to instatiate it with no options" do
@@ -29,7 +32,7 @@ describe Monit do
     
     it "should parse XML into a Hash" do
       status = Monit::Status.new
-      status.stub!(:xml).and_return(File.read("./spec/samples/smallish_status.xml"))
+      status.stub!(:xml).and_return(File.read(SMALLISH_STATUS_PATH))
       status.parse(status.xml)
       status.hash.should be_kind_of Hash
       status.hash["monit"].should_not be_nil
@@ -37,7 +40,7 @@ describe Monit do
       status.hash["monit"]["platform"].should_not be_nil
       status.hash["monit"]["service"].should_not be_nil
       
-      status.stub!(:xml).and_return(File.read("./spec/samples/largish_status.xml"))
+      status.stub!(:xml).and_return(File.read(LARGISH_STATUS_PATH))
       status.parse(status.xml)
       status.hash.should be_kind_of Hash
       status.hash["monit"].should_not be_nil
@@ -48,7 +51,7 @@ describe Monit do
     
     it "should parse XML into a Ruby representation" do
       status = Monit::Status.new
-      status.stub!(:xml).and_return(File.read("./spec/samples/smallish_status.xml"))
+      status.stub!(:xml).and_return(File.read(SMALLISH_STATUS_PATH))
       status.parse(status.xml)
       
       status.server.should be_kind_of Monit::Server
@@ -58,7 +61,7 @@ describe Monit do
       status.services.first.should be_kind_of Monit::Service
       status.services.first.should be_kind_of OpenStruct
       
-      status.stub!(:xml).and_return(File.read("./spec/samples/largish_status.xml"))
+      status.stub!(:xml).and_return(File.read(LARGISH_STATUS_PATH))
       status.parse(status.xml)
       
       status.server.should be_kind_of Monit::Server
@@ -159,7 +162,7 @@ describe Monit do
       service.pendingaction.should == "0"
       service.groups.should be_kind_of Hash
       service.system.should be_kind_of Hash
-      service.type.should == "5"
+      service.service_type.should == "5"
     end
   end
 end

data/spec/spec_helper.rb

@@ -4,4 +4,3 @@ Bundler.setup
 
 require "rspec"
 require "monit"
-

metadata

@@ -1,113 +1,86 @@
 --- !ruby/object:Gem::Specification 
 name: monit
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors: 
-- Matias Korhonen
+  - Matias Korhonen
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 +03:00
-default_executable: 
+date: 2012-03-23 00:00:00 Z
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 20
-        version: 2.0.0.beta.20
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: awesome_print
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: crack
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 8
-        version: 0.1.8
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: curb
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 8
-        version: 0.7.8
-  type: :runtime
-  version_requirements: *id006
+  - !ruby/object:Gem::Dependency 
+    name: rake
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    requirement: *id001
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: bundler
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    requirement: *id002
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 2.9.0
+    requirement: *id003
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: nokogiri
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.5.2
+    requirement: *id004
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: activesupport
+    version_requirements: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 3.2.2
+    requirement: *id005
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: jruby-openssl
+    version_requirements: &id006 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.7.6.1
+    requirement: *id006
+    prerelease: false
+    type: :runtime
 description: Retrieve server information from Monit.
 email: 
-- matias@kiskolabs.com
+  - matias@kiskolabgem.com
 executables: []
 
 extensions: []
@@ -115,25 +88,25 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .gitignore
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.md
-- Rakefile
-- lib/monit.rb
-- lib/monit/httpd.rb
-- lib/monit/platform.rb
-- lib/monit/server.rb
-- lib/monit/service.rb
-- lib/monit/status.rb
-- lib/monit/version.rb
-- monit.gemspec
-- spec/monit_spec.rb
-- spec/samples/largish_status.xml
-- spec/samples/smallish_status.xml
-- spec/spec_helper.rb
-has_rdoc: true
+  - .gitignore
+  - .travis.yml
+  - Gemfile
+  - Gemfile.lock
+  - LICENSE
+  - README.md
+  - Rakefile
+  - lib/monit.rb
+  - lib/monit/httpd.rb
+  - lib/monit/platform.rb
+  - lib/monit/server.rb
+  - lib/monit/service.rb
+  - lib/monit/status.rb
+  - lib/monit/version.rb
+  - monit.gemspec
+  - spec/monit_spec.rb
+  - spec/samples/largish_status.xml
+  - spec/samples/smallish_status.xml
+  - spec/spec_helper.rb
 homepage: http://github.com/k33l0r/monit
 licenses: []
 
@@ -141,31 +114,34 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
-      version: 1.3.6
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
-rubyforge_project: monit
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Connect to Monit
-test_files: []
-
+test_files: 
+  - spec/monit_spec.rb
+  - spec/samples/largish_status.xml
+  - spec/samples/smallish_status.xml
+  - spec/spec_helper.rb