circleci-bundle-update-pr 1.14.3 → 1.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bdafb1b444baf9846b2158bfa36e3219c9862e6071630d05e05437aa496a5d5
-  data.tar.gz: c0b3e21251127726e560cada9a584965cedacdc9136b91936da08f9ba7470795
+  metadata.gz: f0132033cd212b7a4de6428ae448cf78fc452f8766141e54eaeff0e85f583a32
+  data.tar.gz: 6265c70896a7a0e9e4aa474d0447a7b574ac6c9bcf901e055e843aa0fb2f0ad5
 SHA512:
-  metadata.gz: e745407da1928387d9848a5031f883e2bfa5fd4b442903a48756f6b4876eabd87b05a72f2239450e4e8669c1d4842c68728c82cebd48f3b27cfca3e24fcdccfb
-  data.tar.gz: 6944b8f80c97b25c2d15007a91ddf94175e9105c3c3ff91b496344e5277c76c4e3514291e468525a806161f4b79d2260a319b8c85d2ae4106dd59e1f2c0a0188
+  metadata.gz: 4c4825bd2e230a48f8ae2b67a7210bd430a6294188df0bdbd5506aa47fdbd7b1060a6c009cb96d57e72c3d655169806ed7cdfa3b985fb14f08067beb831fd214
+  data.tar.gz: bb016368f762b942f75cb7080052683ec83e097e40e95914e3153af2d49261b5ddc9b8e3fef74ccc749ccf15de0d93fcfcbe8b7e91e77a02c1730c1c080e1f95

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    circleci-bundle-update-pr (1.14.3)
+    circleci-bundle-update-pr (1.14.4)
       compare_linker (>= 1.4.0)
       octokit
 
@@ -18,7 +18,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     httpclient (2.8.3)
     multipart-post (2.0.0)
-    octokit (4.13.0)
+    octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     public_suffix (3.0.3)
     rake (12.3.2)

data/lib/circleci/bundle/update/pr.rb

@@ -16,7 +16,12 @@ module Circleci
             return
           end
 
-          unless need_to_commit?(git_branches)
+          unless target_branch?(running_branch: ENV['CIRCLE_BRANCH'], target_branches: git_branches)
+            puts "Skip because CIRCLE_BRANCH[#{ENV['CIRCLE_BRANCH']}] is not included in target branches[#{git_branches.join(',')}]."
+            return
+          end
+
+          unless need_to_commit?
             puts 'No changes due to bundle update'
             return
           end
@@ -68,12 +73,20 @@ module Circleci
         end
         private_class_method :exists_bundle_update_pr?
 
+        # Is running branch included in target_branches?
+        #
+        # @param running_branch [String]
+        # @param target_branches [Array<String>]
+        # @return [Boolean]
+        def self.target_branch?(running_branch:, target_branches:)
+          target_branches.include?(running_branch)
+        end
+        private_class_method :target_branch?
+
         # Does it need to commit due to bundle update?
         #
-        # @param git_branches [Array<String>]
         # @return [Boolean]
-        def self.need_to_commit?(git_branches)
-          return false unless git_branches.include?(ENV['CIRCLE_BRANCH'])
+        def self.need_to_commit?
           unless system("bundle update && bundle update --ruby")
             raise "Unable to execute `bundle update && bundle update --ruby`"
           end

data/lib/circleci/bundle/update/pr/version.rb

@@ -2,7 +2,7 @@ module Circleci
   module Bundle
     module Update
       module Pr
-        VERSION = '1.14.3'
+        VERSION = '1.14.4'
       end
     end
   end

data/spec/circleci/bundle/update/pr_spec.rb

@@ -18,4 +18,29 @@ describe Circleci::Bundle::Update::Pr do
       it { is_expected.to eq 'github.com' }
     end
   end
+
+  describe ".target_branch?" do
+    subject do
+      Circleci::Bundle::Update::Pr.send(
+        :target_branch?,
+        running_branch: running_branch,
+        target_branches: ["target"],
+      )
+    end
+
+    context "running_target is included in target branches" do
+      let(:running_branch) { 'target' }
+      it { is_expected.to be_truthy }
+    end
+
+    context "ENV['CIRCLE_BRANCH'] is not included in target branches" do
+      let(:running_branch) { 'not_included' }
+      it { is_expected.to be_falsy }
+    end
+
+    context "ENV['CIRCLE_BRANCH'] is nil" do
+      let(:running_branch) { nil }
+      it { is_expected.to be_falsy }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: circleci-bundle-update-pr
 version: !ruby/object:Gem::Version
-  version: 1.14.3
+  version: 1.14.4
 platform: ruby
 authors:
 - Takashi Masuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit