du_pretty 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d143049a63ea770de4a93da816eee87e78621238045d3d96a2c311b77cd82be6
-  data.tar.gz: 785368c3b8c2e67300f79037cbd80f096e28e52ca3d86d02bd6722c7d608b379
+  metadata.gz: 61dc0af33ffecb01858522e4fa90309c5e04c6942bef5d8dbcbca1ec24f0aad3
+  data.tar.gz: 966e1e39727763f52a18a8a1fe418cfc845f1e3e37556adceb960c31d50e239e
 SHA512:
-  metadata.gz: 68ab666e2c371cb4128a91f063869974d1ca92d9c3ea75d4af9a2d1ac4d68550cdc7f81e7899b85d2aa67a078ac2fc48622ca8ddf0b90d5283dfdc269e2b55ff
-  data.tar.gz: 3117c5a6d46eeb69a2ab728793ea40b38b4547463a41681becc7975b893a4c865d147e82d4ea4500cc28ed1ffa2b8015326f344fc95c8653287ad15330f57c97
+  metadata.gz: f399efd4c2e46e23b22766a9d0c1cb589d6e7851064fafa969f9a68b6a36d90ff63c35f547efd10e8aef3a6d10023623358776db7ea2c3189efb85bbe14c0494
+  data.tar.gz: 65d2be03a70889c77f149f097995768875f20bf70665c36f4b1eee012cdad24d4280da6255e97ebcab68c228716c4b3395da8e57cb911e15e403f45e15dc0a0c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    du_pretty (0.2.2)
+    du_pretty (0.3.0)
       colorize
       thor
 
@@ -36,4 +36,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/lib/du_pretty/cli.rb

@@ -9,14 +9,26 @@ module DuPretty
     option :min_mbyte, type: :numeric
     option :min_kbyte, type: :numeric
     option :depth, type: :numeric, aliases: :d
+    option :sort, aliases: :s, type: :boolean
+    option :all, aliases: :a, type: :boolean
+    option :tree, type: :boolean, default: true
+
     def path(path = '.')
       min_kbyte = [(options[:min_gbyte] || 0) * 1024 * 1024, (options[:min_mbyte] || 0) * 1024, (options[:min_kbyte] || 0)].max
-      print DuWrapper.new(
+      du_wrapper = DuWrapper.new(
         path,
         min_kbyte: min_kbyte,
-        depth: options[:depth]
-      ).pretty
-      print "\n"
+        depth: options[:depth],
+        with_files: options[:all],
+      )
+      result = if options[:sort]
+        du_wrapper.sorted
+      elsif options[:tree] == false
+        du_wrapper.original
+      else
+        du_wrapper.tree
+      end
+      print result + "\n"
     end
   end
 end

data/lib/du_pretty/version.rb

@@ -1,3 +1,3 @@
 module DuPretty
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/du_pretty.rb

@@ -6,39 +6,62 @@ require 'du_pretty/cli'
 
 module DuPretty
   class DuWrapper
-    def initialize(path, min_kbyte: 0, depth: nil)
+    def initialize(path, min_kbyte: 0, depth: nil, with_files: false)
       @path = File.expand_path(path, Pathname.pwd)
       @min_kbyte = min_kbyte
       @depth = depth
+      @with_files = with_files
     end
 
-    def pretty
-      du.split("\n")
-        .map { |line| DiskUsage.new(line, @path) }
-        .select { |x| x.kbyte >= @min_kbyte }
-        .reverse
-        .map(&:pretty)
-        .join("\n")
+    def original
+      filtered_disk_usages.map(&:pretty).join("\n")
+    end
+
+    def sorted
+      filtered_disk_usages.sort_by(&:kbyte).map(&:pretty).join("\n")
+    end
+
+    def tree
+      filtered_disk_usages.reverse.map(&:tree_format).join("\n")
     end
 
     private
 
     def du
-      options = @depth.nil? ? '' : "-d #{@depth}"
-      `du -k #{options} #{@path}`
+      options = [
+        @depth.nil? ? nil : "-d #{@depth}",
+        @with_files ? '-a' : nil,
+        '-k'
+      ]
+      `du #{options.join(' ')} #{@path}`
+    end
+
+    def disk_usages
+      xs = du.split("\n").map { |line| DiskUsage.new(line, @path) }
+      total = xs.map(&:kbyte).max
+      xs.map { |x| DiskUsage.new(x.raw, @path, total: total) }
+    end
+
+    def filtered_disk_usages
+      disk_usages.select { |x| x.kbyte >= @min_kbyte }
     end
 
     class DiskUsage
       attr_accessor :raw, :kbyte, :path
 
-      def initialize(raw, root)
+      def initialize(raw, root, total: nil)
         @raw = raw
         @root = root
         @kbyte = raw.split("\t").compact[0].to_i
         @path = raw.split("\t").compact[1]
+        @total = total
       end
 
       def pretty
+        pretty_byte + "\t." + relative_path
+      end
+
+      def tree_format
         pretty_path + ' ' + pretty_byte
       end
 
@@ -57,21 +80,21 @@ module DuPretty
         gb = mb / 1024
         if gb.positive?
           if gb > 10
-            "#{gb}GB".red
+            "#{gb}GB (#{percentage})".red
           else
-            "#{gb}GB".light_red
+            "#{gb}GB (#{percentage})".light_red
           end
         elsif mb.positive?
           if mb > 500
-            "#{mb}MB".yellow
+            "#{mb}MB (#{percentage})".yellow
           else
-            "#{mb}MB".light_yellow
+            "#{mb}MB (#{percentage})".light_yellow
           end
         else
           if @kbyte > 500
-            "#{@kbyte}KB".green
+            "#{@kbyte}KB (#{percentage})".green
           else
-            "#{@kbyte}KB".light_green
+            "#{@kbyte}KB (#{percentage})".light_green
           end
         end
       end
@@ -83,6 +106,11 @@ module DuPretty
         spaces + tree_symbol + basename
       end
 
+      def percentage
+        percentage = @kbyte * 1.0 / @total * 100
+        "#{percentage.ceil}%"
+      end
+
       def relative_path
         @path.sub(/^#{@root}/, '')
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: du_pretty
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Katsuma Narisawa
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Simple wrapper for "du" to pretty print.