octopolo 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTgyM2U3NzNkMzA5ZmFmYjM2ZjkwNTAzNTU2MDU3MWQzNWVlMzc5Nw==
+    Yzk5NjJkNWE2MzhhYTkxOWVhMzFiZGUxMDRhMTgwNTAyY2UzMjQ1ZA==
   data.tar.gz: !binary |-
-    NThjZWMxNGIwMjkyMTgxYjVlN2FhZmQ1YjZiMThjZWUyMDY5YzQ4Ng==
+    MTVhNTUyNmZhY2NmZGYzZTRkOGJhM2M2MzRmOTE1ZWViNWI3NDJmZA==
 SHA512:
   metadata.gz: !binary |-
-    OTQwNTI2ZThiYzFhNGI1YmJiM2Q0YjUxOTNhM2ViYTBhMmEyNmM1N2M0Y2Jh
-    YTdiY2Y4ODRhMTJmOGU2MzgyYjQ3MzBiY2NiY2I4NjEwYzIyMjM5NTBkNTk5
-    MTU0MzEyNDlkNTk0MGFmMmU0ZWVkMjcwOWU5NDAyYzkyMDc3ZTU=
+    ZTM0M2VjODQyNGY2YmE1YjQ1YTI1ZTRmNjFiZWZiNDg0NmYyMjNjMmY2MDJk
+    ODlkYjYxYzEzZDExNjI0Mzk3M2JlNmYzYjEzNTI1MzQzN2Y3MTM4MGQ2ZjE5
+    NDRkZThhMjVkYzcxMTVkMDExZjcwM2Q2MmQ1YzI0NmZhZGUxYWQ=
   data.tar.gz: !binary |-
-    ZDk2ZTdlMGExMzg1NTNhNzUzY2RkMzEyZjJiYTI5MzJhNjg3ZWJlOWY4YTY1
-    ZTg3N2RiOWQ1ZmI5MWM0MWYwNGZlNmZhZDliOTRjNjA3Zjc2NDJmNWRlNWFk
-    ODUyZDg3MmUzYTcwZDczMDdkNjBlOTBhY2E5YzdlOTM3NDdjZmE=
+    YjIwODg3ODA4NGI2MWQ2YTY4YzllZTNlZDY2YzNkMWFmMDgzZmM4NTRiNDUy
+    ZDk4NTc5OTNhOWZmMGEwNzM2OGU5NjJhMThjNmVlYTQ4NTY5MzYzMTI0MDA1
+    ZmVkNWUyYmExMTEwNDlkMjIzZDAwNzE2NDIwZGZiM2M0NTU2MTQ=

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+#### v0.1.3
+
+* Label tweaks
+
+  > Nick LaMuro: Ian Ehlert: https://github.com/sportngin/octopolo/pull/30
+
 #### v0.1.2
 
 * Fixed first_or_create

data/lib/octopolo/scripts/pull_request.rb

@@ -72,9 +72,9 @@ module Octopolo
 
       # 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]
+        choices = Octopolo::GitHub::Label.get_names(label_choices).concat(["None"])
+        response = cli.ask(label_prompt, choices)
+        self.label = Hash[label_choices.map{|l| [l.name,l]}][response]
       end
       private :ask_label
 
@@ -119,6 +119,14 @@ module Octopolo
       end
       private :open_pull_request
 
+      def label_prompt
+        'Label:'
+      end
+
+      def label_choices
+        Octopolo::GitHub::Label.all
+      end
+
       def update_pivotal
         pivotal_ids.each do |story_id|
           Pivotal::StoryCommenter.new(story_id, pull_request.url).perform

data/lib/octopolo/version.rb

@@ -1,3 +1,3 @@
 module Octopolo
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/octopolo/scripts/pull_request_spec.rb

@@ -117,11 +117,11 @@ module Octopolo
       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"]}
+        let(:choices) {["low-risk","high-risk","None"]}
+
         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)
+          expect(cli).to receive(:ask).with("Label:", choices)
           subject.send(:ask_label)
         end
 
@@ -192,6 +192,17 @@ module Octopolo
         end
       end
 
+      context "#label_choices" do
+        let(:label1) { Octopolo::GitHub::Label.new(name: "low-risk", color: '151515') }
+        let(:label2) { Octopolo::GitHub::Label.new(name: "high-risk", color: '151515') }
+        let(:github_labels) { [label1, label2] }
+
+        it "returns the labels plus 'None'" do
+          allow(Octopolo::GitHub::Label).to receive(:all) { github_labels }
+          expect(subject.send(:label_choices)).to eq github_labels
+        end
+      end
+
       context "#update_pivotal" do
         before do
           subject.pivotal_ids = %w(123 234)

metadata

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