assisted_workflow 0.1.4 → 0.2.0

data/Gemfile.lock

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

data/lib/assisted_workflow.rb

@@ -2,8 +2,12 @@ require "assisted_workflow/version"
 require "assisted_workflow/exceptions"
 
 module AssistedWorkflow
-  autoload :Pivotal,    "assisted_workflow/pivotal"
-  autoload :Git,        "assisted_workflow/git"
-  autoload :Github,     "assisted_workflow/github"
   autoload :ConfigFile, "assisted_workflow/config_file"
+  autoload :Output, "assisted_workflow/output"
+  
+  module Addons
+    autoload :Pivotal,    "assisted_workflow/addons/pivotal"
+    autoload :Git,        "assisted_workflow/addons/git"
+    autoload :Github,     "assisted_workflow/addons/github"
+  end
 end

data/lib/assisted_workflow/addons/base.rb

@@ -0,0 +1,46 @@
+module AssistedWorkflow::Addons
+  
+  class Base
+    
+    def initialize(output, options = {})
+      @output = output
+      validate_options!(options)
+    end
+    
+    def name
+      self.class.name.downcase.split("::").last
+    end
+    
+    def valid?
+      false
+    end
+    
+    class << self
+      
+      def required_options(*args)
+        @required_options = Array(args).map(&:to_s)
+      end
+      
+      def get_required_options
+        @required_options || []
+      end
+    end
+    
+    protected #===============================================================
+    
+    def log(message)
+      @output.say_status(name, message) if @output
+    end
+    
+    def validate_options!(options)
+      if options.nil?
+        raise AssistedWorkflow::Error, "#{name} missing configuration"
+      end
+      missing_keys = self.class.get_required_options - options.keys
+      if missing_keys.size > 0
+        raise AssistedWorkflow::Error, "#{name} missing configuration: #{missing_keys.inspect}"
+      end
+    end
+    
+  end
+end

data/lib/assisted_workflow/addons/git.rb

@@ -0,0 +1,108 @@
+require "assisted_workflow/exceptions"
+require "assisted_workflow/addons/base"
+
+module AssistedWorkflow::Addons
+  
+  class GitError < AssistedWorkflow::Error; end
+  
+  class Git < Base
+    
+    DESCRIPTION_LIMIT = 30
+    
+    def initialize(output, options = {})
+      super
+      @command_options = {:raise_error => true}.merge(options)
+    end
+    
+    # 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)
+      log "creating the feature branch"
+      branch = branch_name(story)
+      git "checkout -b #{branch}"
+      # git "push --set-upstream origin #{branch}"
+    end
+    
+    # run all the git steps required for a clean pull request
+    def rebase_and_push
+      check_everything_commited!
+      branch = current_branch
+      git "checkout master"
+      git "pull --rebase"
+      git "checkout #{branch}"
+      git "rebase master"
+      git "push -u -f origin #{branch}"
+    end
+    
+    # returns the current story id based on branch name
+    def current_story_id
+      current_branch.split(".")[1]
+    end
+    
+    # returns the current local branch name
+    def current_branch
+      git("rev-parse --abbrev-ref HEAD", :silent => true)
+    end
+    
+    # returns the repository name assigned to origin following the format:
+    # owner/project
+    def repository
+      url = git("config --get remote.origin.url", :error => "cannot find 'origin' remote repository url")
+      url.gsub("git@github.com:", "").gsub("https://github.com/", "").gsub(/\.git$/, "").chomp
+    end
+    
+    # check if current branch is merged into master
+    def is_merged?
+      check_everything_commited!
+      branch = current_branch
+      git "checkout master"
+      git "pull --rebase"
+      merged = git("branch --merged").include?(branch)
+      git "checkout #{branch}"
+      merged
+    end
+    
+    # removes current branch and its remote version
+    def remove_branch
+      branch = current_branch
+      git "push origin :#{branch}", :raise_error => false
+      git "checkout master"
+      git "branch -D #{branch}"
+    end
+    
+    private #=================================================================
+    
+    def git(command, options = {})
+      options = @command_options.merge(options)
+      puts "git #{command}" unless options[:silent] == true
+      result = system("git #{command}")
+      if system_error? && options[:raise_error]
+        msg = ["git command error", options[:error]].compact.join(": ")
+        raise GitError, msg
+      end
+      result
+    end
+    
+    def system(command)
+      %x{#{command}}.chomp
+    end
+    
+    def system_error?
+      $? != 0
+    end
+    
+    def branch_name(story)
+      description = story.name.to_s.downcase.gsub(/\W/, "_").slice(0, DESCRIPTION_LIMIT)
+      [story.other_id, story.id, description].join(".").downcase
+    end
+    
+    def not_commited_changes
+      git("status --porcelain", :silent => true).split("\n")
+    end
+    
+    def check_everything_commited!
+      raise AssistedWorkflow::Error, "git: there are not commited changes" unless not_commited_changes.empty?
+    end
+  end
+end

data/lib/assisted_workflow/{github.rb → addons/github.rb}

@@ -1,11 +1,14 @@
 require "assisted_workflow/exceptions"
+require "assisted_workflow/addons/base"
 require "octokit"
 
-module AssistedWorkflow
+module AssistedWorkflow::Addons
   
-  class Github
-    def initialize(options)
-      validate_options!(options)
+  class Github < Base
+    required_options :token
+    
+    def initialize(output, options = {})
+      super
       @client = Octokit::Client.new(:access_token => options["token"])
     end
     
@@ -16,31 +19,21 @@ module AssistedWorkflow
     # @param story [Story] Pivotal story object
     # @return [Sawyer::Resource] The newly created pull request
     def create_pull_request(repo, branch, story)
+      log "submiting the new pull request"
       base = "master"
       title = "[##{story.id}] #{story.name}"
       pull_request = @client.create_pull_request(repo, base, branch, title, story.description)
       if pull_request.nil?
         raise AssistedWorkflow::Error, "error on submiting the pull request"
       else
-        pull_request
+        url = pull_request._links.html.href
+        log "new pull request at #{url}"
+        url
       end
     end
     
     def valid?
       @client.user_authenticated?
     end
-    
-    private
-    
-    def validate_options!(options)
-      if options.nil? || options.empty?
-        raise AssistedWorkflow::Error, "github missing configuration"
-      end
-      required_keys = %w(token)
-      missing_keys = required_keys - options.keys
-      if missing_keys.size > 0
-        raise AssistedWorkflow::Error, "github missing configuration: #{missing_keys.inspect}"
-      end
-    end
   end
 end

data/lib/assisted_workflow/{pivotal.rb → addons/pivotal.rb}

@@ -1,12 +1,14 @@
 require "assisted_workflow/exceptions"
+require "assisted_workflow/addons/base"
 require 'pivotal_tracker'
 
 # wrapper class to pivotal api client
-module AssistedWorkflow
-  class Pivotal
+module AssistedWorkflow::Addons
+  class Pivotal < Base
+    required_options :fullname, :token, :project_id
   
-    def initialize(options)
-      validate_options!(options)
+    def initialize(output, options = {})
+      super
 
       PivotalTracker::Client.token = options["token"]
       begin
@@ -20,6 +22,7 @@ module AssistedWorkflow
   
     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
@@ -28,16 +31,19 @@ module AssistedWorkflow
     end
   
     def start_story(story, options = {})
+      log "starting story ##{story.id}"
       update_story! story, options.merge(:current_state => "started")
     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]
       end
     end
   
     def pending_stories(options = {})
+      log "loading pending stories"
       states = ["unstarted"]
       states << "started" if options[:include_started]
       @project.stories.all(:state => states, :owned_by => @fullname, :limit => 5)
@@ -49,17 +55,6 @@ module AssistedWorkflow
   
     private
   
-    def validate_options!(options)
-      if options.nil? || options.empty?
-        raise AssistedWorkflow::Error, "pivotal missing configuration"
-      end
-      required_keys = %w(fullname token project_id)
-      missing_keys = required_keys - options.keys
-      if missing_keys.size > 0
-        raise AssistedWorkflow::Error, "pivotal missing configuration: #{missing_keys.inspect}"
-      end
-    end
-  
     def finished_state(story)
       if story.story_type == "chore"
         "accepted"

data/lib/assisted_workflow/cli.rb

@@ -1,188 +1,158 @@
 require "assisted_workflow"
 require "thor"
 
-class AssistedWorkflow::CLI < Thor
-  include Thor::Actions
-  GLOBAL_CONFIG = File.expand_path(".awconfig", ENV["HOME"])
-  LOCAL_CONFIG = ".awconfig"
-  source_root(File.expand_path(File.join(__FILE__, "..", "templates")))
+module AssistedWorkflow
+  class CLI < Thor
+    include Thor::Actions
+    GLOBAL_CONFIG = File.expand_path(".awconfig", ENV["HOME"])
+    LOCAL_CONFIG = ".awconfig"
+    source_root(File.expand_path(File.join(__FILE__, "..", "templates")))
   
-  # tasks shortcuts
-  map ["-v", "--version"] => :version
-  map "s" => :start
-  map "u" => :submit
-  map "f" => :finish
+    # tasks shortcuts
+    map ["-v", "--version"] => :version
+    map "s" => :start
+    map "u" => :submit
+    map "f" => :finish
   
-  desc "setup", "Setup initial configuration in current project directory"
-  def setup
-    copy_file "awconfig.global.tt", GLOBAL_CONFIG
-    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"
+    desc "setup", "Setup initial configuration in current project directory"
+    def setup
+      copy_file "awconfig.global.tt", GLOBAL_CONFIG
+      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
+      out.next_command "set your own configuration running:", "" do |c|
+        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 pivotal.project_id=00001"
+      end
     end
-    say "set your own configuration editing the .awconfig files or running:", :green
-    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(:include_started => options[:all])
-      print_title "pending stories"
-      print_stories(stories)
-      say "start a story using:", :green
-      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 "after commiting your changes, submit a pull request using:", :green
-      say_command "$ aw submit"
+    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(:include_started => options[:all])
+        out.print_stories "pending stories", stories, options
+        out.next_command "start a story using:", "$ aw start [STORY_ID]"
+      else
+        pivotal.start_story(story, :estimate => options[:estimate])
+        out.print_story story
+        git.create_story_branch(story)
+        out.next_command "after commiting your changes, submit a pull request using:", "$ aw submit"
+      end
     end
-  end
   
-  desc "submit", "Submits the current story creating a new pull request"
-  def submit
-    check_awfile!
-    story_id = git.current_story_id
-    say "loading story info"
-    story = pivotal.find_story(story_id)
-    if story
-      say "preparing local branch"
-      git.rebase_and_push
-      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, :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_command "$ aw finish"
-    else
-      raise AssistedWorkflow::Error, "story not found, make sure a feature branch in active"
+    desc "submit", "Submits the current story creating a new pull request"
+    def submit
+      check_awfile!
+      story_id = git.current_story_id
+      story = pivotal.find_story(story_id)
+      if story
+        git.rebase_and_push
+        pr_url = github.create_pull_request(
+          git.repository, git.current_branch, story
+        )
+        pivotal.finish_story(story, :note => pr_url)
+        out.next_command "after pull request approval, remove the feature branch using:", "$ aw finish"
+      else
+        raise AssistedWorkflow::Error, "story not found, make sure a feature branch in active"
+      end
     end
-  end
   
-  desc "finish", "Check if the changes are merged into master, removing the current feature branch"
-  def finish
-    check_awfile!
-    story_id = git.current_story_id
-    if story_id.to_i > 0
-      if git.is_merged?
-        say "removing local and remote feature branches"
+    desc "finish", "Check if the changes are merged into master, removing the current feature branch"
+    def finish
+      check_awfile!
+      story_id = git.current_story_id
+      if story_id.to_i > 0
+        git.check_merged!
         git.remove_branch
-        say "well done! check your next stories using:", :green
-        say_command "$ aw start"
+        out.next_command "well done! check your next stories using:", "$ aw start"
       else
-        say "this branch is not merged into master yet", :yellow
+        raise AssistedWorkflow::Error, "story not found, make sure a feature branch in active"
       end
-    else
-      raise AssistedWorkflow::Error, "story not found, make sure a feature branch in active"
     end
-  end
   
-  desc "version", "Display assisted_workflow gem version"
-  def version
-    say AssistedWorkflow::VERSION
-  end
+    desc "version", "Display assisted_workflow gem version"
+    def version
+      say AssistedWorkflow::VERSION
+    end
   
-  desc "config group.key=value", "Set configuration keys in local config file"
-  method_option :global, :type => :boolean, :aliases => "-g", :desc => "Set configuration key in global configuration file (for all projects)"
-  def config(*args)
-    if args.empty?
-      print_table configuration.to_hash
-    else
-      config_file.parse(args).save!
+    desc "config group.key=value", "Set configuration keys in local config file"
+    method_option :global, :type => :boolean, :aliases => "-g", :desc => "Set configuration key in global configuration file (for all projects)"
+    def config(*args)
+      if args.empty?
+        print_table configuration.to_hash
+      else
+        config_file.parse(args).save!
+      end
     end
-  end
   
-  desc "thanks", "Aw, Thanks!", :hide => true
-  def thanks
-    say "you're welcome!", :on_magenta
-  end
+    desc "thanks", "Aw, Thanks!", :hide => true
+    def thanks
+      out.say "you're welcome!", :on_magenta
+    end
   
   
-  no_tasks do
-    def pivotal
-      @pivotal ||= AssistedWorkflow::Pivotal.new(configuration[:pivotal])
-    end
+    no_tasks do
+      def out
+        @out ||= Output.new(self.shell)
+      end
+      
+      def pivotal
+        @pivotal ||= Addons::Pivotal.new(out, configuration[:pivotal])
+      end
     
-    def git
-      @git ||= AssistedWorkflow::Git.new
-    end
+      def git
+        @git ||= Addons::Git.new(out)
+      end
     
-    def github
-      @github ||= AssistedWorkflow::Github.new(configuration[:github])
-    end
+      def github
+        @github ||= Addons::Github.new(out, configuration[:github])
+      end
     
-    def config_file
-      @config_file ||= AssistedWorkflow::ConfigFile.new(awfile)
-    end
+      def config_file
+        @config_file ||= ConfigFile.new(awfile)
+      end
     
-    # loads all configuration, merging global and local values
-    def configuration
-      @configuration ||= begin
-        AssistedWorkflow::ConfigFile.new(GLOBAL_CONFIG).merge_file(LOCAL_CONFIG)
-      rescue TypeError
-        raise AssistedWorkflow::Error, "Error on loading .awconfig files. Please check the content format."
+      # loads all configuration, merging global and local values
+      def configuration
+        @configuration ||= begin
+          ConfigFile.new(GLOBAL_CONFIG).merge_file(LOCAL_CONFIG)
+        rescue TypeError
+          raise AssistedWorkflow::Error, "Error on loading .awconfig files. Please check the content format."
+        end
       end
     end
-  end
   
-  class << self
-    def start(given_args=ARGV, config={})
-      super
-    rescue AssistedWorkflow::Error => e
-      config[:shell].say e.message, :red
-      exit(1)
+    class << self
+      def start(given_args=ARGV, config={})
+        super
+      rescue AssistedWorkflow::Error => e
+        config[:shell].say e.message, :red
+        exit(1)
+      end
     end
-  end
   
-  private ######################################################################
+    private ##################################################################
   
-    def print_title(title)
-      say "-" * title.length, :green
-      say title.upcase, :green
-      say "-" * title.length, :green
-    end
-    
-    def print_stories(stories)
-      rows = stories.map do |story|
-        if options[:all]
-          [story.id, story.current_state, story.name]
-        else
-          [story.id, story.estimate, story.name]
-        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
-      print_table(rows)
-    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
 
-    def awfile
-      case
-        when options[:awfile] then options[:awfile]
-        when options[:global] then GLOBAL_CONFIG
-        else LOCAL_CONFIG
+      def awfile
+        case
+          when options[:awfile] then options[:awfile]
+          when options[:global] then GLOBAL_CONFIG
+          else LOCAL_CONFIG
+        end
       end
-    end
+  end
 end

data/lib/assisted_workflow/git.rb

@@ -8,7 +8,8 @@ module AssistedWorkflow
     
     DESCRIPTION_LIMIT = 30
     
-    def initialize(options = {})
+    def initialize(output, options = {})
+      super
       @command_options = {:raise_error => true}.merge(options)
     end
     
@@ -16,6 +17,7 @@ module AssistedWorkflow
     # the branch name format is:
     # => story_onwer_username.story_id.story_name
     def create_story_branch(story)
+      log "creating the new branch"
       branch = branch_name(story)
       git "checkout -b #{branch}"
       # git "push --set-upstream origin #{branch}"
@@ -23,6 +25,7 @@ module AssistedWorkflow
     
     # run all the git steps required for a clean pull request
     def rebase_and_push
+      log "preparing local branch"
       check_everything_commited!
       branch = current_branch
       git "checkout master"
@@ -50,18 +53,21 @@ module AssistedWorkflow
     end
     
     # check if current branch is merged into master
-    def is_merged?
+    def check_merged!
       check_everything_commited!
       branch = current_branch
       git "checkout master"
       git "pull --rebase"
       merged = git("branch --merged").include?(branch)
       git "checkout #{branch}"
-      merged
+      unless merged
+        raise AssistedWorkflow::Error, "this branch is not merged into master"
+      end
     end
     
     # removes current branch and its remote version
     def remove_branch
+      log "removing local and remote feature branches"
       branch = current_branch
       git "push origin :#{branch}", :raise_error => false
       git "checkout master"
@@ -72,7 +78,7 @@ module AssistedWorkflow
     
     def git(command, options = {})
       options = @command_options.merge(options)
-      puts "git #{command}" unless options[:silent] == true
+      # log("git #{command}", :step => true) unless options[:silent] == true
       result = system("git #{command}")
       if system_error? && options[:raise_error]
         msg = ["git command error", options[:error]].compact.join(": ")

data/lib/assisted_workflow/output.rb

@@ -0,0 +1,54 @@
+module AssistedWorkflow
+  
+  # a helper class to provide custom shell print methods
+  class Output < SimpleDelegator
+    def initialize(shell)
+      super
+      @shell = shell
+    end
+    
+    # prints a wrapped gray line, showing as comments between log lines
+    def say_comment(comment)
+      @shell.padding = 4
+      say comment, [:black, :bold]
+      @shell.padding = 0
+    end
+    
+    # prints a highlighted title section
+    def print_title(title)
+      say "-" * title.length, :green
+      say title.upcase, :green
+      say "-" * title.length, :green
+    end
+    
+    # prints as table with stories data
+    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
+      end
+      print_table(rows)
+    end
+    
+    def print_story(story)
+      say "-" * 40
+      print_wrapped story.name, :indent => 2
+      print_wrapped story.description, :indent => 2
+      say "-" * 40
+    end
+    
+    def next_command(title, commands, &block)
+      say title, :green
+      _commands = Array(commands)
+      yield(_commands) if block_given?
+      _commands.each do |command|
+        print_wrapped command, :indent => 2
+      end
+    end
+    
+  end
+end

data/lib/assisted_workflow/version.rb

@@ -1,3 +1,3 @@
 module AssistedWorkflow
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/spec/assisted_workflow/{git_spec.rb → addons/git_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
-require 'assisted_workflow/git'
+require 'assisted_workflow/addons/git'
 
-describe AssistedWorkflow::Git do
+describe AssistedWorkflow::Addons::Git do
   before do
-    @git = AssistedWorkflow::Git.new(:silent => true)
+    @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"}
   end
@@ -16,7 +16,7 @@ describe AssistedWorkflow::Git do
   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::GitError, "git command error"
+    proc { @git.create_story_branch(story) }.must_raise AssistedWorkflow::Addons::GitError, "git command error"
   end
   
   

data/spec/assisted_workflow/{github_spec.rb → addons/github_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require 'assisted_workflow/github'
+require 'assisted_workflow/addons/github'
 
-describe AssistedWorkflow::Github do
+describe AssistedWorkflow::Addons::Github do
   before do
     @configuration = {
       "token" => "mygithubtoken",
@@ -11,7 +11,7 @@ describe AssistedWorkflow::Github do
     stub(@client).user_authenticated?{ true }
     stub(Octokit::Client).new{ @client }
     
-    @github = AssistedWorkflow::Github.new(@configuration)
+    @github = AssistedWorkflow::Addons::Github.new(nil, @configuration)
   end
   
   it "initializes a valid github wrapper" do
@@ -20,15 +20,15 @@ describe AssistedWorkflow::Github do
   
   it "requires token" do
     proc { 
-      AssistedWorkflow::Github.new({})
+      AssistedWorkflow::Addons::Github.new(nil, {})
     }.must_raise AssistedWorkflow::Error, "github missing configuration:[token]"
   end
   
   it "creates a new valid pull request" do
-    mock(@client).create_pull_request("flaviogranero/assisted_workflow", "master", "flavio.00001.new_feature", "[#00001] New Feature", "Feature description"){ true }
+    mock(@client).create_pull_request("flaviogranero/assisted_workflow", "master", "flavio.00001.new_feature", "[#00001] New Feature", "Feature description"){ pull_request }
     @github.create_pull_request(
       "flaviogranero/assisted_workflow", "flavio.00001.new_feature", story
-    )
+    ).must_match /flaviogranero\/assisted_workflow\/pull\/1/
   end
   
   it "raises on creating an invalid pull request" do
@@ -45,4 +45,10 @@ describe AssistedWorkflow::Github do
   def story
     @story ||= PivotalTracker::Story.new(:id => "00001", :name => "New Feature", :description => "Feature description")
   end
+  
+  def pull_request
+    agent = Sawyer::Agent.new("", {:links_parser => Sawyer::LinkParsers::Simple.new})
+    data = {_links: {html: {href: "https://github.com/flaviogranero/assisted_workflow/pull/1"}}}
+    Sawyer::Resource.new(agent, data)
+  end
 end

data/spec/assisted_workflow/{pivotal_spec.rb → addons/pivotal_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require 'assisted_workflow/pivotal'
+require 'assisted_workflow/addons/pivotal'
 
-describe AssistedWorkflow::Pivotal do
+describe AssistedWorkflow::Addons::Pivotal do
   
   before do
     @configuration = {
@@ -14,7 +14,7 @@ describe AssistedWorkflow::Pivotal do
     @project = PivotalTracker::Project.new(:id => "1")
     stub(PivotalTracker::Project).find(@configuration["project_id"]){ @project }
     
-    @pivotal = AssistedWorkflow::Pivotal.new(@configuration)
+    @pivotal = AssistedWorkflow::Addons::Pivotal.new(nil, @configuration)
   end
   
   it "initializes a valid pivotal wrapper" do
@@ -23,7 +23,8 @@ describe AssistedWorkflow::Pivotal do
   
   it "requires fullname" do
     proc { 
-      AssistedWorkflow::Pivotal.new(
+      AssistedWorkflow::Addons::Pivotal.new(
+        nil,
         @configuration.reject{|k,v| k == "fullname"}
       )
     }.must_raise AssistedWorkflow::Error, "pivotal missing configuration:[fullname]"
@@ -31,7 +32,8 @@ describe AssistedWorkflow::Pivotal do
   
   it "requires token" do
     proc {
-      AssistedWorkflow::Pivotal.new(
+      AssistedWorkflow::Addons::Pivotal.new(
+        nil,
         @configuration.reject{|k,v| k == "token"}
       )
     }.must_raise AssistedWorkflow::Error, "pivotal missing configuration:[token]"
@@ -39,7 +41,8 @@ describe AssistedWorkflow::Pivotal do
 
   it "requires project_id" do
     proc { 
-      AssistedWorkflow::Pivotal.new(
+      AssistedWorkflow::Addons::Pivotal.new(
+        nil,
         @configuration.reject{|k,v| k == "project_id"}
       )
     }.must_raise AssistedWorkflow::Error, "pivotal missing configuration:[project_id]"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assisted_workflow
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -144,20 +144,23 @@ files:
 - assisted_workflow.gemspec
 - bin/aw
 - lib/assisted_workflow.rb
+- lib/assisted_workflow/addons/base.rb
+- lib/assisted_workflow/addons/git.rb
+- lib/assisted_workflow/addons/github.rb
+- lib/assisted_workflow/addons/pivotal.rb
 - lib/assisted_workflow/cli.rb
 - lib/assisted_workflow/config_file.rb
 - lib/assisted_workflow/exceptions.rb
 - lib/assisted_workflow/git.rb
-- lib/assisted_workflow/github.rb
-- lib/assisted_workflow/pivotal.rb
+- lib/assisted_workflow/output.rb
 - lib/assisted_workflow/templates/awconfig.global.tt
 - lib/assisted_workflow/templates/awconfig.local.tt
 - lib/assisted_workflow/templates/commit-msg.tt
 - lib/assisted_workflow/version.rb
+- spec/assisted_workflow/addons/git_spec.rb
+- spec/assisted_workflow/addons/github_spec.rb
+- spec/assisted_workflow/addons/pivotal_spec.rb
 - spec/assisted_workflow/config_file_spec.rb
-- spec/assisted_workflow/git_spec.rb
-- spec/assisted_workflow/github_spec.rb
-- spec/assisted_workflow/pivotal_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/flaviogranero/assisted_workflow
 licenses:
@@ -216,7 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2646088369177769038
+      hash: -50568132931744746
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -225,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2646088369177769038
+      hash: -50568132931744746
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -234,8 +237,8 @@ specification_version: 3
 summary: AW is a CLI tool to automate software development workflows based on github
   pull requests
 test_files:
+- spec/assisted_workflow/addons/git_spec.rb
+- spec/assisted_workflow/addons/github_spec.rb
+- spec/assisted_workflow/addons/pivotal_spec.rb
 - spec/assisted_workflow/config_file_spec.rb
-- spec/assisted_workflow/git_spec.rb
-- spec/assisted_workflow/github_spec.rb
-- spec/assisted_workflow/pivotal_spec.rb
 - spec/spec_helper.rb