octopolo 0.0.2 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjU0YzE4ZTQ4NzI1MjYwMDljM2MzNzgzYmJkZWM1Yjc3Y2Y5ZDVlYQ==
+    M2Q4NWI4ZGY4Y2M3NmNmNTc1MjU0YTcwYjM3YjkyMmU5ZmFjMmViNA==
   data.tar.gz: !binary |-
-    YjViZWE1OGI2ZTUzNTVkMzI0NTcyOWJkZjMwOGQ3YjhiY2YxMTVmMg==
+    NjFiZjgyMmZiODM0M2ZlZDM4ODVlY2E2M2QxMzMyMmRjMzcwMjkwNg==
 SHA512:
   metadata.gz: !binary |-
-    OGJjMmQ3ZTg2OGVkMDE4ODhiMTFhYjlmOGYzNmYwOGI4OTE0OGFmZDdjZWY2
-    ZTc3N2U0ZTU2ZDg2Y2M4OTg3MDFmMTg5NmZlZDdmNDVmZGI5M2U5NmY4YWU4
-    NDBjZDMxZWE5MGVmYzgzMDk3ZGMxYTVjMmYzMjJkNjQyYzI1NGI=
+    MGNmMTYzMmI5ZjM1YTk0M2Q3NTY3MGFmMTFlNmEzZDAwNTlhZDkxMDg1ZWU4
+    ODk0NDFjMDI4YmFiOThkMDU3NWYzOGQ3MDcyOTZiMDcyN2RhMzUxNzlkMTk1
+    YWQxYWY3OWM2NjlhZmJkMDMyN2ViYTIyYzUyMmUxYWQ1NzM3OWY=
   data.tar.gz: !binary |-
-    OTRmMzUyMTg1MGZjOGE5NzBhZGJkYWFhNzUzY2IyODI1ZDM5OWM2MTU5YjRm
-    ZDJiZmZkNGQzNDI2NjVjZDhmYzhjNjQyNDg0MTczNWY3OTI0MDM0MzY5ODc1
-    YmY2YTY3NDNmMzA2ZTAyMzI1NzhmYTFmYWM4OWU3ZDJiNzRhMzE=
+    OWU3MzBjNWJlMTc4NjRmMjNiZmQ3ZmEwZmQ1NmQxZDE4Njk5YTc5NWQyY2Y1
+    ODVjODVlYmMxYWFjNDdhNDRiZGMxYjAzODdmZDRmNzM1ZGNkZTVmYTYzZGJi
+    ZGUwZGFiZjlmZWZhMzJhZjZkZjkwNzA1YTI5N2UxMWJiYTUwMzI=

data/.gitignore

@@ -14,6 +14,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+log/
 
 # YARD artifacts
 .yardoc

data/CHANGELOG.markdown

@@ -0,0 +1,10 @@
+#### v0.1.0
+
+* Add Label for deployable
+
+  > Elliot Hursh: Nick LaMuro: https://github.com/sportngin/octopolo/pull/20
+
+* upgraded rspec to 2.99.0, moved deprecation warning output to deprecations.log
+
+  > Elliot Hursh: Nick LaMuro: https://github.com/sportngin/octopolo/pull/18
+

data/lib/octopolo/config.rb

@@ -36,6 +36,10 @@ module Octopolo
       @deploy_methods || []
     end
 
+    def deployable_label
+      @deployable_label.nil? ? true : @deployable_label
+    end
+
     def github_repo
       @github_repo || raise(MissingRequiredAttribute, "GitHub Repo is required")
     end

data/lib/octopolo/github.rb

@@ -86,6 +86,18 @@ module Octopolo
       ["tst-octopolo"]
     end
 
+    def self.labels *args
+      client.labels *args
+    end
+
+    def self.add_label *args
+      client.add_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/label.rb

@@ -0,0 +1,86 @@
+require_relative "../github"
+require "yaml"
+require "octokit"
+
+module Octopolo
+  module GitHub
+    class Label
+      extend ConfigWrapper
+
+      attr_accessor :name
+      attr_accessor :color
+
+      def initialize(name, color)
+        self.name = name
+        self.color = color
+      end
+
+      def == (obj)
+        (self.name == obj.name) ? true : false
+      end
+
+      # 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
+      end
+
+      # Public: Gets the names of labels
+      #
+      # label_array - an array of labels
+      #
+      # returns - an array of all names from label_array
+      def self.get_names(label_array)
+        label_array.map{ |label| label.name }
+      end
+
+      # Public: Checks to see if label exists on remote, if not makes one.
+      #
+      # label - a label object
+      def self.first_or_create(label)
+        unless all_labels.include?(label)
+          GitHub.add_label(config.github_repo, label.name, label.color)
+        end
+      end
+
+      # Public: Adds labels to a pull-request
+      #
+      # 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
+      #
+      # returns - a label
+      def self.to_label(label_hash)
+        Label.new(label_hash[:name], label_hash[:color])
+      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)}
+      end
+      private_class_method :build_label_array
+
+    end
+  end
+end

data/lib/octopolo/scripts/deployable.rb

@@ -1,5 +1,6 @@
 require_relative "../scripts"
 require_relative "../pull_request_merger"
+require_relative "../github/label"
 
 module Octopolo
   module Scripts
@@ -13,6 +14,10 @@ module Octopolo
         new(pull_request_id).execute
       end
 
+      def self.deployable_label
+        Octopolo::GitHub::Label.new("deployable", "428BCA")
+      end
+
       def initialize(pull_request_id=nil)
         @pull_request_id = pull_request_id
       end
@@ -21,7 +26,9 @@ module Octopolo
       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
       end
+
     end
   end
 end

data/lib/octopolo/version.rb

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

data/octopolo.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'pivotal-tracker', '~> 0.5'
   gem.add_dependency 'jiralicious'
 
-  gem.add_development_dependency 'rspec', '~> 2.11.0'
+  gem.add_development_dependency 'rspec', '~> 2.99.0'
   gem.add_development_dependency "guard"
   gem.add_development_dependency "guard-rspec"
   gem.add_development_dependency 'octopolo-plugin-example'

data/spec/octopolo/config_spec.rb

@@ -62,6 +62,16 @@ module Octopolo
         end
       end
 
+      context "#deployable_label" do 
+        it "is true by default" do
+          expect(Config.new.deployable_label).to eq(true)
+        end
+
+        it "is can be configured as well" do
+          expect(Config.new(deployable_label: false).deployable_label).to eq(false)
+        end
+      end
+
       context "#github_repo" do
         it "raises an exception if not given" do
           expect { Config.new.github_repo }.to raise_error(Config::MissingRequiredAttribute)

data/spec/octopolo/github/label_spec.rb

@@ -0,0 +1,103 @@
+require "spec_helper"
+require_relative "../../../lib/octopolo/github/label"
+
+module Octopolo
+  module GitHub
+    describe Label do
+
+      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(:config) { stub(:config, github_repo: "foo") }
+
+      subject { Label }
+
+      before do
+        subject.config = config
+      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])
+        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])
+          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])
+          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)
+        end
+      end
+
+      context "#==" do
+        it "returns true if names are same ignoring color" do
+          expect(label1 == Label.new("low-risk","121212")).to eq(true)
+        end
+
+        it "returns true if names are same ignoring color" do
+          expect(label1 == label2).to eq(false)
+        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 
+        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])
+        end
+
+        it "returns an array of labels when given a list of labels" do
+          allow(Label).to receive(:first_or_create)
+          expect(Label.send(:build_label_array,label1,label2)).to eq([label1,label2])
+        end
+
+        it "returns an array of labels when given an array of length 1" do
+          allow(Label).to receive(:first_or_create)
+          expect(Label.send(:build_label_array,[label1])).to eq([label1])
+        end
+
+        it "returns an array of labels when given an array of length 1" do
+          allow(Label).to receive(:first_or_create)
+          expect(Label.send(:build_label_array,[label1,label2])).to eq([label1,label2])
+        end
+      end
+
+      context "#get_names" do
+        it "returns a list of names when given an array of labels" do
+          expect(Label.get_names([label1,label2])).to eq(["low-risk","high-risk"])
+        end
+      end
+    end
+  end
+end

data/spec/octopolo/scripts/deployable_spec.rb

@@ -5,7 +5,7 @@ module Octopolo
   module Scripts
     describe Deployable do
       let(:cli) { stub(:Cli) }
-      let(:config) { stub(:user_notifications => ['NickLaMuro']) }
+      let(:config) { stub(:user_notifications => ['NickLaMuro'], :github_repo => 'foo', :deployable_label => true) }
       before { Deployable.any_instance.stub(:cli => cli, :config => config) }
 
       context "#execute" do
@@ -13,6 +13,7 @@ module Octopolo
           subject { Deployable.new 42 }
 
           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
           end
@@ -29,6 +30,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"])
               subject.execute
             end
@@ -46,6 +48,27 @@ module Octopolo
             end
           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 "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
+          end
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require_relative "../lib/octopolo"
 Octopolo.instance_variable_set(:@config, Octopolo::Config.new({:deploy_branch => "master"}))
 
 RSpec.configure do |config|
+  config.deprecation_stream = 'log/deprecations.log'
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopolo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Patrick Byrne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.99.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.99.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -179,6 +179,7 @@ files:
 - .ruby-gemset
 - .ruby-version
 - .travis.yml
+- CHANGELOG.markdown
 - Gemfile
 - Guardfile
 - MIT-LICENSE
@@ -211,6 +212,7 @@ files:
 - lib/octopolo/git.rb
 - lib/octopolo/github.rb
 - lib/octopolo/github/commit.rb
+- lib/octopolo/github/label.rb
 - lib/octopolo/github/pull_request.rb
 - lib/octopolo/github/pull_request_creator.rb
 - lib/octopolo/github/user.rb
@@ -248,6 +250,7 @@ files:
 - spec/octopolo/dated_branch_creator_spec.rb
 - spec/octopolo/git_spec.rb
 - spec/octopolo/github/commit_spec.rb
+- spec/octopolo/github/label_spec.rb
 - spec/octopolo/github/pull_request_creator_spec.rb
 - spec/octopolo/github/pull_request_spec.rb
 - spec/octopolo/github/user_spec.rb
@@ -312,6 +315,7 @@ test_files:
 - spec/octopolo/dated_branch_creator_spec.rb
 - spec/octopolo/git_spec.rb
 - spec/octopolo/github/commit_spec.rb
+- spec/octopolo/github/label_spec.rb
 - spec/octopolo/github/pull_request_creator_spec.rb
 - spec/octopolo/github/pull_request_spec.rb
 - spec/octopolo/github/user_spec.rb