libis-tools 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5e609222120f658fb18e1594ed1f87f0c35bde28
-  data.tar.gz: 66d3563d04e59fd324a593754a74947b1c3a722f
+SHA256:
+  metadata.gz: 90860bd5c61913c592d7dd212e9ac49cde403217295a2abebe96bc15413a8421
+  data.tar.gz: 0037ce1b2ddf54ff80862648c6a596398c6326e88a399148d2df7f4c81a4f0fd
 SHA512:
-  metadata.gz: ef95ab98cc37ab82f24e92f1db943cd92eef3276964c5ee3c2591aa1575dda048bd01c2d6117a230726f6a7d735d1fca8d0591c0c256c206e868b57663782eec
-  data.tar.gz: ab8ffbcec667aa8f6d618f2f5c3cbc5295a46bea69038f7c3e4616e465c3f01044b2cc22bddf1963f3dac96695135b773048bb46d4eb41a3570654a405450b67
+  metadata.gz: 98b63d9c943f7eaf01014ade5c3a1ec94f659c1b8920198d6705a074f4f76d440911fc3b0c7298a178c1a41f52d7b7d3f2b6f1b4a4e9aea02a748f8f85a02763
+  data.tar.gz: 4b712432c22a54e44939d076aff84bf1d1628bdfb99efdf7dbb9c1f9e90597ac98e62331767e2f1f2e7c00dcd3849d72998fb6100fc468afce137682db352394

data/lib/libis/tools/cli/reorg.rb

@@ -262,13 +262,13 @@ module Libis
             next if file_name =~ /^\.\.?$/
             entry = File.join(File.absolute_path(base_dir), file_name)
             unless File.file?(entry)
-              puts "Skipping directory #{entry}." unless @report
+              prompt.say "Skipping directory #{entry}." unless @report
               write_report(entry, '', '', 'Directory - skipped.')
               count[:skipped_dir] += 1
               next
             end
             unless file_name =~ parse_regex
-              puts "Skipping file #{file_name}. File name does not match expression." unless @report
+              prompt.say "Skipping file #{file_name}. File name does not match expression." unless @report
               write_report(entry, '', '', 'Mismatch - skipped.')
               count[:unmatched_file] += 1
               next
@@ -278,7 +278,7 @@ module Libis
             target_dir = File.dirname(target)
             target_dir = File.join(base_dir, target_dir) unless target_dir[0] == '/'
             unless target_dir_list.include?(target_dir)
-              puts "-> Create directory '#{target_dir}'" unless @report
+              prompt.say "-> Create directory '#{target_dir}'" unless @report
               FileUtils.mkpath(target_dir) unless dummy_operation
               target_dir_list << target_dir
             end
@@ -289,7 +289,7 @@ module Libis
               if compare_entry(entry, target_path)
                 remark = 'Duplicate - skipped.'
                 count[:duplicate] += 1
-                $stderr.puts "Duplicate file entry: #{entry}." unless @report
+                prompt.error "Duplicate file entry: #{entry}." unless @report
               else
                 # puts "source: #{File.mtime(entry)} #{'%11s' % Filesize.new(File.size(entry)).pretty} #{entry}"
                 # puts "target: #{File.mtime(target_path)} #{'%11s' % Filesize.new(File.size(target_path)).pretty} #{target_path}"
@@ -299,7 +299,7 @@ module Libis
                   count[:update] += 1
                 else
                   remark = 'Duplicate - rejected.'
-                  $stderr.puts "ERROR: #{entry} exists with different content." unless @report
+                  prompt.error "ERROR: #{entry} exists with different content." unless @report
                   count[:reject] += 1
                 end
               end
@@ -308,7 +308,7 @@ module Libis
               count[:move] += 1
             end
             if action
-              puts "-> #{file_operation} '#{file_name}' to '#{target}'" unless @report
+              prompt.say "-> #{file_operation} '#{file_name}' to '#{target}'" unless @report
               case file_operation
               when 'move'
                 FileUtils.move(entry, File.join(target_dir, target_file), force: true)

data/lib/libis/tools/extend/array.rb

@@ -0,0 +1,15 @@
+
+# Extension class for Array
+class Array
+
+  # Removes all empty entries
+  def cleanup
+    self.delete_if { |v| v.nil? || (v.respond_to?(:empty?) ? v.empty? : false) }
+  end unless method_defined? :cleanup
+
+  # Removes all empty entries recursively in the array and each Hash in it
+  def recursive_cleanup
+    cleanup.each { |v| v.recursive_cleanup if Array === v || Hash === v }
+  end unless method_defined? :recursive_cleanup
+
+end

data/lib/libis/tools/extend/hash.rb

@@ -10,11 +10,8 @@ class Hash
 
   # Removes all hash entries for which value.empty? is true. Performed recursively.
   def recursive_cleanup
-    delete_proc = Proc.new do |_, v|
-      v.delete_if(&delete_proc) if v.kind_of?(Hash)
-      v.nil? || (v.respond_to?(:empty?) ? v.empty? : false)
-    end
-    self.delete_if &delete_proc
+    cleanup
+    each { |_, v| v.recursive_cleanup if Array === v || Hash === v }
   end unless method_defined? :recursive_cleanup
 
   # Merges two hashes, but does so recursively.
@@ -66,7 +63,7 @@ class Hash
   end unless method_defined? :key_strings_to_symbols!
 
   # Return new Hash with all keys converted to symbols.
-  # @param [Hash] opts valid options are:
+  # @param [Hash] options valid options are:
   #   * recursive : perform operation recursively
   #   * upcase : convert all keys to upper case
   #   * downcase : convert all keys to lower case

data/lib/libis/tools/extend/symbol.rb

@@ -0,0 +1,8 @@
+# Symbol monkey patch to allow map(&:method) to take arguments. Allows: [2,3].map(&:+.(10)) # => [12,13]
+# See: https://stackoverflow.com/questions/23695653/can-you-supply-arguments-to-the-mapmethod-syntax-in-ruby
+# for more information,
+class Symbol
+  def call(*args, &block)
+    ->(caller, *rest) { caller.public_send(self, *rest, *args, &block) }
+  end
+end

data/lib/libis/tools/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Tools
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end

data/spec/command_spec.rb

@@ -30,7 +30,7 @@ describe 'Command' do
     result = Libis::Tools::Command.run('ls', '-1')
 
     output = result[:out]
-    expect(output.size).to eq (entries.size)
+    expect(output.size).to eq entries.size
     expect(output.sort).to match entries
     expect(result[:err]).to eq []
     expect(result[:status]).to eq 0
@@ -42,7 +42,7 @@ describe 'Command' do
     result = Libis::Tools::Command.run('ls', '-1', '-a', '-p')
 
     output = result[:out]
-    expect(output.size).to eq (entries.size + 2)
+    expect(output.size).to eq entries.size + 2
     expect(output[0]).to eq './'
     expect(output[1]).to eq '../'
     expect(output[2..-1].sort).to match entries

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-tools
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -332,6 +332,7 @@ files:
 - lib/libis/tools/config_file.rb
 - lib/libis/tools/csv.rb
 - lib/libis/tools/deep_struct.rb
+- lib/libis/tools/extend/array.rb
 - lib/libis/tools/extend/empty.rb
 - lib/libis/tools/extend/hash.rb
 - lib/libis/tools/extend/kernel.rb
@@ -339,6 +340,7 @@ files:
 - lib/libis/tools/extend/roo.rb
 - lib/libis/tools/extend/string.rb
 - lib/libis/tools/extend/struct.rb
+- lib/libis/tools/extend/symbol.rb
 - lib/libis/tools/logger.rb
 - lib/libis/tools/mets_dnx.rb
 - lib/libis/tools/mets_file.rb
@@ -398,8 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: LIBIS toolbox.