rallycat 0.4.0 → 0.4.1

data/Gemfile

@@ -2,9 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rallycat.gemspec
 gemspec
-
-group :development, :test do
-  gem 'artifice'
-  gem 'pry'
-  gem 'rspec'
-end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rallycat (0.4.0)
+    rallycat (0.4.1)
       builder
       nokogiri
       rally_rest_api
@@ -12,17 +12,12 @@ GEM
     artifice (0.6)
       rack-test
     builder (3.0.0)
-    coderay (1.0.6)
     diff-lcs (1.1.3)
-    method_source (0.7.1)
     nokogiri (1.5.5)
-    pry (0.9.9.6)
-      coderay (~> 1.0.5)
-      method_source (~> 0.7.1)
-      slop (>= 2.4.4, < 3)
     rack (1.4.1)
     rack-test (0.6.1)
       rack (>= 1.0)
+    rake (0.9.2.2)
     rally_rest_api (1.0.3)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)
@@ -32,13 +27,12 @@ GEM
     rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.10.1)
-    slop (2.4.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   artifice
-  pry
+  rake
   rallycat!
   rspec

data/TODO

@@ -8,11 +8,9 @@
 * Slow as balls? Make nice wait messages
 * Add man page
 * Create .rallycatrc file on first run?
-* Listing stories
-  * Per iteration
-  * Per project (project configured in rc or passed in?)
 * AC-only story view
 * consolidate spec styles
+* rallycat list stories are colored based on schedule state
 
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
@@ -20,6 +18,8 @@
 
 rallycat list -s <search phrase>    # do a contains lookup for an iteration
 
+rallycat list -pdacb # Filter by schedule states
+
 Keep a log of last (n) stories typed into `cat` so the default action for
   `rallycat cat` will list the last (n) stories for the user.
 

data/lib/rallycat/cat.rb

@@ -10,7 +10,7 @@ module Rallycat
     def story(story_number)
       story_type = story_number.start_with?('US') ? :hierarchical_requirement : :defect
 
-      results = @rally_api.find(story_type, fetch: true) do
+      results = @rally_api.find(story_type, :fetch => true) do
         equal :formatted_id, story_number
       end
 
@@ -57,7 +57,7 @@ TEXT
       # [TA12345] [C] The name of the task.
       #
       sorted_tasks.map do |task|
-        state =  task.state == 'In-Progress' ? 'P' : task.state[0]
+        state =  task.state == 'In-Progress' ? 'P' : task.state.split('')[0]
         "[#{task.formatted_i_d}] [#{state}] #{task.name}"
       end.join("\n")
     end

data/lib/rallycat/connection.rb

@@ -16,10 +16,10 @@ module Rallycat
         logger = ENV['RALLY_DEBUG'] ? Logger.new(STDOUT) : Logger.new(nil)
 
         @api = RallyRestAPI.new \
-         base_url: 'https://rally1.rallydev.com/slm',
-         username: username,
-         password: password,
-         logger: logger
+         :base_url => 'https://rally1.rallydev.com/slm',
+         :username => username,
+         :password => password,
+         :logger   => logger
 
       rescue Rally::NotAuthenticatedError
         raise InvalidCredentialsError.new('Your Rally credentials are invalid.')

data/lib/rallycat/list.rb

@@ -14,9 +14,9 @@ module Rallycat
       project = find_project(project_name)
 
       iterations = @api.find_all(:iteration, {
-        project: project,
-        order: 'StartDate desc',
-        pagesize: 10
+        :project  => project,
+        :order    => 'StartDate desc',
+        :pagesize => 10
       }).results
 
       if iterations.count == 0
@@ -43,15 +43,15 @@ module Rallycat
       iteration = find_iteration(iteration_name, project)
 
       stories = @api.find(:hierarchical_requirement, {
-        project: project,
-        pagesize: 100,
-        fetch: true
+        :project  => project,
+        :pagesize => 100,
+        :fetch    => true
       }) { equal :iteration, iteration }.results
 
       stories += @api.find(:defect, {
-        project: project,
-        pagesize: 100,
-        fetch: true
+        :project  => project,
+        :pagesize => 100,
+        :fetch    => true
       }) { equal :iteration, iteration }.results
 
       if stories.count == 0
@@ -61,7 +61,7 @@ module Rallycat
       list = %{# Stories for iteration "#{iteration_name}" - "#{project_name}"\n\n}
 
       stories.each do |story|
-        state = story.schedule_state == 'In-Progress' ? 'P' : story.schedule_state[0]
+        state = story.schedule_state == 'In-Progress' ? 'P' : story.schedule_state.split('')[0]
         list += "* [#{story.formatted_i_d}] [#{state}] #{story.name}\n"
       end
 

data/lib/rallycat/version.rb

@@ -1,3 +1,3 @@
 module Rallycat
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/rallycat.gemspec

@@ -20,4 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rally_rest_api'
   gem.add_dependency 'nokogiri'
 
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'artifice'
+  gem.add_development_dependency 'rspec'
 end

data/spec/rallycat/cat_spec.rb

@@ -4,12 +4,7 @@ require 'cgi'
 describe Rallycat::Cat, '#story' do
 
   before do
-    responder = lambda do |env|
-      # 'https://rally1.rallydev.com/slm/webservice/current/user'
-      [200, {}, ['<foo>bar</foo>']]
-    end
-
-    Artifice.activate_with responder do
+    Artifice.activate_with RallyAuthResponder.new do
       @api = Rallycat::Connection.new('foo.bar@rallycat.com', 'password').api
     end
   end
@@ -127,22 +122,7 @@ STORY
   end
 
   it 'raises when the story does not exist' do
-    responder = lambda do |env|
-      [200, {}, [
-        <<-XML
-          <QueryResult rallyAPIMajor="1" rallyAPIMinor="17">
-          <Errors/>
-          <Warnings/>
-          <TotalResultCount>0</TotalResultCount>
-          <StartIndex>1</StartIndex>
-          <PageSize>20</PageSize>
-          <Results/>
-          </QueryResult>
-        XML
-      ]]
-    end
-
-    Artifice.activate_with responder do
+    Artifice.activate_with RallyNoResultsResponder.new do
       story_num = "US9999"
       cat = Rallycat::Cat.new(@api)
 

data/spec/rallycat/cli_spec.rb

@@ -27,8 +27,8 @@ describe Rallycat::CLI, '#options' do
     cli  = Rallycat::CLI.new %w{ -u foo.bar@rallycat.com -p password help }, sout
 
     cli.options.should == {
-      username: 'foo.bar@rallycat.com',
-      password: 'password'
+      :username => 'foo.bar@rallycat.com',
+      :password => 'password'
     }
   end
 
@@ -45,10 +45,10 @@ describe Rallycat::CLI, '#options' do
     cli  = Rallycat::CLI.new %w{ -u foo.bar@rallycat.com -p password update -p TA6666 -b }, sout
 
     cli.options.should == {
-      username:    'foo.bar@rallycat.com',
-      password:    'password',
-      in_progress: true,
-      blocked:     true
+      :username    => 'foo.bar@rallycat.com',
+      :password    => 'password',
+      :in_progress => true,
+      :blocked     => true
     }
   end
 
@@ -57,8 +57,8 @@ describe Rallycat::CLI, '#options' do
     cli  = Rallycat::CLI.new %w{ update TA6666 -pb }, sout
 
     cli.options.should == {
-      in_progress: true,
-      blocked:     true
+      :in_progress => true,
+      :blocked     => true
     }
   end
 end

data/spec/rallycat/update_spec.rb

@@ -1,13 +1,12 @@
 require 'spec_helper'
 
 describe Rallycat::Update do
-  before do
-    auth_responder = lambda do |env|
-      # 'https://rally1.rallydev.com/slm/webservice/current/user'
-      [200, {}, ['<foo>bar</foo>']]
-    end
+  def get_post_request(responder)
+    responder.requests.detect {|request| request.post? }
+  end
 
-    Artifice.activate_with auth_responder do
+  before do
+    Artifice.activate_with RallyAuthResponder.new do
       @api = Rallycat::Connection.new('foo.bar@rallycat.com', 'password').api
     end
   end
@@ -21,12 +20,12 @@ describe Rallycat::Update do
       Artifice.activate_with responder do
         task_num = "TA6666"
         update = Rallycat::Update.new(@api)
-        update.task(task_num, state: "In-Progress")
+        update.task(task_num, :state => "In-Progress")
       end
 
-      post_request = responder.requests[2] # this is the request that actually updates the task
-      post_request.should be_post
-      post_request.url.should == 'https://rally1.rallydev.com/slm/webservice/1.17/task/12345'
+      post_request = get_post_request(responder)
+
+      post_request.path.should == '/slm/webservice/1.17/task/12345'
 
       body =  post_request.body.tap(&:rewind).read
       body.should include('<Blocked>false</Blocked>')
@@ -40,13 +39,13 @@ describe Rallycat::Update do
       Artifice.activate_with responder do
         task_num = "TA6666"
         update = Rallycat::Update.new(@api)
-        message = update.task(task_num, state: "In-Progress", blocked: true)
+        message = update.task(task_num, :state => "In-Progress", :blocked => true)
         message.should include('Task (TA6666) was set to "In-Progress"')
       end
 
-      post_request = responder.requests[2] # this is the request that actually updates the task
-      post_request.should be_post
-      post_request.url.should == 'https://rally1.rallydev.com/slm/webservice/1.17/task/12345'
+      post_request = get_post_request(responder)
+
+      post_request.path.should == '/slm/webservice/1.17/task/12345'
 
       body =  post_request.body.tap(&:rewind).read
       body.should include('<Blocked>true</Blocked>')
@@ -59,12 +58,12 @@ describe Rallycat::Update do
       Artifice.activate_with responder do
         task_num = "TA6666"
         update = Rallycat::Update.new(@api)
-        message = update.task(task_num, state: "Completed")
+        message = update.task(task_num, :state => "Completed")
       end
 
-      post_request = responder.requests[2] # this is the request that actually updates the task
-      post_request.should be_post
-      post_request.url.should == 'https://rally1.rallydev.com/slm/webservice/1.17/task/12345'
+      post_request = get_post_request(responder)
+
+      post_request.path.should == '/slm/webservice/1.17/task/12345'
 
       body =  post_request.body.tap(&:rewind).read
       body.should include('<State>Completed</State>')
@@ -78,13 +77,13 @@ describe Rallycat::Update do
       Artifice.activate_with responder do
         task_num = "TA6666"
         update = Rallycat::Update.new(@api)
-        message = update.task(task_num, blocked: true)
+        message = update.task(task_num, :blocked => true)
         message.should include('Task (TA6666) was blocked.')
       end
 
-      post_request = responder.requests[2] # this is the request that actually updates the task
-      post_request.should be_post
-      post_request.url.should == 'https://rally1.rallydev.com/slm/webservice/1.17/task/12345'
+      post_request = get_post_request(responder)
+
+      post_request.path.should == '/slm/webservice/1.17/task/12345'
 
       body =  post_request.body.tap(&:rewind).read
       body.should include('<Blocked>true</Blocked>')
@@ -96,13 +95,13 @@ describe Rallycat::Update do
       Artifice.activate_with responder do
         task_num = "TA6666"
         update = Rallycat::Update.new(@api)
-        message = update.task(task_num, state: 'Completed', owner: 'Freddy Fender')
+        message = update.task(task_num, :state => 'Completed', :owner => 'Freddy Fender')
         message.should include('Task (TA6666) was assigned to "Freddy Fender"')
       end
 
-      post_request = responder.requests[4] # this is the request that actually updates the task
-      post_request.should be_post
-      post_request.url.should == 'https://rally1.rallydev.com/slm/webservice/1.17/task/12345'
+      post_request = get_post_request(responder)
+
+      post_request.path.should == '/slm/webservice/1.17/task/12345'
 
       body =  post_request.body.tap(&:rewind).read
       body.should include('<State>Completed</State>')
@@ -118,7 +117,7 @@ describe Rallycat::Update do
       update = Rallycat::Update.new(@api)
 
       lambda {
-        update.task(task_num, state: 'Completed', owner: 'Norman Notreal')
+        update.task(task_num, :state => 'Completed', :owner => 'Norman Notreal')
       }.should raise_error(Rallycat::UserNotFound, 'User (Norman Notreal) does not exist.')
     end
   end
@@ -131,9 +130,8 @@ describe Rallycat::Update do
       update = Rallycat::Update.new(@api)
 
       lambda {
-        update.task(task_num, state: 'Completed')
+        update.task(task_num, :state => 'Completed')
       }.should raise_error(Rallycat::TaskNotFound, 'Task (TA6666) does not exist.')
     end
-
   end
 end

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
 require 'rallycat'
-require 'pry'
 require 'rally_rest_api'
 require 'artifice'
 

data/spec/support/rally_auth_responder.rb

@@ -2,10 +2,12 @@ class RallyAuthResponder < GenericResponder
 
   def call(env)
     @requests << request = Rack::Request.new(env)
-    if request.url == 'https://rally1.rallydev.com/slm/webservice/current/user'
+
+    case request.path
+    when '/slm/webservice/current/user'
       [200, {}, ['<User><DisplayName></DisplayName></User>']]
     else
-      [500, {}, ['oh noes']]
+      [500, {}, ['No user was found']]
     end
   end
 end

data/spec/support/rally_defect_responder.rb

@@ -3,8 +3,8 @@ class RallyDefectResponder < GenericResponder
   def call(env)
     @requests << request = Rack::Request.new(env)
 
-    case request.url
-    when "https://rally1.rallydev.com/slm/webservice/current/Defect?query=%28FormattedId+%3D+DE1234%29&fetch=true"
+    case request.path
+    when "/slm/webservice/current/Defect"
       [200, {}, [
         <<-XML
           <QueryResult>
@@ -25,6 +25,8 @@ class RallyDefectResponder < GenericResponder
           </QueryResult>
 XML
       ]]
+    else
+      RallyNoResultsResponder.new.call(env)
     end
   end
 end

data/spec/support/rally_iterations_responder.rb

@@ -3,72 +3,78 @@ class RallyIterationsResponder < GenericResponder
   def call(env)
     @requests << request = Rack::Request.new(env)
 
-    case request.url
-    when 'https://rally1.rallydev.com/slm/webservice/current/Project?query=%28Name+%3D+SuperBad%29'
-      [200, {}, [
-        <<-XML
-          <QueryResult>
-            <Results>
-              <Object ref="https://rally1.rallydev.com/slm/webservice/1.36/project/777555" type="Project">
-                <Name>SuperBad</Name>
-              </Object>
-            </Results>
-          </QueryResult>
-        XML
-      ]]
-    when 'https://rally1.rallydev.com/slm/webservice/current/Iteration?query=%28ObjectID+%3E+0%29&project=https%3A%2F%2Frally1.rallydev.com%2Fslm%2Fwebservice%2F1.36%2Fproject%2F777555&order=Startdate+desc&pagesize=10'
-      [200, {}, [
-        <<-XML
-          <QueryResult>
-            <Results>
-              <Object type="Iteration">
-                <Name>25 (2012-05-01 to 2012-05-05)</Name>
-              </Object>
-              <Object type="Iteration">
-                <Name>25 (2012-05-01 to 2012-05-05)</Name>
-              </Object>
-              <Object type="Iteration">
-                <Name>24 (2012-04-01 to 2012-04-05)</Name>
-              </Object>
-              <Object type="Iteration">
-                <Name>24 (2012-04-01 to 2012-04-05)</Name>
-              </Object>
-              <Object type="Iteration">
-                <Name>23 (2012-03-01 to 2012-03-05)</Name>
-              </Object>
-              <Object type="Iteration">
-                <Name>23 (2012-03-01 to 2012-03-05)</Name>
-              </Object>
-              <Object type="Iteration">
-                <Name>22 (2012-02-01 to 2012-02-05)</Name>
-              </Object>
-              <Object type="Iteration">
-                <Name>22 (2012-02-01 to 2012-02-05)</Name>
-              </Object>
-              <Object type="Iteration">
-                <Name>21 (2012-01-01 to 2012-01-05)</Name>
-              </Object>
-              <Object type="Iteration">
-                <Name>21 (2012-01-01 to 2012-01-05)</Name>
-              </Object>
-            </Results>
-          </QueryResult>
-        XML
-      ]]
-    when 'https://rally1.rallydev.com/slm/webservice/current/Project?query=%28Name+%3D+SuperAwful%29'
-      [200, {}, [
-        <<-XML
-          <QueryResult>
-            <Results>
-              <Object ref="https://rally1.rallydev.com/slm/webservice/1.36/project/888444" type="Project">
-                <Name>SuperAwful</Name>
-              </Object>
-            </Results>
-          </QueryResult>
-        XML
-      ]]
-    when 'https://rally1.rallydev.com/slm/webservice/current/Iteration?query=%28ObjectID+%3E+0%29&project=https%3A%2F%2Frally1.rallydev.com%2Fslm%2Fwebservice%2F1.36%2Fproject%2F888444&order=Startdate+desc&pagesize=10'
-      RallyNoResultsResponder.new.call(env)
+    case request.path
+    when '/slm/webservice/current/Project'
+      if request.params["query"].include? "SuperBad"
+        [200, {}, [
+          <<-XML
+            <QueryResult>
+              <Results>
+                <Object ref="/slm/webservice/1.36/project/777555" type="Project">
+                  <Name>SuperBad</Name>
+                </Object>
+              </Results>
+            </QueryResult>
+          XML
+        ]]
+      elsif request.params["query"].include? "SuperAwful"
+        [200, {}, [
+          <<-XML
+            <QueryResult>
+              <Results>
+                <Object ref="/slm/webservice/1.36/project/888444" type="Project">
+                  <Name>SuperAwful</Name>
+                </Object>
+              </Results>
+            </QueryResult>
+          XML
+        ]]
+      else
+        RallyNoResultsResponder.new.call(env)
+      end
+    when '/slm/webservice/current/Iteration'
+      if request.params["project"].include? "777555" # Project ID
+        [200, {}, [
+          <<-XML
+            <QueryResult>
+              <Results>
+                <Object type="Iteration">
+                  <Name>25 (2012-05-01 to 2012-05-05)</Name>
+                </Object>
+                <Object type="Iteration">
+                  <Name>25 (2012-05-01 to 2012-05-05)</Name>
+                </Object>
+                <Object type="Iteration">
+                  <Name>24 (2012-04-01 to 2012-04-05)</Name>
+                </Object>
+                <Object type="Iteration">
+                  <Name>24 (2012-04-01 to 2012-04-05)</Name>
+                </Object>
+                <Object type="Iteration">
+                  <Name>23 (2012-03-01 to 2012-03-05)</Name>
+                </Object>
+                <Object type="Iteration">
+                  <Name>23 (2012-03-01 to 2012-03-05)</Name>
+                </Object>
+                <Object type="Iteration">
+                  <Name>22 (2012-02-01 to 2012-02-05)</Name>
+                </Object>
+                <Object type="Iteration">
+                  <Name>22 (2012-02-01 to 2012-02-05)</Name>
+                </Object>
+                <Object type="Iteration">
+                  <Name>21 (2012-01-01 to 2012-01-05)</Name>
+                </Object>
+                <Object type="Iteration">
+                  <Name>21 (2012-01-01 to 2012-01-05)</Name>
+                </Object>
+              </Results>
+            </QueryResult>
+          XML
+        ]]
+      else
+        RallyNoResultsResponder.new.call(env)
+      end
     else
       RallyNoResultsResponder.new.call(env)
     end

data/spec/support/rally_stories_responder.rb

@@ -3,18 +3,22 @@ class RallyStoriesResponder < GenericResponder
   def call(env)
     @requests << request = Rack::Request.new(env)
 
-    case request.url
-    when 'https://rally1.rallydev.com/slm/webservice/current/Project?query=%28Name+%3D+SuperBad%29'
-      [200, {}, [
-        <<-XML
-          <QueryResult>
-            <Results>
-              <Object ref="https://rally1.rallydev.com/slm/webservice/1.17/project/777555" type="Project" />
-            </Results>
-          </QueryResult>
-        XML
-      ]]
-    when 'https://rally1.rallydev.com/slm/webservice/1.17/project/777555'
+    case request.path
+    when '/slm/webservice/current/Project'
+      if request.params["query"].include? "SuperBad"
+        [200, {}, [
+          <<-XML
+            <QueryResult>
+              <Results>
+                <Object ref="https://rally1.rallydev.com/slm/webservice/1.17/project/777555" type="Project" />
+              </Results>
+            </QueryResult>
+          XML
+        ]]
+      else
+        RallyNoResultsResponder.new.call(env)
+      end
+    when '/slm/webservice/1.17/project/777555'
       [200, {}, [
         <<-XML
           <Project ref="https://rally1.rallydev.com/slm/webservice/1.17/project/777555">
@@ -22,77 +26,79 @@ class RallyStoriesResponder < GenericResponder
           </Project>
         XML
       ]]
-    when 'https://rally1.rallydev.com/slm/webservice/current/Iteration?query=%28Name+%3D+%2225+%282012-05-01+to+2012-05-05%29%22%29&project=https%3A%2F%2Frally1.rallydev.com%2Fslm%2Fwebservice%2F1.17%2Fproject%2F777555'
-      [200, {}, [
-        # NOTE: Always getting two results back from Rally, not sure why.
-        <<-XML
-          <QueryResult>
-            <Results>
-              <Object ref="https://rally1.rallydev.com/slm/webservice/1.17/iteration/1234" type="Iteration" />
-              <Object ref="https://rally1.rallydev.com/slm/webservice/1.17/iteration/4567" type="Iteration" />
-            </Results>
-          </QueryResult>
-        XML
-      ]]
-    when 'https://rally1.rallydev.com/slm/webservice/1.17/iteration/1234'
+    when '/slm/webservice/current/Iteration'
+      if request.params["query"].include? '25 (2012-05-01 to 2012-05-05)'
+        [200, {}, [
+          <<-XML
+            <QueryResult>
+              <Results>
+                <Object ref="https://rally1.rallydev.com/slm/webservice/1.17/iteration/1234" type="Iteration" />
+              </Results>
+            </QueryResult>
+          XML
+        ]]
+      elsif request.params["query"].include? '26 (2012-06-01 to 2012-06-05)'
+        [200, {}, [
+          <<-XML
+            <QueryResult>
+              <Results>
+                <Object ref="https://rally1.rallydev.com/slm/webservice/1.17/iteration/7890" type="Iteration" />
+              </Results>
+            </QueryResult>
+          XML
+        ]]
+      else
+        RallyNoResultsResponder.new.call(env)
+      end
+    when '/slm/webservice/1.17/iteration/1234'
       [200, {}, [
         <<-XML
-          <Iteration>
+          <Iteration ref="https://https://rally1.rallydev.com/slm/webservice/1.17/iteration/1234">
             <Name>25 (2012-05-01 to 2012-05-05)</Name>
           </Iteration>
         XML
       ]]
-    when 'https://rally1.rallydev.com/slm/webservice/current/HierarchicalRequirement?query=%28Iteration+%3D+%29&project=https%3A%2F%2Frally1.rallydev.com%2Fslm%2Fwebservice%2F1.17%2Fproject%2F777555&pagesize=100&fetch=true'
-      [200, {}, [
-        <<-XML
-          <QueryResult>
-            <Results>
-              <Object type="HierarchicalRequirement">
-                <FormattedID>US123</FormattedID>
-                <Name>This is story number one</Name>
-                <ScheduleState>Completed</ScheduleState>
-              </Object>
-              <Object type="HierarchicalRequirement">
-                <FormattedID>US456</FormattedID>
-                <Name>This is story number two</Name>
-                <ScheduleState>In-Progress</ScheduleState>
-              </Object>
-            </Results>
-          </QueryResult>
-        XML
-      ]]
-    when 'https://rally1.rallydev.com/slm/webservice/current/Defect?query=%28Iteration+%3D+%29&project=https%3A%2F%2Frally1.rallydev.com%2Fslm%2Fwebservice%2F1.17%2Fproject%2F777555&pagesize=100&fetch=true'
-      [200, {}, [
-        <<-XML
-          <QueryResult>
-            <Results>
-              <Object type="Defect">
-                <FormattedID>DE789</FormattedID>
-                <Name>This is defect number one</Name>
-                <ScheduleState>Defined</ScheduleState>
-              </Object>
-            </Results>
-          </QueryResult>
-        XML
-      ]]
-
-    # These are for testing the not so happy path.
-    when 'https://rally1.rallydev.com/slm/webservice/current/Iteration?query=%28Name+%3D+%22Sprint+0%22%29&project=https%3A%2F%2Frally1.rallydev.com%2Fslm%2Fwebservice%2F1.17%2Fproject%2F777555'
-      RallyNoResultsResponder.new.call(env)
-    when 'https://rally1.rallydev.com/slm/webservice/current/Iteration?query=%28Name+%3D+%2226+%282012-06-01+to+2012-06-05%29%22%29&project=https%3A%2F%2Frally1.rallydev.com%2Fslm%2Fwebservice%2F1.17%2Fproject%2F777555'
-      [200, {}, [
-        <<-XML
-          <QueryResult>
-            <Results>
-              <Object ref="https://rally1.rallydev.com/slm/webservice/1.17/iteration/7890" type="Iteration" />
-            </Results>
-          </QueryResult>
-        XML
-      ]]
-    when 'https://rally1.rallydev.com/slm/webservice/1.17/iteration/7890'
-      # does nothing WTF(but will make tests fail if not here)???
-    when 'https://rally1.rallydev.com/slm/webservice/current/HierarchicalRequirement?query=%28Iteration+%3D+https%3A%2F%2Frally1.rallydev.com%2Fslm%2Fwebservice%2F1.17%2Fiteration%2F7890%29&project=https%3A%2F%2Frally1.rallydev.com%2Fslm%2Fwebservice%2F1.17%2Fproject%2F777555&pagesize=100&fetch=true'
-      RallyNoResultsResponder.new.call(env)
+    when '/slm/webservice/current/HierarchicalRequirement'
+      if request.params["query"].include? '1234' # Iteration ID
+        [200, {}, [
+          <<-XML
+            <QueryResult>
+              <Results>
+                <Object type="HierarchicalRequirement">
+                  <FormattedID>US123</FormattedID>
+                  <Name>This is story number one</Name>
+                  <ScheduleState>Completed</ScheduleState>
+                </Object>
+                <Object type="HierarchicalRequirement">
+                  <FormattedID>US456</FormattedID>
+                  <Name>This is story number two</Name>
+                  <ScheduleState>In-Progress</ScheduleState>
+                </Object>
+              </Results>
+            </QueryResult>
+          XML
+        ]]
+      else
+        RallyNoResultsResponder.new.call(env)
+      end
+    when '/slm/webservice/current/Defect'
+      if request.params["query"].include? '1234' # Iteration ID
+        [200, {}, [
+          <<-XML
+            <QueryResult>
+              <Results>
+                <Object type="Defect">
+                  <FormattedID>DE789</FormattedID>
+                  <Name>This is defect number one</Name>
+                  <ScheduleState>Defined</ScheduleState>
+                </Object>
+              </Results>
+            </QueryResult>
+          XML
+        ]]
+      else
+        RallyNoResultsResponder.new.call(env)
+      end
     else
       RallyNoResultsResponder.new.call(env)
     end

data/spec/support/rally_story_responder.rb

@@ -5,8 +5,8 @@ class RallyStoryResponder < GenericResponder
   def call(env)
     @requests << request = Rack::Request.new(env)
 
-    case request.url
-    when 'https://rally1.rallydev.com/slm/webservice/1.17/task/1'
+    case request.path
+    when '/slm/webservice/1.17/task/1'
       [200, {}, [
         <<-XML
           <Task refObjectName="Change link to button">
@@ -16,7 +16,7 @@ class RallyStoryResponder < GenericResponder
           </Task>
 XML
       ]]
-    when 'https://rally1.rallydev.com/slm/webservice/1.17/task/2'
+    when '/slm/webservice/1.17/task/2'
       [200, {}, [
         <<-XML
           <Task refObjectName="Add confirmation">
@@ -26,7 +26,7 @@ XML
           </Task>
 XML
       ]]
-    when 'https://rally1.rallydev.com/slm/webservice/1.17/task/3'
+    when '/slm/webservice/1.17/task/3'
       [200, {}, [
         <<-XML
           <Task refObjectName="Code Review">
@@ -36,7 +36,7 @@ XML
           </Task>
 XML
       ]]
-    when 'https://rally1.rallydev.com/slm/webservice/1.17/task/4'
+    when '/slm/webservice/1.17/task/4'
       [200, {}, [
         <<-XML
           <Task refObjectName="QA Test">
@@ -46,8 +46,7 @@ XML
           </Task>
 XML
       ]]
-    else
-      # https://rally1.rallydev.com/slm/webservice/current/HierarchicalRequirement?query=%28FormattedId+%3D+US7176%29&fetch=true
+    when '/slm/webservice/current/HierarchicalRequirement'
       [200, {}, [
         <<-XML
           <QueryResult>
@@ -74,6 +73,8 @@ XML
           </QueryResult>
 XML
       ]]
+    else
+      RallyNoResultsResponder.new.call(env)
     end
   end
 end

data/spec/support/rally_task_update_responder.rb

@@ -3,7 +3,8 @@ class RallyTaskUpdateResponder < GenericResponder
   def call(env)
     @requests << request = Rack::Request.new(env)
 
-    if request.url == 'https://rally1.rallydev.com/slm/webservice/current/Task?query=%28FormattedId+%3D+TA6666%29'
+    case request.path
+    when '/slm/webservice/current/Task'
       [200, {}, [
         <<-XML
           <?xml version="1.0" encoding="UTF-8"?>
@@ -17,47 +18,60 @@ class RallyTaskUpdateResponder < GenericResponder
           </QueryResult>
         XML
       ]]
-    elsif request.get? && request.url == 'https://rally1.rallydev.com/slm/webservice/1.17/task/12345'
-      [200, {}, [
-        <<-XML
-          <Task rallyAPIMajor="1" rallyAPIMinor="17" ref="https://rally1.rallydev.com/slm/webservice/1.17/task/12345" objectVersion="8" refObjectName="Tie your shoes!" CreatedAt="today at 8:31 pm">
-            <CreationDate>2012-07-17T03:31:33.801Z</CreationDate>
-            <ObjectID>12345</ObjectID>
-            <Description />
-            <Discussion />
-            <FormattedID>TA6666</FormattedID>
-            <LastUpdateDate>2012-07-17T04:00:35.888Z</LastUpdateDate>
-            <Name>Tie your shoes!</Name>
-            <Notes />
-            <Owner>tester@testing.com</Owner>
-            <Tags />
-            <Attachments />
-            <Blocked>false</Blocked>
-            <Rank>4000</Rank>
-            <State>Defined</State>
-            <TaskIndex>2</TaskIndex>
-            <ToDo>2.0</ToDo>
-          </Task>
-        XML
-      ]]
-    elsif request.post? && request.url == 'https://rally1.rallydev.com/slm/webservice/1.17/task/12345'
-      [200, {}, ['<?xml version="1.0" encoding="UTF-8"?><OperationResult rallyAPIMajor="1" rallyAPIMinor="17"><Errors /><Warnings /></OperationResult>']]
-    elsif request.url == 'https://rally1.rallydev.com/slm/webservice/current/User?query=%28DisplayName+%3D+%22Freddy+Fender%22%29'
-      [200, {}, [
-        <<-XML
-          <QueryResult rallyAPIMajor="1" rallyAPIMinor="17">
-            <Errors />
-            <Warnings />
-            <TotalResultCount>1</TotalResultCount>
-            <StartIndex>1</StartIndex>
-            <PageSize>20</PageSize>
-            <Results>
-              <Object rallyAPIMajor="1" rallyAPIMinor="17" ref="https://rally1.rallydev.com/slm/webservice/1.17/user/4567" refObjectName="Freddy Fender" type="User" />
-            </Results>
-          </QueryResult>
-        XML
-      ]]
-    elsif request.url == 'https://rally1.rallydev.com/slm/webservice/1.17/user/4567'
+    when '/slm/webservice/1.17/task/12345'
+      if request.get?
+        [200, {}, [
+          <<-XML
+            <Task rallyAPIMajor="1" rallyAPIMinor="17" ref="https://rally1.rallydev.com/slm/webservice/1.17/task/12345" objectVersion="8" refObjectName="Tie your shoes!" CreatedAt="today at 8:31 pm">
+              <CreationDate>2012-07-17T03:31:33.801Z</CreationDate>
+              <ObjectID>12345</ObjectID>
+              <Description />
+              <Discussion />
+              <FormattedID>TA6666</FormattedID>
+              <LastUpdateDate>2012-07-17T04:00:35.888Z</LastUpdateDate>
+              <Name>Tie your shoes!</Name>
+              <Notes />
+              <Owner>tester@testing.com</Owner>
+              <Tags />
+              <Attachments />
+              <Blocked>false</Blocked>
+              <Rank>4000</Rank>
+              <State>Defined</State>
+              <TaskIndex>2</TaskIndex>
+              <ToDo>2.0</ToDo>
+            </Task>
+          XML
+        ]]
+      elsif request.post?
+        [200, {}, [
+          <<-XML
+            <OperationResult rallyAPIMajor="1" rallyAPIMinor="17">
+              <Errors />
+              <Warnings />
+            </OperationResult>
+          XML
+        ]]
+      end
+    when '/slm/webservice/current/User'
+      if request.params["query"].include? "Freddy Fender"
+        [200, {}, [
+          <<-XML
+            <QueryResult rallyAPIMajor="1" rallyAPIMinor="17">
+              <Errors />
+              <Warnings />
+              <TotalResultCount>1</TotalResultCount>
+              <StartIndex>1</StartIndex>
+              <PageSize>20</PageSize>
+              <Results>
+                <Object rallyAPIMajor="1" rallyAPIMinor="17" ref="https://rally1.rallydev.com/slm/webservice/1.17/user/4567" refObjectName="Freddy Fender" type="User" />
+              </Results>
+            </QueryResult>
+          XML
+        ]]
+      else
+        RallyNoResultsResponder.new.call(env)
+      end
+    when '/slm/webservice/1.17/user/4567'
       [200, {}, [
         <<-XML
           <User rallyAPIMajor="1" rallyAPIMinor="17" ref="https://rally1.rallydev.com/slm/webservice/1.17/user/4567" objectVersion="50" refObjectName="Freddy Fender">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rallycat
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2012-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70357622298460 !ruby/object:Gem::Requirement
+  requirement: &70290592025020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357622298460
+  version_requirements: *70290592025020
 - !ruby/object:Gem::Dependency
   name: rally_rest_api
-  requirement: &70357622297960 !ruby/object:Gem::Requirement
+  requirement: &70290592024300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357622297960
+  version_requirements: *70290592024300
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70357622297540 !ruby/object:Gem::Requirement
+  requirement: &70290592023620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,40 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357622297540
+  version_requirements: *70290592023620
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70290592022780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70290592022780
+- !ruby/object:Gem::Dependency
+  name: artifice
+  requirement: &70290592022000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70290592022000
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70290592020900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70290592020900
 description: The Rally website sucks. CLI is better.
 email:
 - adam@adamtanner.org
@@ -104,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2821747029306890735
+      hash: 682521708574243756
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -113,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2821747029306890735
+      hash: 682521708574243756
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.7