crab 0.2.9 → 0.2.10

data/bin/crab-project

@@ -18,17 +18,17 @@ Usage: crab project [name] [options*]
         opt :dry, "Dry-run (don't change anything)", :short => "-D", :default => false
       end
 
-      if current_project_name.present?
-        puts current_project_name
-        exit 0
+      name = args.join(" ").strip
 
-      elsif args.reject {|arg| arg.blank? }.empty?
-        puts "No project currently selected."
+      if name.empty?
+        if current_project_name.present?
+          puts current_project_name
+        else
+          puts "No project currently selected."
+        end
         exit 1
       end
 
-      name = args.join(" ").strip
-
       Crab::Rally.new(opts[:dry]) do |rally|
         project = rally.find_project name
         Trollop::die "#{name.inspect} is not a valid project" if project.nil?

data/bin/crab-st-move

@@ -14,21 +14,26 @@ class Crab::StoryMove
         banner <<-BANNER
 crab story move: move a story from one status to the next (or previous)
 
-Usage: crab story move <id> [options*]
+Usage: crab story move <id> [state] [options*]
         BANNER
         opt :back, "Move story backwards (from accepted to completed, for example)"
         opt :dry, "Dry-run (don't change anything)", :short => "-D", :default => false
       end
 
-      id = args.join(" ")
+      id = args.shift
       Trollop::die "No story given" if id.empty?
 
       Crab::Rally.new(opts[:dry]) do |rally|
         story = rally.find_story_with_id id
-        state = state_from(story.state)
 
-        story.update :schedule_state => (opts[:back] ? state_before(state) : state_after(state))
+        state = args.shift
+        if state.blank?
+          state = (opts[:back] ? state_before(story.state) : state_after(story.state))
+        else
+          state = state_from(state)
+        end
 
+        story.update :schedule_state => state
         puts "#{story.formatted_id}: #{story.name} (#{story.state})"
       end
     end

data/bin/crab-st-mv

@@ -14,21 +14,26 @@ class Crab::StoryMove
         banner <<-BANNER
 crab story move: move a story from one status to the next (or previous)
 
-Usage: crab story move <id> [options*]
+Usage: crab story move <id> [state] [options*]
         BANNER
         opt :back, "Move story backwards (from accepted to completed, for example)"
         opt :dry, "Dry-run (don't change anything)", :short => "-D", :default => false
       end
 
-      id = args.join(" ")
+      id = args.shift
       Trollop::die "No story given" if id.empty?
 
       Crab::Rally.new(opts[:dry]) do |rally|
         story = rally.find_story_with_id id
-        state = state_from(story.state)
 
-        story.update :schedule_state => (opts[:back] ? state_before(state) : state_after(state))
+        state = args.shift
+        if state.blank?
+          state = (opts[:back] ? state_before(story.state) : state_after(story.state))
+        else
+          state = state_from(state)
+        end
 
+        story.update :schedule_state => state
         puts "#{story.formatted_id}: #{story.name} (#{story.state})"
       end
     end

data/bin/crab-story-move

@@ -14,21 +14,26 @@ class Crab::StoryMove
         banner <<-BANNER
 crab story move: move a story from one status to the next (or previous)
 
-Usage: crab story move <id> [options*]
+Usage: crab story move <id> [state] [options*]
         BANNER
         opt :back, "Move story backwards (from accepted to completed, for example)"
         opt :dry, "Dry-run (don't change anything)", :short => "-D", :default => false
       end
 
-      id = args.join(" ")
+      id = args.shift
       Trollop::die "No story given" if id.empty?
 
       Crab::Rally.new(opts[:dry]) do |rally|
         story = rally.find_story_with_id id
-        state = state_from(story.state)
 
-        story.update :schedule_state => (opts[:back] ? state_before(state) : state_after(state))
+        state = args.shift
+        if state.blank?
+          state = (opts[:back] ? state_before(story.state) : state_after(story.state))
+        else
+          state = state_from(state)
+        end
 
+        story.update :schedule_state => state
         puts "#{story.formatted_id}: #{story.name} (#{story.state})"
       end
     end

data/bin/crab-story-mv

@@ -14,21 +14,26 @@ class Crab::StoryMove
         banner <<-BANNER
 crab story move: move a story from one status to the next (or previous)
 
-Usage: crab story move <id> [options*]
+Usage: crab story move <id> [state] [options*]
         BANNER
         opt :back, "Move story backwards (from accepted to completed, for example)"
         opt :dry, "Dry-run (don't change anything)", :short => "-D", :default => false
       end
 
-      id = args.join(" ")
+      id = args.shift
       Trollop::die "No story given" if id.empty?
 
       Crab::Rally.new(opts[:dry]) do |rally|
         story = rally.find_story_with_id id
-        state = state_from(story.state)
 
-        story.update :schedule_state => (opts[:back] ? state_before(state) : state_after(state))
+        state = args.shift
+        if state.blank?
+          state = (opts[:back] ? state_before(story.state) : state_after(story.state))
+        else
+          state = state_from(state)
+        end
 
+        story.update :schedule_state => state
         puts "#{story.formatted_id}: #{story.name} (#{story.state})"
       end
     end

data/features/pull-from-rally-into-cucumber.feature

@@ -14,13 +14,9 @@ Feature: Pull From Rally Into Cucumber
     Then the output should contain "US4988: features/grooming/US4988-sample-crab-story.feature"
     And a directory named "features" should exist
     And a file named "features/grooming/US4988-sample-crab-story.feature" should exist
-    And the file "features/grooming/US4988-sample-crab-story.feature" should contain exactly:
-      """
-      # language: en
-      Feature: [US4988] Sample Crab Story
-
-      Sample Description
-      """
+    And the file "features/grooming/US4988-sample-crab-story.feature" should contain "# language: en"
+    And the file "features/grooming/US4988-sample-crab-story.feature" should contain "Feature: [US4988] Sample Crab Story"
+    And the file "features/grooming/US4988-sample-crab-story.feature" should contain "  Sample Description"
 
   Scenario: Pulling Multiple Stories
     When I run `crab story pull US4988 US5000`

data/features/show-from-rally.feature

@@ -9,12 +9,8 @@ Feature: Show Story From Rally
 
   Scenario: Show Simple Story
     When I run `crab story show US4988`
-    Then the output should contain:
-      """
-      Feature: [US4988] Sample Crab Story
-
-      Sample Description
-      """
+    Then the output should contain "Feature: [US4988] Sample Crab Story"
+    And the output should contain "  Sample Description"
 
   Scenario: Show Story With Test Cases
     When I run `crab story show US5000`

data/features/subcommand-help.feature

@@ -32,7 +32,7 @@ Feature: Subcommand Help
       | story delete    | Usage: crab story delete <id> [options*]              |
       | story diff      | Usage: crab story diff <file> [file*] [options*]      |
       | story find      | Usage: crab story find [options*] [text]              |
-      | story move      | Usage: crab story move <id> [options*]                |
+      | story move      | Usage: crab story move <id> [state] [options*]        |
       | story pull      | Usage: crab story pull <id> [id*] [options*]          |
       | story rename    | Usage: crab story rename <id> <name> [options*]       |
       | story show      | Usage: crab story show <id> [options*]                |

data/lib/crab.rb

@@ -5,6 +5,7 @@ require 'active_support/all'
 require 'fileutils'
 require 'gherkin'
 require 'gherkin/i18n'
+require 'gherkin/formatter/pretty_formatter'
 require 'highline/import'
 require 'rally_rest_api'
 require 'sanitize'
@@ -16,6 +17,7 @@ require "crab/rally"
 require "crab/story"
 require "crab/testcase"
 require "crab/cucumber_to_rally_adapter"
+require "crab/rally_to_cucumber_adapter"
 
 # cucumber support
 require "crab/cucumber_feature"

data/lib/crab/cucumber_feature.rb

@@ -2,25 +2,31 @@ module Crab
 
   class CucumberFeature
 
+    include Crab::Utilities
+
     def initialize(language)
       @language = Gherkin::I18n.new(language)
+      @adapter = Crab::RallyToCucumberAdapter.new @language
     end
 
     def generate_from(story, include_testcases)
-      text = <<-FEATURE
-# language: #{@language.iso_code}
-#{@language.keywords('feature').last}: [#{story.formatted_id}] #{story.name}
-
-#{story.description}
-      FEATURE
+      text = StringIO.new
+      formatter = Gherkin::Formatter::PrettyFormatter.new(text, true, false)
+      feature = @adapter.feature_from story
+      formatter.feature feature
 
       if include_testcases
-        text << <<-SCENARIOS
-#{Array(story.scenarios).map {|scenario| CucumberScenario.new(@language.iso_code).generate_from scenario }}
-        SCENARIOS
+        Array(story.test_cases).tap {|tcs| logger.info "#{tcs.size} test case(s) found" }.each do |test_case|
+          formatter.scenario @adapter.scenario_from(test_case)
+          @adapter.steps_from(test_case).each do |step|
+            formatter.step step
+          end
+        end
       end
 
-      text.strip
+      formatter.eof
+
+      text.string.strip
     end
   end
 end

data/lib/crab/cucumber_scenario.rb

@@ -1,17 +1,24 @@
 module Crab
   class CucumberScenario
 
+    include Crab::Utilities
+
     def initialize(language)
       @language = Gherkin::I18n.new(language)
+      @adapter = Crab::RallyToCucumberAdapter.new @language
     end
 
-    def generate_from(scenario)
-      return <<-SCENARIO
+    def generate_from(test_case)
+      text = StringIO.new
+      formatter = Gherkin::Formatter::PrettyFormatter.new(text, true, false)
+
+      formatter.scenario @adapter.scenario_from(test_case)
+      @adapter.steps_from(test_case).each do |step|
+        formatter.step step
+      end
+      formatter.eof
 
-#{scenario.tags.map {|tag| "@" + tag }.join(" ")}
-#{@language.keywords('scenario').last}: [#{scenario.formatted_id}] #{scenario.name}
-  #{scenario.steps.join("\n  ")}
-      SCENARIO
+      text.string.strip
     end
   end
 end

data/lib/crab/rally_to_cucumber_adapter.rb

@@ -0,0 +1,43 @@
+class Crab::RallyToCucumberAdapter
+
+  include Crab::Utilities
+
+  def initialize(language)
+    @language = language
+  end
+
+  def feature_from(story)
+    comments = [Gherkin::Formatter::Model::Comment.new("# language: #{@language.iso_code}", 0)]
+    tags = []
+    keyword = @language.keywords('feature').last
+    name = "[#{story.formatted_id}] #{story.name}"
+    description = story.description
+    line = 0
+
+    Gherkin::Formatter::Model::Feature.new(comments, tags, keyword, name, description, line)
+  end
+
+  def scenario_from(test_case)
+    comments = []
+    tags = test_case.tags.map {|tag| Gherkin::Formatter::Model::Tag.new("@#{tag}", 0) }
+    keyword = @language.keywords('scenario').last
+    name = "[#{test_case.formatted_id}] #{test_case.name}"
+    description = test_case.description
+    line = 0
+
+    Gherkin::Formatter::Model::Scenario.new(comments, tags, keyword, name, description, line)
+  end
+
+  def steps_from(test_case)
+    test_case.steps.tap {|steps| logger.info "#{steps.size} step(s) found"}.map do |step|
+      step_words = step.split(' ')
+      comments = []
+      keyword = step_words.shift
+      name = " " + step_words.join(' ')
+      line = 0
+
+      Gherkin::Formatter::Model::Step.new(comments, keyword, name, line)
+    end
+  end
+
+end

data/lib/crab/story.rb

@@ -41,6 +41,10 @@ module Crab
       Array(@rally_story.test_cases).map {|tc| Crab::TestCase.new(tc, @dry_run) }
     end
 
+    def test_cases
+      scenarios
+    end
+
     def update(opts)
       if @dry_run
         puts "Would update story #{formatted_id} with #{opts.inspect}"

data/lib/crab/testcase.rb

@@ -20,6 +20,10 @@ module Crab
       @rally_test_case.name
     end
 
+    def description
+      @rally_test_case.description
+    end
+
     def tags
       [priority, risk, test_method, test_type].map &:parameterize
     end

data/lib/crab/utilities.rb

@@ -54,7 +54,7 @@ module Crab
         banner banner
         opt :priority, "Priority (one of: #{Crab::TestCase::PRIORITIES.join(" ")}", :default => "important", :short => '-p'
         opt :risk,     "Risk (one of: #{Crab::TestCase::RISKS.join(" ")})", :default => "medium", :short => '-r'
-        opt :method,   "Method (one of: #{Crab::TestCase::METHODS.join(" ")})", :default => "automated", :short => '-m'
+        opt :method,   "Method (one of: #{Crab::TestCase::METHODS.join(" ")})", :default => "manual", :short => '-m'
         opt :type,     "Type (one of: #{Crab::TestCase::TYPES.join(" ")})", :default => "acceptance", :short => '-t'
         opt :pre,      "Pre-conditions", :default => "N/A"
         opt :post,     "Post-conditions", :default => "N/A"

data/lib/crab/version.rb

@@ -1,3 +1,3 @@
 module Crab
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crab
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 2
-  - 9
-  version: 0.2.9
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Carlos Villela
@@ -355,6 +355,7 @@ files:
 - lib/crab/cucumber_scenario.rb
 - lib/crab/cucumber_to_rally_adapter.rb
 - lib/crab/rally.rb
+- lib/crab/rally_to_cucumber_adapter.rb
 - lib/crab/story.rb
 - lib/crab/testcase.rb
 - lib/crab/utilities.rb