libis-tools 1.0.2 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5e609222120f658fb18e1594ed1f87f0c35bde28
-  data.tar.gz: 66d3563d04e59fd324a593754a74947b1c3a722f
+SHA256:
+  metadata.gz: c057b018c6fd9fa648ba532ebbf0919d7f04c399057aa2a73b61b346076dece9
+  data.tar.gz: 9ae7380f4b60de143a6949990a69cb7249f4d81ea06912194c329c5df1b5bcf6
 SHA512:
-  metadata.gz: ef95ab98cc37ab82f24e92f1db943cd92eef3276964c5ee3c2591aa1575dda048bd01c2d6117a230726f6a7d735d1fca8d0591c0c256c206e868b57663782eec
-  data.tar.gz: ab8ffbcec667aa8f6d618f2f5c3cbc5295a46bea69038f7c3e4616e465c3f01044b2cc22bddf1963f3dac96695135b773048bb46d4eb41a3570654a405450b67
+  metadata.gz: c00fa670055c8cc156b3a7b5810f4e927c8386dba41ae4dd5b55bb602124fd962df415a4b0f1c640941685d2d1d3a7bb8222978f199bb55856ba095287015865
+  data.tar.gz: 60d16f403a7473bea8f0de32793a53f72779db587ba82911628ff974b9f62d5fed2eacf3532dad4ff177383e2f47d1c7e9aae8714a66aa1c5b82f011d3142cb4

data/.travis.yml

@@ -1,36 +1,40 @@
+dist: bionic
 language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.1.10
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
   - ruby-head
-  - jruby-9.0.5.0
-  - jruby-9.1.9.0
+#  - jruby-9.1
+  - jruby-9.2
   - jruby-head
 jdk:
-  - openjdk8
-  - oraclejdk8
+  - openjdk10
+  - openjdk11
 matrix:
   exclude:
-    - rvm: 2.1.10
-      jdk: oraclejdk8
-    - rvm: 2.2.8
-      jdk: oraclejdk8
-    - rvm: 2.3.5
-      jdk: oraclejdk8
-    - rvm: 2.4.2
-      jdk: oraclejdk8
+    - rvm: 2.3
+      jdk: openjdk10
+    - rvm: 2.4
+      jdk: openjdk10
+    - rvm: 2.5
+      jdk: openjdk10
+    - rvm: 2.6
+      jdk: openjdk10
     - rvm: ruby-head
-      jdk: oraclejdk8
+      jdk: openjdk10
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
 branches:
   only:
       - master
+#before_install:
+#  - gem update --system
+#  - gem --version
 addons:
   code_climate:
     repo_token: f6978964f55e6543befb82373651365f8195677816af6ff40ad70c82f7f22f09

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,16 @@
+
+# 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
+    each { |v| v.recursive_cleanup if Array === v || Hash === v }
+    cleanup
+  end unless method_defined? :recursive_cleanup
+
+end

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

@@ -1,5 +1,3 @@
-require 'backports/rails/hash'
-
 # Extension class for Hash
 class Hash
 
@@ -10,11 +8,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
+    each { |_, v| v.recursive_cleanup if Array === v || Hash === v }
+    cleanup
   end unless method_defined? :recursive_cleanup
 
   # Merges two hashes, but does so recursively.
@@ -59,6 +54,14 @@ class Hash
     self.merge!(other_hash) {|_,v, w| v.blank? ? w : v}
   end unless method_defined? :apply_defaults!
 
+  def symbolize_keys
+    self.transform_keys {|k| k.to_sym}
+  end unless method_defined? :symbolize_keys
+
+  def symbolize_keys!
+    self.transform_keys! {|k| k.to_sym}
+  end unless method_defined? :symbolize_keys!
+
   # Convert all keys to symbols. In-place operation.
   # @param (see #key_strings_to_symbols)
   def key_strings_to_symbols!(options = {})
@@ -66,7 +69,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
@@ -104,6 +107,14 @@ class Hash
     r
   end unless method_defined? :key_strings_to_symbols
 
+  def stringify_keys
+    self.transform_keys {|k| k.to_s}
+  end unless method_defined? :stringify_keys
+
+  def stringify_keys!
+    self.transform_keys! {|k| k.to_s}
+  end unless method_defined? :stringify_keys!
+
   # Convert all keys to strings. In-place operation.
   # (@see #key_symbols_to_strings)
   # @param (see #key_symbols_to_strings)
@@ -147,4 +158,36 @@ class Hash
     r
   end unless method_defined? :key_symbols_to_strings
 
+  def transform_keys
+    result = {}
+    each_key do |key|
+      result[yield(key)] = self[key]
+    end
+    result
+  end unless method_defined? :transform_keys
+
+  def transform_keys!
+    keys.each do |key|
+      self[yield(key)] = delete(key)
+    end
+    self
+  end unless method_defined? :transform_keys!
+
+  def transform_values
+    return enum_for(:transform_values) { size } unless block_given?
+    return {} if empty?
+    result = self.class.new
+    each do |key, value|
+      result[key] = yield(value)
+    end
+    result
+  end unless method_defined? :transform_values
+
+  def transform_values!
+    return enum_for(:transform_values!) { size } unless block_given?
+    each do |key, value|
+      self[key] = yield(value)
+    end
+  end unless method_defined? :transform_values!
+
 end

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

@@ -1,3 +1,2 @@
 # encoding: utf-8
-require 'ostruct'
-require 'backports/2.0.0/stdlib/ostruct'
+require 'ostruct'

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

@@ -1,8 +1,42 @@
-require 'backports/rails/string'
-
 # Extension class
 class String
 
+  # from activesupport
+  def camelize(first_letter = :upper)
+    if first_letter == :upper
+      gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+    else
+      self[0..0].downcase + camelize[1..-1]
+    end
+  end unless method_defined? :camelize
+
+  def constantize
+    names = split('::')
+    names.shift if names.empty? || names.first.empty?
+
+    constant = Object
+    names.each do |name|
+      constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+    end
+    constant
+  end unless method_defined? :constantize
+
+  def dasherize
+    gsub(/_/, '-')
+  end unless method_defined? :dasherize
+
+  def demodulize
+    gsub(/^.*::/, '')
+  end unless method_defined? :demodulize
+
+  def underscore
+    gsub(/::/, '/').
+        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+        tr("-", "_").
+        downcase
+  end unless method_defined? :underscore
+
   # Check if string is empty
   def blank?
     self == ''

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

@@ -1,7 +1,6 @@
 # encoding: utf-8
 require 'json'
-require 'backports/rails/hash'
-require 'backports/2.0.0/struct'
+require_relative 'hash'
 
 class Struct
   # def to_hash

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/logger.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 
-require 'backports'
 require 'libis/tools/config'
 require 'libis/tools/extend/string'
 

data/lib/libis/tools/parameter.rb

@@ -60,7 +60,7 @@ module Libis
       # Merges other parameter data into the current parameter
       # @param [::Libis::Tools::Parameter] other parameter definition to copy properties from
       def merge!(other)
-        other.each do |k,v|
+        other.each do |k, v|
           if k == :options
             self[:options].merge!(v)
           else
@@ -130,55 +130,59 @@ module Libis
         end
         true
       end
+
       private
 
       def guess_datatype
         self[:datatype] || case self[:default]
-                             when TrueClass, FalseClass
-                               'bool'
-                             when NilClass
-                               'string'
-                             when Integer
-                               'int'
-                             when Float
-                               'float'
-                             when DateTime, Date, Time
-                               'datetime'
-                             when Array
-                               'array'
-                             when Hash
-                               'hash'
-                             else
-                               self[:default].class.name.downcase
+                           when TrueClass, FalseClass
+                             'bool'
+                           when NilClass
+                             'string'
+                           when Integer
+                             'int'
+                           when Float
+                             'float'
+                           when DateTime, Date, Time
+                             'datetime'
+                           when Array
+                             'array'
+                           when Hash
+                             'hash'
+                           else
+                             self[:default].class.name.downcase
                            end
       end
 
       def convert(v)
         case self[:datatype].to_s.downcase
-          when 'boolean', 'bool'
-            return true if TRUE_BOOL.include?(v.to_s.downcase)
-            return false if FALSE_BOOL.include?(v.to_s.downcase)
-            raise ParameterValidationError, "No boolean information in '#{v.to_s}'. " +
-                                              "Valid values are: '#{TRUE_BOOL.join('\', \'')}" +
-                                              "' and '#{FALSE_BOOL.join('\', \'')}'."
-          when 'string', 'nil'
-            return v.to_s
-          when 'int'
-            return Integer(v)
-          when 'float'
-            return Float(v)
-          when 'datetime'
-            return v.to_datetime if v.respond_to? :to_datetime
-            return DateTime.parse(v)
-          when 'array'
-            return v if v.is_a?(Array)
-            return v.split(/[,;|\s]+/) if v.is_a?(String)
-            return v.to_a if v.respond_to?(:to_a)
-          when 'hash'
-            return v when v.is_a?(Hash)
-                       return Hash[(0...v.size).zip(v)] when v.is_a?(Array)
-          else
-            raise ParameterValidationError, "Datatype not supported: '#{self[:datatype]}'"
+        when 'boolean', 'bool'
+          return true if TRUE_BOOL.include?(v.to_s.downcase)
+          return false if FALSE_BOOL.include?(v.to_s.downcase)
+          raise ParameterValidationError, "No boolean information in '#{v.to_s}'. " +
+              "Valid values are: '#{TRUE_BOOL.join('\', \'')}" +
+              "' and '#{FALSE_BOOL.join('\', \'')}'."
+        when 'string', 'nil'
+          return v.to_s
+        when 'int', 'integer'
+          return Integer(v)
+        when 'float'
+          return Float(v)
+        when 'datetime'
+          return v.to_datetime if v.respond_to? :to_datetime
+          return DateTime.parse(v)
+        when 'array'
+          return v if v.is_a?(Array)
+          return v.split(/[,;|\s]+/) if v.is_a?(String)
+          # Alternatavely:
+          # return JSON.parse(v) if v.is_a?(String)
+          return v.to_a if v.respond_to?(:to_a)
+        when 'hash'
+          return v if v.is_a?(Hash)
+          return Hash[(0...v.size).zip(v)] if v.is_a?(Array)
+          return JSON.parse(v) if v.is_a?(String)
+        else
+          raise ParameterValidationError, "Datatype not supported: '#{self[:datatype]}'"
         end
         nil
       end
@@ -194,17 +198,17 @@ module Libis
       def constraint_checker(v, constraint)
 
         case constraint
-          when Array
-            constraint.each do |c|
-              return true if (constraint_checker(v, c) rescue false)
-            end
-            return true if constraint.include? v
-          when Range
-            return true if constraint.cover? v
-          when Regexp
-            return true if v =~ constraint
-          else
-            return true if v == constraint
+        when Array
+          constraint.each do |c|
+            return true if (constraint_checker(v, c) rescue false)
+          end
+          return true if constraint.include? v
+        when Range
+          return true if constraint.cover? v
+        when Regexp
+          return true if v =~ constraint
+        else
+          return true if v == constraint
         end
         false
       end
@@ -245,16 +249,16 @@ module Libis
         # @return [Hash] with parameter names as keys and {Parameter} instance as value.
         def parameter_defs
           return @parameters if @parameters
-            @parameters = ::Concurrent::Hash.new
-            begin
-              self.superclass.parameter_defs.
-                  each_with_object(@parameters) do |(name, param), hash|
-                  hash[name] = param.dup
-              end
-            rescue NoMethodError
-              # ignored
+          @parameters = ::Concurrent::Hash.new
+          begin
+            self.superclass.parameter_defs.
+                each_with_object(@parameters) do |(name, param), hash|
+              hash[name] = param.dup
             end
-            @parameters
+          rescue NoMethodError
+            # ignored
+          end
+          @parameters
         end
 
         # DSL method that allows creating parameter definitions on the class level.

data/lib/libis/tools/version.rb

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

data/libis-tools.gemspec

@@ -29,14 +29,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.has_rdoc = 'yard'
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake', '~> 10.3'
+  spec.add_development_dependency 'bundler', '> 1.6'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.1'
   spec.add_development_dependency 'term-ansicolor', '~> 1.6'
   spec.add_development_dependency 'equivalent-xml', '~> 0.5'
   spec.add_development_dependency 'awesome_print', '~> 1.6'
 
-  spec.add_runtime_dependency 'backports', '~> 3.6'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6'
   spec.add_runtime_dependency 'gyoku',  '~> 1.3'
   spec.add_runtime_dependency 'nori', '~> 2.6'

data/spec/command_spec.rb

@@ -19,7 +19,9 @@ describe 'Command' do
 
     result = Libis::Tools::Command.run('ls')
 
-    expect(result[:out].sort).to match entries
+    output = result[:out].map {|x| x.split(/\s+/)}.flatten.compact
+    expect(output.size).to eq entries.size
+    expect(output.sort).to match entries
     expect(result[:err]).to eq []
     expect(result[:status]).to eq 0
 
@@ -30,7 +32,8 @@ describe 'Command' do
     result = Libis::Tools::Command.run('ls', '-1')
 
     output = result[:out]
-    expect(output.size).to eq (entries.size)
+    puts output.sort
+    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 +45,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,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: libis-tools
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.9
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: backports
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -332,6 +318,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 +326,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
@@ -399,7 +387,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: LIBIS toolbox.