libis-tools 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9e3d995478c23cf34462e49682a86e2268c059314a3f9b8f1a4d4cb7dca3cfa
-  data.tar.gz: 20138f051ab8337d686aa2f7b226883ea535afc418765a80b19cd135c016b673
+  metadata.gz: 614880562757e58d8f1e86db7f507411a873c7920efcc3b932dd446b65eb7a70
+  data.tar.gz: c8aa877ea6b7fcc8daec5f2c1e49d5680afd857e900c6b8e6f5a309e884858e9
 SHA512:
-  metadata.gz: d35c8c621b0e07a7817a5671a74f624ab7fc5a1d4a3f781c19f77fc03e61a411edafbb77666c3bab7607b59057a90d58e271cb927cd4156fcd77925ed755da4b
-  data.tar.gz: 1381a075f84a335510b4acff0a6c8ffef7daf8a0efb84d0a30fc49d56dc0250191b6f51bb0fd8d6b75faacc08fc4783d56c5c6915c70c78663c3d2fbd591984e
+  metadata.gz: 8907c8cdb69831d8bfcf432d47d2abf06bb010e8aa6aac8a20e125cbfa1487df3a3b1db2fb3e4da7c77533f34b78377bfec929c4d3c5f5d79e747f11a54c0c8b
+  data.tar.gz: e7536a051acb0cfe862cca95799c1b9b8653f06cc550ffc30cde1a9c5a21a044bb4c5a4d9183a0099cd31b27f0615f8c4fb72e53f03b451c30ef0b3e83e7d124

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/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.4'
+    VERSION = '1.0.6'
   end
 end

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,6 +32,7 @@ describe 'Command' do
     result = Libis::Tools::Command.run('ls', '-1')
 
     output = result[:out]
+    puts output.sort
     expect(output.size).to eq entries.size
     expect(output.sort).to match entries
     expect(result[:err]).to eq []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-tools
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2020-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -400,7 +400,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: LIBIS toolbox.