server_metrics 1.2.7 → 1.2.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWJiY2MxZmM4ZGM2ZjBkZjAxNWUxYTNlOTAzNDFhYmUwNGI3OWIzZA==
-  data.tar.gz: !binary |-
-    OTA2NDQzYWFkYmJmMjY5MTIxY2QxYTkyYzA4ODIwNjU3OTUwYmY4Nw==
+SHA1:
+  metadata.gz: a4040b1194f4904d529f0b9325e5770d33ca7364
+  data.tar.gz: 2cd897acaa0dbde2e0a44e4a3d83fa3263b8720c
 SHA512:
-  metadata.gz: !binary |-
-    YWU3OWRiMDc1NTcxNzM4YmIyN2M2NTljNmYwY2IwZDE2ODNmNTExZDA4NTdk
-    Mjc0ZDk4OWU4YTYxZmM0OTIwOTQyYzY4YmY3MDA2OGIwYjI1MGEwMmJmNDgw
-    NmI4MzEzNjRjN2IxMTQ1ZmIxOTk4ZjYxMGJhNzYyM2Q2YmVhMGQ=
-  data.tar.gz: !binary |-
-    NmU4NTliMTFlNTQ0ODY0YzA1YzIyOWMyZDc0ZDA5ZTI0Njc3Yzk0NTU3YTlk
-    YjE5ZWJlMDE3NTE0YTYwNDgyN2QyZWRmZWQxNDBmNGE0ODY1MWQwNWJhYTRi
-    MjRiZmViMDk0YTNlOWU1NjhiNzkwZGZlNGM5YmQ4NzRkMDUyZjE=
+  metadata.gz: 18a1aaf212424d1d3801b7d1519980aacad35b9b84cbda28774638c70cb93fbf6db786e0222ef0c7366a4556cabd413067a166a92ac4feeada4f181a20b60ab0
+  data.tar.gz: b55d1b3a853393b13c86a817a38e33d2587f659733613f5b31abd4fd518f08c5977b3a1406a7e00aa5d672bf99d857cd04c9a0f9878f44936505499055387d03

data/lib/server_metrics.rb

@@ -1,4 +1,5 @@
 require 'server_metrics/version'
+require 'server_metrics/backward_compatibility_patch'
 require 'server_metrics/collector'
 require 'server_metrics/multi_collector'
 require 'server_metrics/system_info'

data/lib/server_metrics/backward_compatibility_patch.rb

@@ -0,0 +1,17 @@
+# Ruby 1.8.6 compatibility
+if !String.method_defined?(:lines)
+  class String
+    def lines
+      to_a
+    end
+  end
+end 
+
+# Ruby 1.8.6 compatibility
+if !String.method_defined?(:start_with?)
+  class String
+    def start_with?(matcher)
+      !!match(/\A#{matcher}/)
+    end
+  end
+end

data/lib/server_metrics/collectors/disk.rb

@@ -44,7 +44,7 @@ class ServerMetrics::Disk < ServerMetrics::MultiCollector
 
     df_output[1..df_output.size-1].each do |line|
       values=line.split(/\s+/,6)
-      parsed_lines<<Hash[headers.zip(values)]
+      parsed_lines<<Hash[*headers.zip(values).flatten]
     end
 
     # select the right line

data/lib/server_metrics/version.rb

@@ -1,3 +1,3 @@
 module ServerMetrics
-  VERSION = '1.2.7'
+  VERSION = '1.2.8'
 end

data/test/test_helper.rb

@@ -1,6 +1,10 @@
 $LOAD_PATH << File.expand_path( File.dirname(__FILE__) + '/../lib' ) # needed because when running tests, Rubygems manage $LOAD_PATH like it does in runtime
 require 'rubygems' # so the development-only dependencies below can be loaded
-require 'pry'
+begin
+  require 'pry'
+rescue LoadError
+  # not using pry
+end
 require 'awesome_print'
 require 'timecop'
 require 'test/unit'

data/test/test_with_fixtures.rb

@@ -6,7 +6,7 @@ class TestWithFixtures < Test::Unit::TestCase
     fixture = fixtures(:cpu)
     c = ServerMetrics::Cpu.new()
 
-    ServerMetrics::Cpu::CpuStats.expects(:`).with("cat /proc/stat 2>&1").returns(fixture.command("cat /proc/stat 2>&1")).once
+    File.expects(:read).with("/proc/stat").returns(fixture.command("cat /proc/stat 2>&1")).once
     c.expects(:`).with("uptime").returns(fixture.command("uptime")).once
 
     c.run
@@ -39,7 +39,7 @@ class TestWithFixtures < Test::Unit::TestCase
     fixture = fixtures(:disk)
     c.expects(:`).with("mount").returns(fixture.command("mount")).once
     c.expects(:`).with("df -Pkh").returns(fixture.command("df -Pkh")).once
-    c.expects(:`).with("cat /proc/diskstats").returns(fixture.command("cat /proc/diskstats")).once
+    File.expects(:readlines).with("/proc/diskstats").returns(fixture.command("cat /proc/diskstats")).once
     c.run
 
     assert_equal ["/dev/xvda1"], c.data.keys
@@ -98,7 +98,7 @@ eos
     fixture = fixtures(:disk)
     c.expects(:`).with("mount").returns(fixture.command("mount")).once
     c.expects(:`).with("df -Pkh").returns(fixture.command("df -Pkh")).once
-    c.expects(:`).with("cat /proc/diskstats").returns(fixture.command("cat /proc/diskstats", "ubuntu second run")).once
+    File.expects(:readlines).with("/proc/diskstats").returns(fixture.command("cat /proc/diskstats", "ubuntu second run")).once
 
     Timecop.travel(60) do
       c.run
@@ -116,7 +116,7 @@ eos
     fixture = fixtures(:memory)
     c = ServerMetrics::Memory.new()
     c.expects(:`).with("uname").returns("Linux").times(2)
-    c.expects(:`).with("cat /proc/meminfo").returns(fixture.command("cat /proc/meminfo")).once
+    File.expects(:read).with("/proc/meminfo").returns(fixture.command("cat /proc/meminfo")).once
     c.run
     assert_equal 7, c.data.keys.size
     # the field names should align with the disk field names
@@ -133,10 +133,10 @@ eos
     ServerMetrics::Network.any_instance.stubs("linux?").returns(true)
     fixture = fixtures(:network)
     c = ServerMetrics::Network.new()
-    c.expects(:`).with("cat /proc/net/dev").returns(fixture.command("cat /proc/net/dev")).once
+    File.expects(:read).with("/proc/net/dev").returns(fixture.command("cat /proc/net/dev")).once
     c.run
 
-    c.expects(:`).with("cat /proc/net/dev").returns(fixture.command("cat /proc/net/dev", "second run")).once
+    File.expects(:read).with("/proc/net/dev").returns(fixture.command("cat /proc/net/dev", "second run")).once
     Timecop.travel(60) do
       c.run
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: server_metrics
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Andre Lewis
@@ -10,104 +10,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 description: Collect information about disks, memory, CPU, networks, and processes
@@ -117,7 +117,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -126,6 +126,7 @@ files:
 - examples/example_processes.rb
 - examples/example_usage.rb
 - lib/server_metrics.rb
+- lib/server_metrics/backward_compatibility_patch.rb
 - lib/server_metrics/collector.rb
 - lib/server_metrics/collectors/cpu.rb
 - lib/server_metrics/collectors/disk.rb
@@ -159,12 +160,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []