assisted_workflow 0.3.1 → 0.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWE2NGVhNzAxMmI0NWIwOTRhNjczMGY2MjhmM2RmNzEwYzRkNWI1OQ==
-  data.tar.gz: !binary |-
-    ZjJkZTJjNTRmOGViZjFmNjhmNzZhZDUyMDhiMzViMTU4YmViYWYxMg==
+SHA1:
+  metadata.gz: 67a9b4050e4f187dcce995edb3525fda212c62da
+  data.tar.gz: ff942865f4e047eb9d0ad746653ce694e8f4aabe
 SHA512:
-  metadata.gz: !binary |-
-    N2ZiOGYyZjJiYTgwNjkzODZkZmUwNWI4MzY2OWNmOWFlM2U3MDJhZDc0MjAx
-    ZTY0NzIyZjhiZmU4NzlmZTE0MzA3ZDIyYjhkODkzZWUxMTdhYmRlNzYxMzli
-    YmRmNzY3MWE3MTczNDA5OTk1NDM0NTk2YjUyNDQxYjk0YTc4M2I=
-  data.tar.gz: !binary |-
-    OWU5ODQxOGMxYjc1NTllY2NjMWFlNmQ2M2EwYmU1NDJhOTYwZmFlNWFjNzI5
-    YmEwMzM0YjgzZGJkOTJhMzlkY2QwNjRkNzBkZTQyMmE4ODNhNGE5OTdhMmJl
-    NTE5NjliZjdhZWI2NWEyZTg0YjM0ODI5MTI2Zjk2NDU0MDJmMjg=
+  metadata.gz: 9c981d14895eac973df61ea28842306a73fd92eb92e691015eb249f15d861392a76172a15af13ffbb6acb0e6200700a322015952c4f17763932c481b71e885e3
+  data.tar.gz: 6545db20692ebb93fdae521dcc020a96b3d3fdb1e47d8c103117dff6feee5045409b1fcac232a6062c48197184282fc87e553b94bfa87dc3ceb24964020bd885

data/.gitignore

@@ -1,2 +1,5 @@
-pkg/
-.awconfig
+/pkg/
+.awconfig
+/aw-*/
+aw-*.tar.gz
+/packaging/*.tar.gz

data/.ruby-version

@@ -0,0 +1 @@
+2.2.2

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ### Unreleased
 
+### 0.4.0
+
+* enchancements
+  * Moving from pivotal-tracker to tracker-api gem, in order to use api v5 (@alemata)
+  * Packaging with Traveling Ruby (@flaviogranero)
+
+### 0.3.1
+
+* bug fix
+  * Fixing issue when states/transitions are the default ones
+  * Bugfix for issues with empty descriptions
+
 ### 0.3.0
 
 * enchancements

data/Gemfile.lock

@@ -1,64 +1,88 @@
 PATH
   remote: .
   specs:
-    assisted_workflow (0.3.1)
+    assisted_workflow (0.4.0)
       hashie (~> 2.0.5)
       jiralicious (~> 0.4.0)
       octokit (~> 2.0)
-      pivotal-tracker (~> 0.5.12)
-      thor (~> 0.18.1)
+      thor (~> 0.19)
+      tracker_api (~> 0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.3.8)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
     builder (3.2.2)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
     crack (0.1.8)
-    fakefs (0.5.0)
-    faraday (0.9.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    equalizer (0.0.11)
+    excon (0.45.3)
+    fakefs (0.6.7)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    happymapper (0.4.1)
-      libxml-ruby (~> 2.0)
+    faraday_middleware (0.9.1)
+      faraday (>= 0.7.4, < 0.10)
     hashie (2.0.5)
-    httparty (0.11.0)
-      multi_json (~> 1.0)
+    httparty (0.13.5)
+      json (~> 1.8)
       multi_xml (>= 0.5.2)
-    jiralicious (0.4.0)
+    i18n (0.7.0)
+    ice_nine (0.11.1)
+    jiralicious (0.4.3)
       crack (~> 0.1.8)
       hashie (>= 1.1)
-      httparty (>= 0.10, < 0.12.0)
+      httparty (>= 0.10)
       json (>= 1.6, < 1.9.0)
-    json (1.8.1)
-    libxml-ruby (2.7.0)
-    mime-types (2.1)
-    mini_portile (0.5.2)
-    multi_json (1.8.4)
+      nokogiri
+      oauth
+    json (1.8.2)
+    mini_portile (0.6.2)
+    minitest (5.7.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    nokogiri-happymapper (0.5.8)
-      nokogiri (~> 1.5)
-    octokit (2.7.1)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    oauth (0.4.7)
+    octokit (2.7.2)
       sawyer (~> 0.5.2)
-    pivotal-tracker (0.5.12)
-      builder
-      builder
-      crack
-      happymapper (>= 0.3.2)
-      nokogiri (>= 1.4.3)
-      nokogiri (>= 1.5.5)
-      nokogiri-happymapper (>= 0.5.4)
-      rest-client (~> 1.6.0)
-      rest-client (~> 1.6.0)
-    rake (10.1.1)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    rake (10.4.2)
     rr (1.1.2)
-    sawyer (0.5.3)
+    sawyer (0.5.5)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
-    thor (0.18.1)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tracker_api (0.2.9)
+      activemodel
+      activesupport
+      addressable
+      excon
+      faraday (~> 0.9.0)
+      faraday_middleware
+      virtus
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
 
 PLATFORMS
   ruby
@@ -66,5 +90,6 @@ PLATFORMS
 DEPENDENCIES
   assisted_workflow!
   fakefs
+  minitest
   rake
   rr

data/{LICENSE.txt → LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Flavio Granero
+Copyright (c) 2015 Electronic Inaka LLC
 
 MIT License
 

data/README.md

@@ -1,6 +1,6 @@
 # Assisted Workflow (aw)
 
-[![Gem Version](https://badge.fury.io/rb/assisted_workflow.png)](http://badge.fury.io/rb/assisted_workflow) [![Build Status](https://travis-ci.org/flaviogranero/assisted_workflow.png?branch=master)](https://travis-ci.org/flaviogranero/assisted_workflow) [![Code Climate](https://codeclimate.com/github/flaviogranero/assisted_workflow.png)](https://codeclimate.com/github/flaviogranero/assisted_workflow)
+[![Gem Version](https://badge.fury.io/rb/assisted_workflow.png)](http://badge.fury.io/rb/assisted_workflow) [![Build Status](https://travis-ci.org/inaka/assisted_workflow.png?branch=master)](https://travis-ci.org/inaka/assisted_workflow) [![Code Climate](https://codeclimate.com/github/inaka/assisted_workflow.png)](https://codeclimate.com/github/inaka/assisted_workflow)
 
 AW is a CLI tool to automate software development workflows based on github pull requests.
 
@@ -14,10 +14,18 @@ Here in [Inaka](http://inaka.net) we have the following workflow steps:
 4. Finish the story, removing both local and remote feature branches
 5. Deploy master branch.
 
-For more details, please read more about the [Inaka Workflow](https://github.com/inaka/inaka_corp/wiki/Inaka-Workflow).
+For more details, please read more about the [Inaka's Development Workflow](https://github.com/inaka/assisted_workflow/wiki/Inaka's-Development-Flow).
 
 This gem provides a command line tool to automate tasks related with `start`, `submit` and `finish` steps.
 
+## Contact Us
+For **questions** or **general comments** regarding the use of this library, please use our public
+[hipchat room](https://www.hipchat.com/gpBpW3SsT).
+
+If you find any **bugs** or have a **problem** while using this library, please [open an issue](https://github.com/inaka/assisted_workflow/issues/new) in this repo (or a pull request :)).
+
+And you can check all of our open-source projects at [inaka.github.io](http://inaka.github.io)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -88,9 +96,4 @@ either add an 'origin' remote that points to the GitHub repository you want to s
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-## To-do
-
-1. add github issues support
-2. refactor addons to a base class, with access to a shell output wrapper.
+5. Create new Pull Request

data/RELEASING.md

@@ -0,0 +1,39 @@
+Releasing
+=========
+
+Assisted Workflow uses a set of `rake` tasks to create packages and bundles [traveling
+ruby][traveling_ruby] to simplify the dependency on Ruby.
+
+Generating packages
+-------------------
+
+Packages can be generated for the following systems:
+
+* OSX `rake package:osx`
+* Linux x86 `rake package:linux:x86`
+* Linux x86_64 `rake package:linux:x86_64`
+
+You can generate all packages with `rake package:all`
+
+[traveling_ruby]: https://github.com/phusion/traveling-ruby
+
+The packages generated are tarballs of the following directory structure:
+
+    aw-package
+    ├── bin # shims
+    └── lib
+        ├── app # where aw is installed as a gem with its dependencies
+        └── ruby # traveling ruby for target system
+
+Releasing a new version
+-----------------------
+
+1. Update the version in `lib/assisted_workflow/version.rb`
+1. Update the `CHANGELOG.md` with the news
+1. Use `rake release` to tag and publish the new version as a gem
+1. Generate the osx package with `rake package:osx`
+1. Create a [release] for the latest tag and attach the packages
+1. Update the [homebrew formula] to point to the latest OSX package
+
+[release]: https://github.com/inaka/assisted_workflow/releases
+[homebrew formula]: https://github.com/inaka/homebrew-formulas

data/Rakefile

@@ -1,5 +1,6 @@
 require "bundler/gem_tasks"
 require 'rake/testtask'
+require 'assisted_workflow/version'
 
 Rake::TestTask.new do |t|
   t.libs << "spec"
@@ -13,4 +14,105 @@ task :console do
   require 'assisted_workflow/cli'
   ARGV.clear
   IRB.start
+end
+
+PROJECT_NAME = "aw"
+TRAVELING_RUBY_VERSION = "20150517-2.2.2"
+TRAVELING_RUBY_HOST = "http://d6r77u77i8pq3.cloudfront.net/releases"
+RUBY_BASENAME = "traveling-ruby-#{TRAVELING_RUBY_VERSION}"
+
+namespace :package do
+  desc "Generate assisted_workflow #{AssistedWorkflow::VERSION} packages for OSX, Linux x86 and Linux x86_64"
+
+  task all: ["linux:x86", "linux:x86_64", "osx"]
+
+  namespace :linux do
+    desc "Generate assisted_workflow #{AssistedWorkflow::VERSION} package for Linux x86"
+    task x86: "packaging/#{RUBY_BASENAME}-linux-x86.tar.gz" do
+      clean_up("linux-x86")
+      create_package("linux-x86")
+    end
+
+    desc "Generate assisted_workflow #{AssistedWorkflow::VERSION} package for Linux x86_64"
+    task x86_64: "packaging/#{RUBY_BASENAME}-linux-x86_64.tar.gz" do
+      clean_up("linux-x86_64")
+      create_package("linux-x86_64")
+    end
+  end
+
+  desc "Generate assisted_workflow #{AssistedWorkflow::VERSION} package for OSX"
+  task osx: "packaging/#{RUBY_BASENAME}-osx.tar.gz" do
+    clean_up("osx")
+    create_package("osx")
+  end
+
+  desc "Remove the files generated by packaging"
+  task :cleanup do
+    clean_up("osx")
+    clean_up("linux-x86")
+    clean_up("linux-x86_64")
+  end
+end
+
+file "packaging/#{RUBY_BASENAME}-osx.tar.gz" do
+  sh "cd packaging && curl -L -O --fail #{TRAVELING_RUBY_HOST}/#{ruby_for("osx")}"
+end
+
+file "packaging/#{RUBY_BASENAME}-linux-x86.tar.gz" do
+  sh "cd packaging && curl -L -O --fail #{TRAVELING_RUBY_HOST}/#{ruby_for("linux-x86")}"
+end
+
+file "packaging/#{RUBY_BASENAME}-linux-x86_64.tar.gz" do
+  sh "cd packaging && curl -L -O --fail #{TRAVELING_RUBY_HOST}/#{ruby_for("linux-x86_64")}"
+end
+
+def create_package(target)
+ if RUBY_VERSION !~ /^2\.2\./
+    abort "You can't package with a Ruby version other than 2.2."
+  end
+  package_dir = "#{PROJECT_NAME}-#{AssistedWorkflow::VERSION}-#{target}"
+
+  copy_shims(package_dir)
+  install_dependencies(package_dir)
+  extract_ruby(package_dir, target)
+  archive_package(package_dir)
+end
+
+def clean_up(target)
+  package_name = "#{PROJECT_NAME}-#{AssistedWorkflow::VERSION}-#{target}"
+  rm_rf package_name
+  rm_f "#{package_name}.tar.gz"
+end
+
+def ruby_for(target)
+  "#{RUBY_BASENAME}-#{target}.tar.gz"
+end
+
+def install_dependencies(package_dir)
+  app_path = "#{package_dir}/lib/app"
+  mkdir_p app_path
+
+  cp "packaging/Gemfile", app_path
+  mkdir "#{app_path}/.bundle"
+  cp "packaging/bundler-config", "#{app_path}/.bundle/config"
+  Bundler.with_clean_env do
+    sh "cd #{app_path}/ && bundle install"
+  end
+end
+
+def copy_shims(package_dir)
+  shim_dir = "#{package_dir}/bin"
+  mkdir_p shim_dir
+  
+  cp "packaging/aw.sh", "#{shim_dir}/aw"
+end
+
+def extract_ruby(package_dir, target)
+  ruby_dir = "#{package_dir}/lib/ruby"
+  mkdir_p ruby_dir
+  sh "tar -xzf packaging/#{ruby_for(target)} -C #{ruby_dir}"
+end
+
+def archive_package(package_dir)
+  sh "tar -czf #{package_dir}.tar.gz #{package_dir}"
 end

data/assisted_workflow.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.authors       = ["Flavio Granero"]
   gem.email         = ["maltempe@gmail.com"]
   gem.summary       = %q{AW is a CLI tool to automate software development workflows based on github pull requests}
-  gem.homepage      = "https://github.com/flaviogranero/assisted_workflow"
+  gem.homepage      = "https://github.com/inaka/assisted_workflow"
   gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($/)
@@ -21,12 +21,13 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rr"
   gem.add_development_dependency "fakefs"
+  gem.add_development_dependency "minitest"
   
-  gem.add_dependency "thor", "~> 0.18.1"
-  gem.add_dependency "pivotal-tracker", "~> 0.5.12"
+  gem.add_dependency "thor", "~> 0.19"
   gem.add_dependency "jiralicious", "~> 0.4.0"
   gem.add_dependency "octokit", "~> 2.0"
   gem.add_dependency "hashie", "~> 2.0.5"
+  gem.add_dependency "tracker_api", "~> 0.2.0"
   
   gem.description   = <<desc
   `aw` is a command line tool to automate software development workflows based on github pull requests.

data/lib/assisted_workflow/addons/git.rb

@@ -17,9 +17,9 @@ module AssistedWorkflow::Addons
     # creates a new git branch based on story attributes
     # the branch name format is:
     # => story_onwer_username.story_id.story_name
-    def create_story_branch(story)
+    def create_story_branch(story, username)
       log "creating the feature branch"
-      branch = branch_name(story)
+      branch = branch_name(story, username)
       git "checkout -b #{branch}"
       # git "push --set-upstream origin #{branch}"
     end
@@ -97,9 +97,9 @@ module AssistedWorkflow::Addons
       $? != 0
     end
     
-    def branch_name(story)
+    def branch_name(story, username)
       description = story.name.to_s.downcase.gsub(/\W/, "_").slice(0, DESCRIPTION_LIMIT)
-      [story.other_id, story.id, description].join(".").downcase
+      [username, story.id, description].join(".").downcase
     end
     
     def not_commited_changes
@@ -110,4 +110,4 @@ module AssistedWorkflow::Addons
       raise AssistedWorkflow::Error, "git: there are not commited changes" unless not_commited_changes.empty?
     end
   end
-end
+end

data/lib/assisted_workflow/addons/github.rb

@@ -22,12 +22,12 @@ module AssistedWorkflow::Addons
       @issue.body.to_s.gsub("\r\n", "\n")
     end
     
-    def other_id
-      @issue.assignee.login
-    end
-    
     def current_state
-      other_id
+      @issue.labels.map(&:name).join(",")
+    end
+
+    def owners_str
+      @issue.assignee.login if issue.assignee
     end
     
     def labels
@@ -57,7 +57,7 @@ module AssistedWorkflow::Addons
     
     # Creates a pull request using current branch changes
     # 
-    # @param repo [String] Repository name. flaviogranero/assisted_workflow
+    # @param repo [String] Repository name. inaka/assisted_workflow
     # @param branch [String] Branch name. flavio.0001.new_feature
     # @param story [Story] Pivotal story object
     # @return [Sawyer::Resource] The newly created pull request
@@ -118,5 +118,9 @@ module AssistedWorkflow::Addons
     def valid?
       @client.user_authenticated?
     end
+
+    def username
+      @username
+    end
   end
-end
+end

data/lib/assisted_workflow/addons/jira.rb

@@ -21,13 +21,13 @@ module AssistedWorkflow::Addons
       @issue.summary
     end
     
-    def other_id
-      @issue.fields.current["assignee"]["name"].split.join
-    end
-    
     def current_state
       @issue.fields.current["status"]["name"]
     end
+
+    def owners_str
+      @issue.fields.current["assignee"]["name"]
+    end
     
     def estimate
       @issue.fields.current["priority"]["name"]
@@ -102,4 +102,4 @@ module AssistedWorkflow::Addons
       end
     end
   end
-end
+end

data/lib/assisted_workflow/addons/pivotal.rb

@@ -1,18 +1,30 @@
 require "assisted_workflow/exceptions"
 require "assisted_workflow/addons/base"
-require 'pivotal_tracker'
+require "tracker_api"
 
 # wrapper class to pivotal api client
 module AssistedWorkflow::Addons
+
+  class PivotalStory < SimpleDelegator
+    def initialize(story)
+      super
+    end
+
+    def owners_str
+      url = "/projects/#{project_id}/stories/#{id}/owners"
+      client.get(url).body.map{|owner| owner["name"]}.join(", ")
+    end
+  end
+
   class Pivotal < Base
     required_options :fullname, :token, :project_id
   
     def initialize(output, options = {})
       super
 
-      PivotalTracker::Client.token = options["token"]
+      @client = TrackerApi::Client.new(token: options["token"])
       begin
-        @project = PivotalTracker::Project.find(options["project_id"])
+        @project = @client.project(options["project_id"])
       rescue
         raise AssistedWorkflow::Error, "pivotal project #{options["project_id"]} not found."
       end
@@ -23,22 +35,27 @@ module AssistedWorkflow::Addons
     def find_story(story_id)
       if story_id.to_i > 0
         log "loading story ##{story_id}"
-        story = @project.stories.find(story_id)
-        story.other_id = @username || @fullname
-        story.other_id = story.other_id.to_s.downcase.split.join
-        story
+        PivotalStory.new(@project.story(story_id))
       end
     end
   
     def start_story(story, options = {})
       log "starting story ##{story.id}"
-      update_story! story, options.merge(:current_state => "started")
+      options.delete(:estimate) if options[:estimate].nil?
+      update_story!(story, options.merge(:current_state => "started"))
+
+      owner_ids = story.owner_ids
+      if owner_ids.empty? || !owner_ids.include?(@client.me.id)
+        log "assigning story ##{story.id}"
+        update_story!(story, :owner_ids => owner_ids.dup << @client.me.id)
+      end
     end
-  
+
     def finish_story(story, options = {})
       log "finishing story ##{story.id}"
-      if update_story! story, :current_state => finished_state(story)
-        story.notes.create(:text => options[:note]) if options[:note]
+      saved = update_story! story, :current_state => finished_state(story)
+      if saved && options[:note]
+        add_comment_to_story(story, options[:note])
       end
     end
   
@@ -46,14 +63,27 @@ module AssistedWorkflow::Addons
       log "loading pending stories"
       states = ["unstarted"]
       states << "started" if options[:include_started]
-      @project.stories.all(:state => states, :owned_by => @fullname, :limit => 5)
+      filter_str = "state:#{states.join(',')} owned_by:#{@client.me.id}"
+      stories = @project.stories(:filter => filter_str, :limit => 5)
+      stories.map do |story|
+        PivotalStory.new(story)
+      end
     end
     
     def valid?
       !@project.nil?
     end
-  
+
     private
+
+    def add_comment_to_story(story, text)
+      url = "/projects/#{story.project_id}/stories/#{story.id}/comments"
+      @client.post(url, params: {:text => text})
+    rescue TrackerApi::Error => e
+      body = e.response[:body]
+      msg = body["possible_fix"] || body["general_problem"]
+      raise AssistedWorkflow::Error, msg
+    end
   
     def finished_state(story)
       if story.story_type == "chore"
@@ -65,10 +95,16 @@ module AssistedWorkflow::Addons
     
     def update_story!(story, attributes)
       if story
-        story.update(attributes)
-        raise AssistedWorkflow::Error, story.errors.first.to_s if story.errors.any?
+        begin
+          story.attributes = attributes
+          story.save
+        rescue TrackerApi::Error => e
+          body = e.response[:body]
+          msg = body["possible_fix"] || body["general_problem"]
+          raise AssistedWorkflow::Error, msg
+        end
         true
       end
     end
   end
-end
+end

data/lib/assisted_workflow/cli.rb

@@ -28,6 +28,7 @@ module AssistedWorkflow
         c << "$ aw config pivotal.fullname='Your Pivotal User Name' --global"
         c << "$ aw config pivotal.token=MYPIVOTALTOKEN --global"
         c << "$ aw config github.token=MYGITHUBOAUTHTOKEN --global"
+        c << "$ aw config branch_username='Username for branch names' --global"
         c << "$ aw config pivotal.project_id=00001"
       end
     end
@@ -45,7 +46,7 @@ module AssistedWorkflow
       else
         tracker.start_story(story, :estimate => options[:estimate])
         out.print_story story
-        git.create_story_branch(story)
+        git.create_story_branch(story, configuration[:branch_username])
         out.next_command "after commiting your changes, submit a pull request using:", "$ aw submit"
       end
     end
@@ -151,4 +152,4 @@ module AssistedWorkflow
         end
       end
   end
-end
+end

data/lib/assisted_workflow/output.rb

@@ -25,11 +25,7 @@ module AssistedWorkflow
     def print_stories(title, stories, options = {})
       print_title title
       rows = stories.map do |story|
-        if options[:all]
-          [story.id, story.current_state, story.name]
-        else
-          [story.id, story.estimate, story.name]
-        end
+        [story.id, story.current_state, story.owners_str, story.name]
       end
       print_table(rows)
     end
@@ -51,4 +47,4 @@ module AssistedWorkflow
     end
     
   end
-end
+end

data/lib/assisted_workflow/templates/awconfig.global.tt

@@ -4,4 +4,5 @@ pivotal:
   fullname:
   token:
 github:
-  token:
+  token:
+branch_username:

data/lib/assisted_workflow/version.rb

@@ -1,3 +1,3 @@
 module AssistedWorkflow
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/packaging/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'assisted_workflow'

data/packaging/aw.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+# Figure out where this script is located.
+SELFDIR="`dirname \"$0\"`"
+SELFDIR="`cd \"$SELFDIR\" && pwd`"
+
+# Tell Bundler where the Gemfile and gems are.
+export BUNDLE_GEMFILE="$SELFDIR/../lib/app/Gemfile"
+unset BUNDLE_IGNORE_CONFIG
+
+# Run the actual app using the bundled Ruby interpreter, with Bundler activated.
+exec "$SELFDIR/../lib/ruby/bin/ruby" -rbundler/setup "$SELFDIR/../lib/app/vendor/ruby/2.2.0/bin/aw" "$@"

data/packaging/bundler-config

@@ -0,0 +1,4 @@
+---
+BUNDLE_PATH: "vendor"
+BUNDLE_WITHOUT: development
+BUNDLE_DISABLE_SHARED_GEMS: '1'

data/spec/assisted_workflow/addons/git_spec.rb

@@ -5,18 +5,18 @@ describe AssistedWorkflow::Addons::Git do
   before do
     @git = AssistedWorkflow::Addons::Git.new(nil, :silent => true)
     stub(@git).system_error?{ false }
-    stub(@git).system("git rev-parse --abbrev-ref HEAD"){ "flavio.00001.new_feature"}
+    stub(@git).system("git rev-parse --abbrev-ref HEAD"){ "flavio.1234.new_feature"}
   end
   
   it "creates a story branch" do
-    mock(@git).system("git checkout -b flavio.00001.new_feature")
-    @git.create_story_branch(story)
+    mock(@git).system("git checkout -b flavio.1234.new_feature")
+    @git.create_story_branch(story, "flavio")
   end
   
   it "raises a git error when git command does not exit with success" do
     mock(@git).system_error?{ true }
-    mock(@git).system("git checkout -b flavio.00001.new_feature")
-    proc { @git.create_story_branch(story) }.must_raise AssistedWorkflow::Addons::GitError, "git command error"
+    mock(@git).system("git checkout -b flavio.1234.new_feature")
+    proc { @git.create_story_branch(story, "flavio") }.must_raise AssistedWorkflow::Addons::GitError, "git command error"
   end
   
   
@@ -24,9 +24,9 @@ describe AssistedWorkflow::Addons::Git do
     mock(@git).system("git status --porcelain"){ "" }
     mock(@git).system("git checkout master")
     mock(@git).system("git pull --rebase")
-    mock(@git).system("git checkout flavio.00001.new_feature")
+    mock(@git).system("git checkout flavio.1234.new_feature")
     mock(@git).system("git rebase master")
-    mock(@git).system("git push -u -f origin flavio.00001.new_feature")
+    mock(@git).system("git push -u -f origin flavio.1234.new_feature")
     @git.rebase_and_push
   end
   
@@ -38,11 +38,11 @@ describe AssistedWorkflow::Addons::Git do
   end
   
   it "returns the story_id from branch name" do
-    @git.current_story_id.must_equal "00001"
+    @git.current_story_id.must_equal "1234"
   end
   
   it "return the current branch name" do
-    @git.current_branch.must_equal "flavio.00001.new_feature"
+    @git.current_branch.must_equal "flavio.1234.new_feature"
   end
   
   it "returns the repository name assigned to origin" do
@@ -54,33 +54,47 @@ describe AssistedWorkflow::Addons::Git do
     
     before do
       mock(@git).system("git status --porcelain"){ "" }
-      mock(@git).system("git checkout flavio.00001.new_feature")
+      mock(@git).system("git checkout flavio.1234.new_feature")
       mock(@git).system("git checkout master")
       mock(@git).system("git pull --rebase")
     end
     
     it "returns true if current branch is merged into master" do
-      mock(@git).system("git branch --merged"){ "flavio.00001.new_feature" }
+      mock(@git).system("git branch --merged"){ "flavio.1234.new_feature" }
       @git.check_merged!.must_equal true
     end
     
     it "returns false if current branch is not merged into master" do
-      mock(@git).system("git branch --merged"){ "flavio.00002.other_feature" }
+      mock(@git).system("git branch --merged"){ "flavio.1234.other_feature" }
       proc { @git.check_merged! }.must_raise AssistedWorkflow::Error, "this branch is not merged into master"
       
     end
   end
   
   it "removes current branch and its remote version" do
-    mock(@git).system("git push origin :flavio.00001.new_feature")
+    mock(@git).system("git push origin :flavio.1234.new_feature")
     mock(@git).system("git checkout master")
-    mock(@git).system("git branch -D flavio.00001.new_feature")
+    mock(@git).system("git branch -D flavio.1234.new_feature")
     @git.remove_branch
   end
   
   private #==================================================================
   
   def story
-    @story ||= PivotalTracker::Story.new(:id => "00001", :name => "New Feature", :description => "Feature description", :other_id => "flavio")
+    # stubs
+    @client = TrackerApi::Client.new(token: "mypivotaltoken")
+    stub(TrackerApi::Client).new{ @client }
+
+    any_instance_of(TrackerApi::Resources::Story) do |klass|
+      stub(klass).comments { [] }
+      stub(klass).tasks { [] }
+    end
+    @story ||= TrackerApi::Resources::Story.new(:id => "1234",
+                                                :name => "New Feature",
+                                                :description => "Feature description",
+                                                :client => @client)
+    stub(@story).save {}
+
+    @story
   end
-end
+end

data/spec/assisted_workflow/addons/github_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'pivotal_tracker'
 require 'assisted_workflow/addons/github'
 
 describe AssistedWorkflow::Addons::Github do
@@ -25,25 +24,25 @@ describe AssistedWorkflow::Addons::Github do
   end
   
   it "creates a new valid pull request from a pivotal story" do
-    mock(@client).create_pull_request("fakeuser/fakerepo", "master", "fakeuser.00001.new_feature", "[#00001] New Feature", "Feature description"){ pull_request }
+    mock(@client).create_pull_request("fakeuser/fakerepo", "master", "fakeuser.1234.new_feature", "[#1234] New Feature", "Feature description"){ pull_request }
     @github.create_pull_request(
-      "fakeuser.00001.new_feature", story
+      "fakeuser.1234.new_feature", story
     ).must_match /fakeuser\/fakerepo\/pull\/1/
   end
   
   it "creates a new valid pull request from a github story" do
-    mock(@client).create_pull_request_for_issue("fakeuser/fakerepo", "master", "fakeuser.00001.new_feature", 10){ pull_request }
+    mock(@client).create_pull_request_for_issue("fakeuser/fakerepo", "master", "fakeuser.1234.new_feature", 10){ pull_request }
     @github.create_pull_request(
-      "fakeuser.00001.new_feature",
+      "fakeuser.1234.new_feature",
       AssistedWorkflow::Addons::GithubStory.new(gh_issue(:number => 10))
     ).must_match /fakeuser\/fakerepo\/pull\/1/
   end
   
   it "raises on creating an invalid pull request" do
-    mock(@client).create_pull_request("fakeuser/fakerepo", "master", "fakeuser.00001.new_feature", "[#00001] New Feature", "Feature description"){ nil }
+    mock(@client).create_pull_request("fakeuser/fakerepo", "master", "fakeuser.1234.new_feature", "[#1234] New Feature", "Feature description"){ nil }
     proc { 
       @github.create_pull_request(
-        "fakeuser.00001.new_feature", story
+        "fakeuser.1234.new_feature", story
       )
     }.must_raise AssistedWorkflow::Error, "error on submiting the pull request"
   end
@@ -55,7 +54,6 @@ describe AssistedWorkflow::Addons::Github do
     
     story = @github.find_story("10")
     story.id.must_equal "10"
-    story.other_id.must_match /fakeuser/
   end
   
   it "returns pending stories" do
@@ -82,7 +80,19 @@ describe AssistedWorkflow::Addons::Github do
   private #==================================================================
   
   def story
-    @story ||= PivotalTracker::Story.new(:id => "00001", :name => "New Feature", :description => "Feature description")
+    # stubs
+    @client = TrackerApi::Client.new(token: "mypivotaltoken")
+    stub(TrackerApi::Client).new{ @client }
+
+     any_instance_of(TrackerApi::Resources::Story) do |klass|
+      stub(klass).comments { [] }
+      stub(klass).tasks { [] }
+    end
+    @story ||= TrackerApi::Resources::Story.new(:id => "1234", :name => "New Feature",
+                                                :description => "Feature description", :client => @client)
+    stub(@story).save {}
+
+    @story
   end
   
   def agent_stub
@@ -108,4 +118,4 @@ describe AssistedWorkflow::Addons::Github do
     stub(client).user_authenticated?{ true }
     client
   end
-end
+end

data/spec/assisted_workflow/addons/jira_spec.rb

@@ -74,7 +74,6 @@ describe AssistedWorkflow::Addons::Jira do
     
     story = @jira.find_story("aw-01")
     story.id.must_equal "aw-01"
-    story.other_id.must_match /jirauser/
   end
   
   it "returns pending stories" do
@@ -134,4 +133,4 @@ describe AssistedWorkflow::Addons::Jira do
     mock(Jiralicious::Issue).get_transitions(url){ response }
     mock(Jiralicious::Issue).transition(url, {"transition" => status_id})
   end
-end
+end

data/spec/assisted_workflow/addons/pivotal_spec.rb

@@ -11,9 +11,12 @@ describe AssistedWorkflow::Addons::Pivotal do
       "fullname" => "Flavio Granero"
     }
     # stubs
-    @project = PivotalTracker::Project.new(:id => "1")
-    stub(PivotalTracker::Project).find(@configuration["project_id"]){ @project }
-    
+    @client = TrackerApi::Client.new(token: "mypivotaltoken")
+    stub(TrackerApi::Client).new{ @client }
+    @project = TrackerApi::Resources::Project.new(client: @client, id: 1)
+    stub(@client).project(@configuration["project_id"]){ @project }
+    stub(@client).me{ TrackerApi::Resources::Me.new }
+
     @pivotal = AssistedWorkflow::Addons::Pivotal.new(nil, @configuration)
   end
   
@@ -49,23 +52,22 @@ describe AssistedWorkflow::Addons::Pivotal do
   end
   
   it "finds a story by id" do
-    mock(PivotalTracker::Story).find("100001", @project.id) do |story_id, project_id|
-      story_stub(:id => story_id, :project_id => project_id)
+    mock(@project).story("100001") do |story_id|
+      story_stub(:id => story_id, :project_id => @project.id)
     end
     
     story = @pivotal.find_story("100001")
-    story.id.must_equal "100001"
-    story.other_id.must_match /flavio/
+    story.id.must_equal 100001
   end
   
   it "returns pending stories" do
-    mock(PivotalTracker::Story).all(@project, :state => ["unstarted", "started"], :owned_by => @configuration["fullname"], :limit => 5) do |project|
+    stub(@project).stories do
       [
-        story_stub(:id => "100001", :project_id => project.id),
-        story_stub(:id => "100002", :project_id => project.id)
+        story_stub(:id => "100001", :project_id => @project.id),
+        story_stub(:id => "100002", :project_id => @project.id)
       ]
     end
-    
+
     stories = @pivotal.pending_stories(:include_started => true)
     stories.size.must_equal 2
   end
@@ -74,30 +76,29 @@ describe AssistedWorkflow::Addons::Pivotal do
     story = story_stub(:id => "100001", :project_id => @project.id)
     @pivotal.start_story(story, :estimate => "3")
     story.current_state.must_match /started/
-    story.estimate.must_equal "3"
-    story.errors.must_be_empty
+    story.estimate.must_equal 3
   end
   
   it "finishes a story" do
     story = story_stub(:id => "100001", :project_id => @project.id)
-    any_instance_of(PivotalTracker::Note) do |klass|
-      stub(klass).create{ true }
-    end
+    #stub post to create comment
+    url = "/projects/#{story.project_id}/stories/#{story.id}/comments"
+    stub(@client).post(url, :params => {:text=>"pull_request_url"}){}
     
     @pivotal.finish_story(story, :note => "pull_request_url")
     story.current_state.must_match /finished/
-    story.errors.must_be_empty
   end
   
   private #===================================================================
   
   def story_stub(attributes = {})
-    story = PivotalTracker::Story.new(attributes)
-    stub(story).update do |attrs|
-      story.send(:update_attributes, attrs)
-      story
+    any_instance_of(TrackerApi::Resources::Story) do |klass|
+      stub(klass).comments { [] }
+      stub(klass).tasks { [] }
     end
-    
+    story = TrackerApi::Resources::Story.new(attributes.merge(client: @client))
+    stub(story).save {}
+
     story
   end
-end
+end

metadata

@@ -1,131 +1,143 @@
 --- !ruby/object:Gem::Specification
 name: assisted_workflow
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Flavio Granero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.1
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pivotal-tracker
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.12
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.12
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: jiralicious
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.5
-description: ! '  `aw` is a command line tool to automate software development workflows
-  based on github pull requests.
-
-'
+- !ruby/object:Gem::Dependency
+  name: tracker_api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+description: |2
+    `aw` is a command line tool to automate software development workflows based on github pull requests.
 email:
 - maltempe@gmail.com
 executables:
@@ -133,13 +145,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- LICENSE.txt
+- LICENSE
 - README.md
+- RELEASING.md
 - Rakefile
 - assisted_workflow.gemspec
 - bin/aw
@@ -157,17 +171,20 @@ files:
 - lib/assisted_workflow/templates/awconfig.local.tt
 - lib/assisted_workflow/templates/commit-msg.tt
 - lib/assisted_workflow/version.rb
+- packaging/Gemfile
+- packaging/aw.sh
+- packaging/bundler-config
 - spec/assisted_workflow/addons/git_spec.rb
 - spec/assisted_workflow/addons/github_spec.rb
 - spec/assisted_workflow/addons/jira_spec.rb
 - spec/assisted_workflow/addons/pivotal_spec.rb
 - spec/assisted_workflow/config_file_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/flaviogranero/assisted_workflow
+homepage: https://github.com/inaka/assisted_workflow
 licenses:
 - MIT
 metadata: {}
-post_install_message: ! "\n                       `..::/++ooooooooo+/::--`                                 \n
+post_install_message: "\n                       `..::/++ooooooooo+/::--`                                 \n
   \                  `-:://:---....```......--::///:-.`                           \n
   \              `..-:::---.```            ```...----::-..`                       \n
   \             `.:///-`````                       .-:++::-`                      \n
@@ -215,17 +232,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: AW is a CLI tool to automate software development workflows based on github