bu_pr 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 151da8efbdea7d8e1f213c389aec5638ada216fb
-  data.tar.gz: 8ed0c5664508e90b7eeafa3f2d6830c45d6c8f17
+  metadata.gz: dfefdc17a5f821f2fd9b6eaf2d14746d52a7562f
+  data.tar.gz: a544d1f62fab74dc852fa1b0c3b8d78eb4c4a100
 SHA512:
-  metadata.gz: 57c0c8693900ff6b9ddb68eac293fd47d9927d02f758a8246b8922e0706f01407c672fd656d98740e21ba91ffe62f0dd7571a8ec67a8870cb99230f4c38c11d5
-  data.tar.gz: 253564184b645a6f4cbdffbc1387275794bea5f788ffe438259368e78e8cf178a429a1aebd9c2bf98a9692255a4f801b4d4a1cda997e8ec0406943d138d2db6f
+  metadata.gz: fc2655816c91d8f24cb23e976db2161320426c62870cf2c37d26fc28b8161424e34009180f0526b52e5b3353324ed79f3c624ad8f4f98fc5394d0a00cfc5519c
+  data.tar.gz: bcbdba47a2a454c6c7214c9479f7304ae018dcb72f574c5c9ebc3547bc187775011c61ec6408c71091758dbac14e08907a15d90402970836d7db941c1998f856

data/.travis.yml

@@ -1,9 +1,9 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.1.0
   - 2.2.0
   - 2.3.0
+  - 2.4.0
   - ruby-head
 before_install: gem install bundler
 matrix:

data/bu_pr.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "compare_linker", "~> 1.1.0"
-  spec.add_dependency "thor", "~> 0.19"
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/bu_pr/command.rb

@@ -1,19 +1,43 @@
 # frozen_string_literal: true
-require "thor"
+
+require "optparse"
 
 module BuPr
-  class Command < ::Thor
-    default_command :all
-
-    desc "all", "Run bundle update and create pull-request"
-    method_options(
-      branch: :string,
-      title:  :string,
-      token:  :string,
-      repo:   :string,
-    )
-    def all
-      Runner.call(options)
+  class Command
+    # Entry Point
+    #
+    # @note for backward compatibility
+    def self.start args
+      Runner.call \
+        new(args).parse
+    end
+
+    attr_reader :args
+    attr_reader :opts
+
+    # @param args [Array<String>]
+    def initialize args
+      @args = args
+      @opts = {}
+    end
+
+    # @return [Hash<Symbol, String>]
+    def parse
+      parser.parse! args
+      opts
+    end
+
+    private
+
+    def parser
+      ::OptionParser.new do |o|
+        o.banner = "Usage: bu_pr [options]"
+
+        o.on("-b", "--branch [NAME]",  String, "Base branch name")   { |v| opts[:branch] = v }
+        o.on("-t", "--title  [TITLE]", String, "pull-request title") { |v| opts[:title]  = v }
+        o.on("-k", "--token  [TOKEN]", String, "GitHub Token")       { |v| opts[:token]  = v }
+        o.on("-r", "--repo   [NAME]",  String, "GitHub repo name")   { |v| opts[:repo]   = v }
+      end
     end
   end
 end

data/lib/bu_pr/configuration.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module BuPr
   class Configuration
     ATTRS = %i(
@@ -8,10 +9,9 @@ module BuPr
       repo
     )
 
-    # @return [String]
-    attr_accessor(*ATTRS)
+    attr_accessor(*ATTRS) # @return [String]
 
-    # @param opts [Hash]
+    # @param  opts [Hash]
     # @option opts [String] :branch Base branch name
     # @option opts [String] :title pull-request title
     # @option opts [String] :token GitHub access token
@@ -33,8 +33,9 @@ module BuPr
 
     ATTRS.each do |attr|
       # @private
+      # @return [Boolean]
       define_method "#{attr}?" do
-        v = public_send(attr)
+        v = public_send attr
         !v.nil? && v != ""
       end
     end

data/lib/bu_pr/git.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module BuPr
   class Git
     LOCKFILE = "Gemfile.lock"
@@ -18,12 +19,12 @@ module BuPr
 
     # @return [Boolean]
     def diff?
-      `git status`.include?(LOCKFILE)
+      `git status`.include? LOCKFILE
     end
 
     # @return [Boolean]
     def installed?
-      system("git --help > /dev/null 2>&1")
+      system "git --help > /dev/null 2>&1"
     end
 
     def push

data/lib/bu_pr/handlers/github.rb

@@ -1,43 +1,41 @@
 # frozen_string_literal: true
+
 require "octokit"
 require "compare_linker"
 
 module BuPr
   module Handlers
     class Github
-      # @return [String] base branch name
-      attr_reader :base
-
-      # @return [String]
-      attr_reader :current_branch
-
-      # @return [String]
-      attr_reader :repo
-
-      # @return [String]
-      attr_reader :title
-
-      # @return [String]
-      attr_reader :token
-
-      # @return [CompareLinker]
-      attr_reader :linker
-
-      # @param attrs [Hash]
-      def initialize attrs = {}
-        config          = attrs[:config]
-
-        @current_branch = attrs[:current_branch]
+      attr_reader :base    # @return [String] base branch name
+      attr_reader :current # @return [String] current branch
+      attr_reader :repo    # @return [String]
+      attr_reader :title   # @return [String]
+      attr_reader :token   # @return [String]
+      attr_reader :linker  # @return [CompareLinker]
+
+      # Entry point
+      #
+      # @option [BuPr::Configuration] :config
+      # @option [String]              :current_branch
+      def self.call config:, current_branch:
+        new(
+          config:         config,
+          current_branch: current_branch
+        ).call
+      end
 
-        @base  = config.branch
-        @repo  = config.repo
-        @title = config.title
-        @token = config.token
+      # @option [BuPr::Configuration] :config
+      # @option [String]              :current_branch
+      def initialize config:, current_branch:
+        @current = current_branch
+        @base    = config.branch
+        @repo    = config.repo
+        @title   = config.title
+        @token   = config.token
       end
 
       def call
-        number = create_pull_request
-        diff_comment(number)
+        diff_comment create_pull_request
       end
 
       # @return [Integer] pull-request ID
@@ -45,14 +43,15 @@ module BuPr
         res = client.create_pull_request \
           repo,
           base,
-          current_branch,
+          current,
           title
 
         res[:number]
       end
 
+      # @param pr_number [Integer]
       def diff_comment pr_number
-        load_linker(pr_number)
+        load_linker pr_number
         linker.add_comment repo, pr_number, comment_content
       end
 
@@ -61,9 +60,7 @@ module BuPr
       # @private
       # @return [Octokit::Client]
       def client
-        @client ||= ::Octokit::Client.new(
-          access_token: token,
-        )
+        @client ||= ::Octokit::Client.new access_token: token
       end
 
       # @private

data/lib/bu_pr/runner.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
+
 module BuPr
+  # Custom errors
+  class RequirementUnfulfilled < StandardError; end
+  class InvalidConfigurations < StandardError; end
+
   class Runner
     class << self
       # @param opts [Hash]
@@ -9,23 +14,16 @@ module BuPr
       end
     end
 
-    # @private
-    # @return [BuPr::Git]
-    attr_reader :git
-
-    # @private
-    # @return [BuPr::Configuration]
-    attr_reader :config
+    attr_reader :git    # @return [BuPr::Git]
+    attr_reader :config # @return [BuPr::Configuration]
 
-    # @private
     # @param opts [Hash]
     # @see BuPr::Configuration#initialize
     def initialize opts = {}
       @git    = Git.new
-      @config = Configuration.new(opts)
+      @config = Configuration.new opts
     end
 
-    # @private
     def call
       if bundle_update && !git.diff?
         puts "no update"
@@ -34,28 +32,21 @@ module BuPr
 
       git.push
 
-      handler = Handlers::Github.new config: config, current_branch: git.current_branch
-      handler.call
+      Handlers::Github.call \
+        config:         config,
+        current_branch: git.current_branch
     end
 
-    # @private
     # @return [Boolean]
     def bundle_update
       valid? && _bundle_update
     end
 
-    # @private
     # @return [Boolean]
+    # @raise [BuPr::InvalidConfigurations]
+    # @raise [BuPr::RequirementUnfulfilled]
     def valid?
-      unless config.valid?
-        raise "Invalid configuration"
-      end
-
-      unless git.installed?
-        raise "Git is not installed"
-      end
-
-      true
+      check_config! && check_git!
     end
 
     private
@@ -68,5 +59,23 @@ module BuPr
 
       raise "Error(s) happened"
     end
+
+    # @private
+    # @return [Boolean]
+    # @raise [BuPr::InvalidConfigurations]
+    def check_config!
+      return true if config.valid?
+
+      raise InvalidConfigurations, "Invalid configuration"
+    end
+
+    # @private
+    # @return [Boolean]
+    # @raise [BuPr::RequirementUnfulfilled]
+    def check_git!
+      return true if git.installed?
+
+      raise RequirementUnfulfilled, "Git is not installed"
+    end
   end
 end

data/lib/bu_pr/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module BuPr
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/bu_pr.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "bu_pr/version"
 require "bu_pr/configuration"
 require "bu_pr/git"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bu_pr
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Masaya Myojin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compare_linker
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.19'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement