usd 1.3.2 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f3f388a3efedae368a6a99c7169029d78f92e11179ca97ad8edb196a125be5d
-  data.tar.gz: ed31ec8a487df5132d06fd71cb77e301017b5292fcd6dde662359d169a0a27cb
+  metadata.gz: 2f200b7489e39e8790b98cd217f685141c977eea38b009ff4e7c086aa475868a
+  data.tar.gz: e520b09923e8ebc24e2ddf3f03d2c4d455896e99dc708b0439a23c0f37154a61
 SHA512:
-  metadata.gz: 3d0d07c311dcc0b1b20c41ea818a08d3e910ae47e6909c0df1a00e4143ab4c190fdaaa9cf3da522bdbf104e54cf2a6404504261edb4d68e80084ca85cd90eb4d
-  data.tar.gz: ad097417d07cec1dc9c097dea1785f91fb4b3ff737abb03840e05d4e779b31a2176ed47f5e53e841ce72c261da6dc8fb15cf831fd7887c95f21b9c1a103bff34
+  metadata.gz: 1a66a5e24cf6651dab72a6c5a564c466d8320f7c2d9c3c74a5d832b90eb384a257043d245dcb2636e270631a775cdb25e3dd3ec584bcf3ce01f484485354375b
+  data.tar.gz: c4bb48aa371fcd9770e8fb3e64e4c79dcebed55cf6100aa1ca330f0fe403c66427fc5c94ac7a5ed7fd334376ffd2e62ddb927e1346698d91d1bfef9066091f7b

data/README.md

@@ -40,8 +40,6 @@ If you use the `rusdc find` command with `--format mlr` option then you need `ml
 
 Place the `mlr`-binary in a path, which is in your PATH-Environment. Download-Url for mlr-releases: [https://github.com/johnkerl/miller/releases](https://github.com/johnkerl/miller/releases).
 
-For uloading attachments `unix2dos` and `base64` is used. 
-
 # functions from the commandline-tool `rusdc`
 
 ```
@@ -58,13 +56,14 @@ rusdc get_attachment_of_co <co_name> <filename>                              # d
 rusdc get_attachment_of_in <incident> <filename>                             # download an attachment of an Incident and print it out on stdout
 rusdc help [COMMAND]                                                         # Describe available commands or one specific command
 rusdc in_add_2_chg <changeorder> <incident>                                  # add incident to changeorder
-rusdc in_add_attachment <in> <file>                                          # attach the file to incident
+rusdc in_add_attachment <in> <file>                                          # attach a file to an incident or problem
 rusdc in_list_child_ins <in>                                                 # list all child-incidents of one incident
 rusdc list_attachments_of_ci <ci_name>                                       # list all attachments of a CI
 rusdc list_attachments_of_co <co_name>                                       # list all attachments of a changeorder
-rusdc list_attachments_of_in <in>                                            # list all attachments of an Incident
+rusdc list_attachments_of_in <in>                                            # list all attachments of an incident or problem
 rusdc nr_add_attachment <nr> <file>                                          # attach the file to nr
 rusdc nr_add_child <nr-name> <child-name>                                    # add one child CI to another CI
+rusdc nr_add_contact <nr> <cnt_email>                                        # add contact to configuration-item
 rusdc nr_add_org <nr> <org>                                                  # add an Organisation to a ConfigurationItem
 rusdc nr_changes <nr> [inactive-too]                                         # list all open changeorders of one CI
 rusdc nr_childs <ci-name>                                                    # lists all childs CIs of a specific CI

data/bin/rusdc

@@ -9,7 +9,7 @@ class Rusdc < Thor
 
   desc "chg_add_attachment <co> <file>", "attach the file to co"
   def chg_add_attachment(co, file)
-    response = upload_attachment(file, loadcon.base_url, loadcon.access_key)
+    response = loadcon.upload_attachment(file)
     puts response
     data = JSON.parse(response)
     template = ERB.new <<-EOF
@@ -230,19 +230,15 @@ class Rusdc < Thor
     end
   end
 
-  # in: lrel_attachments_requests ?
-
   desc "get_attachment_of_co <co_name> <filename>", "download an attachment of a changeorder and print it out on stdout"
   def get_attachment_of_co(coname, filename)
     ids = loadcon.search("lrel_attachments_changes",{'fields' => "*","wc" => "chg.chg_ref_num = 'CO341144' and attmnt.orig_file_name = 'IMAP61A845F524A9D06536_3212.eml'"})
     puts loadcon.request("/caisd-rest/attmnt/#{ids[0]["@id"]}/file-resource",{:unchanged => true}) if ids.class == Array
   end
 
-
-  #lrel_attachments_requests",{'fields' => "attmnt","wc" => "cr.ref_num
-  desc "in_add_attachment <in> <file>", "attach the file to incident"
+  desc "in_add_attachment <in> <file>", "attach a file to an incident or problem"
   def in_add_attachment(incident, file)
-    response = upload_attachment(file, loadcon.base_url, loadcon.access_key)
+    response = loadcon.upload_attachment(file)
     puts response
     data = JSON.parse(response)
     template = ERB.new <<-EOF
@@ -261,7 +257,6 @@ class Rusdc < Thor
         :id => data["attmnt"]["@id"],
         :incident => incident
       })
-    #puts "create relation to chg with json: #{json}"
     puts loadcon.create({:type => "json", :data => json})
   end
 
@@ -292,7 +287,7 @@ class Rusdc < Thor
     end
   end
 
-  desc "list_attachments_of_in <in>", "list all attachments of an Incident"
+  desc "list_attachments_of_in <in>", "list all attachments of an incident or problem"
   def list_attachments_of_in(incident)
     att_in = loadcon.search("lrel_attachments_requests",{'fields' => "attmnt","wc" => "cr.ref_num = '#{incident}'"})
     att_in.each do |att|
@@ -302,7 +297,7 @@ class Rusdc < Thor
 
   desc "nr_add_attachment <nr> <file>", "attach the file to nr"
   def nr_add_attachment(nr, file)
-    response = upload_attachment(file, loadcon.base_url, loadcon.access_key)
+    response = loadcon.upload_attachment(file)
     puts response
     data = JSON.parse(response)
     nr_id = loadcon.search("nr",{'fields' => "@id","wc" => "name = '#{nr}'"})[0]["@id"]
@@ -344,6 +339,28 @@ class Rusdc < Thor
     puts loadcon.create({:type => "json", :data => json})
   end
 
+  desc "nr_add_contact <nr> <cnt_email>", "add contact to configuration-item"
+  def nr_add_contact(nr, cnt_email)
+    template = ERB.new <<-EOF
+      {
+        "lrel_cenv_cntref": {
+          "nr": {
+            "@id": "<%= uid_nr %>"
+          },
+          "cnt": {
+            "@id": "<%= uid_cnt %>"
+          }
+        }
+      }
+    EOF
+    json = template.result_with_hash({
+        :uid_nr => loadcon.request("/caisd-rest/nr/COMMON_NAME-#{nr}")["nr"]["@id"],
+        :uid_cnt => loadcon.search("cnt",{'fields' => "@id","wc" => "email_address = '#{cnt_email}'"})[0]["@id"]
+      })
+    #puts "create relation to chg with json: #{json}"
+    puts loadcon.create({:type => "json", :data => json})
+  end
+
   desc "nr_add_org <nr> <org>", "add an Organisation to a ConfigurationItem"
   def nr_add_org(nr, org)
     template = ERB.new <<-EOF
@@ -569,36 +586,6 @@ END:VCARD
     end
   end
 
-  def upload_attachment(file, baseurl, ak)
-    baseurl =~ /^([^:]+):/
-    server = $1
-    filename = File.basename(file)
-    uri = "/caisd-rest/attmnt?repositoryId=1002&serverName=#{server}&mimeType=Text&description=#{filename}"
-    url = URI("#{baseurl}#{uri}")
-    tempfile = Tempfile.new('base64_encoding')
-    temp_path=tempfile.path
-    tempfile.write("")
-    tempfile.close
-    cmd = %(base64 "#{file}" > #{temp_path})
-    `#{cmd}`
-    cmd = %(unix2dos #{tempfile.path})
-    `#{cmd}`
-    fileObj = File.open(temp_path, "rb")
-    fileContent = fileObj.read
-    fileObj.close
-    tempfile.unlink
-    http = Net::HTTP.new(url.host, url.port);
-    request = Net::HTTP::Post.new(url)
-    request["X-AccessKey"] = ak
-    request["Content-Type"] = "multipart/form-data; BOUNDARY=*****MessageBoundary*****"
-    request["accept"] = "application/json"
-    request["Cache-Control"] = "no-cache"
-    request.body = "--*****MessageBoundary*****\r\n \r\nContent-Disposition: form-data; name=\"payload\" \r\nContent-Type: application/xml; CHARACTERSET=UTF-8 \r\n\r\n \r\n<attmnt> \r\n<repository id=\"1002\"></repository> \r\n<orig_file_name>#{filename}</orig_file_name> \r\n<attmnt_name>#{filename}</attmnt_name> \r\n<description>Uploaded with rusdc from rubygem usd</description> \r\n</attmnt> \r\n\r\n \r\n--*****MessageBoundary*****\r\n \r\nContent-Disposition: form-data; name=\"#{filename}\"; filename=\"#{filename}\" \r\nContent-Type: application/octet-stream \r\nContent-Transfer-Encoding: base64\r\n\r\n#{fileContent}\r\n\r\n \r\n--*****MessageBoundary*****--\r\n"
-
-    response = http.request(request)
-    response.read_body
-  end
-
 end
 
 Rusdc.start(ARGV)

data/change_log.md

@@ -1,5 +1,29 @@
 # rusdc changelog
 
+## 1.3.6
+
+- Bugfix : uploaded filename with special character will be renamed with `URI.escape`
+
+## 1.3.5
+
+- new function `nr_add_contact <nr> <email>` to assign a contact to a configuration-item
+
+## 1.3.4.1
+
+- fixed another error in Usd.search. which comes with 1.3.1 .
+
+## 1.3.4
+
+- move function `upload_attachment` from `bin/rusdc` to `lib/usd`.
+
+## 1.3.3
+
+- private `rusdc`-funktion `upload_attachment` changed. Instead using `base64` and `unix2dos` binaries, we use Base64-Ruby-Class now. It is already required by usd.
+
+## 1.3.2
+
+- fixed error in Usd.search. which comes with 1.3.1 .
+
 ## 1.3.1
 
 - new functions:

data/lib/usd.rb

@@ -251,7 +251,7 @@ class Usd
     # if wc contains no sql-compare operater, it will be changed to "COMMON_NAME like '%<wc-before>%'"
     wc = attr.pop
     wc.gsub!(/^WC=/,'')
-    if ([" like ","<",">","="," is "," in "].find {|e| wc =~ /#{e}/}).nil?
+    if ([" like ","<",">","="," is "," in "," LIKE ", " IS ", " IN "].find {|e| wc =~ /#{e}/}).nil?
       wc = "#{CN[object]} like '%#{wc}%'"
     end
     attr.push "WC=#{wc}"
@@ -279,6 +279,27 @@ class Usd
     end
   end
 
+  def upload_attachment(file, baseurl = @base_url, ak = @access_key)
+    baseurl =~ /^([^:]+):/
+    server = $1
+    filename = File.basename(file)
+    filename_escaped = URI.escape(filename)
+    uri = "/caisd-rest/attmnt?repositoryId=1002&serverName=#{server}&mimeType=Text&description=#{filename_escaped}"
+    url = URI("#{baseurl}#{uri}")
+    http = Net::HTTP.new(url.host, url.port);
+    request = Net::HTTP::Post.new(url)
+    request["X-AccessKey"] = ak
+    request["Content-Type"] = "multipart/form-data; BOUNDARY=*****MessageBoundary*****"
+    request["accept"] = "application/json"
+    request["Cache-Control"] = "no-cache"
+    fileObj = File.open(file, "rb")
+    fileContent = fileObj.read
+    fileObj.close
+    request.body = "--*****MessageBoundary*****\r\n \r\nContent-Disposition: form-data; name=\"payload\" \r\nContent-Type: application/xml; CHARACTERSET=UTF-8 \r\n\r\n \r\n<attmnt> \r\n<repository id=\"1002\"></repository> \r\n<orig_file_name>#{filename_escaped}</orig_file_name> \r\n<attmnt_name>#{filename_escaped}</attmnt_name> \r\n<description>Uploaded with rusdc from rubygem usd</description> \r\n</attmnt> \r\n\r\n \r\n--*****MessageBoundary*****\r\n \r\nContent-Disposition: form-data; name=\"#{filename_escaped}\"; filename=\"#{filename_escaped}\" \r\nContent-Type: application/octet-stream \r\nContent-Transfer-Encoding: base64\r\n\r\n#{Base64.encode64(fileContent)}\r\n\r\n \r\n--*****MessageBoundary*****--\r\n"
+    response = http.request(request)
+    response.read_body
+  end
+
 end
 
 module Jsonpretty

data/usd.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |spec|
   spec.name = 'usd'
-  spec.version = '1.3.2'
-  spec.date = '2020-09-10'
+  spec.version = '1.3.6'
+  spec.date = '2020-09-29'
   spec.summary = "SDM REST-API-Calls"
   spec.description = "a Ruby class and a commandlinetool for SDM REST-API-Calls"
   spec.authors = ["Oliver Gaida"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usd
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.6
 platform: ruby
 authors:
 - Oliver Gaida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -82,6 +82,7 @@ files:
 - bin/rusdc
 - bin/set_env
 - change_log.md
+- images/vcard.png
 - lib/usd.rb
 - usd.gemspec
 homepage: https://github.com/ogaida/usd