rt-client 0.2.2 → 0.3.1

data/rt/client.rb

@@ -5,6 +5,7 @@ require "rest_client"
 require "tmail"
 require "iconv"
 require 'mime/types' # requires both nokogiri and rcov.  Yuck.
+require 'date'
 
 ##A ruby library API to Request Tracker's REST interface. Requires the
 ##rubygems rest-client, tmail and mime-types to be installed.  You can
@@ -20,7 +21,7 @@ require 'mime/types' # requires both nokogiri and rcov.  Yuck.
 
 class RT_Client
 
-  UA = "Mozilla/5.0 ruby RT Client Interface 0.2"
+  UA = "Mozilla/5.0 ruby RT Client Interface 0.3.1"
   attr_reader :status, :site, :version, :cookies, :server, :user, :cookie
   
   # Create a new RT_Client object. Load up our stored cookie and check it.
@@ -53,7 +54,7 @@ class RT_Client
   #  cookies=<directory>
   def initialize(*params)
     @boundary = "----xYzZY#{rand(1000000).to_s}xYzZY"
-    @version = "0.2"
+    @version = "0.3"
     @status = "Not connected"
     @server = "http://localhost/"
     @user = "rt_user"
@@ -143,7 +144,11 @@ class RT_Client
       sid = $~[2]
     end
     reply = {}
-    resp = @site["#{type}/#{sid}/show"].get
+    if type.downcase == 'user'
+      resp = @site["#{type}/#{sid}"].get
+    else
+      resp = @site["#{type}/#{sid}/show"].get
+    end
     resp.gsub!(/RT\/\d\.\d\.\d\s\d{3}\s.*\n\n/,"") # toss the HTTP response
     resp.gsub!(/\n\n/,"\n") # remove double spacing, TMail stops at a blank line
     return {:error => resp, }  if resp =~ /does not exist./
@@ -215,7 +220,7 @@ class RT_Client
   # For a full list of possible parameters that you can specify, look at
   # "/opt/rt/bin/rt edit user/1"
   #
-  #  new_id = rt.create_user(:Name => "Joe Smith", :EmailAddress => "joes\@here.com")
+  #  new_id = rt.create_user(:Name => "Joe_Smith", :EmailAddress => "joes\@here.com")
   def create_user(field_hash)
     field_hash[:id] = "user/new"
     payload = compose(field_hash)
@@ -228,7 +233,27 @@ class RT_Client
     end
     new_user # return the new user id or the full REST response
   end
-
+  
+  # edit or create a user.  If the user exists, edits the user as "edit" would.
+  # If the user doesn't exist, creates it as "create_user" would.
+  def edit_or_create_user(field_hash)
+    if field_hash.has_key? :id
+      id = field_hash[:id]
+      if id !~ /^user\//
+        id = "user/#{id}"
+        field_hash[:id] = id
+      end
+    else
+      raise "RT_Client.edit_or_create_user require a user id in the 'id' key."
+    end
+    resp1 =  "not called"
+    resp2 =  "not called"
+    resp1 = edit(field_hash)
+    resp2 = create_user(field_hash) if resp1 =~ /does not exist./
+    resp = "Edit: #{resp1}\nCreate:#{resp2}"
+    resp
+  end
+  
   # edit an existing ticket/user. Requires a hash containing RT
   # form fields as keys.  the key :id is required.
   # returns the complete REST response, whatever it is.  If the 
@@ -276,6 +301,17 @@ class RT_Client
     @site["ticket/#{id}/comment"].post payload
   end
   
+  def usersearch(field_hash)
+    if field_hash.has_key? :EmailAddress
+      email = field_hash[:EmailAddress]
+    else
+      raise "RT_Client.usersearch requires a user email in the 'EmailAddress' key."
+    end
+    payload = compose(field_hash)
+    resp = @site["search/user/?query=EmailAddress='#{email}'"].post payload
+    resp
+  end
+  
   # correspond on a ticket.  Requires a hash, which must have an :id key
   # containing the ticket number.  Returns the REST response.  For a list of
   # fields you can use in correspondence, try "/opt/rt3/bin/rt correspond
@@ -369,7 +405,17 @@ class RT_Client
       th = TMail::Mail.parse(ticket)
       reply = {}
       th.each_header do |k,v|
-        reply["#{k}"] = v.to_s
+        case k
+          when 'created','due','told','lastupdated','started'
+            begin
+              vv = DateTime.parse(v.to_s)
+              reply["#{k}"] = vv.strftime("%Y-%m-%d %H:%M:%S")
+            rescue ArgumentError
+              reply["#{k}"] = v.to_s
+            end
+          else
+            reply["#{k}"] = v.to_s
+        end
       end
       replies.push reply
     end

data/rt/rtxmlsrv.rb

@@ -8,6 +8,7 @@ require "rubygems"             # so we can load gems
 require "rt/client"            # rt-client REST library
 require "xmlrpc/server"        # that's what we're doing
 require "date"                 # for parsing arbitrary date formats
+require "pp"
 
 PORT=8080
 MAX_CONN=50
@@ -43,6 +44,7 @@ class TicketSrv
     meth 'string create(struct)','Calls RT_Client::create'
     meth 'string create_user(struct)','Calls RT_Client::create_user'
     meth 'string edit(struct)','Calls RT_Client::edit'
+    meth 'string edit_or_create_user(struct)','Calls RT_Client::edit_or_create_user'
     meth 'struct get_attachment(struct)','Calls RT_Client::get_attachment'
     meth 'struct history(struct)','Calls RT_Client::history (long form)'
     meth 'struct history_item(struct)','Calls RT_Client::history_item'
@@ -132,6 +134,19 @@ class TicketSrv
     val
   end
 
+  # Allows new users to be edited or created if they don't exist
+  def edit_or_create_user(struct)
+    struct.remapkeys!
+    if struct.has_key? :user and struct.has_key? :pass
+      rt = RT_Client.new(:user => struct[:user], :pass => struct[:pass])
+    else
+      rt = RT_Client.new
+    end
+    val = rt.edit_or_create_user(struct)
+    rt = nil
+    val
+  end
+
   # Allows existing ticket to be modified via RT_Client::edit
   def edit(struct)
     struct.remapkeys!

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rt-client
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  hash: 17
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Tom Lahti
@@ -9,80 +15,117 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-01 00:00:00 -07:00
+date: 2010-07-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
         version: "0.9"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: tmail
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mime-types
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 1
+        - 16
         version: "1.16"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: archive-tar-minitar
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 5
         version: "0.5"
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
         version: "1.2"
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 1
+        - 9
+        - 0
         version: 1.9.0
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rcov
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
         version: "0.8"
-    version: 
-description: RT_Client is a ruby object that accesses the REST interface version 1.0 of a Request Tracker instance.  See http://www.bestpractical.com/ for Request Tracker.
+  type: :runtime
+  version_requirements: *id007
+description: "    RT_Client is a ruby object that accesses the REST interface version 1.0\n    of a Request Tracker instance.  See http://www.bestpractical.com/ for\n    Request Tracker.\n"
 email: toml@bitstatement.net
 executables: []
 
@@ -95,6 +138,8 @@ files:
 - rt/rtxmlsrv.rb
 has_rdoc: true
 homepage: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --inline-source
@@ -103,23 +148,31 @@ rdoc_options:
 require_paths: 
 - .
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 59
+      segments: 
+      - 1
+      - 8
+      - 6
       version: 1.8.6
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - A working installation of RT with the REST 1.0 interface
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Ruby object for RT access via REST
 test_files: []