dle 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 954b6dbb956a5a13cab35c61df14f1d614f246d2
-  data.tar.gz: 5e80a17b73437a40587f6be58b1d0f48d87d33bf
+  metadata.gz: e4e369f0d5b31fd3d9ae966eb044321f9a48a3b2
+  data.tar.gz: 785f54970608d82c8c443059a3fc85214caeb83e
 SHA512:
-  metadata.gz: 1a75351e1d3d18792ed530564364a773a8d5e7e83fe65cea779c232c6f35ad448184c93ef33f82085482bba4616962aea4283cb5d9390ca781b47d25eacbcafe
-  data.tar.gz: 2e13b0f57002f7e517cbbbc166cd1aec9bd41d42a7cd6960711f19a18306d495f769e1cd36f98a5a818c18fcd58659e91fe151ae8a454517fd55501c1004e041
+  metadata.gz: 826305d9aafac83e780768cfa73bdf98b7f16ebae0e67a368e9715cb92d13205d240b6df3cb9273cbb24215f864afc1acc48b0182daae0e70fef8495c20242e7
+  data.tar.gz: 933374bee70087e1b3fa5292916f2d8d520aff847613fc72638b1d0643a7930652e7972e45099d645135c895f323b72057c05aa765b86d2538430712dae8a3df

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/dle

@@ -1,3 +1,8 @@
 #!/usr/bin/env ruby
 require "dle"
-Dle::Application.dispatch(ENV, ARGV)
+begin
+  Dle::Application.dispatch(ENV, ARGV)
+rescue Interrupt
+  puts("\n\nInterrupted")
+  exit 1
+end

data/lib/dle.rb

@@ -3,8 +3,10 @@ require "yaml"
 require "find"
 require "optparse"
 require "securerandom"
+require "ostruct"
+require "tempfile"
+begin ; require "pry" ; rescue LoadError ; end
 
-require "pry"
 require "active_support/core_ext/object/blank"
 require "active_support/core_ext/object/try"
 
@@ -21,4 +23,5 @@ require "dle/application"
 
 module Dle
   ROOT = Pathname.new(File.expand_path("../..", __FILE__))
+  BASH_ENABLED = "#{ENV["SHELL"]}".downcase["bash"]
 end

data/lib/dle/application.rb

@@ -8,6 +8,7 @@ module Dle
   class Application
     attr_reader :opts
     include Dispatch
+    include Helpers
 
     # =========
     # = Setup =
@@ -16,7 +17,11 @@ module Dle
       new(*a) do |app|
         app.parse_params
         app.log "core ready"
-        app.dispatch
+        begin
+          app.dispatch
+        rescue Interrupt
+          app.abort("Interrupted", 1)
+        end
       end
     end
 

data/lib/dle/application/dispatch.rb

@@ -69,7 +69,7 @@ module Dle
         base_dir = ARGV[0].present? ? File.expand_path(ARGV[0].to_s) : ARGV[0].to_s
         if !FileTest.directory?(base_dir)
           if base_dir.present?
-            abort c(ARGV[0].to_s, :magenta) << c(" is not a valid directory!", :red)
+            abort c(ARGV[0].to_s, :magenta) << c(" is not a valid directory!", :red), 1
           else
             dispatch(:help)
             abort "Please provide a base directory.", 1
@@ -78,8 +78,21 @@ module Dle
 
         # index filesystem
         log("index #{c base_dir, :magenta}")
-        @fs = Filesystem.new(base_dir, dotfiles: @opts[:dotfiles])
+        logger.ensure_prefix c("[index]\t", :magenta) do
+          @fs = Filesystem.new(base_dir, dotfiles: @opts[:dotfiles])
+
+          notifier do
+            loop do
+              logger.raw("\033]0;#{human_number @fs.index.count} nodes indexed\007", :print) if BASH_ENABLED
+              sleep 1
+            end
+          end.perform do
+            @fs.reindex!
+            @fs.opts[:verbose] = false
+          end
+        end
         abort("Base directory is empty or not readable", 1) if @fs.index.empty?
+        log("indexed #{c "#{human_number @fs.index.count} nodes", :magenta}") if @fs.index.count > 1000
 
         file = "#{Dir.tmpdir}/#{SecureRandom.urlsafe_base64}"
         begin
@@ -87,6 +100,7 @@ module Dle
           if @opts[:input_file]
             ifile = File.expand_path(@opts[:input_file])
             if FileTest.file?(ifile) && FileTest.readable?(ifile)
+              log "processing file..."
               @dlfile = DlFile.parse(ifile)
             else
               abort "Input file not readable: " << c(ifile, :magenta)
@@ -94,10 +108,16 @@ module Dle
           else
             FileUtils.mkdir_p(File.dirname(file)) if !FileTest.exist?(File.dirname(file))
             if !FileTest.exist?(file) || File.read(file).strip.empty?
-              File.open(file, "w") {|f| f.write @fs.to_dlfile }
+              notifier do
+                sleep 3
+                log "writing result list to file..."
+              end.perform do
+                File.open(file, "w") {|f| f.write @fs.to_dlfile }
+              end
             end
             log "open list for editing..."
             open_editor(file)
+            log "processing file..."
             @dlfile = DlFile.parse(file)
           end
 
@@ -138,12 +158,28 @@ module Dle
 
         # apply changes
         log "#{@opts[:simulate] ? "Simulating" : "Applying"} changes..."
-        @delta.each do |action, snodes|
-          logger.ensure_prefix c("[apply-#{action}]\t", :magenta) do
-            snodes.each do |snode|
-              Filesystem::Destructive.new(self, action, @fs, snode).perform
+        total_actions = @delta.map{|_, nodes| nodes.count }.inject(&:+)
+        actions_performed = 0
+        begin
+          notifier do
+            loop do
+              if BASH_ENABLED
+                logger.raw("\033]0;#{@opts[:simulate] ? "Simulated" : "Peformed"} #{human_number actions_performed}/#{human_number total_actions} changes\007", :print)
+              end
+              sleep 1
+            end
+          end.perform do
+            @delta.each do |action, snodes|
+              logger.ensure_prefix c("[apply-#{action}]\t", :magenta) do
+                snodes.each do |snode|
+                  actions_performed += 1
+                  Filesystem::Destructive.new(self, action, @fs, snode).perform
+                end
+              end
             end
           end
+        ensure
+          log "#{@opts[:simulate] ? "Simulated" : "Peformed"} #{human_number actions_performed} changes..."
         end
       end
     end

data/lib/dle/filesystem.rb

@@ -23,8 +23,8 @@ module Dle
     def initialize base_dir, opts = {}
       raise ArgumentError, "#{base_dir} is not a directory" unless FileTest.directory?(base_dir)
       @base_dir = File.expand_path(base_dir).freeze
-      @opts = { dotfiles: true }.merge(opts)
-      reindex!
+      @opts = { dotfiles: true, verbose: true }.merge(opts)
+      @index = {}
     end
 
     def reindex!
@@ -103,7 +103,13 @@ module Dle
   protected
 
     def index_node path
-      Node.new(self, path).tap{|node| @index[node.inode] = node }
+      begin
+        Node.new(self, path).tap{|node| @index[node.inode] = node }
+      rescue Errno::EPERM
+        warn "Operation not permitted - #{path}" if @opts[:verbose]
+      rescue Errno::ENOENT
+        warn "No such file or directory (broken symlink?) - #{path}" if @opts[:verbose]
+      end
     end
   end
 end

data/lib/dle/helpers.rb

@@ -12,6 +12,25 @@ module Dle
       ((s > 9 || s.modulo(1) < 0.1 ? '%d' : '%.1f') % s) + ' ' + BYTE_UNITS[i]
     end
 
+    def human_number(n)
+      n.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse
+    end
+
+    def notifier &block
+      OpenStruct.new.tap do |o|
+        o.callback = block
+
+        def o.perform &block
+          t = Thread.new(&callback)
+          begin
+            block.call(t)
+          ensure
+            t.kill
+          end
+        end
+      end
+    end
+
     def render_table table, headers = []
       [].tap do |r|
         col_sizes = table.map{|col| col.map(&:to_s).map(&:length).max }

data/lib/dle/version.rb

@@ -1,4 +1,4 @@
 module Dle
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
   UPDATE_URL = "https://raw.githubusercontent.com/2called-chaos/dle/master/VERSION"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dle
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sven Pachnit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry