usd 1.3.4 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f324bd2fb86597239321dad232f442527502773a66fda4cf5096e9ebec7d30b1
-  data.tar.gz: 8376aa51f4e5ec5be644c452d93bb7b975c02368121cb7be2c80baa2ae14dac9
+  metadata.gz: d0f4c4811a43c68772d1caddb04541173cd3ca9818cd4b24519d3935a3434ff2
+  data.tar.gz: e13a6fe87854b0d8f5bcbcf9de6cb159dc35eb1b833f54b7047cffb07414d15e
 SHA512:
-  metadata.gz: 03c0822a8e18840e2beda5b720fd9bb81fb64c8bf3bd17f6ee10db9af77c9bb97157fa5faad5ff31c7cd3976c64bf0f3d98994b6878e9527b6b986cebc3ff67a
-  data.tar.gz: bb0df905af199fa12e3abaa0e83debde076e9bc40a204dd75dd5c07d930f592ce2b4c34cf510dc4402592dc770ed898560ce628f34280a996e1b82a4b24ad4ca
+  metadata.gz: a39169e0643ec4b4c860b2a01ce6de2ab8f599e23f7b15d1daab7299d0d9ea60c6a8bf94426eae9d08165903bc95e6d64f0f81477b8d188a7d49c2f720a83543
+  data.tar.gz: f83e92536d7541fc3b22cd7cc960acff97e59eb8197662eb4f935b1bcfefdb1a61d0acebb5edec6e4120e8d2bc45aa20f116fd22d155ee7e08bc71c22dfc6873

data/README.md

@@ -56,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
@@ -112,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

@@ -230,17 +230,19 @@ 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 = loadcon.upload_attachment(file)
     puts response
@@ -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|
@@ -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

data/change_log.md

@@ -1,5 +1,25 @@
 # rusdc changelog
 
+## 1.4.0
+
+- remove "warning: URI.escape is obsolete" 
+
+## 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`.

data/lib/usd.rb

@@ -11,6 +11,7 @@ require 'tempfile'
 class Usd
 
   CN={
+    "grc" => "type",
     "chg" => "chg_ref_num",
     "cnt" => "combo_name",
     "arcpur_rule" => "name",
@@ -160,10 +161,11 @@ class Usd
     RestClient.log = STDOUT if @debug
     hash = {:method => "get", :header => header(), :unchanged => false, :json => "", :base_url => @base_url}.update hash
     puts "request - hash: #{JSON.pretty_generate(hash)}" if @debug
+    parser = URI::RFC2396_Parser.new
     if (uri !~ /^http/)
-      url = URI.escape("#{hash[:base_url]}#{uri}")
+      url = parser.escape("#{hash[:base_url]}#{uri}")
     else
-      url = URI.escape(uri)
+      url = parser.escape(uri)
     end
     begin
       if hash[:method] == "get"
@@ -251,7 +253,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}"
@@ -283,7 +285,9 @@ class Usd
     baseurl =~ /^([^:]+):/
     server = $1
     filename = File.basename(file)
-    uri = "/caisd-rest/attmnt?repositoryId=1002&serverName=#{server}&mimeType=Text&description=#{filename}"
+    #filename_escaped = URI.escape(filename)
+    filename_escaped = filename.gsub(/[^0-9A-Za-z.\-]/, '_')
+    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)
@@ -294,7 +298,7 @@ class Usd
     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"
+    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

data/usd.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |spec|
   spec.name = 'usd'
-  spec.version = '1.3.4'
-  spec.date = '2020-09-11'
+  spec.version = '1.4.0'
+  spec.date = '2020-11-12'
   spec.summary = "SDM REST-API-Calls"
   spec.description = "a Ruby class and a commandlinetool for SDM REST-API-Calls"
   spec.authors = ["Oliver Gaida"]
@@ -13,4 +13,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'thor', '~> 0.20', '>= 0.20.3'
   spec.add_runtime_dependency 'rest-client', '~> 2.0', '>= 2.0.0'
   spec.add_runtime_dependency 'json', '~> 2.1', '>= 2.1.0'
+  spec.license = 'MIT'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usd
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.0
 platform: ruby
 authors:
 - Oliver Gaida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -86,7 +86,8 @@ files:
 - lib/usd.rb
 - usd.gemspec
 homepage: https://github.com/ogaida/usd
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -103,8 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: SDM REST-API-Calls