usd 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd0b2054000b2def693dfdb2fed2dd4ac34b844b733ef332424d642023a4f088
-  data.tar.gz: c604209a6723f2c17185399019ab7008930874df3a9ba2cdf157b3f4e2ccabe4
+  metadata.gz: 1dc348116c2ad35950bcea88ca80863c751b7b50c8d30e9f7e1b61555f6d08dd
+  data.tar.gz: 4fb82b76d1aa8ba9277ac3512e6d4fd0bc40e29fdff4054192de6f94709ee27a
 SHA512:
-  metadata.gz: b47d3d45583358c0f8f2fe4beb335145adcee61db83162fa70df0012be146e1e08f728b93d7c18bcfc911adc6868cea6854e0bfd0f3023afb023f642449a09fa
-  data.tar.gz: f89aa581d81e20ec819518be185ad5d794bd601ed78ae0a6c4a17c943dd22d3ad5f1c5ab243f09a27eac77b005c622a113ec98421725371a3f79b49d345a455f
+  metadata.gz: 2b99881822e2e345d1dc7c227806f7df202af50d51fef1d3bc4dd16563dd58e3e01b95249aab6cb910ba7209e78fc0bad04ad39613895c9bc7ad1d1e070d749a
+  data.tar.gz: ddb9e9db898df0849150849d75fae4d848bc0d5305f6605ca881a3e5ae2c1c6498af3ac4c8f7d3370f81a278b7d41b6990853a94cf4e3dcf4e275df5cddc46c1

data/README.md

@@ -23,12 +23,11 @@ yum install ruby-devel
 
 # external tools
 
-Some external dependencies are:
+If you use the `rusdc find` command with `--format mlr` option then you need `mlr`.
 
-- [jq](https://stedolan.github.io/jq/) - a great tool for query and manipulate json-data
 - [mlr - Miller](http://johnkerl.org/miller/doc/index.html) - a great tool for data-transforming to and from json, csv and many more
 
-place both binaries `jq` und `mlr` in a path, which is in your PATH-Environment.
+Place the `mlr`-binary in a path, which is in your PATH-Environment.
 
 # funktions from the commandline-tool `rusdc`
 

data/bin/rusdc

@@ -84,10 +84,32 @@ class Rusdc < Thor
   option :nice_time, :type => :boolean, :default => true
   option :debug, :type => :boolean, :default => false
   def find(object, wc, fields="*")
-    con = loadcon
-    con.debug = options[:debug]
-    e = con.search(object,{'fields' => fields,"wc" => wc})
-    if e.length > 0
+    unless (fields =~ /^[\w\_,@]+$/)
+      puts "fields-problem: there must be only letters, numbers, comma and underscore, nothing else!"
+    else
+      con = loadcon
+      con.debug = options[:debug]
+      e = con.search(object,{'fields' => fields,"wc" => wc})
+      fields_array=fields.split(/,/)
+      e.each do |elem|
+        elem.keys.each do |elem_key|
+          if fields_array.include?(elem_key)
+            if elem[elem_key].class == Hash
+              elem_value = elem[elem_key]["@COMMON_NAME"]
+              elem.delete(elem_key)
+              elem[elem_key] = elem_value
+            end
+          else
+            elem.delete(elem_key)
+          end
+        end
+        # fill up not found keys
+        fields_array.each do |elem_key|
+          unless elem.has_key?(elem_key)
+            elem[elem_key]=""
+          end
+        end
+      end
       if options[:nice_time]
         e.each_index do |i|
           e[i].keys.each do |key|
@@ -103,35 +125,17 @@ class Rusdc < Thor
       when "yaml"
         puts e.to_yaml
       when "mlr"
-        # hierfuer muessen jq und mlr verfuegbar sein
-        if (fields =~ /^[\w\_,@]+$/)
-          fields_array=fields.split(/,/)
-          jq_mapping = []
-          fields_array.each do |key|
-            if e[0].keys.include?(key)
-              if e[0][key].class == Hash
-                jq_mapping << %("#{key}": ."#{key}"."@COMMON_NAME")
-              else
-                jq_mapping << %("#{key}": ."#{key}")
-              end
-            end
-          end
-          jq_mapping_string = jq_mapping.join(",")
-          file = Tempfile.new('inner_cmd')
-          cmd = %(jq "[.[]|{#{jq_mapping_string}}]" #{file.path} | mlr --ijson --o#{options[:mlr_format]} cat)
-          file.write(e.jp)
-          file.close
-          puts `#{cmd}`
-          file.unlink
-        else
-          puts "fields Problem: es sind nur Buchstaben, Ziffern, Komma und Unterstrich zulaessig."
-        end
+        # hierfuer muss mlr verfuegbar sein
+        file = Tempfile.new('json')
+        cmd = %(mlr --ijson --o#{options[:mlr_format]} cat #{file.path})
+        file.write(e.jp)
+        file.close
+        puts `#{cmd}`
+        file.unlink
       else
         puts "das Format #{options[:format]} ist nicht hinterlegt. Es gibt nur json, yaml oder mlr."
       end
-    else
-      puts "keine Einträge gefunden!"
-    end
+    end # fields check
   end
 
   desc "get", "get <object> <cn>"

data/usd.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = 'usd'
-  spec.version = '0.1.3'
+  spec.version = '0.1.4'
   spec.date = '2019-10-31'
   spec.summary = "SDM REST-API-Calls"
   spec.description = "a Ruby class and a commandlinetool for SDM REST-API-Calls"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usd
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Oliver Gaida