roust 1.0.1 → 1.1.0

data/roust.gemspec

@@ -21,9 +21,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'rest-client',         ">= 0.9"
-  s.add_runtime_dependency 'mail',                ">= 2.5.4"
-  s.add_runtime_dependency 'mime-types',          ">= 1.16"
-  s.add_runtime_dependency 'archive-tar-minitar', ">= 0.5"
-  s.add_runtime_dependency 'nokogiri',            ">= 1.2"
+  s.add_runtime_dependency 'mail',                '>= 2.5.4'
+  s.add_runtime_dependency 'httparty',            '>= 0.13.1'
+  s.add_runtime_dependency 'activesupport',       '>= 4.1.0'
 end

data/spec/ticket_spec.rb

@@ -10,20 +10,19 @@ describe "Roust" do
     }
     mocks_path = Pathname.new(__FILE__).parent.join('mocks')
 
-    stub_request(:post, "http://rt.example.org/REST/1.0/").
+    stub_request(:post, "http://rt.example.org/index.html").
       with(:body => {
             "user"=>"admin",
             "pass"=>"password",
            }).
       to_return(:status => 200, :body => "", :headers => {})
 
-
     stub_request(:get, "http://rt.example.org/REST/1.0/ticket/1/show").
       to_return(:status  => 200,
                 :body    => mocks_path.join('ticket-1-show.txt').read,
                 :headers => {})
 
-    stub_request(:get, "http://rt.example.org/REST/1.0/search/ticket/?format=s&orderby=&query=id%20=%201%20or%20id%20=%202").
+    stub_request(:get, "http://rt.example.org/REST/1.0/search/ticket?format=s&orderby=%2Bid&query%5Bquery%5D=id%20=%201%20or%20id%20=%202").
        to_return(:status  => 200,
                  :body    => mocks_path.join('ticket-search-1-or-2.txt').read,
                  :headers => {})
@@ -53,7 +52,7 @@ describe "Roust" do
     rt = Roust.new(@credentials)
     rt.authenticated?.should be_true
 
-    results = rt.list(:query => "id = 1 or id = 2")
+    results = rt.search(:query => "id = 1 or id = 2")
     results.size.should == 2
     results.each do |result|
       result.size.should == 2
@@ -67,18 +66,18 @@ describe "Roust" do
     ticket = rt.show("1")
     ticket.should_not be_nil
 
-    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)
+    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)
 
     attrs.each do |attr|
       ticket[attr].should_not be_nil, "#{attr} key doesn't exist"
     end
 
-    %w(requestors cc admincc).each do |field|
+    %w(Requestors Cc AdminCc).each do |field|
       ticket[field].size.should > 1
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roust
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -39,47 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.5.4
 - !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: archive-tar-minitar
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 4.1.0
 description: Roust is a Ruby API client that accesses the REST interface version 1.0
   of a Request Tracker instance. See http://www.bestpractical.com/ for Request Tracker.
 email:
@@ -97,7 +69,6 @@ files:
 - Rakefile
 - examples/example.rb
 - lib/roust.rb
-- lib/roust/rtxmlsrv.rb
 - lib/roust/version.rb
 - roust.gemspec
 - spec/mocks/ticket-1-history-long.txt

data/lib/roust/rtxmlsrv.rb

@@ -1,271 +0,0 @@
-#!/opt/ruby-enterprise-1.8.7-2010.02/bin/ruby
-
-## XML RPC service to provide a cross-platform API for
-## RT ticket creation/maintenance.  Essentially just a wrapper
-## around the rt/client library.
-
-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
-
-# extend the Hash class to 
-# translate string keys into symbol keys
-class Hash # :nodoc:
-  def remapkeys!
-    n = Hash.new
-    self.each_key do |key|
-      n[key.to_sym] = self[key]
-    end
-    self.replace(n)
-    n = nil
-    $stderr.puts self.map { |k,v| "#{k} => #{v}" }
-    self
-  end
-end
-
-class TicketSrv
-
-  def initialize
-  end
-  
-  INTERFACE = XMLRPC::interface("rt") {
-    meth 'string add_watcher(struct)','Calls RT_Client::add_watcher'
-    meth 'array attachments(struct)','Calls RT_Client::attachments'
-    meth 'string comment(struct)','Calls RT_Client::comment'
-    meth 'string correspond(struct)','Calls RT_Client::correspond'
-    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'
-    meth 'array list(struct)','Calls RT_Client::list'
-    meth 'array query(struct)','Calls RT_Client::query (long form)'
-    meth 'struct show(struct)','Calls RT_Client::show'
-  }
-
-  # Allows watchers to be added via RT_Client::add_watcher
-  # You need to pass :id, :addr, and optionally :type
-  def add_watcher(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.add_watcher(struct)
-    rt = nil
-    val
-  end
-
-  # Gets a list of attachments via RT_Client::attachments
-  # You need to pass :id, and optionally :unnamed
-  def attachments(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
-    rt = RT_Client.new
-    val = rt.attachments(struct)
-    rt = nil
-    val
-  end
-
-  # Adds comments to tickets via RT_Client::comment
-  def comment(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.comment(struct)
-    rt = nil
-    val
-  end
-
-  # Allows new tickets to be created via RT_Client::correspond
-  def correspond(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.correspond(struct)
-    rt = nil
-    val
-  end
-
-  # Allows new tickets to be created via RT_Client::create
-  def create(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.create(struct)
-    rt = nil
-    val
-  end
-
-  # Allows new users to be created via RT_Client::create_user
-  def 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.create_user(struct)
-    rt = nil
-    val
-  end
-
-  # Find RT user details from email address via RT_Cleint::usersearch
-  def usersearch(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.usersearch(struct)
-    rt = nil
-    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!
-    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(struct)
-    rt = nil
-    val
-  end
-
-  # Retrieves attachments via RT_Client::get_attachment
-  def get_attachment(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.get_attachment(struct)
-    rt = nil
-    val
-  end
-
-  # Gets the history of a ticket via RT_Client::history
-  def history(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.history(struct)
-    rt = nil
-    val
-  end
-
-  # Gets a single history item via RT_Client::history_item
-  def history_item(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.history_item(struct)
-    rt = nil
-    val
-  end
-
-  # Gets a list of tickets via RT_Client::list
-  def list(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.list(struct)
-    rt = nil
-    val
-  end
-
-  # Gets a list of tickets via RT_Client::query
-  def query(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.query(struct)
-    rt = nil
-    val
-  end
-
-  # Gets detail (minus history/attachments) via RT_Client::show
-  def show(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.show(struct)
-    rt = nil
-    val
-  end
-  
-end # class TicketSrv
-
-pid = fork do
-  Signal.trap('HUP','IGNORE')
-  # set up a log file
-  logfile = File.dirname(__FILE__) + "/ticketsrv.log"
-  accfile = File.dirname(__FILE__) + "/access.log"
-  acc = File.open(accfile,"a+")
-  $stderr.reopen acc # redirect $stderr to the log as well
-  # determine the IP address to listen on and create the server
-  sock = Socket.getaddrinfo(Socket.gethostname,PORT,Socket::AF_INET,Socket::SOCK_STREAM)
-  $s = XMLRPC::Server.new(sock[0][1], sock[0][3], MAX_CONN, logfile)
-  $s.set_parser(XMLRPC::XMLParser::XMLStreamParser.new)
-  $s.add_handler(TicketSrv::INTERFACE, TicketSrv.new)
-  $s.add_introspection
-  $s.serve  # start serving
-  $stderr.reopen STDERR
-  acc.close
-end
-Process.detach(pid)
-