but 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 693e50dbd8f3e958a71eb3f0a187aa462e2182b1bddb4e83978f1bca5695ef0b
-  data.tar.gz: a1d7780e97e9e53b3a6fa07b266dc4ceac0cf7326fc2a1d5a5d24446cec3f6d6
+  metadata.gz: 46fdad6aef500448ab94aa57873370e26e239b13ff90ec383682719c2c30632b
+  data.tar.gz: 89a61e37ac310c3d306b5a4f43332074e906546380ab5e61c1fff4bad45e5481
 SHA512:
-  metadata.gz: 9371a46a799d1296bcb9bbc255d09805b72014e34bff7c1f296868506e185232d8dff3056429758d091fe5ba25ead003ffceccf9df3dbffb1b14377b31d06813
-  data.tar.gz: 2721547f469207c3f84a1aa64fca23a2b2ca7acf6ea9d3cdaf524ee1a0c4ae654fff911e81f604b99a3633a87ac0ffdd5e54205b63e52928c689b3dcf3ecd8ae
+  metadata.gz: 102a16ea09f9d5c42d081e712ca8ec61b702f82c90307c7a3bee44fcba5137386e1e9dcecabfe1f22d409c9131685a6609bc5d00829419afec32c8fa80f31a79
+  data.tar.gz: c424e206533dc68965a9e7c4adf949f607a669fc17e0e02162e5c8d799eddfde679583ee20c6df4e58bffbe99b73f310aefbd9c6c76115e2e67d0afaaf9e1a36

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    but (0.1.4)
+    but (0.1.5)
       colorize
       ruby-prof
+      ruby-progressbar
       thor
 
 GEM

data/but.gemspec

@@ -50,6 +50,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor'
   spec.add_dependency 'colorize'
   spec.add_dependency 'ruby-prof'
+  spec.add_dependency 'ruby-progressbar'
 
 
   spec.metadata    = { "source_code_uri" => "https://git.computational.bio.uni-giessen.de/rmueller/bcf_user_tools" }

data/lib/but/home_keeper.rb

@@ -1,9 +1,11 @@
 require 'open3'
 require 'tempfile'
 require 'colorize'
+require 'ruby-progressbar'
 
 module But
   module HomeKeeper
+    BLOCK_SIZE = 1024
 
     def self.info(options = {})
       file = ENV['BUTHOMEKEEPER'] || create_disk_usage_file(options)
@@ -21,22 +23,68 @@ module But
       end
     end
 
+    def self.all_eof(files)
+      files.find { |f| !f.eof }.nil?
+    end
 
     # Q: is $HOME always set?
     def self.create_disk_usage_file(options = {})
       tmpfile = ::Tempfile.new("diskusage")
       dir = options[:dir] || ENV['HOME']
-      ::Open3.popen3("du","-d 0", dir) do |stdin, stdout, stderr, wait_thr|
 
-        if wait_thr.value != 0
-          STDERR.write "Exitcode: #{wait_thr.value}\n".light_black
-          STDERR.write stderr.gets(nil).light_black
+      total_lines = `ls -d ~/.*/ ~/*/ | wc -l`.to_i
+      #puts total_lines
+      progressbar = ProgressBar.create(title: "inspecting #{dir}", total: total_lines , 
+                                       :format         => "%a %c/%C %b\u{15E7}%i %p%% %t",
+                                       :progress_mark  => ' ',
+                                       :remainder_mark => "\u{FF65}",
+                                      )
+
+      ::Open3.popen3("du","-d 1", dir) do |stdin, stdout, stderr, wait_thr|
+        # inspired by from https://gist.github.com/chrisn/7450808
+
+        stdin.close_write
+        begin
+          files = [stdout, stderr]
+          until all_eof(files) do
+            ready = IO.select(files)
+            progressbar.refresh
+
+            if ready
+              readable = ready[0]
+              readable.each do |f|
+                fileno = f.fileno
+
+                begin
+                  data = f.read_nonblock(BLOCK_SIZE)
+
+                  #puts "fileno: #{fileno}, data: #{data.inspect}"
+                  progressbar.progress += data.lines.count
+                  progressbar.title = "inspecting %s" % data.split(/\s+/).last
+                  tmpfile.write(data)
+                rescue EOFError => e
+                  puts "fileno: #{fileno} EOF"
+                  files.delete f
+                end
+              end
+            end
+          end
+        rescue IOError => e
+          puts "IOError: #{e}"
         end
 
-        tmpfile.write(stdout.gets(nil))
+
+        #if wait_thr.value != 0
+        #  STDERR.write "Exitcode: #{wait_thr.value}\n".light_black
+        #  STDERR.write stderr.gets(nil).light_black
+        #end
+
+        #tmpfile.write(stdout.gets(nil))
       end
+      progressbar.finish
       tmpfile.rewind
       return tmpfile.path
     end
+
   end
 end

data/lib/but/version.rb

@@ -1,3 +1,3 @@
 module But
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: but
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Raphael Müller
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: BCF admins have a hard live. Their user's don't keep their $HOMES and
   other working places clean. It appears that some users don't know that they use
   too much space in their home or don't clean used directories on cluster (or other)