LinuxSystemInfo 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bddb8a7b8cd8763dfbc53881ac4da5849f65a44f
-  data.tar.gz: 0bb6cf8d049b8664a35434e7b9833da09307942d
+  metadata.gz: 602d914b59dc1b98b935aa5f0abdfd19b9608e14
+  data.tar.gz: 85c06e4e0f9f3a9a20c69bb7b29d73d32ae88b30
 SHA512:
-  metadata.gz: f12428a487163082abd0a7481d51ef81cdbd20836c14333a49ce70b54319583bf05699bfcc1871104e640722e1de75222a3dd55fd6e2203f5e4b81e45dd938a4
-  data.tar.gz: 9fb493c2a884f4c59a0ead181ff7703b834bcaba9b6542995e1e467a10a3cb2c1b2704809b1c50a5af04efc4e4528016ef783dc664a1a5e9ae121cb705fa46cd
+  metadata.gz: 73e76d634240de03fcc3d2ffb18f4ed6bbaf14e6f6c0b7da711934967bec513604d82acef1e1daf9e6e215d25275c60c224c91989438e989af28f5d29ec1d7cc
+  data.tar.gz: 5853c4f0c29767a4e1b007ee7c8e04015be25b74ccfaa4b38d098716824e3b857fa03e4c3809097f2155b0c5c3e4375ade3159411846ccbe1917e21a8a6bcb94

data/LinuxSystemInfo.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'json', '>= 1.7'
-  spec.add_development_dependency 'rspec', '>= 3.0'
+  spec.add_development_dependency 'rspec', '>= 3'
 end

data/lib/LinuxSystemInfo.rb

@@ -4,10 +4,24 @@ require 'json'
 module LinuxSystemInfo
   class << self
     def info
+      uptime = `uptime`.strip
+      uptime = uptime.split(',')
+
+      running_time = ''
+      users = ''
+
+      if uptime[1].match(/\d+ (user|users)/).nil?
+        running_time = [ uptime[0], uptime[1] ].join ', '
+        users = uptime[2]
+      else
+        running_time = uptime[0]
+        users = uptime[1]
+      end
+
       {
         os: `cat /proc/version`.strip,
-        uptime: `uptime -p`.strip,
-        users: `users | wc -w`.strip
+        uptime: running_time.strip,
+        users: users.strip
       }
     end
 
@@ -101,6 +115,7 @@ module LinuxSystemInfo
       storage.each do |file|
         file = file.split
         next if file[0][0..4] != '/dev/'
+        next if file[1].nil?
         output[file[0]] = {
           :size            => file[1],
           :used            => file[2],

data/lib/LinuxSystemInfo/version.rb

@@ -1,3 +1,3 @@
 module LinuxSystemInfo
-  VERSION = '0.0.5'
+  VERSION = '0.1.0'
 end

data/spec/audio_spec.rb

@@ -11,7 +11,7 @@ describe 'With audio info' do
     end
 
     it 'will detect correct device' do
-      expect(@audio.first).to match /(Audio)/
+      expect(@audio.first).to match /(Audio|HDA|HDMI)/
     end
   end
 end

data/spec/info_spec.rb

@@ -15,11 +15,11 @@ describe 'With info' do
     end
 
     it 'will have valid uptime' do
-      expect(@os[:uptime]).to match /up \d+ [a-z]+, \d+ [a-z]+/
+      expect(@os[:uptime]).to match /\d+:\d+:\d+ up/
     end
 
     it 'will have valid users count' do
-      expect(@os[:users].to_i).to be > 0
+      expect(@os[:users].to_i).to be >= 0
     end
   end
 end

data/spec/storage_spec.rb

@@ -15,15 +15,15 @@ describe 'With storage info' do
     end
 
     it 'will have valid size' do
-      expect(@storage.first.last[:size]).to match /\d+(G|M)/
+      expect(@storage.first.last[:size]).to match /\d+(T|G|M|K)/
     end
 
     it 'will have valid used' do
-      expect(@storage.first.last[:used]).to match /\d+(G|M)/
+      expect(@storage.first.last[:used]).to match /\d+(T|G|M|K)/
     end
 
     it 'will have valid available' do
-      expect(@storage.first.last[:available]).to match /\d+(G|M)/
+      expect(@storage.first.last[:available]).to match /\d+(T|G|M|K)/
     end
 
     it 'will have valid used_percentage' do

data/spec/video_spec.rb

@@ -11,7 +11,7 @@ describe 'With video info' do
     end
 
     it 'will detect correct device' do
-      expect(@video.first).to match /(VGA|Graphics Controller)/
+      expect(@video.first).to match /(Radeon|HD|VGA|Graphics Controller)/
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: LinuxSystemInfo
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Saimon Lovell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 description: This gem gives information about RAM, CPU, HARD Drives and more. Works
   only on Linux OS.
 email:
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Get local linux hardware information.