storage_visualizer 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 194d65e776b179be3a357f52d97c0b30f5e396d5
-  data.tar.gz: 9299adc1d69eba26b5c9ef859f9606b5be3c7384
+  metadata.gz: 9b04a7461544880c9306687b865389509da70a78
+  data.tar.gz: 0bb34bc3b809e78e5c65ba36268c8ce5350083f8
 SHA512:
-  metadata.gz: 50c06dded42e0726d18e996700c1fb03f3441491a77bff6dcfb660fac4d283d5373cac51836fcaf85f6a4fdd33ea387ed6a21726ca1f6510602b203eb534a13d
-  data.tar.gz: 2042e22397e7be0eb2fa8b49836c0a5a24b1c4cffbbd830e8fc676ebf5f5136749a4983badb20126dfe168a10b8aa75382aaca973ffed7426e2fd4bf8fe5b250
+  metadata.gz: 71be27304b23dcda4983799579ece5a71a8c8ecf8a7d4a088baaedd9090924c1082023f1cc57621ba183d2bbeddbc0d859d6c091b4d4785e6d5675a65fcb8fe3
+  data.tar.gz: 0c9a246a63c73fde9c094749dea7065f13496032574dfd69691f6c97204299cdd1ea43a4313148a79d61350e2ed9e99eaaf2567ee6818c7045128af7396c66a3

data/lib/storage_visualizer.rb

@@ -1,5 +1,22 @@
 #!/usr/bin/env ruby
 
+# @author Terry Case <terrylcase@gmail.com>
+
+#  Copyright 2015 Terry Case
+#  
+#  Licensed under the Creative Commons, Version 3.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#  
+#      https://creativecommons.org/licenses/by/3.0/us/
+#  
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+
 require 'pp'
 require 'yaml'
 require 'date'
@@ -20,10 +37,12 @@ class StorageVisualizer
   end
   
   # To do:
-  # - Specify blocksize and do not assume 512 bytes (use the -k flag, which reports blocks as KB)
+  # x Make it work on linux
+  # x Specify blocksize and do not assume 512 bytes (use the -k flag, which reports blocks as KB)
+  # - Enable for filesystems not mounted at the root '/'
   # - Allow the threshold to be specified (default is 5%)
   # - Allow output filename to be specified
-  # - Enable for filesystems not mounted at the root '/'
+  # Maybe:
   # - Prevent paths on the graph from crossing
   # - See if it would be cleaner to use the googlecharts gem (gem install googlecharts)
   # - Create an installer that sets up cron scheduling and add polling to the webpage
@@ -177,8 +196,31 @@ class StorageVisualizer
   
   def get_basic_disk_info
     # df -l gets info about locally-mounted filesystems
-    output = `df -l`
-    # Looks like this:
+    output = `df -lk`
+    
+    # OSX
+    #   Filesystem                          1024-blocks  Used      Available   Capacity   iused     ifree       %iused  Mounted on
+    #   /dev/disk1                          975912960    349150592 626506368   36%        87351646  156626592   36%     /
+    #   localhost:/QwnJE6UBvlR1EvqouX6gMM   975912960    975912960         0   100%        0         0          100%    /Volumes/MobileBackups
+    
+    # CentOS:
+    #   Filesystem     1K-blocks    Used Available Use% Mounted on
+    #   /dev/xvda1      82436764 3447996  78888520   5% /
+    #   devtmpfs        15434608      56  15434552   1% /dev
+    #   tmpfs           15443804       0  15443804   0% /dev/shm
+    
+    # Ubuntu:
+    #   Filesystem     1K-blocks   Used Available Use% Mounted on
+    #   /dev/xvda1      30832636 797568  28676532   3% /
+    #   none                   4      0         4   0% /sys/fs/cgroup
+    #   udev             3835900     12   3835888   1% /dev
+    #   tmpfs             769376    188    769188   1% /run
+    #   none                5120      0      5120   0% /run/lock
+    #   none             3846876      0   3846876   0% /run/shm
+    #   none              102400      0    102400   0% /run/user
+    #   /dev/xvdb       30824956  45124  29207352   1% /mnt
+
+    # Populate disk info into a hash of hashes
     # {"/"=>
     #   {"capacity"=>498876809216, "used"=>434777001984, "available"=>63837663232},
     #  "/Volumes/MobileBackups"=>
@@ -190,14 +232,26 @@ class StorageVisualizer
         next
       end
       cols = line.split
-      # ["Filesystem", "512-blocks", "Used", "Available", "Capacity", "iused", "ifree", "%iused", "Mounted", "on"]
+      # ["Filesystem", "1024-blocks", "Used", "Available", "Capacity", "iused", "ifree", "%iused", "Mounted", "on"]
       # line: ["/dev/disk1", "974368768", "849157528", "124699240", "88%", "106208689", "15587405", "87%", "/"]
       
-      self.diskhash[cols[8]] = {
-        'capacity' => (cols[1].to_i * 512).to_i,
-        'used' => (cols[2].to_i * 512).to_i,
-        'available' => (cols[3].to_i * 512).to_i
-      }
+      if cols.length == 9
+        # OSX
+        self.diskhash[cols[8]] = {
+          'capacity' => (cols[1].to_i ).to_i,
+          'used' => (cols[2].to_i ).to_i,
+          'available' => (cols[3].to_i ).to_i
+        }
+      elsif cols.length == 6
+        # Ubuntu & CentOS
+        self.diskhash[cols[5]] = {
+          'capacity' => (cols[1].to_i ).to_i,
+          'used' => (cols[2].to_i ).to_i,
+          'available' => (cols[3].to_i ).to_i
+        }
+      else
+        raise "Reported disk utilization not understood"
+      end
     end
 
     # puts "Disk mount info:"
@@ -209,13 +263,13 @@ class StorageVisualizer
 
 
     free_space = (self.available).to_i
-    free_space_gb = "#{'%.0f' % (free_space / 1024 / 1024 / 1024)}"
+    free_space_gb = "#{'%.0f' % (free_space / 1024 / 1024)}"
     free_space_array = ['/', 'Free Space', free_space_gb]
     self.tree.push(free_space_array)
 
-    self.capacity_gb  = "#{'%.0f' % (self.capacity.to_i / 1024 / 1024 / 1024)}"
-    self.used_gb      = "#{'%.0f' % (self.used.to_i / 1024 / 1024 / 1024)}"
-    self.available_gb = "#{'%.0f' % (self.available.to_i / 1024 / 1024 / 1024)}"
+    self.capacity_gb  = "#{'%.0f' % (self.capacity.to_i / 1024 / 1024)}"
+    self.used_gb      = "#{'%.0f' % (self.used.to_i / 1024 / 1024)}"
+    self.available_gb = "#{'%.0f' % (self.available.to_i / 1024 / 1024)}"
 
 
 
@@ -240,19 +294,19 @@ class StorageVisualizer
     end
 
 
-    cmd = "du -sx \"#{dir_to_analyze}\""
+    cmd = "du -sxk \"#{dir_to_analyze}\""
     puts "\trunning #{cmd}"
     output = `#{cmd}`.strip().split("\t")
     # puts "Du output:"
     # pp output
-    size = output[0].to_i * 512
-    size_gb = "#{'%.0f' % (size.to_f / 1024 / 1024 / 1024)}"
+    size = output[0].to_i 
+    size_gb = "#{'%.0f' % (size.to_f / 1024 / 1024)}"
     # puts "Size: #{size}\nCapacity: #{self.diskhash['/']['capacity']}"
     
     occupancy = (size.to_f / self.capacity.to_f)
     occupancy_pct = "#{'%.0f' % (occupancy * 100)}"
     
-    capacity_gb = "#{'%.0f' % (self.capacity.to_f / 1024 / 1024 / 1024)}"
+    capacity_gb = "#{'%.0f' % (self.capacity.to_f / 1024 / 1024)}"
     
     # if this dir contains more than 5% of disk space, add it to the tree
     
@@ -264,7 +318,7 @@ class StorageVisualizer
       if (dir_to_analyze == self.target_dir)
         
         other_space = self.used - size
-        other_space_gb = "#{'%.0f' % (other_space / 1024 / 1024 / 1024)}"
+        other_space_gb = "#{'%.0f' % (other_space / 1024 / 1024)}"
         other_space_array = ['/', 'Other', other_space_gb]
 
         short_target_dir = self.target_dir.split('/').reverse[0]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: storage_visualizer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Terry Case
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies: []
 description: This tool helps visualize which directories are occupying the most storage.
   Any directory that occupies more than 5% of disk space is added to a visual hierarchichal