roust 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3febce0ccfa7b44ea209547f57d97b758f7e7190
-  data.tar.gz: d45a596e62bc4c1039428796539f7c5057f7ffd4
+  metadata.gz: 5b227d0780f4901c6964f0dbabc8249a14eb36ca
+  data.tar.gz: 74852906c70295672ef84e94f545236948bc71ea
 SHA512:
-  metadata.gz: ae9c3cc4cdc0518d99d0c8a0a5e2947ff1267614c01f20c221218634a4fbafe2794c5933f97d79cf081bd55d0a52da1f023298a1dd201fc04246c55ab0088d72
-  data.tar.gz: 68025367e6042fecf660cdb6ade159895d5b1d12e1db9cdf685cfdee65b5602c0fba187b421f0eeb391557fb335e99c5f732a5fcb9a40ea06c4ca0052f430a42
+  metadata.gz: 4f5f32014af95ef2afed1b8bd21574532a8eadee97293ee135e80a67d152ccd58dc2731e30a35afd053996636ca7826157758e9c5b88951a0739a30d3e54b1d4
+  data.tar.gz: 2f126f6276a5fd87467ae0d7a804cf458f52089d4825b4df4dcad5b7a76185136cf9f2259482489a3d9b65957c192c353ab7ca5c0e1d0b0ab920c8b061fb4e62

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roust (1.6.1)
+    roust (1.7.0)
       activesupport (>= 4.1.0)
       httparty (>= 0.13.1)
       mail (>= 2.5.4)

data/lib/roust/ticket.rb

@@ -7,39 +7,7 @@ class Roust
 
       return nil if body =~ /^# (Ticket (\d+) does not exist\.)/
 
-        # Replace CF spaces with underscores
-        while body.match(/CF\.\{[\w_ ]*[ ]+[\w ]*\}/)
-          body.gsub!(/CF\.\{([\w_ ]*)([ ]+)([\w ]*)\}/, 'CF.{\1_\3}')
-        end
-
-      # Sometimes the API returns requestors formatted like this:
-      #
-      #   Requestors: foo@example.org,
-      #               bar@example.org, baz@example.org
-      #               qux@example.org, quux@example.org,
-      #               corge@example.org
-      #
-      # Turn it into this:
-      #
-      #   Requestors: foo@example.org, bar@example.org, baz@example.org, ...
-      #
-      body.gsub!(/\n\n/, "\n")
-
-      %w(Requestors Cc AdminCc).each do |field|
-        body.gsub!(/^#{field}:(.+)^\n/m) do |m|
-          m.strip.split(/,\s+/).join(', ').strip
-        end
-      end
-
-      hash = body_to_hash(body)
-
-      %w(Requestors Cc AdminCc).each do |field|
-        hash[field] = hash[field].split(', ') if hash[field]
-      end
-
-      hash['id'] = hash['id'].split('/').last
-
-      hash
+      parse_ticket_attributes(body)
     end
 
     def ticket_create(attrs)
@@ -119,15 +87,25 @@ class Roust
         :orderby => '+id'
       }.merge(attrs)
 
+      params[:format] = 'l' if verbose = params.delete(:verbose)
+
       # FIXME(auxesis): query should be an actual method argument
       raise ArgumentError, ":query not specified" unless params[:query]
 
       response = self.class.get('/search/ticket', :query => params)
 
       body, _ = explode_response(response)
-      body.split("\n").map do |t|
-        id, subject = t.split(': ', 2)
-        {'id' => id, 'Subject' => subject}
+
+      if verbose
+        results = body.split("\n--\n\n")
+        results.map do |result_body|
+          parse_ticket_attributes(result_body)
+        end
+      else
+        body.split("\n").map do |t|
+          id, subject = t.split(': ', 2)
+          {'id' => id, 'Subject' => subject}
+        end
       end
     end
 
@@ -195,6 +173,42 @@ class Roust
       end
     end
 
+    def parse_ticket_attributes(body)
+      # Replace CF spaces with underscores
+      while body.match(/CF\.\{[\w_ ]*[ ]+[\w ]*\}/)
+        body.gsub!(/CF\.\{([\w_ ]*)([ ]+)([\w ]*)\}/, 'CF.{\1_\3}')
+      end
+
+      # Sometimes the API returns requestors formatted like this:
+      #
+      #   Requestors: foo@example.org,
+      #               bar@example.org, baz@example.org
+      #               qux@example.org, quux@example.org,
+      #               corge@example.org
+      #
+      # Turn it into this:
+      #
+      #   Requestors: foo@example.org, bar@example.org, baz@example.org, ...
+      #
+      body.gsub!(/\n\n/, "\n")
+
+      %w(Requestors Cc AdminCc).each do |field|
+        body.gsub!(/^#{field}:(.+)^\n/m) do |m|
+          m.strip.split(/,\s+/).join(', ').strip
+        end
+      end
+
+      hash = body_to_hash(body)
+
+      %w(Requestors Cc AdminCc).each do |field|
+        hash[field] = hash[field].split(', ') if hash[field]
+      end
+
+      hash['id'] = hash['id'].split('/').last
+
+      hash
+    end
+
     def parse_short_history(body, opts = {})
       comments = opts[:comments]
       regex    = comments ? '^\d+:' : '^\d+: [^Comments]'

data/lib/roust/version.rb

@@ -1,3 +1,3 @@
 class Roust
-  VERSION = '1.6.1'
+  VERSION = '1.7.0'
 end

data/spec/mocks/ticket-search-1-or-2-long.txt

@@ -0,0 +1,57 @@
+RT/3.4.6 200 Ok
+
+id: ticket/1
+Queue: support
+Owner: bob
+Creator: alice
+Subject: Heavy packet loss
+Status: open
+Priority: 101
+InitialPriority: 101
+FinalPriority: 100
+
+Requestors: carol@them.example, chuck@them.example,
+            craig@them.example
+
+Cc: dan@us.example, dave@them.example
+
+AdminCc: erin@us.example, eve@us.example,
+         frank@us.example, oscar@us.example,
+         peggy@us.example, trent@us.example
+
+Created: Tue Dec 11 07:59:31 2012
+Starts: Not set
+Started: Not set
+Due: Wed Dec 12 20:58:48 2012
+Resolved: Wed Jan 16 16:33:15 2013
+Told: Mon Jan 07 15:27:09 2013
+LastUpdated: Wed Nov 06 09:33:43 2013
+TimeEstimated: 0
+TimeWorked: 12 hours
+TimeLeft: 0
+
+--
+
+id: ticket/2
+Queue: sales
+Owner: bob
+Creator: RT_System
+Subject: Bloom
+Status: resolved
+Priority: 20
+InitialPriority: 20
+FinalPriority: 1
+Requestors: carol@them.example, chuck@them.example,
+Cc:
+AdminCc:
+Created: Tue May 29 16:19:22 2001
+Starts: Not set
+Started: Not set
+Due: Not set
+Resolved: Mon Mar 15 11:54:58 2004
+Told: Not set
+LastUpdated: Mon Oct 14 11:41:10 2013
+TimeEstimated: 0
+TimeWorked: 0
+TimeLeft: 0
+

data/spec/roust/ticket_spec.rb

@@ -12,6 +12,11 @@ describe Roust do
                   :body    => mocks_path.join('ticket-search-1-or-2.txt').read,
                   :headers => {})
 
+    stub_request(:get, "http://rt.example.org/REST/1.0/search/ticket?format=l&orderby=%2Bid&query=id%20=%201%20or%20id%20=%202")
+       .to_return(:status  => 200,
+                  :body    => mocks_path.join('ticket-search-1-or-2-long.txt').read,
+                  :headers => {})
+
     stub_request(:get, 'http://rt.example.org/REST/1.0/ticket/1/history?format=s')
        .to_return(:status  => 200,
                   :body    => mocks_path.join('ticket-1-history-short.txt').read,
@@ -40,6 +45,24 @@ describe Roust do
       end
     end
 
+    it 'can verbosely list tickets matching a query' do
+      results = @rt.search(:query => 'id = 1 or id = 2', :verbose => true)
+      expect(results.size).to eq(2)
+
+      attrs = %w(id Subject Queue) +
+              %w(Requestors Cc AdminCc Owner Creator) +
+              %w(Resolved Status) +
+              %w(Starts Started TimeLeft Due TimeWorked TimeEstimated) +
+              %w(LastUpdated Created Told) +
+              %w(Priority FinalPriority InitialPriority)
+
+      results.each do |result|
+        attrs.each do |attr|
+          expect(result[attr]).to_not eq(nil), "#{attr} key doesn't exist"
+        end
+      end
+    end
+
     it 'can fetch metadata on individual tickets' do
       ticket = @rt.show('1')
       expect(ticket).to_not eq(nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roust
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -85,6 +85,7 @@ files:
 - spec/mocks/ticket-1-show-unauthenticated.txt
 - spec/mocks/ticket-1-show.txt
 - spec/mocks/ticket-3-links.txt
+- spec/mocks/ticket-search-1-or-2-long.txt
 - spec/mocks/ticket-search-1-or-2.txt
 - spec/mocks/user-dan@us.example-after-edit.txt
 - spec/mocks/user-dan@us.example-edit.txt
@@ -129,6 +130,7 @@ test_files:
 - spec/mocks/ticket-1-show-unauthenticated.txt
 - spec/mocks/ticket-1-show.txt
 - spec/mocks/ticket-3-links.txt
+- spec/mocks/ticket-search-1-or-2-long.txt
 - spec/mocks/ticket-search-1-or-2.txt
 - spec/mocks/user-dan@us.example-after-edit.txt
 - spec/mocks/user-dan@us.example-edit.txt