roust 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 513086117718e9f68a4940b63d82d3546b1c999e
-  data.tar.gz: efa3079add7548468976c137b1b1cfb40525df21
+  metadata.gz: e7ee7d17e0b20c09150bf0bdd916cb095e80cb00
+  data.tar.gz: 8980ec21a7e9ba564c76b030b7228864eb63c967
 SHA512:
-  metadata.gz: 4ccafda8340e695d70354798db29f7338828a2fa5d932ccb9bf8803a8aba0035ee109dbace9175d2dc78b177ddf10f9557238e503b09cd26d237a20a558e3b0c
-  data.tar.gz: c1719e2fb75e59ffba44f05e5b5c24a98faa42fb625137a169a3b74063b46c45f27ac24d9847391e87999954fdf56b557c92ec9736da2fe49b6bc1592ceaef32
+  metadata.gz: 79232477402303a69319cc1b5ec6d7d586b15b25c769fdfac226806d8b5262308a3daf24878bcaaea6afc002f2cbc39c6e9401c01c5cd7fb7a2b8c37735c5089
+  data.tar.gz: f0df4616af12ea96fa3443c216fbf7371e88f3ba8b95d1143b2059f721c79f69c0a09b406960c746adcb2067dad140aec433c1d83bddff8389ea342de33767b1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roust (1.0.0)
+    roust (1.0.1)
       archive-tar-minitar (>= 0.5)
       mail (>= 2.5.4)
       mime-types (>= 1.16)

data/README.md

@@ -3,7 +3,7 @@ Roust
 
 Roust is a Ruby client for [Request Tracker](http://www.bestpractical.com/rt/)'s REST API.
 
-It is a fork of [rt-client](http://rubygems.org/gems/rt-client) by Tom Lahti.
+It is a complete fork of [rt-client](http://rubygems.org/gems/rt-client) by Tom Lahti, and shares little ancestry.
 
 Features
 --------
@@ -43,7 +43,7 @@ credentials = {
 rt = Roust.new(credentials)
 rt.authenticated? # => true
 
-# Query RT 
+# Query RT
 rt.list(:query => "id = 1 or id = 2") # => [["1", "A subject"], ["2", "Another subject"]]
 
 # Fetch ticket metadata
@@ -86,12 +86,10 @@ Releasing
 ---------
 
 1. Bump the version in `lib/roust/version.rb`
-2. Add an entry to `CHANGELOG.md`
-3. Run a `bundle` to update any RubyGems dependencies.
-4. `git commit` everything.
-5. git tag the version git tag X.Y.Z
-6. Build the gem with `rake build`
-
+2. Run a `bundle` to update any RubyGems dependencies.
+3. git tag the version git tag X.Y.Z
+4. Build the gem with `rake build`
+5. Push the gem with `rake push`
 
 
 TODO

data/Rakefile

@@ -29,6 +29,8 @@ task :push do
   newest = filenames_with_times.sort_by { |tuple| tuple.last }.last
   newest_filename = newest.first
 
+  p newest_filename
+
   command = "gem push #{newest_filename}"
   system(command)
 end

data/lib/roust/version.rb

@@ -1,3 +1,3 @@
 class Roust
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/roust.rb

@@ -198,14 +198,19 @@ class Roust
     reply = {}
     resp = @site["ticket/#{sid}/links/show"].get
     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
+    resp.gsub!(/\n\n/,"\n") # remove double spacing, Mail stops at a blank line
     while resp.match(/CF\.\{[\w_ ]*[ ]+[\w ]*\}/) #replace CF spaces with underscores
       resp.gsub!(/CF\.\{([\w_ ]*)([ ]+)([\w ]*)\}/, 'CF.{\1_\3}')
     end
     return {:error => resp, }  if resp =~ /does not exist./
-    th = TMail::Mail.parse(resp)
-    th.each_header do |k,v|
-      reply["#{k}"] = v.to_s
+    items = resp.split("\n--\n")
+    items.each do |item|
+      th = Mail.new(item)
+      th.header.fields.each do |header|
+        k = header.name.to_s.downcase
+        v = header.value.to_s
+        reply["#{k}"] = v.to_s
+      end
     end
     reply
   end
@@ -460,23 +465,30 @@ class Roust
     tickets = resp.split("\n--\n") # -- occurs between each ticket
     tickets.each do |ticket|
       ticket.gsub!(/^\n/,"") # strip leading blank lines
-      ticket.gsub!(/\n\n/,"\n") # remove blank lines for TMail
+      ticket.gsub!(/\n\n/,"\n") # remove blank lines for Mail
       while ticket.match(/CF\.\{[\w_ ]*[ ]+[\w ]*\}/) #replace CF spaces with underscores
         ticket.gsub!(/CF\.\{([\w_ ]*)([ ]+)([\w ]*)\}/, 'CF.{\1_\3}')
       end
-      th = TMail::Mail.parse(ticket)
+      items = ticket.split("\n--\n")
       reply = {}
-      th.each_header do |k,v|
-        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
+      items.each do |item|
+        item.gsub!(/\n\s*\n/,"\n") # remove blank lines for Mail
+        th = Mail.new(item)
+        th.header.fields.each do |header|
+          k = header.name.to_s.downcase
+          v = header.value.to_s
+          case k
+            when 'created','due','told','lastupdated','started'
+              begin
+                vv = DateTime.parse(v)
+                reply["#{k}"] = vv.strftime("%Y-%m-%d %H:%M:%S")
+              rescue ArgumentError => e
+                p "e #{e}"
+                reply["#{k}"] = v
+              end
+            else
+              reply["#{k}"] = v
+          end
         end
       end
       replies.push reply
@@ -534,9 +546,10 @@ class Roust
         resp.gsub!(/CF\.\{([\w_ ]*)([ ]+)([\w ]*)\}/, 'CF.{\1_\3}')
       end
       items = resp.split("\n--\n")
-
       list = []
       items.each do |item|
+        #yes, this messes with the "content:" field but that's the one that's upsetting Mail.new
+        item.gsub!(/\n\s*\n/,"\n") # remove blank lines for Mail
         th = Mail.new(item)
         next if not comments and th["type"].to_s =~ /Comment/ # skip comments
         reply = {}
@@ -567,7 +580,7 @@ class Roust
             end
           when "content"
             reply["content"] = v.to_s
-            #temp = item.match(/^Content: (.*?)^\w+:/m) # TMail strips line breaks
+            #temp = item.match(/^Content: (.*?)^\w+:/m) # Mail strips line breaks
             #reply["content"] = temp[1] if temp.class != NilClass
           else
             reply["#{k}"] = v.to_s
@@ -607,35 +620,39 @@ class Roust
     while resp.match(/CF\.\{[\w_ ]*[ ]+[\w ]*\}/) #replace CF spaces with underscores
       resp.gsub!(/CF\.\{([\w_ ]*)([ ]+)([\w ]*)\}/, 'CF.{\1_\3}')
     end
-    th = TMail::Mail.parse(resp)
-    attachments = []
-    th.each_header do |k,v|
-      case k
-        when "attachments"
-          temp = resp.match(/Attachments:\s*(.*)[^\w|$]/m)
-          if temp.class != NilClass
-            atarr = temp[1].split("\n")
-            atarr.map { |a| a.gsub!(/^\s*/,"") }
-            atarr.each do |a|
-              i = a.match(/(\d+):\s*(.*)/)
-              s={}
-              s[:id] = i[1]
-              s[:name] = i[2]
-              sz = i[2].match(/(.*?)\s*\((.*?)\)/)
-              if sz.class == MatchData
-                s[:name] = sz[1]
-                s[:size] = sz[2]
+    items = resp.split("\n--\n")
+    items.each do |item|
+      th = Mail.new(item)
+      th.header.fields.each do |header|
+        k = header.name.to_s.downcase
+        v = header.value.to_s
+        case k
+          when "attachments"
+            temp = resp.match(/Attachments:\s*(.*)[^\w|$]/m)
+            if temp.class != NilClass
+              atarr = temp[1].split("\n")
+              atarr.map { |a| a.gsub!(/^\s*/,"") }
+              atarr.each do |a|
+                i = a.match(/(\d+):\s*(.*)/)
+                s={}
+                s[:id] = i[1]
+                s[:name] = i[2]
+                sz = i[2].match(/(.*?)\s*\((.*?)\)/)
+                if sz.class == MatchData
+                  s[:name] = sz[1]
+                  s[:size] = sz[2]
+                end
+                attachments.push s
               end
-              attachments.push s
+              reply["#{k}"] = attachments
             end
-            reply["#{k}"] = attachments
-          end
-        when "content"
-          reply["content"] = v.to_s
-          temp = resp.match(/^Content: (.*?)^\w+:/m) # TMail strips line breaks
-          reply["content"] = temp[1] if temp.class != NilClass
-        else
-          reply["#{k}"] = v.to_s
+          when "content"
+            reply["content"] = v.to_s
+            temp = resp.match(/^Content: (.*?)^\w+:/m) # Mail strips line breaks
+            reply["content"] = temp[1] if temp.class != NilClass
+          else
+            reply["#{k}"] = v.to_s
+        end
       end
     end
     reply
@@ -662,10 +679,19 @@ class Roust
     while resp.match(/CF\.\{[\w_ ]*[ ]+[\w ]*\}/) #replace CF spaces with underscores
       resp.gsub!(/CF\.\{([\w_ ]*)([ ]+)([\w ]*)\}/, 'CF.{\1_\3}')
     end
-    th = TMail::Mail.parse(resp)
     list = []
     pattern = /(\d+:\s.*?\)),/
-    match = pattern.match(th['attachments'].to_s)
+    items = resp.split("\n--\n")
+    attachment_string = ""
+    items.each do |item|
+      th = Mail.new(item)
+      th.header.fields.each do |header|
+        if header.name.to_s.downcase == "attachments"
+          attachment_string = attachment_string + header.value.to_s
+        end
+      end
+    end
+    match = pattern.match(attachment_string)
     while match != nil
       list.push match[0]
       s = match.post_match
@@ -721,10 +747,15 @@ class Roust
     while resp.match(/CF\.\{[\w_ ]*[ ]+[\w ]*\}/) #replace CF spaces with underscores
       resp.gsub!(/CF\.\{([\w_ ]*)([ ]+)([\w ]*)\}/, 'CF.{\1_\3}')
     end
-    headers = TMail::Mail.parse(resp)
     reply = {}
-    headers.each_header do |k,v|
-      reply["#{k}"] = v.to_s
+    items = resp.split("\n--\n")
+    items.each do |item|
+      th = Mail.new(item)
+      th.header.fields.each do |header|
+        k = header.name.to_s.downcase
+        v = header.value.to_s
+        reply["#{k}"] = v.to_s
+      end
     end
     content = resp.match(/Content:\s+(.*)/m)[1]
     content.gsub!(/\n\s{9}/,"\n") # strip leading spaces on each line

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roust
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Lindsay Holmwood