bu_pr 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a378ce215962223f4579793c8f83f8e26240d49a
-  data.tar.gz: dd89b9e076031789c9b8e347d6f5a9167217e440
+  metadata.gz: 8d6a26d015d99b0818e94691d0c9ac8f4ec3e024
+  data.tar.gz: 42188f7945e7571011501e85fd78fc597211c5f2
 SHA512:
-  metadata.gz: e9a323893ebdf4506ddd47808aeb6e0b987a8a9695883d5db9b558cc14fbf712201cae200c2ce28e174a42f421f939a3a3c5ce4ed4ee72811dcd750569d0775d
-  data.tar.gz: 908fb84ded4440352d1d98cfb9f1de5e3470cd64c25356ba007d1531965639218cb72e6ba065101ae35ccbafb45b60284585ce6c0fd3539af1beb834f2285052
+  metadata.gz: ff2ac1be3f65db5a20da3a878686ee416b45a435bf4a66db2bdd48e08582d51a92f43c82a82bfcaa4af6261ef54b1497abea2ddcf36b7ee2cdd2bbb53693e074
+  data.tar.gz: 6c28f0f2a9bc0fcf6849c047bb00a072a3a89f85b139c0802ae4764e384de79a8cc284c06c612cf31c90078d19f3aeb0ef132772272a6b77033fb18d63b13bc7

data/README.md

@@ -24,28 +24,44 @@ Or install it yourself as:
 
 Get Github access token from [this page](https://github.com/settings/tokens/new) with `repo` scope.
 
+
+### Set configuration values as Environment variables.
+
+```sh
+# .bash_profile / .profile / .zshrc / etc.
+
+export BUPR_TOKEN="xxx"
+export BUPR_REPO="mmyoji/bu_pr"
+# export BUPR_BRANCH="develop"
+# export BUPR_TITLE="My bundle update"
+```
+
+
+### Set configuration values in config file.
+
 ```rb
 require 'bu_pr'
 
 # Setup
 BuPr.configure do |config|
-  config.access_token = "xxx"              # Required: or check ENV["BUPR_TOKEN"]
-  config.repo_name    = "mmyoji/bu_pr"     # Required: or check ENV["BUPR_REPO"]
+  config.token  = "xxx"              # Required
+  config.repo   = "mmyoji/bu_pr"     # Required
 
-  config.base_branch  = "develop"          # Optional: default is 'master'
-  config.pr_title     = "My bundle update" # Optional: default is like 'Bundle update 2016-11-13'
+  config.branch = "develop"          # Optional :: default is 'master'
+  config.title  = "My bundle update" # Optional :: default is like 'Bundle update 2016-11-13'
 end
 
 BuPr::Runner.call
 ```
 
-or if you're using Rails,
+### Rails
 
 ```rb
 # config/initializers/bu_pr.rb
+
 BuPr.configure do |config|
-  config.access_token = "xxx"
-  config.repo_name    = "mmyoji/bu_pr"
+  config.token = "xxx"
+  config.repo  = "mmyoji/bu_pr"
 end
 ```
 

data/lib/bu_pr/configuration.rb

@@ -5,27 +5,51 @@ module BuPr
   class Configuration
     include Singleton
 
-    ACCESSORS = %i(
-      access_token base_branch
-      pr_title repo_name
+    attr_accessor(
+      :branch,
+      :title,
+      :token,
+      :repo,
     )
 
-    attr_accessor(*ACCESSORS)
+    # DEPRECATED
+    alias access_token token
+    alias access_token= token=
+    alias base_branch branch
+    alias base_branch= branch=
+    alias pr_title title
+    alias pr_title= title=
+    alias repo_name repo
+    alias repo_name= repo=
 
     def initialize
-      @base_branch = "master"
-      @pr_title    = "Bundle update #{Time.now.strftime('%F')}"
+      @branch = ENV.fetch("BUPR_BRANCH") { "master" }
+      @title  = ENV.fetch("BUPR_TITLE")  { "Bundle update #{Time.now.strftime('%F')}" }
 
-      @access_token = ENV["BUPR_TOKEN"]
-      @repo_name    = ENV["BUPR_REPO"]
+      @token  = ENV["BUPR_TOKEN"]
+      @repo   = ENV["BUPR_REPO"]
     end
 
     def valid?
-      ACCESSORS.all? do |accr|
-        val = public_send(accr)
+      token? && branch? && title? && repo?
+    end
+
+    private
+
+    def token?
+      token && token != ""
+    end
+
+    def branch?
+      branch && branch != ""
+    end
+
+    def title?
+      title && title != ""
+    end
 
-        val && val != ""
-      end
+    def repo?
+      repo && repo != ""
     end
   end
 end

data/lib/bu_pr/handlers/github.rb

@@ -6,18 +6,22 @@ require "compare_linker"
 module BuPr
   module Handlers
     class Github
-      attr_reader :base, :current_branch, :repo, :title, :token
+      attr_reader :base
+      attr_reader :current_branch
+      attr_reader :repo
+      attr_reader :title
+      attr_reader :token
       attr_reader :linker
 
-      def initialize(attrs = {})
+      def initialize attrs = {}
         config          = attrs[:config]
 
         @current_branch = attrs[:current_branch]
 
-        @base  = config.base_branch
-        @repo  = config.repo_name
-        @title = config.pr_title
-        @token = config.access_token
+        @base  = config.branch
+        @repo  = config.repo
+        @title = config.title
+        @token = config.token
       end
 
       def call
@@ -27,15 +31,15 @@ module BuPr
 
       def create_pull_request
         res = client.create_pull_request \
-           repo,
-           base,
-           current_branch,
-           title
+          repo,
+          base,
+          current_branch,
+          title
 
         res[:number]
       end
 
-      def diff_comment(pr_number)
+      def diff_comment pr_number
         load_linker(pr_number)
         linker.add_comment repo, pr_number, comment_content
       end
@@ -52,7 +56,7 @@ module BuPr
         "#{linker.make_compare_links.to_a.join("\n")}"
       end
 
-      def load_linker(pr_number)
+      def load_linker pr_number
         ENV['OCTOKIT_ACCESS_TOKEN'] = token
 
         @linker           = ::CompareLinker.new repo, pr_number

data/lib/bu_pr/railtie.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-if defined?(Rails::Railtie)
-  module BuPr
-    class Railtie < ::Rails::Railtie
-      rake_tasks do
-        load "bu_pr/tasks/bu_pr.rake"
-      end
+module BuPr
+  class Railtie < ::Rails::Railtie
+    rake_tasks do
+      load "bu_pr/tasks/bu_pr.rake"
     end
   end
 end

data/lib/bu_pr/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BuPr
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/bu_pr.rb

@@ -2,12 +2,9 @@
 require "bu_pr/version"
 require "bu_pr/configuration"
 require "bu_pr/git"
-
 require "bu_pr/handlers/github"
-
 require "bu_pr/runner"
-
-require "bu_pr/railtie"
+require "bu_pr/railtie" if defined?(Rails::Railtie)
 
 module BuPr
   def configure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bu_pr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Masaya Myojin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compare_linker