but 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a401f4f83816e46b9a0a8dd97b84f4da1c1ef3141e20c750d902a98ca7050b5
-  data.tar.gz: bf75f25a1d4f0eca838d60f7b7f21c1db3ad3e18f1398b3387d7b1d414b4e3a4
+  metadata.gz: d1e0e7f89684475a8ab03efce23401e10563fcd76b52ad811007437900892866
+  data.tar.gz: 1eb6a7f6f0f809a0e1a573f306702839d20cdc1c044c9ef0f64d2a6d53e9c95c
 SHA512:
-  metadata.gz: f6e61db7075302c71a5ac845aeb85433a75fbe44d90e785a81ebf0025ff80bde37e4436678f2a1d445d5438b73b1cc9905ff3222ae33de9683478e06337c3fa1
-  data.tar.gz: 6b854b4002ec51e9577ab01e0cc0b05280dff03741e1add324d048cad06ce11cae2c036c073ee765c05896e51a622def90f44008f6177145711b63d67f409431
+  metadata.gz: 8da2f660ae317bf5be7bbf3709d8ca9b1abf112046dfbfe14b5bd758e1cd50dc85eb9327a27e00c2fa21c92bcdfac0c45485e2b250851daaa7370ab0f8cabc92
+  data.tar.gz: 30f680abc3f62da8ae30042a3ab8278496f8ed623a4d986b012e37daee332c8d04b344b05db72576a852165dcd86cfdf15ec967e1a53de0266fb842a69651482

data/Gemfile.lock

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

data/README.md

@@ -130,7 +130,7 @@ but command --profile MEMORY
 
 ### Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/but. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitLab at https://git.computational.bio.uni-giessen.de/rmueller/bcf_user_tools. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ### License
 
@@ -138,5 +138,5 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ### Code of Conduct
 
-Everyone interacting in the But project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/but/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the But project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://git.computational.bio.uni-giessen.de/rmueller/bcf_user_tools/-/blob/master/CODE_OF_CONDUCT.md).
 

data/but.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["raphael.mueller@computational.bio.uni-giessen.de"]
   spec.homepage    = 'https://git.computational.bio.uni-giessen.de/rmueller/bcf_user_tools'
   spec.license       = "MIT"
+  spec.required_ruby_version = '>=2.6.0'
   spec.summary     = "Tools, to help users to improve their experience with the BCF infrastructure."
   spec.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) machines. This tools helps users find unused and unwanted directories, which could make BCF admins happier."
 
@@ -49,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)
@@ -15,9 +17,9 @@ module But
       total_disc_usage = total_disc_usage.to_i
 
       if total_disc_usage >= But::HOMELIMIT
-        return "Dare you! Your directory #{dir} contains #{total_disc_usage}, which is #{total_disc_usage - But::HOMELIMIT} above the limit of #{But::HOMELIMIT}. Dare you!".red
+        return "Dare you! Your directory #{dir} contains ~#{h_readable total_disc_usage}, which is ~#{h_readable (total_disc_usage - But::HOMELIMIT)} above the limit of #{h_readable But::HOMELIMIT}. Dare you!".red
       else
-        return "Good job! Your directory #{dir} takes only #{total_disc_usage} disk storage. Good job!".light_green
+        return "Good job! Your directory #{dir} takes only ~#{h_readable total_disc_usage} disk storage. Good job!".light_green
       end
     end
 
@@ -26,17 +28,70 @@ module But
     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 = "completed: %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
+    
+    private
+
+    def self.all_eof(files)
+      files.find { |f| !f.eof }.nil?
+    end
+
+    def self.h_readable(bytes)
+      return "%.2f GB"% (bytes / (1024.0 * 1024.0))
+    end
+
   end
 end

data/lib/but/version.rb

@@ -1,3 +1,3 @@
 module But
-  VERSION = "0.1.3"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: but
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 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)
@@ -243,7 +257,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="