rallycat 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rallycat (0.3.0)
+    rallycat (0.3.1)
       builder
       nokogiri
       rally_rest_api

data/TODO

@@ -1,10 +1,19 @@
 # Rallycat TODO
 
 * update help (use option_parser help or custom help)
+* todo time
+* set todo time
+* set notes on a task (-n overwrite, -N to append)
 * add update behavior for stories (maybe)
 * add update behavior for defects (maybe)
 * Slow as balls? Make nice wait messages
 * Add man page
+* Ordering of arguments matters? (rallycat update TA1234 -b silently fails)
+* Create .rallycatrc file on first run?
+* Listing stories
+  * Per iteration
+  * Per project (project configured in rc or passed in?)
+* AC-only story view
 
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 

data/lib/rallycat/cat.rb

@@ -32,7 +32,6 @@ module Rallycat
 
   Plan Estimate:   #{story.plan_estimate}
   State:           #{story.schedule_state}
-  Task Actual:     #{story.task_actual_total}
   Task Estimate:   #{story.task_estimate_total}
   Task Remaining:  #{story.task_remaining_total}
   Owner:           #{story.owner}

data/lib/rallycat/cli.rb

@@ -2,21 +2,26 @@ require 'optparse'
 
 module Rallycat
   class CLI
+    attr_reader :options
+
     def initialize(argv, stdout=STDOUT)
       @argv   = argv
       @stdout = stdout
+
+      parse_global_options!
+      parse_command_options!
     end
 
-    def run
-      options = {}
+    def parse_global_options!
+      @options ||= {}
 
       global = OptionParser.new do |opts|
-        opts.on('-u USERNAME', '--username') do |user|
-          options[:user] = user
+        opts.on('-u USERNAME', '--username') do |username|
+          @options[:username] = username
         end
 
         opts.on('-p PASSWORD', '--password') do |password|
-          options[:password] = password
+          @options[:password] = password
         end
 
         opts.on('-h', '--help') do
@@ -25,6 +30,12 @@ module Rallycat
         end
       end
 
+      global.order! @argv
+    end
+
+    def parse_command_options!
+      @options ||= {}
+
       commands = {
         'cat' => OptionParser.new,
 
@@ -32,37 +43,37 @@ module Rallycat
           opts.banner = 'Usage: rallycat update <story number> [options]'
 
           opts.on('-b', '--blocked') do |blocked|
-            options[:blocked] = true
+            @options[:blocked] = true
           end
 
           opts.on('-p', '--in-progress') do |in_progress|
-            options[:in_progress] = true
+            @options[:in_progress] = true
           end
 
           opts.on('-c', '--completed') do |completed|
-            options[:completed] = true
+            @options[:completed] = true
           end
 
           opts.on('-d', '--defined') do |defined|
-            options[:defined] = true
+            @options[:defined] = true
           end
 
           opts.on('-o OWNER', '--owner') do |owner|
-            options[:owner] = owner
+            @options[:owner] = owner
           end
         end,
 
         'help' => OptionParser.new
       }
 
-      global.order! @argv
-
-      command = @argv.shift
-      commands[command].order! @argv if commands.has_key? command
+      @command = @argv.shift
+      commands[@command].parse! @argv if commands.has_key? @command
+    end
 
-      case command
+    def run
+      case @command
       when 'cat'
-        api = Rallycat::Connection.new(options[:user], options[:password]).api
+        api = Rallycat::Connection.new(options[:username], options[:password]).api
 
         story_number = @argv.shift
 
@@ -74,7 +85,7 @@ module Rallycat
           abort e.message
         end
       when 'update'
-        api = Rallycat::Connection.new(options[:user], options[:password]).api
+        api = Rallycat::Connection.new(options[:username], options[:password]).api
 
         task_number = @argv.shift
 
@@ -96,7 +107,7 @@ module Rallycat
         # `puts` calls `to_s`
         @stdout.puts Rallycat::Help.new
       else
-        @stdout.puts "'#{command}' is not a supported command. See 'rallycat help'."
+        @stdout.puts "'#{@command}' is not a supported command. See 'rallycat help'."
       end
     end
   end

data/lib/rallycat/update.rb

@@ -29,6 +29,12 @@ module Rallycat
         attributes[:owner] = login_name
       end
 
+      # If the task is marked as 'Complete', we should remove the remaining
+      # hours.
+      if attributes[:state] == "Completed"
+        attributes[:to_do] = 0.0
+      end
+
       task.update(attributes)
 
       messages = []

data/lib/rallycat/version.rb

@@ -1,3 +1,3 @@
 module Rallycat
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/integration_spec.rb

@@ -7,7 +7,7 @@ describe 'Rallycat' do
     it 'fetches, parses and outputs the rally story requested by the user' do
       sout = StringIO.new
 
-      cli = Rallycat::CLI.new %w{ cat US4567 -u foo.bar@rallycat.com -p password }, sout
+      cli = Rallycat::CLI.new %w{ -u foo.bar@rallycat.com -p password cat US4567 }, sout
 
       story_responder = RallyStoryResponder.new
 
@@ -68,7 +68,7 @@ describe 'Rallycat' do
       it 'sets the state to in-progress' do
         sout = StringIO.new
 
-        cli = Rallycat::CLI.new %w{ update -p TA6666 -u foo.bar@rallycat.com -p password }, sout
+        cli = Rallycat::CLI.new %w{ -u foo.bar@rallycat.com -p password update -p TA6666 }, sout
 
         task_responder = RallyTaskUpdateResponder.new
 
@@ -83,7 +83,7 @@ describe 'Rallycat' do
       it 'sets the state to defined' do
         sout = StringIO.new
 
-        cli = Rallycat::CLI.new %w{ update -d TA6666 -u foo.bar@rallycat.com -p password }, sout
+        cli = Rallycat::CLI.new %w{ -u foo.bar@rallycat.com -p password update -d TA6666 }, sout
 
         task_responder = RallyTaskUpdateResponder.new
 
@@ -98,7 +98,7 @@ describe 'Rallycat' do
       it 'sets the state to completed' do
         sout = StringIO.new
 
-        cli = Rallycat::CLI.new %w{ update -c TA6666 -u foo.bar@rallycat.com -p password }, sout
+        cli = Rallycat::CLI.new %w{ -u foo.bar@rallycat.com -p password update -c TA6666 }, sout
 
         task_responder = RallyTaskUpdateResponder.new
 
@@ -113,7 +113,7 @@ describe 'Rallycat' do
       it 'blocks the task' do
         sout = StringIO.new
 
-        cli = Rallycat::CLI.new %w{ update -b TA6666 -u foo.bar@rallycat.com -p password }, sout
+        cli = Rallycat::CLI.new %w{ -u foo.bar@rallycat.com -p password update -b TA6666 }, sout
 
         task_responder = RallyTaskUpdateResponder.new
 
@@ -128,7 +128,7 @@ describe 'Rallycat' do
       it 'assigns the owner of the task' do
         sout = StringIO.new
 
-        cli = Rallycat::CLI.new %w{ update -o Freddy\ Fender TA6666 -u foo.bar@rallycat.com -p password }, sout
+        cli = Rallycat::CLI.new %w{ -u foo.bar@rallycat.com -p password update -o Freddy\ Fender TA6666 }, sout
 
         task_responder = RallyTaskUpdateResponder.new
 
@@ -143,7 +143,7 @@ describe 'Rallycat' do
       it 'aborts when the owner does not exist' do
         sout = StringIO.new
 
-        cli = Rallycat::CLI.new %w{ update -o Norman\ Notreal TA6666 -u foo.bar@rallycat.com -p password }, sout
+        cli = Rallycat::CLI.new %w{ -u foo.bar@rallycat.com -p password update -o Norman\ Notreal TA6666 }, sout
 
         task_responder = RallyTaskUpdateResponder.new
 
@@ -171,7 +171,7 @@ describe 'Rallycat' do
       it 'aborts when a task does not exist' do
         sout = StringIO.new
 
-        cli = Rallycat::CLI.new %w{ update -i TA9999 -u foo.bar@rallycat.com -p password }, sout
+        cli = Rallycat::CLI.new %w{ -u foo.bar@rallycat.com -p password update -i TA9999 }, sout
 
         task_responder = RallyNoResultsResponder.new
 

data/spec/lib/rallycat/cat_spec.rb

@@ -22,7 +22,6 @@ describe Rallycat::Cat, '#story' do
 
   Plan Estimate:   1.0
   State:           In-Progress
-  Task Actual:     0.0
   Task Estimate:   6.5
   Task Remaining:  0.5
   Owner:           scootin@fruity.com
@@ -60,7 +59,6 @@ STORY
 
   Plan Estimate:   1.0
   State:           In-Progress
-  Task Actual:     0.0
   Task Estimate:   6.5
   Task Remaining:  0.5
   Owner:           scootin@fruity.com
@@ -108,7 +106,6 @@ XML
 
   Plan Estimate:   
   State:           
-  Task Actual:     
   Task Estimate:   
   Task Remaining:  
   Owner:           

data/spec/lib/rallycat/cli_spec.rb

@@ -9,7 +9,6 @@ describe Rallycat::CLI do
 end
 
 describe Rallycat::CLI, '#run' do
-
   it 'should execute command' do
     sout = StringIO.new
     cli  = Rallycat::CLI.new ['foo'], sout
@@ -20,3 +19,47 @@ describe Rallycat::CLI, '#run' do
     sout.read.should == "'foo' is not a supported command. See 'rallycat help'.\n"
   end
 end
+
+describe Rallycat::CLI, '#options' do
+
+  it 'parses global options' do
+    sout = StringIO.new
+    cli  = Rallycat::CLI.new %w{ -u foo.bar@rallycat.com -p password help }, sout
+
+    cli.options.should == {
+      username: 'foo.bar@rallycat.com',
+      password: 'password'
+    }
+  end
+
+  it 'raises if global options do not appear before the command' do
+    sout = StringIO.new
+
+    lambda {
+      cli  = Rallycat::CLI.new %w{ help -u foo.bar@rallycat.com -p password }, sout
+    }.should raise_error(OptionParser::InvalidOption, 'invalid option: -u')
+  end
+
+  it 'parses all options' do
+    sout = StringIO.new
+    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
+    }
+  end
+
+  it 'parses command options (no global options)' do
+    sout = StringIO.new
+    cli  = Rallycat::CLI.new %w{ update TA6666 -pb }, sout
+
+    cli.options.should == {
+      in_progress: true,
+      blocked:     true
+    }
+  end
+end
+

data/spec/lib/rallycat/update_spec.rb

@@ -53,6 +53,24 @@ describe Rallycat::Update do
       body.should include('<State>In-Progress</State>')
     end
 
+    it 'sets the todo hours to zero when completing the task' do
+      responder = RallyTaskUpdateResponder.new
+
+      Artifice.activate_with responder do
+        task_num = "TA6666"
+        update = Rallycat::Update.new(@api)
+        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'
+
+      body =  post_request.body.tap(&:rewind).read
+      body.should include('<State>Completed</State>')
+      body.should include('<ToDo>0.0</ToDo>')
+    end
+
 
     it 'blocks the task' do
       responder = RallyTaskUpdateResponder.new

data/spec/support/generic_responder.rb

@@ -0,0 +1,15 @@
+class GenericResponder
+  attr_reader :requests
+
+  def initialize
+    @requests = []
+  end
+
+  def last_request
+    @requests.last
+  end
+
+  def call(env)
+    [200, {}, ['']]
+  end
+end

data/spec/support/rally_defect_responder.rb

@@ -1,14 +1,4 @@
-class RallyDefectResponder
-
-  attr_reader :requests
-
-  def initialize
-    @requests = []
-  end
-
-  def last_request
-    @requests.last
-  end
+class RallyDefectResponder < GenericResponder
 
   def call(env)
     @requests << request = Rack::Request.new(env)

data/spec/support/rally_no_results_responder.rb

@@ -1,13 +1,4 @@
-class RallyNoResultsResponder
-  attr_reader :requests
-
-  def initialize
-    @requests = []
-  end
-
-  def last_request
-    @requests.last
-  end
+class RallyNoResultsResponder < GenericResponder
 
   def call(env)
     @requests << request = Rack::Request.new(env)
@@ -25,4 +16,4 @@ class RallyNoResultsResponder
       XML
     ]]
   end
-end
+end

data/spec/support/rally_story_responder.rb

@@ -1,16 +1,6 @@
 require 'cgi'
 
-class RallyStoryResponder
-
-  attr_reader :requests
-
-  def initialize
-    @requests = []
-  end
-
-  def last_request
-    @requests.last
-  end
+class RallyStoryResponder < GenericResponder
 
   def call(env)
     @requests << request = Rack::Request.new(env)

data/spec/support/rally_task_update_responder.rb

@@ -1,14 +1,4 @@
-class RallyTaskUpdateResponder
-
-  attr_reader :requests
-
-  def initialize
-    @requests = []
-  end
-
-  def last_request
-    @requests.last
-  end
+class RallyTaskUpdateResponder < GenericResponder
 
   def call(env)
     @requests << request = Rack::Request.new(env)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rallycat
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70303674111620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303674111620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rally_rest_api
-  requirement: &70303674111020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303674111020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70303674110340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +54,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303674110340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The Rally website sucks. CLI is better.
 email:
 - adam@adamtanner.org
@@ -79,6 +94,7 @@ files:
 - spec/lib/rallycat/html_to_text_converter_spec.rb
 - spec/lib/rallycat/update_spec.rb
 - spec/spec_helper.rb
+- spec/support/generic_responder.rb
 - spec/support/rally_defect_responder.rb
 - spec/support/rally_no_results_responder.rb
 - spec/support/rally_story_responder.rb
@@ -97,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4474919884476792167
+      hash: 1844620157454279745
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -106,10 +122,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4474919884476792167
+      hash: 1844620157454279745
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: The Rally website sucks. CLI is better.
@@ -121,6 +137,7 @@ test_files:
 - spec/lib/rallycat/html_to_text_converter_spec.rb
 - spec/lib/rallycat/update_spec.rb
 - spec/spec_helper.rb
+- spec/support/generic_responder.rb
 - spec/support/rally_defect_responder.rb
 - spec/support/rally_no_results_responder.rb
 - spec/support/rally_story_responder.rb