bundler-diff 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 396448a09341622ba815d36158c1c75326187d1e02e80bf034679c3734151ea7
-  data.tar.gz: 258c66d28bcd0fb02d41543e9c33188cb75e3e5b092d77db3d0a70e167f3f2bd
+  metadata.gz: aa495cccf95f5c21f03fa11fac02dd9f682205d9892fc53a6c4b72a3fcca066d
+  data.tar.gz: ddd43a9b67597a11167d9eee5d32b19c6e96cd4d9f2c096d250d3fa5ba292082
 SHA512:
-  metadata.gz: 00bb8a49e251f8c6e14492e46c17f6a8574da4eddcee31d6d008aa83b1402961277cb82266af1d0b2a0cac856bfc0c6c135a9d8817b7b32bd42999a7686f5345
-  data.tar.gz: 8a18283e1635cd52d379e08cc76a3437e4b5a74e7c9e174c02f9d62d00d1b3e23ebe5db5ead6fc8a274ec76cc96e76ad2b220c84398b2c5215f2be800b6ea674
+  metadata.gz: 91b003ca66c18d8c78d28145349b8e20817912a52703da2f2698f731c4b05d8ed5fc75de3c668e43b5c98f720d26338df1b81b2829519ce2f10bacfc0b5a81cf
+  data.tar.gz: 130a7bf297aa2d21b847f2058d53e9d89776cd469674f15cdbefc1e2bd868e2c866412f679fee3a9dc7effb596a520f3298b59f209be128cff959f2385cba00e

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
   DisplayCopNames: true
   DisplayStyleGuide: true
   ExtraDetails: true

data/.travis.yml

@@ -2,7 +2,6 @@ sudo: false
 language: ruby
 
 rvm:
-  - 2.3.7
   - 2.4.4
   - 2.5.1
   - ruby-head

data/README.md

@@ -54,6 +54,7 @@ Usage: bundle diff [options]
                                        default
                                        md_table
         --escape-json                Escape output as a JSON string
+        --access-token ACCESS_TOKEN  Set access token for GitHub API
     -v, --version                    Display the version
 ```
 

data/lib/bundler_diff.rb

@@ -7,10 +7,40 @@ require 'bundler_diff/formatter/md_table'
 require 'bundler_diff/version'
 
 module BundlerDiff
-  def self.formatters
-    @formatters ||= {
-      default: Formatter::Default,
-      md_table: Formatter::MdTable
-    }
+  class << self
+    def formatters
+      @formatters ||= {
+        default: Formatter::Default,
+        md_table: Formatter::MdTable
+      }
+    end
+
+    def parse_options(args) # rubocop:disable Metrics/MethodLength
+      options = {}
+
+      opt = OptionParser.new
+      opt.banner = 'Usage: bundle diff [options]'
+      opt.on('-c', '--commit COMMIT', 'Specify a commit') { |val| options[:commit] = val }
+      formatter_desc = [
+        'Choose a formatter',
+        '  default',
+        '  md_table'
+      ]
+      opt.on('-f', '--format FORMATTER', *formatter_desc) do |val|
+        options[:format] = val.to_sym
+      end
+      opt.on('--escape-json', 'Escape output as a JSON string') do |val|
+        options[:escape_json] = val
+      end
+      opt.on('--access-token ACCESS_TOKEN', 'Set access token for GitHub API') do |val|
+        options[:access_token] = val
+      end
+
+      opt.on('-v', '--version', 'Display the version') { options[:version] = true }
+
+      remaining_args = opt.parse(args)
+      options[:commit] ||= remaining_args.shift
+      options
+    end
   end
 end

data/lib/bundler_diff/cli.rb

@@ -25,7 +25,7 @@ module BundlerDiff
 
       gems = GemsComparator.compare(before_lockfile, after_lockfile)
       output = formatter.new.render(gems)
-      output = JSON.dump(output) if @escape_json
+      output = JSON.dump(output) if @options[:escape_json]
       puts output
     rescue StandardError => e
       puts e.inspect
@@ -47,46 +47,41 @@ module BundlerDiff
       File.read(file_name)
     end
 
-    def parse_options! # rubocop:disable Metrics/MethodLength
-      opt = OptionParser.new
-      opt.banner = 'Usage: bundle diffgems [options]'
-      opt.on('-c', '--commit COMMIT', 'Specify a commit') { |val| @commit = val }
-      formatter_desc = [
-        'Choose a formatter',
-        '  default',
-        '  md_table'
-      ]
-      opt.on('-f', '--format FORMATTER', *formatter_desc) { |val| @format = val.to_sym }
-      opt.on('--escape-json', 'Escape output as a JSON string') do |val|
-        @escape_json = val
-      end
-      opt.on('-v', '--version', 'Display the version') do
+    def parse_options!
+      @options = BundlerDiff.parse_options(@args)
+
+      if @options.key?(:version)
         puts BundlerDiff::VERSION
         exit
       end
-      options = opt.parse(@args)
-      @commit ||= options.shift
+      @options[:commit] ||= DEFAULT_OPTIONS[:commit]
+      @options[:format] ||= DEFAULT_OPTIONS[:format]
+      @options[:access_token] ||=
+        ENV['BUNDLER_DIFF_GITHUB_TOKEN'] || ENV['GITHUB_TOKEN'] || hub_token
     end
 
     def set_access_token!
-      return if GemsComparator.config.client.access_token
+      return if @options[:access_token].nil?
+
+      GemsComparator.configure do |config|
+        config.client = Octokit::Client.new(access_token: @options[:access_token])
+      end
+    end
+
+    def hub_token
       hub_config_path = "#{ENV['HOME']}/.config/hub"
       return unless File.exist?(hub_config_path)
 
       yaml = YAML.load_file(hub_config_path)
-      oauth_token = yaml.dig('github.com', 0, 'oauth_token')
-      return if oauth_token.nil?
-      GemsComparator.configure do |config|
-        config.client = Octokit::Client.new(access_token: oauth_token)
-      end
+      yaml.dig('github.com', 0, 'oauth_token')
     end
 
     def commit
-      @commit || DEFAULT_OPTIONS[:commit]
+      @options[:commit]
     end
 
     def formatter
-      format = @format || DEFAULT_OPTIONS[:format]
+      format = @options[:format]
       BundlerDiff.formatters[format] || Formatter::Default
     end
   end

data/lib/bundler_diff/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BundlerDiff
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundler-diff
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - sinsoku
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-14 00:00:00.000000000 Z
+date: 2018-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gems_comparator
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A gem support your "bundle update"