usd 1.3.3 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8341a6edac193e671ccde850088a693d452bd571e7685bdba3ed59b6a10dc9c7
-  data.tar.gz: f9688b4546873b2b0d1ae35555080d0c965a2897e69823dc633131df4f6ecd63
+  metadata.gz: 76168d8702cea6b4f50eb7f35849793c694c5359527bc1643a1e3306ea81aa2b
+  data.tar.gz: 0c3ffb3e1e0b880c4d2ef297d19af5d3dcdab2fbf6c88418a55037db77368ab8
 SHA512:
-  metadata.gz: ab1cede636c31e94a3b5d4834c894db2d655638c5582e737e00c372617620dce66dc11839ff5d9ce22da4c378b5a91b027591a68d59ef41e0898fe1d1a6961ef
-  data.tar.gz: ea878deaa14d2ed86591b67b54851584055e11e80b46bf104572f4784b90f16616e154ef779da4d10fdf339cab5550f53a8f48e0165a75396bc128a2097ae807
+  metadata.gz: 3521906b5c80e59468a66c0b9ef20c040a81c6b840b105707ca0f29908e39f38aece82fbf1cd3a4de86e5aca6a8ced40265553bb85d206626f53e93e97d5c1e5
+  data.tar.gz: 6978d0bf488852d0e5e96c34dccf4e745a9435c0ec1a9707a7940815cc58e0a05d0e6266046d31a15f0ba45a1181cded6e51f8af3a223d65f55a8ca25ba3f8e7

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
@@ -114,3 +113,7 @@ foo2  foo TEST
 ```
 
 more examples under [find examples-Wikipage](https://github.com/ogaida/usd/wiki/find-examples) or in the [change_log](https://github.com/ogaida/usd/blob/master/change_log.md)
+
+# senarios
+
+<img src="https://yuml.me/diagram/scruffy/class/[SDM%20REST-API{bg:red}]<->[usd-gem{bg:green}]<->[rusdc{bg:orange}],[ruby-script{bg:orange}]<->[usd-gem],[sinatra%20web-app{bg:orange}]<->[usd-gem],[bash commands]<->[rusdc],[shell-scripts]<->[rusdc],[import]->[ruby-script],[ruby-script]->[export],[reports]<-[sinatra%20web-app]<-[drop datafiles/emails/create objects]">

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,21 @@ 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
+    chg_id=loadcon.request("/caisd-rest/chg/COMMON_NAME-#{coname}")["chg"]["@id"]
+    att_nr = loadcon.search("lrel_attachments_changes",{'fields' => "attmnt","wc" => "chg = #{chg_id}"})
+    att_nr.each do |att|
+      attmnt = loadcon.request("/caisd-rest/attmnt/#{att["attmnt"]["@id"]}")["attmnt"]
+      if attmnt["orig_file_name"] == filename
+        puts loadcon.request("/caisd-rest/attmnt/#{attmnt["@id"]}/file-resource",{:unchanged => true})
+      end
+    end
   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 +263,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 +293,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 +303,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 +345,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,26 +592,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}")
-    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
 
 Rusdc.start(ARGV)

data/change_log.md

@@ -1,8 +1,28 @@
 # rusdc changelog
 
+## 1.3.7
+
+- Bugfix in rusdc-function `get_attachment_of_co`
+
+## 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 `Usd` Class funktion changed. Instead using `base64` and `unix2dos` binaries, we use Base64-Ruby-Class now. It is already required by usd.
+- 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
 

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.3'
-  spec.date = '2020-09-11'
+  spec.version = '1.3.7'
+  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.3
+  version: 1.3.7
 platform: ruby
 authors:
 - Oliver Gaida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-11 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