circleci-bundle-update-pr 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bd4edd9718877715240838f632167af5ee6c194
-  data.tar.gz: 3371dc34677ee4db20edffd9aba415c0d443d4a9
+  metadata.gz: 7e0b523fa54d4c022d06def3817c1f066b956491
+  data.tar.gz: bb96632512394aa32a14e15631290439e660272a
 SHA512:
-  metadata.gz: b3947dafe50e1ea7558100300013da90524e985a4fa1d87cd9196cd7d2cb13e9eebe7063e9f73180a10546101fd7955e3158ced60c233b5645776090d65f03f2
-  data.tar.gz: 077800b88aa7619c23472b07518c9a2abdcc8bce66641cd9e2d4774052b30bb5373bffdf8698f245999c7be6a46f965dba0f89d24612b807d4923c5600fea0cc
+  metadata.gz: 0bc037c1762dd54bafff5b7578f1082d1988cf7e844e0ab24d4e7bc13d50effe1b0a92c0215ecf934c417e98fe398b768e8bc17200819e84e8dfe5ba8dc37803
+  data.tar.gz: 580eb8bb08d85256a6fd351fb7bc9f9f000d470403ef0de7048492f4c0b082a4ee0552285afe1db62eb551085293e73689c4a550dd8df19a1a15bac0fd5b90d8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    circleci-bundle-update-pr (1.2.2)
+    circleci-bundle-update-pr (1.3.0)
       compare_linker
       octokit (~> 3.8)
 

data/README.md

@@ -20,7 +20,11 @@ Or install it yourself as:
 
 ## Usage
 
-    $ circleci-bundle-update-pr 'Git Usename' 'Git email address'
+    $ circleci-bundle-update-pr 'Git username' 'Git email address'
+
+By default, it works only on master branch, but you can also explicitly specify any branches rather than only master branch by adding them to the arguments.
+
+    $ circleci-bundle-update-pr 'Git username' 'Git email address' master develop topic
 
 ## Contributing
 

data/bin/circleci-bundle-update-pr

@@ -2,4 +2,4 @@
 
 require "circleci/bundle/update/pr"
 
-Circleci::Bundle::Update::Pr.create_if_needed(git_username: ARGV[0], git_email: ARGV[1])
+Circleci::Bundle::Update::Pr.create_if_needed(git_username: ARGV.shift, git_email: ARGV.shift, git_branches: ARGV.empty? ? ["master"] : ARGV)

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

@@ -6,21 +6,25 @@ module Circleci
   module Bundle
     module Update
       module Pr
-        def self.create_if_needed(git_username: nil, git_email: nil)
+        def self.create_if_needed(git_username: nil, git_email: nil, git_branches: ["master"])
           raise "$CIRCLE_PROJECT_USERNAME isn't set" unless ENV['CIRCLE_PROJECT_USERNAME']
           raise "$CIRCLE_PROJECT_REPONAME isn't set" unless ENV['CIRCLE_PROJECT_REPONAME']
           raise "$GITHUB_ACCESS_TOKEN isn't set" unless ENV['GITHUB_ACCESS_TOKEN']
-          return unless need?
+          return unless need?(git_branches)
           repo_full_name = "#{ENV['CIRCLE_PROJECT_USERNAME']}/#{ENV['CIRCLE_PROJECT_REPONAME']}"
           now = Time.now
           branch = "bundle-update-#{now.strftime('%Y%m%d%H%M%S')}"
+
+          git_username ||= client.user.login
+          git_email ||= "#{git_username}@users.noreply.github.com"
+
           create_branch(git_username, git_email, branch)
           pull_request = create_pull_request(repo_full_name, branch, now)
           add_comment_of_compare_linker(repo_full_name, pull_request[:number])
         end
 
-        def self.need?
-          return false unless ENV['CIRCLE_BRANCH'] == "master"
+        def self.need?(git_branches)
+          return false unless git_branches.include?(ENV['CIRCLE_BRANCH'])
           system("bundle update")
           `git status -sb 2> /dev/null`.include?("Gemfile.lock")
         end
@@ -39,8 +43,7 @@ module Circleci
         def self.create_pull_request(repo_full_name, branch, now)
           title = "bundle update at #{now.strftime('%Y-%m-%d %H:%M:%S %Z')}"
           body  = "auto generated by [CircleCI of #{ENV['CIRCLE_PROJECT_REPONAME']}](https://circleci.com/gh/#{repo_full_name})"
-          client = Octokit::Client.new(access_token: ENV["GITHUB_ACCESS_TOKEN"])
-          client.create_pull_request(repo_full_name, "master", branch, title, body)
+          client.create_pull_request(repo_full_name, ENV['CIRCLE_BRANCH'], branch, title, body)
         end
         private_class_method :create_pull_request
 
@@ -58,6 +61,11 @@ Powered by [compare_linker](https://rubygems.org/gems/compare_linker)
           compare_linker.add_comment(repo_full_name, pr_number, comment)
         end
         private_class_method :add_comment_of_compare_linker
+
+        def self.client
+          Octokit::Client.new(access_token: ENV["GITHUB_ACCESS_TOKEN"])
+        end
+        private_class_method :client
       end
     end
   end

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

@@ -2,7 +2,7 @@ module Circleci
   module Bundle
     module Update
       module Pr
-        VERSION = "1.2.2"
+        VERSION = "1.3.0"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: circleci-bundle-update-pr
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Takashi Masuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit