assisted_workflow 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assisted_workflow (0.1.0)
+    assisted_workflow (0.1.2)
       hashie (~> 2.0.5)
       octokit (~> 2.0)
       pivotal-tracker (~> 0.5.12)

data/README.md

@@ -1,5 +1,7 @@
 # Assisted Workflow (aw)
 
+[![Gem Version](https://badge.fury.io/rb/assisted_workflow.png)](http://badge.fury.io/rb/assisted_workflow) [![Code Climate](https://codeclimate.com/github/flaviogranero/assisted_workflow.png)](https://codeclimate.com/github/flaviogranero/assisted_workflow)
+
 AW is a CLI tool to automate software development workflows based on github pull requests.
 
 * [Github Workflow](http://scottchacon.com/2011/08/31/github-flow.html)

data/lib/assisted_workflow/cli.rb

@@ -16,33 +16,37 @@ class AssistedWorkflow::CLI < Thor
     copy_file "awconfig.local.tt", LOCAL_CONFIG
     if File.exists?(".git")
       copy_file "commit-msg.tt", ".git/hooks/commit-msg"
+      chmod ".git/hooks/commit-msg", "a+x"
     else
       raise AssistedWorkflow::Error, ".git folder not found"
     end
     say "set your own configuration editing the .awconfig files or running:", :green
-    say "\t$ aw config pivotal.fullname='Flavio Granero' --global"
-    say "\t$ aw config pivotal.token=MYPIVOTALTOKEN --global"
-    say "\t$ aw config github.token=MYGITHUBOAUTHTOKEN --global"
-    say "\t$ aw config pivotal.project_id=00001"
+    say_command "$ aw config pivotal.fullname='Flavio Granero' --global"
+    say_command "$ aw config pivotal.token=MYPIVOTALTOKEN --global"
+    say_command "$ aw config github.token=MYGITHUBOAUTHTOKEN --global"
+    say_command "$ aw config pivotal.project_id=00001"
   end
   
   desc "start [STORY_ID]", "Start the pivotal story and create a new branch to receive the changes"
+  method_option :all, :type => :boolean, :default => false, :aliases => "-a", :desc => "Show started and pending stories when no story_id is provided"
+  method_option :estimate, :type => :numeric, :aliases => "-e", :desc => "Sets the story estimate when starting"
   def start(story_id=nil)
     check_awfile!
     story = pivotal.find_story(story_id)
     if story.nil?
-      stories = pivotal.pending_stories
+      stories = pivotal.pending_stories(:include_started => options[:all])
       print_title "pending stories"
-      print_table(pivotal.display_values(stories))
+      print_table(pivotal.display_values(stories, :show_state => options[:all]))
       say "start a story using:", :green
-      say "\t$ aw start [STORY_ID]"
+      say_command "$ aw start [STORY_ID]"
     else
+      say_status "starting story", story.name
+      pivotal.start_story(story, :estimate => options[:estimate])
+      print_wrapped story.description, :indent => 2
       say "creating the feature branch"
       git.create_story_branch(story)
-      say "starting story: #{story.name}"
-      pivotal.start_story(story)
       say "after commiting your changes, submit a pull request using:", :green
-      say "\t$ aw submit"
+      say_command "$ aw submit"
     end
   end
   
@@ -58,10 +62,10 @@ class AssistedWorkflow::CLI < Thor
       say "submiting the new pull request"
       pr = github.create_pull_request(git.repository, git.current_branch, story)
       say "finishing the story"
-      pivotal.finish_story(story)
+      pivotal.finish_story(story, :note => pr._links.html.href)
       say "new pull request: #{pr._links.html.href}", :yellow
       say "after pull request approval, remove the feature branch using:", :green
-      say "\t$aw finish"
+      say_command "$ aw finish"
     else
       raise AssistedWorkflow::Error, "story not found, make sure a feature branch in active"
     end
@@ -76,7 +80,7 @@ class AssistedWorkflow::CLI < Thor
         say "removing local and remote feature branches"
         git.remove_branch
         say "well done! check your next stories using:", :green
-        say "\t$ aw start"
+        say_command "$ aw start"
       else
         say "this branch is not merged into master yet", :yellow
       end
@@ -144,6 +148,12 @@ class AssistedWorkflow::CLI < Thor
       say "-" * title.length, :green
     end
     
+    def say_command(command)
+      with_padding do
+        say command
+      end
+    end
+    
     def check_awfile!
       raise AssistedWorkflow::Error, "#{awfile} does not exist.\nmake sure you run `$ aw setup` in your project folder." unless File.exist?(awfile)
     end

data/lib/assisted_workflow/git.rb

@@ -60,7 +60,7 @@ module AssistedWorkflow
     # removes current branch and his remote version
     def remove_branch
       branch = current_branch
-      git "push origin :#{branch}"
+      git "push origin :#{branch}", :raise_error => false
       git "checkout master"
       git "branch -D #{branch}"
     end
@@ -68,9 +68,10 @@ module AssistedWorkflow
     private
     
     def git(command, options = {})
+      options = {:raise_error => true}.merge(options)
       puts "git #{command}" unless options[:silent] == true
       result = %x{git #{command}}.chomp
-      unless $? == 0
+      if $? != 0 && options[:raise_error]
         msg = ["git command error", options[:error]].compact.join(": ")
         raise GitError, msg
       end

data/lib/assisted_workflow/pivotal.rb

@@ -27,21 +27,37 @@ module AssistedWorkflow
       end
     end
   
-    def start_story(story)
-      story.update(:current_state => "started") if story
+    def start_story(story, options = {})
+      update_story! story, options.merge(:current_state => "started")
     end
   
-    def finish_story(story)
-      story.update(:current_state => finished_state(story)) if story
+    def finish_story(story, options = {})
+      if update_story! story, :current_state => finished_state(story)
+        story.notes.create(:text => options[:note]) if options[:note]
+      end
     end
   
-    def pending_stories
-      @project.stories.all(:state => "unstarted", :owned_by => @username, :limit => 5)
+    def pending_stories(options = {})
+      states = ["unstarted"]
+      states << "started" if options[:include_started]
+      @project.stories.all(:state => states, :owned_by => @username, :limit => 5)
+    end
+    
+    def update_story!(story, attributes)
+      if story
+        story.update(attributes)
+        raise AssistedWorkflow::Error, story.errors.first.to_s if story.errors.any?
+        true
+      end
     end
   
-    def display_values(stories)
+    def display_values(stories, options = {})
       stories.map do |story|
-        [story.id, story.name]
+        if options[:show_state]
+          [story.id, story.current_state, story.name]
+        else
+          [story.id, story.estimate, story.name]
+        end
       end
     end
   

data/lib/assisted_workflow/version.rb

@@ -1,3 +1,3 @@
 module AssistedWorkflow
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assisted_workflow
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor