munin-ruby 0.2.3 → 0.2.4

data/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec

data/LICENSE

@@ -0,0 +1,18 @@
+Copyright (c) 2011-2013 Dan Sosedoff <dan.sosedoff@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,6 +1,7 @@
 # Munin-Ruby
 
-Munin-ruby is a sockets-based ruby client library to communicate and fetch information from munin-node servers.
+Munin-ruby is a sockets-based ruby client library to communicate and fetch
+information from munin-node servers.
 
 ## Installation
 
@@ -29,9 +30,11 @@ node = Munin::Node.new
 node = Munin::Node.new('YOUR_HOST', YOUR_PORT)
 ```
 
-If munin-node has any restrictions on IP addresses, client will trigger ```Munin::AccessDenied``` exception.
+If munin-node has any restrictions on IP addresses, client will trigger ```Munin::AccessDenied``` 
+exception.
 
-By default client will reconnect if connection was lost. To disable that specify ```false``` after port option.
+By default client will reconnect if connection was lost. To disable that 
+specify ```false``` after port option.
 
 ```ruby
 node = Munin::Node.new('YOUR_HOST', 4949, false)
@@ -45,7 +48,8 @@ node.disconnect
 node.connection.close
 ```
 
-In case if automatic reconnection was enabled, service will establish connection even after you call 'disconnect' method.
+In case if automatic reconnection was enabled, service will establish 
+connection even after you call 'disconnect' method.
 
 To force client not to open connection: ```node.disconnect(false)```. 
 
@@ -156,10 +160,21 @@ Output:
   
 ## License
 
-Copyright (c) 2011-2012 Dan Sosedoff.
+Copyright (c) 2011-2013 Dan Sosedoff.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/munin-ruby/connection.rb

@@ -1,20 +1,25 @@
 module Munin
   class Connection
     include Munin::Parser
-    
+
+    DEFAULT_OPTIONS = {:timeout => Munin::TIMEOUT_TIME}
+
     attr_reader :host, :port
     
     # Initialize a new connection to munin-node server
     #
-    # host - Server host (default: 127.0.0.1)
-    # port - Server port (default: 4949)
-    #
-    def initialize(host='127.0.0.1', port=4949, reconnect=true)
+    # host    - Server host (default: 127.0.0.1)
+    # port    - Server port (default: 4949)
+    # options - A hash containing different options
+    #    :timeout => A timeout in seconds to be used in the connection
+
+    def initialize(host='127.0.0.1', port=4949, reconnect=true, options = {})
       @host      = host
       @port      = port
       @socket    = nil
       @connected = false
       @reconnect = reconnect
+      @options    = DEFAULT_OPTIONS.merge(options)
     end
     
     # Returns true if socket is connected
@@ -114,7 +119,7 @@ module Munin
 
     # Execute operation with timeout
     # @param [Block] block Block to execute
-    def with_timeout(time=Munin::TIMEOUT_TIME)
+    def with_timeout(time=@options[:timeout])
       raise ArgumentError, "Block required" if !block_given?
       if Munin::TIMEOUT_CLASS.respond_to?(:timeout_after)
         Munin::TIMEOUT_CLASS.timeout_after(time) { yield }

data/lib/munin-ruby/node.rb

@@ -4,20 +4,23 @@ module Munin
   class Node
     include Munin::Parser
     include Munin::Cache
-    
+
     attr_reader :connection
-    
+
+    DEFAULT_OPTIONS = {:timeout => Munin::TIMEOUT_TIME}
+
     # Initialize a new Node instance
     #
     # host      - Server host
     # port      - Server port
     # reconnect - Reconnect if connection was closed (default: true)
-    #
-    
-    def initialize(host='127.0.0.1', port=4949, reconnect=true)
-      @connection = Munin::Connection.new(host, port, reconnect)
+    # options   - A hash containing different options
+    #    :timeout => A timeout in seconds to be used in the connection
+    def initialize(host='127.0.0.1', port=4949, reconnect=true, options = {})
+      @options    = DEFAULT_OPTIONS.merge(options)
+      @connection = Munin::Connection.new(host, port, reconnect, @options)
     end
-    
+
     # Open service connection
     #
     def connect
@@ -42,9 +45,13 @@ module Munin
     # Get a list of all available nodes
     #
     def nodes
-      cache 'nodes' do 
+      nodes = []
+      cache 'nodes' do
         connection.send_data("nodes")
-        connection.read_line.split
+        while ( ( line = connection.read_line ) != "." )
+          nodes << line
+        end
+        nodes
       end
     end
     

data/lib/munin-ruby/version.rb

@@ -1,5 +1,5 @@
 module Munin
   unless defined?(::Munin::VERSION)
-    VERSION = '0.2.3'
+    VERSION = '0.2.4'
   end
 end

data/lib/munin-ruby.rb

@@ -7,13 +7,6 @@ rescue LoadError
   require 'timeout'
 end
 
-require 'munin-ruby/version'
-require 'munin-ruby/errors'
-require 'munin-ruby/parser'
-require 'munin-ruby/cache'
-require 'munin-ruby/connection'
-require 'munin-ruby/node'
-
 module Munin
   TIMEOUT_TIME = 10
 
@@ -22,4 +15,12 @@ module Munin
   else
     TIMEOUT_CLASS = Timeout
   end
-end
+end
+
+require 'munin-ruby/version'
+require 'munin-ruby/errors'
+require 'munin-ruby/parser'
+require 'munin-ruby/cache'
+require 'munin-ruby/connection'
+require 'munin-ruby/node'
+

data/munin-ruby.gemspec

@@ -15,5 +15,5 @@ Gem::Specification.new do |gem|
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
   gem.require_paths = ['lib']
   
-  gem.add_development_dependency 'rspec', '~> 2.6'
+  gem.add_development_dependency 'rspec', '~> 2.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: munin-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152614540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *2152614540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
 description: Munin Node client
 email: dan.sosedoff@gmail.com
 executables: []
@@ -30,6 +35,8 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - lib/munin-ruby.rb
@@ -67,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby client library to communicate with munin-node servers
@@ -79,4 +86,3 @@ test_files:
 - spec/node_spec.rb
 - spec/parser_spec.rb
 - spec/spec_helper.rb
-has_rdoc: