usd 1.3.1 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4448a1b65d863520eea90c9fd76f4bc27f437871697c5d5efc150a7cdf6fe30b
-  data.tar.gz: a8e0416e4e629b95add9bdf050fab5a3e8f77d9369147dd006b26a2910bb9a07
+  metadata.gz: 70fbd18a6341df303be1897efab57eefae5c72db3f4e94af89cd7da4900281ad
+  data.tar.gz: ee6882af88f19c208d113bab4d96b2b7725d4e0c635b02c6e885153dd6c95475
 SHA512:
-  metadata.gz: 2982682a3d2df44517df1129aa2754bc9824b56c170c0af053272ac4f89ac1404832d94062058620c6b3668902b78cc99e1d2d55604eb511664204839d799a39
-  data.tar.gz: 155b49fb190294484d453b90716c1a8b6da0d9715a617d634be775e4a221991451b03c8f9948c7dce2a6008f13f6c373bd91d64c79deece02a48fdfe28df2921
+  metadata.gz: a9954d1e3f35a7d2f506e94cf5354f2e3c4ff74b27c855f56fe7e13310bd5cef8e5addc4937e1c01dfee23e803680da3e6c39a32eab22812efb8708279031d88
+  data.tar.gz: e9f4192677bb57d007d8eb98640e8a5e2de42d8053f906caae1ec3494c314f4ef41753b06151a842c935f8e972740319d7ae65d4bfec2fa7bb8105c4971cd550

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`
 
 ```

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,11 +1,31 @@
 # rusdc changelog
 
+## 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:
   - `chg_add_attachment`
   - `nr_add_attachment`
-  - `in_chg_add_attachment`
+  - `in_add_attachment`
   - `vcard_via_email`
 
 with the first three funtions you are able to upload files to changeorders, configurationitems and incidents and it does not matter if it is text or binary. the last new function creates vcards in version 2.1 from a contact via its email as identifier.

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 "].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,26 @@ class Usd
     end
   end
 
+  def upload_attachment(file, baseurl = @base_url, ak = @access_key)
+    baseurl =~ /^([^:]+):/
+    server = $1
+    filename = File.basename(file)
+    uri = "/caisd-rest/attmnt?repositoryId=1002&serverName=#{server}&mimeType=Text&description=#{filename}"
+    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}</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#{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.1'
-  spec.date = '2020-09-10'
+  spec.version = '1.3.5'
+  spec.date = '2020-09-25'
   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.1
+  version: 1.3.5
 platform: ruby
 authors:
 - Oliver Gaida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2020-09-25 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