using Usagewacth module insted of original module

cimtico · Jul 25, 2013 · cbf1041 · cbf1041
1 parent e8e0bb4
commit cbf1041
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/examples/mac_example.rb b/examples/mac_example.rb
@@ -4,7 +4,7 @@
 
 require 'usagewatch_ext'
 
-usw =  UsagewatchExt
+usw =  Usagewatch
 
 puts "#{usw.uw_diskused} Gigabytes Used"
 puts "#{usw.uw_diskused_perc} Percentage of Gigabytes Used"

diff --git a/lib/usagewatch_ext.rb b/lib/usagewatch_ext.rb
@@ -9,6 +9,7 @@ module UsagewatchExt
     puts "Mac version is under development"
   elsif os.include? "linux"
     require "usagewatch/linux"
+    UsagewatchExt = Usagewatch
   elsif os =~ /cygwin|mswin|mingw|bccwin|wince|emx/
     puts "Windows" + text
   else

diff --git a/lib/usagewatch_ext/mac.rb b/lib/usagewatch_ext/mac.rb
@@ -1,4 +1,4 @@
-module UsagewatchExt
+module Usagewatch
 
   # Show disk used in GB
   def self.uw_diskused

diff --git a/spec/usagewatch_spec.rb → spec/linux_spec.rb b/spec/usagewatch_spec.rb → spec/linux_spec.rb
diff --git a/spec/mac_spec.rb b/spec/mac_spec.rb
@@ -5,14 +5,14 @@
 if os.include? "darwin"
   describe 'IncludeLibrary' do
     it 'should include the library' do
-      a = UsagewatchExt
-      a.should be UsagewatchExt
+      a = Usagewatch
+      a.should be Usagewatch
     end
   end
 
   describe 'DiskUsage' do
     it "should be the GB of disk used" do
-      a = UsagewatchExt.uw_diskused
+      a = Usagewatch.uw_diskused
       a.class.should be(Float)
       a.should_not be_nil
       a.should be >= 0
@@ -21,7 +21,7 @@
 
   describe 'CPUUsage' do
     it "should be the percentage of cpu used" do
-      a = UsagewatchExt.uw_cpuused
+      a = Usagewatch.uw_cpuused
       a.class.should be(Float)
       a.should_not be_nil
       a.should be <= 100
@@ -31,7 +31,7 @@
 
   describe 'PercentageDiskUsage' do
     it "should be the percentage of GB of disk used" do
-      a = UsagewatchExt.uw_diskused_perc
+      a = Usagewatch.uw_diskused_perc
       a.class.should be(Float)
       a.should_not be_nil
       a.should be <= 100
@@ -41,7 +41,7 @@
 
   describe 'LoadAverage' do
     it "should be the average load of the past minute" do
-      a = UsagewatchExt.uw_load
+      a = Usagewatch.uw_load
       a.class.should be(Float)
       a.should_not be_nil
       a.should be >= 0
@@ -50,7 +50,7 @@
 
   describe 'TopCPUUsage' do
     it "should be an array of top cpu consumption proccesses " do
-      a = UsagewatchExt.uw_cputop
+      a = Usagewatch.uw_cputop
       a.class.should be(Array )
       a.should_not be_nil
       a[0][0].class.should be String
@@ -61,7 +61,7 @@
 
   describe 'TopMEMUsage' do
     it "should be an array of top mem consumption proccesses " do
-      a = UsagewatchExt.uw_cputop
+      a = Usagewatch.uw_cputop
       a.class.should be(Array )
       a.should_not be_nil
       a[0][0].class.should be String

diff --git a/spec/version_spec.rb b/spec/version_spec.rb
@@ -3,7 +3,7 @@
 
 describe 'Version' do
   it 'should be the version number' do
-    a = Usagewatch::VERSION
+    a = UsagewatchExt::VERSION
     a.class.should be(String)
     a.should_not be_nil
   end