octopolo 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2Q4NWI4ZGY4Y2M3NmNmNTc1MjU0YTcwYjM3YjkyMmU5ZmFjMmViNA==
+    N2RmMDI0OTU2NDAyZGU3MTIzYWUzNGQxNTU3OTg3NDkyZjdmOWJmYQ==
   data.tar.gz: !binary |-
-    NjFiZjgyMmZiODM0M2ZlZDM4ODVlY2E2M2QxMzMyMmRjMzcwMjkwNg==
+    ZWRhMTJiMGE5YjRlZmRlYjk4MzEzMmIxMjE1MzNjMWU2OGZjODlkOQ==
 SHA512:
   metadata.gz: !binary |-
-    MGNmMTYzMmI5ZjM1YTk0M2Q3NTY3MGFmMTFlNmEzZDAwNTlhZDkxMDg1ZWU4
-    ODk0NDFjMDI4YmFiOThkMDU3NWYzOGQ3MDcyOTZiMDcyN2RhMzUxNzlkMTk1
-    YWQxYWY3OWM2NjlhZmJkMDMyN2ViYTIyYzUyMmUxYWQ1NzM3OWY=
+    NjQ0ZTRiMjEwYTZhNjQzNjhmOTcyMjZkODE1NjBlNWI0YTJkNmI5NzkzOWE4
+    YTllOWE0NGYwMjY5YjczYTZlZjRiOTg3ZmU1ZDM4MTY1ZjdjNmRkZDY0MGIy
+    OWY1YWU5M2ExMjRiZDE3NGU2MDhhMDE0ZDVhMDg3MWI1Zjk3NzM=
   data.tar.gz: !binary |-
-    OWU3MzBjNWJlMTc4NjRmMjNiZmQ3ZmEwZmQ1NmQxZDE4Njk5YTc5NWQyY2Y1
-    ODVjODVlYmMxYWFjNDdhNDRiZGMxYjAzODdmZDRmNzM1ZGNkZTVmYTYzZGJi
-    ZGUwZGFiZjlmZWZhMzJhZjZkZjkwNzA1YTI5N2UxMWJiYTUwMzI=
+    NTVlMTZhNGY0OTdmMjU3NDJmMTRmNDFjODA1NGNhZDhjYzhjNjZlYTJlZTEz
+    MjA1NjI2NDJkYmUxNzgzNjViMzg1OGNhZTVhOGRmOGEzMjE5MjMxOGI3NWVm
+    MGE1MTcyNTk0Yjc3NTE1OTc1OTg1NTgyNGEwZWMxM2Q0MWRhNmE=

data/CHANGELOG.markdown

@@ -1,3 +1,13 @@
+#### v0.1.1
+
+* Fix dependancy issues
+
+  > Nick LaMuro: Elliot Hursh: https://github.com/sportngin/octopolo/pull/27
+
+* Label support for pull requests
+
+  > Elliot Hursh: Andy Fleener: https://github.com/sportngin/octopolo/pull/23
+
 #### v0.1.0
 
 * Add Label for deployable

data/lib/octopolo/github.rb

@@ -1,6 +1,9 @@
 require "octokit"
-# TODO this needs to get moved out of scripts and into its own new module
-require_relative "scripts/github_auth"
+require_relative "github/commit"
+require_relative "github/label"
+require_relative "github/pull_request"
+require_relative "github/pull_request_creator"
+require_relative "github/user"
 
 module Octopolo
   module GitHub
@@ -93,11 +96,17 @@ module Octopolo
     def self.add_label *args
       client.add_label *args
     end
-    
+
+    def self.remove_label *args
+      client.remove_label *args
+    end
+
     def self.add_labels_to_pull *args
       client.add_labels_to_an_issue *args
     end
-    
+
+
+
     # now that you've set up your credentials, try again
     TryAgain = Class.new(StandardError)
     # the credentials you've entered are bad

data/lib/octopolo/github/commit.rb

@@ -1,6 +1,3 @@
-require_relative "../github"
-require_relative "user"
-
 module Octopolo
   module GitHub
     class Commit

data/lib/octopolo/github/label.rb

@@ -1,4 +1,3 @@
-require_relative "../github"
 require "yaml"
 require "octokit"
 
@@ -10,9 +9,9 @@ module Octopolo
       attr_accessor :name
       attr_accessor :color
 
-      def initialize(name, color)
-        self.name = name
-        self.color = color
+      def initialize(args)
+        self.name = args[:name]
+        self.color = args[:color]
       end
 
       def == (obj)
@@ -21,8 +20,8 @@ module Octopolo
 
       # Public: Grabs all labels from either file or github
       #         This is the method to override for labels from files
-      def self.all_labels        
-        from_github
+      def self.all
+        all_from_repo
       end
 
       # Public: Gets the names of labels
@@ -38,49 +37,29 @@ module Octopolo
       #
       # label - a label object
       def self.first_or_create(label)
-        unless all_labels.include?(label)
+        unless all.include?(label)
           GitHub.add_label(config.github_repo, label.name, label.color)
         end
       end
 
-      # Public: Adds labels to a pull-request
+      # Public: Finds or creates each of the passed in labels
       #
-      # labels - an array of labels
-      # pull_number - number of the pull_request to add label to
-      def self.add_to_pull(pull_number, *labels)
-        built_labels = build_label_array(labels)
-        GitHub.add_labels_to_pull(config.github_repo, pull_number, get_names(built_labels) )
-      end
-
-      # Private: takes in a hash, out puts a label
-      # 
-      # label_hash - a hashed label
+      # labels - label objects, can be a single label, an array of labels,
+      #          or a list of labels
       #
-      # returns - a label
-      def self.to_label(label_hash)
-        Label.new(label_hash[:name], label_hash[:color])
+      # returns - an array of labels.
+      def self.build_label_array(*labels)
+        Array(labels).flatten.each {|label| first_or_create(label)}
       end
-      private_class_method :to_label
 
       # Private: Gets all the labels from given repository on github
       #
       # returns - an array of labels
-      def self.from_github
-        GitHub.labels(config.github_repo).map{ |label_hash| to_label(label_hash) }
-      end
-      private_class_method :from_github
-
-      # Private: Finds or creates each of the passed in labels
-      #
-      # labels - label objects, can be a single label, an array of labels,
-      #          or a list of labels
-      # 
-      # returns - an array of labels.
-      def self.build_label_array(*labels)
-        Array(labels).flatten.each {|label| first_or_create(label)}
+      def self.all_from_repo
+        GitHub.labels(config.github_repo).map{ |label_hash| new(label_hash) }
       end
-      private_class_method :build_label_array
+      private_class_method :all_from_repo
 
     end
   end
-end
+end

data/lib/octopolo/github/pull_request.rb

@@ -1,7 +1,3 @@
-require_relative "../github"
-require_relative "commit"
-require_relative "pull_request_creator"
-require_relative "user"
 require_relative "../week"
 require "octokit"
 
@@ -118,6 +114,25 @@ module Octopolo
         raise CommentFailed, "Unable to write the comment: '#{error.message}'"
       end
 
+      # Public: Adds labels to a pull-request
+      #
+      # labels - label objects, can be a single label, an array of labels,
+      #          or a list of labels
+      def add_labels(*labels)
+        built_labels = Label.build_label_array(labels)
+        GitHub.add_labels_to_pull(repo_name, number, built_labels.map(&:name) )
+      end
+
+      # Public: Removes labels from a pull-request,
+      #
+      # labels - label objects, can be a single label, an array of labels,
+      #          or a list of labels
+      def remove_labels(*labels)
+        Label.build_label_array(labels).each do |built_label|
+          GitHub.remove_label(repo_name, number, built_label.name)
+        end
+      end
+
       MissingParameter = Class.new StandardError
       NotFound = Class.new StandardError
       CommentFailed = Class.new StandardError

data/lib/octopolo/pull_request_merger.rb

@@ -1,6 +1,6 @@
 require_relative "scripts"
 require_relative "git"
-require_relative "github/pull_request"
+require_relative "github"
 require_relative "dated_branch_creator"
 
 module Octopolo
@@ -42,14 +42,20 @@ module Octopolo
         merge_pull_request
         comment_about_merge
       end
-    rescue GitHub::PullRequest::NotFound
-      cli.say "Unable to find pull request #{pull_request_id}. Please retry with a valid ID."
-    rescue Git::MergeFailed
-      cli.say "Merge failed. Please identify the source of this merge conflict resolve this conflict in your pull request's branch. NOTE: Merge conflicts resolved in the #{branch_type} branch are NOT used when deploying."
-    rescue Git::CheckoutFailed
-      cli.say "Checkout of #{branch_to_merge_into} failed. Please contact Infrastructure to determine the cause."
-    rescue GitHub::PullRequest::CommentFailed
-      cli.say "Unable to write comment. Please navigate to #{pull_request.url} and add the comment, '#{comment_body}'"
+    rescue => e
+      case e
+      when GitHub::PullRequest::NotFound
+        cli.say "Unable to find pull request #{pull_request_id}. Please retry with a valid ID."
+      when Git::MergeFailed
+        cli.say "Merge failed. Please identify the source of this merge conflict resolve this conflict in your pull request's branch. NOTE: Merge conflicts resolved in the #{branch_type} branch are NOT used when deploying."
+      when Git::CheckoutFailed
+        cli.say "Checkout of #{branch_to_merge_into} failed. Please contact Infrastructure to determine the cause."
+      when GitHub::PullRequest::CommentFailed
+        cli.say "Unable to write comment. Please navigate to #{pull_request.url} and add the comment, '#{comment_body}'"
+      else
+        cli.say "An uknown error occured:  #{e.class.to_s}"
+      end
+      false
     end
 
    # Public: Check out the branch
@@ -96,4 +102,3 @@ module Octopolo
     end
   end
 end
-

data/lib/octopolo/scripts.rb

@@ -15,9 +15,3 @@ module Octopolo
     end
   end
 end
-
-# Mostly used for tests
-unless defined?(GLI)
-  require 'gli'
-  include GLI::App
-end

data/lib/octopolo/scripts/accept_pull.rb

@@ -1,6 +1,5 @@
 require_relative "../git"
 require_relative "../github"
-require_relative "../github/pull_request"
 require_relative "../scripts"
 require_relative "../changelog"
 

data/lib/octopolo/scripts/deployable.rb

@@ -1,6 +1,6 @@
 require_relative "../scripts"
 require_relative "../pull_request_merger"
-require_relative "../github/label"
+require_relative "../github"
 
 module Octopolo
   module Scripts
@@ -15,7 +15,7 @@ module Octopolo
       end
 
       def self.deployable_label
-        Octopolo::GitHub::Label.new("deployable", "428BCA")
+        Octopolo::GitHub::Label.new(name: "deployable", color: "428BCA")
       end
 
       def initialize(pull_request_id=nil)
@@ -25,8 +25,28 @@ module Octopolo
       # Public: Perform the script
       def execute
         self.pull_request_id ||= cli.prompt("Pull Request ID: ")
-        PullRequestMerger.perform Git::DEPLOYABLE_PREFIX, Integer(@pull_request_id), :user_notifications => config.user_notifications
-        Octopolo::GitHub::Label.add_to_pull(Integer(@pull_request_id), Deployable.deployable_label) if config.deployable_label
+        merge_and_label
+      end
+
+      def merge_and_label
+        if config.deployable_label
+          ensure_label_was_created
+        else
+          PullRequestMerger.perform Git::DEPLOYABLE_PREFIX, Integer(@pull_request_id), :user_notifications => config.user_notifications
+        end
+      end
+
+      def ensure_label_was_created
+        pull_request = Octopolo::GitHub::PullRequest.new(config.github_repo, @pull_request_id)
+        begin
+          pull_request.add_labels(Deployable.deployable_label)
+          unless PullRequestMerger.perform Git::DEPLOYABLE_PREFIX, Integer(@pull_request_id), :user_notifications => config.user_notifications
+             pull_request.remove_labels(Deployable.deployable_label)
+          end
+        rescue Octokit::Error
+
+          cli.say("Unable to mark as deployable, please try command again")
+        end
       end
 
     end

data/lib/octopolo/scripts/pull_request.rb

@@ -1,5 +1,5 @@
 require_relative "../scripts"
-require_relative "../github/pull_request"
+require_relative "../github"
 require_relative "../pivotal/story_commenter"
 require_relative "../jira/story_commenter"
 
@@ -15,6 +15,7 @@ module Octopolo
       attr_accessor :pivotal_ids
       attr_accessor :jira_ids
       attr_accessor :destination_branch
+      attr_accessor :label
 
       def self.execute(destination_branch=nil)
         new(destination_branch).execute
@@ -34,6 +35,7 @@ module Octopolo
           create_pull_request
           update_pivotal
           update_jira
+          update_label
           open_pull_request
         end
       end
@@ -43,6 +45,7 @@ module Octopolo
         alert_reserved_and_exit if git.reserved_branch?
         announce
         ask_title
+        ask_label
         ask_pivotal_ids if config.use_pivotal_tracker
         ask_jira_ids if config.use_jira
       end
@@ -67,6 +70,14 @@ module Octopolo
       end
       private :ask_title
 
+      # Private: Ask for a label for the pull request
+      def ask_label
+        labels = Octopolo::GitHub::Label.all
+        response = cli.ask("Label:", Octopolo::GitHub::Label.get_names(labels).unshift("Don't know yet"))
+        self.label = Hash[labels.map{|l| [l.name,l]}][response]
+      end
+      private :ask_label
+
       # Private: Ask for a Pivotal Tracker story IDs
       def ask_pivotal_ids
         self.pivotal_ids = cli.prompt("Pivotal Tracker story ID(s):").split(/[\s,]+/)
@@ -122,6 +133,11 @@ module Octopolo
       end
       private :update_jira
 
+      def update_label
+        pull_request.add_labels(label) if label
+      end
+      private :update_label
+
     end
   end
 end

data/lib/octopolo/scripts/signoff.rb

@@ -1,5 +1,5 @@
 require_relative "../scripts"
-require_relative "../github/pull_request"
+require_relative "../github"
 
 module Octopolo
   module Scripts

data/lib/octopolo/version.rb

@@ -1,3 +1,3 @@
 module Octopolo
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/octopolo/github/commit_spec.rb

@@ -1,5 +1,5 @@
 require "spec_helper"
-require_relative "../../../lib/octopolo/github/commit"
+require_relative "../../../lib/octopolo/github"
 
 module Octopolo
   module GitHub

data/spec/octopolo/github/label_spec.rb

@@ -1,5 +1,5 @@
 require "spec_helper"
-require_relative "../../../lib/octopolo/github/label"
+require_relative "../../../lib/octopolo/github"
 
 module Octopolo
   module GitHub
@@ -8,8 +8,8 @@ module Octopolo
       let(:label_hash_1) { {name: "low-risk", url: "github.com", color: "343434"} }
       let(:label_hash_2) { {name: "high-risk", url: "github.com", color: "565656"} }
       let(:labels_hash) { [label_hash_1,label_hash_2] }
-      let(:label1) { Label.new("low-risk", "343434") }
-      let(:label2) { Label.new("high-risk", '565656') }
+      let(:label1) { Label.new(name: "low-risk", color: "343434") }
+      let(:label2) { Label.new(name: "high-risk", color: '565656') }
       let(:config) { stub(:config, github_repo: "foo") }
 
       subject { Label }
@@ -18,37 +18,37 @@ module Octopolo
         subject.config = config
       end
 
+      context "#initialize" do
+        it "creates a label from a hash" do
+          expect(Label.new(name: "low", color: "151515").name).to eq('low')
+        end
+      end
+
+
       context "#all_labels" do
         it "gets and returns all labels belonging to a repository" do
           allow(GitHub).to receive(:labels).and_return(labels_hash)
-          expect(Label.all_labels).to eq([label1,label2])
+          expect(Label.all).to eq([label1,label2])
         end
       end
 
       context "#first_or_create" do
         it "finds the existing label and doesn't do anything" do
-          allow(Label).to receive(:all_labels).and_return([label1,label2])
+          allow(Label).to receive(:all).and_return([label1,label2])
           expect(GitHub).not_to receive(:add_label)
           Label.first_or_create(label1)
         end
 
         it "doesn't find a label and creates one" do
-          allow(Label).to receive(:all_labels).and_return([label1,label2])
+          allow(Label).to receive(:all).and_return([label1,label2])
           expect(GitHub).to receive(:add_label).with(config.github_repo, "medium-risk", "454545")
-          Label.first_or_create(Label.new("medium-risk","454545"))
-        end
-      end
-
-      context "#to_label" do 
-        it "returns a label object" do
-          expect(Label).to receive(:new)
-          Label.send(:to_label, label_hash_1)
+          Label.first_or_create(Label.new(name: "medium-risk", color: "454545"))
         end
       end
 
       context "#==" do
         it "returns true if names are same ignoring color" do
-          expect(label1 == Label.new("low-risk","121212")).to eq(true)
+          expect(label1 == Label.new(name: "low-risk",color: "121212")).to eq(true)
         end
 
         it "returns true if names are same ignoring color" do
@@ -56,22 +56,8 @@ module Octopolo
         end
       end
 
-      context "#add_to_pull" do
-        let (:pull_number) {007}
-        it "sends the correct arguments to add_labels_to_pull for multiple labels" do
-          allow(Label).to receive(:first_or_create)
-          expect(GitHub).to receive(:add_labels_to_pull).with(config.github_repo, pull_number, ["low-risk","high-risk"])
-          Label.add_to_pull(pull_number,[label1, label2])
-        end
-
-        it "sends the correct arguments to add_labels_to_pull for a single label" do
-          allow(Label).to receive(:first_or_create)
-          expect(GitHub).to receive(:add_labels_to_pull).with(config.github_repo, pull_number, ["low-risk"])
-          Label.add_to_pull(pull_number,label1)
-        end
-      end 
 
-      context "#build_labels" do 
+      context "#build_label_array" do
         it "returns an array of label when given a label" do
           allow(Label).to receive(:first_or_create)
           expect(Label.send(:build_label_array,label1)).to eq([label1])

data/spec/octopolo/github/pull_request_creator_spec.rb

@@ -1,5 +1,5 @@
 require "spec_helper"
-require_relative "../../../lib/octopolo/github/pull_request_creator"
+require_relative "../../../lib/octopolo/github"
 
 module Octopolo
   module GitHub

data/spec/octopolo/github/pull_request_spec.rb

@@ -1,5 +1,5 @@
 require "spec_helper"
-require_relative "../../../lib/octopolo/github/pull_request"
+require_relative "../../../lib/octopolo/github"
 
 module Octopolo
   module GitHub
@@ -286,6 +286,47 @@ module Octopolo
           PullRequest.create(repo_name, options).should == pull_request
         end
       end
+
+      context "labeling" do
+        let(:label1) { Label.new(name: "low-risk", color: "343434") }
+        let(:label2) { Label.new(name: "high-risk", color: '565656') }
+        let(:pull_request) { PullRequest.new repo_name, pr_number }
+
+        context "#add_labels" do
+          it "sends the correct arguments to add_labels_to_pull for multiple labels" do
+            allow(Label).to receive(:build_label_array) {[label1,label2]}
+            expect(GitHub).to receive(:add_labels_to_pull).with(repo_name, pr_number, ["low-risk","high-risk"])
+            pull_request.add_labels([label1, label2])
+          end
+
+          it "sends the correct arguments to add_labels_to_pull for a single label" do
+            allow(Label).to receive(:build_label_array) {[label1]}
+            expect(GitHub).to receive(:add_labels_to_pull).with(repo_name, pr_number, ["low-risk"])
+            pull_request.add_labels(label1)
+          end
+        end
+
+        context "#remove_from_pull" do
+
+          it "sends the correct arguments to remove_label" do
+            allow(Label).to receive(:build_label_array) {[label1]}
+            expect(GitHub).to receive(:remove_label).with(repo_name, pr_number, "low-risk")
+            pull_request.remove_labels(label1)
+          end
+
+          it "calls remove_label only once" do
+            allow(Label).to receive(:build_label_array) {[label1]}
+            expect(GitHub).to receive(:remove_label).once
+            pull_request.remove_labels(label1)
+          end
+
+          it "calls remove_label twice" do
+            allow(Label).to receive(:build_label_array) {[label1, label2]}
+            expect(GitHub).to receive(:remove_label).twice
+            pull_request.remove_labels([label1,label2])
+          end
+        end
+      end
     end
   end
 end

data/spec/octopolo/github/user_spec.rb

@@ -1,5 +1,5 @@
 require "spec_helper"
-require_relative "../../../lib/octopolo/github/user"
+require_relative "../../../lib/octopolo/github"
 
 module Octopolo
   module GitHub

data/spec/octopolo/scripts/deployable_spec.rb

@@ -9,13 +9,45 @@ module Octopolo
       before { Deployable.any_instance.stub(:cli => cli, :config => config) }
 
       context "#execute" do
-        context "with a PR passed in via the command args" do
-          subject { Deployable.new 42 }
+        subject { Deployable.new 42}
+        it "calls merge_and_label" do
+          expect(subject).to receive(:merge_and_label)
+          subject.execute
+        end
+
+        context "#merge_and_label" do
+          before do
+            allow(PullRequestMerger).to receive(:perform)
+          end
+
+          context "deployable_label is set to true" do
+            it "calls ensure_label_was_created" do
+              expect(subject).to receive(:ensure_label_was_created)
+              subject.execute
+            end
+          end
+
+          context "deployable_label is set to false " do 
+            let(:config) { stub(:user_notifications => ['NickLaMuro'], :github_repo => 'foo', :deployable_label => false) }
+            it "skips add_to_pull when deployable_label is false" do
+              expect(subject).to_not receive(:ensure_label_was_created)
+              subject.execute
+            end
+          end
+        end
+      end
+
+      context "#ensure_label_was_created" do
+        subject { Deployable.new 42}
+        let(:pull_request) {Octopolo::GitHub::PullRequest.new('foo', subject.pull_request_id, nil)}
+        before do
+          allow_any_instance_of(Octopolo::GitHub::PullRequest).to receive(:add_labels)
+        end
 
+        context "with a PR passed in via the command args" do
           it "delegates the work to PullRequestMerger" do
-            allow(Octopolo::GitHub::Label).to receive(:add_to_pull)
-            PullRequestMerger.should_receive(:perform).with(Git::DEPLOYABLE_PREFIX, 42, :user_notifications => ["NickLaMuro"])
-            subject.execute
+            expect(PullRequestMerger).to receive(:perform).with(Git::DEPLOYABLE_PREFIX, 42, :user_notifications => ["NickLaMuro"]) {true}
+            subject.ensure_label_was_created
           end
         end
 
@@ -30,8 +62,7 @@ module Octopolo
             end
 
             it "delegates the work to PullRequestMerger" do
-              allow(Octopolo::GitHub::Label).to receive(:add_to_pull)
-              PullRequestMerger.should_receive(:perform).with(Git::DEPLOYABLE_PREFIX, 42, :user_notifications => ["NickLaMuro"])
+              expect(PullRequestMerger).to receive(:perform).with(Git::DEPLOYABLE_PREFIX, 42, :user_notifications => ["NickLaMuro"]) {true}
               subject.execute
             end
           end
@@ -49,27 +80,16 @@ module Octopolo
           end
         end
 
-        context "with various values for deployable_label" do
-          let(:deployable_label) {Octopolo::GitHub::Label.new("deployable", "428BCA")}
-          subject { Deployable.new 42 }
-          before do
-            allow(PullRequestMerger).to receive(:perform)
-          end
-
-          it "calls add_to_pull when deployable_label is true" do
-            expect(Octopolo::GitHub::Label).to receive(:add_to_pull).with(42,deployable_label)
-            subject.execute
-          end
+        context "when it creates a label successfully" do
 
-          context "deployable_label is set to false " do 
-            let(:config) { stub(:user_notifications => ['NickLaMuro'], :github_repo => 'foo', :deployable_label => false) }
-            it "skips add_to_pull when deployable_label is false" do
-              expect(Octopolo::GitHub::Label).to_not receive(:add_to_pull).with(42,deployable_label)
-              subject.execute
-            end
+          it "calls remove_label when pull_request_merge fails" do
+            allow(PullRequestMerger).to receive(:perform) {nil}
+            expect_any_instance_of(Octopolo::GitHub::PullRequest).to receive(:remove_labels)
+            subject.ensure_label_was_created
           end
         end
       end
+      
     end
   end
 end

data/spec/octopolo/scripts/pull_request_spec.rb

@@ -40,11 +40,12 @@ module Octopolo
       context "#execute" do
         it "if connected to GitHub, asks some questions, creates the pull request, and opens it" do
           GitHub.should_receive(:connect).and_yield
-          subject.should_receive(:ask_questionaire)
-          subject.should_receive(:create_pull_request)
-          subject.should_receive(:update_pivotal)
-          subject.should_receive(:update_jira)
-          subject.should_receive(:open_pull_request)
+          expect(subject).to receive(:ask_questionaire)
+          expect(subject).to receive(:create_pull_request)
+          expect(subject).to receive(:update_pivotal)
+          expect(subject).to receive(:update_jira)
+          expect(subject).to receive(:update_label)
+          expect(subject).to receive(:open_pull_request)
 
           subject.execute
         end
@@ -57,10 +58,11 @@ module Octopolo
 
       context "#ask_questionaire" do
         it "asks appropriate questions to create a pull request" do
-          subject.should_receive(:announce)
-          subject.should_receive(:ask_title)
-          subject.should_receive(:ask_pivotal_ids)
-          subject.should_receive(:ask_jira_ids)
+          expect(subject).to receive(:announce)
+          expect(subject).to receive(:ask_title)
+          expect(subject).to receive(:ask_pivotal_ids)
+          expect(subject).to receive(:ask_jira_ids)
+          expect(subject).to receive(:ask_label)
 
           subject.send(:ask_questionaire)
         end
@@ -71,6 +73,7 @@ module Octopolo
             subject.stub(:ask_title)
             subject.stub(:ask_pivotal_ids)
             subject.stub(:ask_jira_ids)
+            subject.stub(:ask_label)
           end
           it "exits when branch name is reserved" do
             subject.git.stub(:reserved_branch?).and_return true
@@ -111,6 +114,18 @@ module Octopolo
         end
       end
 
+      context "#ask_label" do
+        let(:label1) {Octopolo::GitHub::Label.new(name: "low-risk", color: '151515')}
+        let(:label2) {Octopolo::GitHub::Label.new(name: "high-risk", color: '151515')}
+        let(:choices) {["Don't know yet", "low-risk","high-risk"]}
+        it "asks for and capture a label" do
+          allow(Octopolo::GitHub::Label).to receive(:all) {[label1,label2]}
+          allow(Octopolo::GitHub::Label).to receive(:get_names) {choices}
+          expect(cli).to receive(:ask).with("Label:",choices)
+          subject.send(:ask_label)
+        end
+      end
+
       context "#ask_pivotal_ids" do
         let(:ids_with_whitespace) { "123 456" }
         let(:ids_with_commas) { "234, 567" }
@@ -197,6 +212,27 @@ module Octopolo
           Jira::StoryCommenter.should_receive(:new).with("234", "test") { story_commenter }
           subject.send(:update_jira)
         end
+      end
+
+      context "#update_label" do
+        before do
+          subject.label = "high-risk"
+          subject.pull_request = stub()
+        end
+        it "calls update_label with proper arguments" do
+          expect(subject.pull_request).to receive(:add_labels).with('high-risk')
+          subject.send(:update_label)
+        end
+
+        context "doesn't know yet label" do
+          before do
+            subject.label = nil
+          end
+          it "doesn't call update_label when label is don't know yet" do
+            expect(subject.pull_request).to_not receive(:add_labels)
+            subject.send(:update_label)
+          end
+        end
 
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopolo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Patrick Byrne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake