server_metrics 1.2.3 → 1.2.4

data/.gitignore

@@ -6,6 +6,7 @@
 Gemfile.lock
 InstalledFiles
 _yardoc
+bin
 coverage
 doc/
 lib/bundler/man
@@ -15,5 +16,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+vendor
 .idea
 .ruby-version

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.2.4
+
+* Collecting OSX disk capacity metrics
+
 ## 1.2.3
 
 * Skipping mapped devices in disk collector

data/lib/server_metrics/collector.rb

@@ -136,12 +136,18 @@ module ServerMetrics
     end
 
     def linux?
-      RbConfig::CONFIG['target_os'].start_with?('linux')
+      ruby_config['target_os'].start_with?('linux')
     end
 
     def osx?
-      RbConfig::CONFIG['target_os'] == 'darwin'
+      ruby_config['target_os'].start_with?('darwin')
     end
 
+    private
+
+    # Returns hash of Ruby config parameters.
+    def ruby_config
+      RbConfig::CONFIG
+    end
   end
 end

data/lib/server_metrics/collectors/disk.rb

@@ -10,8 +10,6 @@ class ServerMetrics::Disk < ServerMetrics::MultiCollector
     ENV['LC_ALL'] = 'C'
     ENV['LANG'] = 'C'
     
-    @disk_stats = File.read("/proc/diskstats").lines.to_a
-
     devices.each do |device|
       get_sizes(device) # does its own reporting
       get_io_stats(device) if linux? # does its own reporting
@@ -103,15 +101,15 @@ class ServerMetrics::Disk < ServerMetrics::MultiCollector
   #   match /proc/diskstats output.
   def iostat(dev)
 
-    # if this is a mapped device, translate it into the mapped name for lookup in @disk_stats
+    # if this is a mapped device, translate it into the mapped name for lookup in disk_stats
     if dev =~ %r(^/dev/mapper/)
       name_to_find = File.readlink(dev).split("/").last rescue dev
     else
       name_to_find = dev
     end
 
-    # narrow our @disk_stats down to a list of possible devices
-    possible_devices = @disk_stats.map { |line|
+    # narrow our disk_stats down to a list of possible devices
+    possible_devices = disk_stats.map { |line|
       Hash[*COLUMNS.zip(line.strip.split(/\s+/).collect { |v| Integer(v) rescue v }).flatten]
     }.select{|entry| name_to_find.include?(entry['name']) }
 
@@ -119,6 +117,13 @@ class ServerMetrics::Disk < ServerMetrics::MultiCollector
     return possible_devices.find { |entry| name_to_find == entry['name'] } || possible_devices.first
   end
 
+  # Returns /proc/diskstats as array.
+  def disk_stats
+    File.readlines("/proc/diskstats")
+  rescue Errno::ENOENT # Handle missing /proc/diskstats, i.e. on Mac OS X.
+    []
+  end
+
   def normalize_key(key)
     key = "Used Percent" if /capacity|use.*%|%.*use/i === key
     key.downcase.gsub(" ", "_").to_sym

data/lib/server_metrics/collectors/network.rb

@@ -3,7 +3,6 @@ require "server_metrics/system_info"
 class ServerMetrics::Network < ServerMetrics::MultiCollector
 
   def build_report
-
     if linux?
       lines = File.read("/proc/net/dev").lines.to_a[2..-1]
       interfaces = []

data/lib/server_metrics/version.rb

@@ -1,3 +1,3 @@
 module ServerMetrics
-  VERSION = "1.2.3"
+  VERSION = '1.2.4'
 end

data/server_metrics.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "mocha"
+  spec.add_development_dependency "rspec", "~> 2.14"
 end

data/spec/server_metrics/collector_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe ServerMetrics::Collector do
+  let(:collector) { ServerMetrics::Collector.new }
+
+  describe '#linux?' do
+    it 'is true when target OS starts with linux' do
+      collector.should_receive(:ruby_config).
+        and_return( {'target_os' => 'linux42.0'} )
+      expect(collector.linux?).to be true
+    end
+
+    it 'is false when target OS does not start with linux' do
+      collector.should_receive(:ruby_config).
+        and_return( {'target_os' => 'chunkybacon'} )
+      expect(collector.linux?).to be false
+    end
+  end
+
+  describe '#osx?' do
+    it 'is true when target OS starts with darwin' do
+      collector.should_receive(:ruby_config).
+        and_return( {'target_os' => 'darwin42.0'} )
+      expect(collector.osx?).to be true
+    end
+
+    it 'is false when target OS does not start with darwin' do
+      collector.should_receive(:ruby_config).
+        and_return( {'target_os' => 'chunkybacon'} )
+      expect(collector.osx?).to be false
+    end
+  end
+end

data/spec/server_metrics/collectors/disk_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe ServerMetrics::Disk do
+  let(:disk) { ServerMetrics::Disk.new }
+
+  describe '#iostat' do
+    it 'uses Disk#diskstats instead @disk_stats' do
+      disk.should_receive(:disk_stats).and_return( [] )
+      expect {
+        disk.send(:iostat, '/dev/chunky')
+      }.to_not raise_error
+    end
+  end
+
+  describe '#disk_stats' do
+    it 'returns lines from /proc/diskstats as array' do
+      File.should_receive(:readlines).with('/proc/diskstats').
+        and_return( %w(chunky bacon) )
+      expect(disk.send(:disk_stats)).to eq %w(chunky bacon)
+    end
+
+    it 'returns empty array when /proc/diskstats is missing' do
+      File.stub(:readlines).and_raise(Errno::ENOENT)
+      expect(disk.send(:disk_stats)).to eq []
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+require 'server_metrics'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: server_metrics
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,6 +109,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
 description: Collect information about disks, memory, CPU, networks, and processes
 email:
 - support@scoutapp.com
@@ -136,6 +152,9 @@ files:
 - lib/server_metrics/system_info.rb
 - lib/server_metrics/version.rb
 - server_metrics.gemspec
+- spec/server_metrics/collector_spec.rb
+- spec/server_metrics/collectors/disk_spec.rb
+- spec/spec_helper.rb
 - test/fixtures/cpu.txt
 - test/fixtures/disk.txt
 - test/fixtures/memory.txt
@@ -171,6 +190,9 @@ signing_key:
 specification_version: 3
 summary: Used by the Scout agent, but also available as a stand-lone gem
 test_files:
+- spec/server_metrics/collector_spec.rb
+- spec/server_metrics/collectors/disk_spec.rb
+- spec/spec_helper.rb
 - test/fixtures/cpu.txt
 - test/fixtures/disk.txt
 - test/fixtures/memory.txt