lock_diff 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c0b8383d775ad39dbd93fff93530652b7e60e3d
-  data.tar.gz: 34ef1bd10ad27bb846e4ba47c7926dd9a0281ae4
+  metadata.gz: f5daade500e51cc434beb8931d9ff6b12d7dde3e
+  data.tar.gz: 8a33731e03a14c8768bae59dd80bf7d84f3f228f
 SHA512:
-  metadata.gz: f2885f2572e82adffed6fa073a2f1fa7b7ae0500a0f8aca59039fe4a52b2da2163f764c0357978016c133e1592a60fedf2da8273b4e8c66a36e39808d086eff4
-  data.tar.gz: c076daeb953b7da33bb7a20fc2e2e607791261b15cedc41b862493f8fb9b4043e30b4b33647c940ad01b33d10a055913cb2c8bca36dccde52421a2ea9f1b3e50
+  metadata.gz: 123148022cfa87ba4b0b125f4656c779a33f87dcd52f7e1e5ca4e10fc534a35ce82c92dacd539a40060ae45471197973cc7cdf679efaac99f901d0b78fd285b9
+  data.tar.gz: 2ad1171f41b5a751685780d886e54b9cb9d8857d4f92735c938c17f5b603b60ada2e24b6b58764a08fb6211f103ddc77720f35ff03c3a21d0ba62c6cc42f92c0

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.3.4
+  - 2.4.1
+script:
+  - bundle exec rspec

data/README.md

@@ -1,6 +1,11 @@
 # LockDiff
 
-[![CircleCI](https://circleci.com/gh/vividmuimui/lock_diff.svg?style=svg)](https://circleci.com/gh/vividmuimui/lock_diff)
+[![Gem Version](https://badge.fury.io/rb/lock_diff.svg)](https://badge.fury.io/rb/lock_diff)
+[![GitHub tag](https://img.shields.io/github/tag/vividmuimui/lock_diff.svg)](https://github.com/vividmuimui/lock_diff/tags)
+[![Build Status](https://travis-ci.org/vividmuimui/lock_diff.svg?branch=master)](https://travis-ci.org/vividmuimui/lock_diff)
+[![Dependency Status](https://gemnasium.com/badges/github.com/vividmuimui/lock_diff.svg)](https://gemnasium.com/github.com/vividmuimui/lock_diff)
+[![Code Climate](https://codeclimate.com/github/vividmuimui/lock_diff/badges/gpa.svg)](https://codeclimate.com/github/vividmuimui/lock_diff)
+[![Issue Count](https://codeclimate.com/github/vividmuimui/lock_diff/badges/issue_count.svg)](https://codeclimate.com/github/vividmuimui/lock_diff)
 
 This gem detects changes to your package manager (e.g. Gemfile) and generates a Markdown-formatted diff including:
 
@@ -69,7 +74,7 @@ When used in conjunction with [tachikoma](https://rubygems.org/gems/tachikoma),
 #### Command line
 
 ```sh
-$ lock_diff
+$ lock_diff_for_tachikoma
 Usage: lock_diff_for_tachikoma [options]
     -r, --repository=REPOSITORY      required. Like as "user/repository"
         --post-comment=true or false default=false

data/exe/lock_diff

@@ -1,20 +1,7 @@
 #!/usr/bin/env ruby
 
 require "lock_diff"
-require "optparse"
+require "lock_diff/option_parser"
 
-options = {
-  post_comment: false
-}
-opt = OptionParser.new
-
-opt.on('-r', '--repository=REPOSITORY', 'required. Like as "user/repository"') { |v| options[:repository] = v }
-opt.on('-n', '--number=PULL_REQUEST_NUMBER', 'required') { |v| options[:number] = v }
-opt.on('--post-comment=true or false', '(default=false. Print result to stdout when false.)') { |v| options[:post_comment] = v }
-opt.parse!
-
-unless options[:repository] && options[:number]
-  $stdout.puts opt.help
-else
-  LockDiff.run(options)
-end
+options = LockDiff::OptionParser.parse(ARGV, require_flags: %i(repository number))
+LockDiff.run(options)

data/exe/lock_diff_for_tachikoma

@@ -1,19 +1,7 @@
 #!/usr/bin/env ruby
 
 require "lock_diff"
-require "optparse"
+require "lock_diff/option_parser"
 
-options = {
-  post_comment: false
-}
-opt = OptionParser.new
-
-opt.on('-r', '--repository=REPOSITORY', 'required. Like as "user/repository"') { |v| options[:repository] = v }
-opt.on('--post-comment=true or false', '(default=false. Print result to stdout when false.)') { |v| options[:post_comment] = v }
-opt.parse!
-
-unless options[:repository]
-  $stdout.puts opt.help
-else
-  LockDiff.run_by_latest_tachikoma(options)
-end
+options = LockDiff::OptionParser.parse(ARGV, require_flags: %i(repository))
+LockDiff.run_by_latest_tachikoma(options)

data/lib/lock_diff/formatter/github_markdown.rb

@@ -59,7 +59,7 @@ module LockDiff
 
         def change_log
           if diff_info.change_log_url
-            "[change log](#{diff_info.change_log_url})"
+            "[#{diff_info.change_log_name}](#{diff_info.change_log_url})"
           else
             ""
           end

data/lib/lock_diff/gem/diff_info.rb

@@ -4,7 +4,7 @@ module LockDiff
       extend Forwardable
 
       attr_reader :old_version, :new_version
-      def_delegators :@gem, :name, :url, :change_log_url
+      def_delegators :@gem, :name, :url
 
       def self.by(old_spec:, new_spec:)
         gem = Gem.new(new_spec.name)
@@ -26,6 +26,18 @@ module LockDiff
           @old_version.version != @new_version.version
       end
 
+      def change_log_url
+        @change_log_url ||= Github::ChangeLogUrlFinder.new(
+          repository: @gem.repository,
+          github_url: @gem.github_url,
+          ref: @new_version.ref
+        ).call
+      end
+
+      def change_log_name
+        File.basename(change_log_url)
+      end
+
       def diff_url
         return unless @gem.github_url && @old_version.ref && @new_version.ref
         "#{@gem.github_url}/compare/#{@old_version.ref}...#{@new_version.ref}"

data/lib/lock_diff/gem/gem.rb

@@ -15,18 +15,10 @@ module LockDiff
         @ruby_gem.github_url || @ruby_gem.homepage_url
       end
 
-      def change_log_url
-        @change_log_url ||= Github::ChangeLogUrlFinder.new(repository: repository, github_url: @ruby_gem.github_url).call
-      end
-
       def repository
         Github::RepositoryNameDetector.new(@ruby_gem.github_url).call
       end
 
-      def tag_names
-        @tag_names ||= LockDiff.client.tag_names(repository)
-      end
-
     end
   end
 end

data/lib/lock_diff/gem/version.rb

@@ -15,18 +15,35 @@ module LockDiff
       end
 
       def to_s
-        ref || version.to_s
+        revision || version.to_s
       end
 
       private
 
       def git_tag
+        return @git_tag if defined? @git_tag
+        @git_tag = find_tag(limit: 4, per_page: 50)
+      end
+
+      def find_tag(page: 1, limit:, per_page:)
+        return nil if page > limit
+
         version_str = version.to_s
-        @gem.tag_names.find do |tag_name|
+        fetched_tags = LockDiff.client.tag_names(@gem.repository, page: page, per_page: per_page)
+        tag = fetched_tags.find do |tag_name|
           tag_name == version_str ||
             tag_name == "v#{version_str}" ||
             tag_name == "#{@gem.name}-#{version_str}"
         end
+
+        if tag
+          return tag
+        else
+          LockDiff.logger.debug { "Not found tag of #{@gem.name}, #{version_str} by page: #{page}, per_page: #{per_page}"}
+          unless fetched_tags.count < per_page
+            find_tag(page: page + 1, limit: limit, per_page: per_page)
+          end
+        end
       end
 
     end

data/lib/lock_diff/github/change_log_url_finder.rb

@@ -10,9 +10,10 @@ module LockDiff
         news
       )
 
-      def initialize(repository:, github_url:)
+      def initialize(repository:, github_url:, ref:)
         @repository = repository
         @github_url = github_url
+        @ref = ref
       end
 
       def call
@@ -22,7 +23,7 @@ module LockDiff
       private
 
       def find_change_log_url
-        Github.client.contents(@repository).
+        Github.client.contents(@repository, ref: @ref).
           select(&:file?).
           find { |content|
             name = content.name.downcase.delete('_')

data/lib/lock_diff/github/client.rb

@@ -40,16 +40,16 @@ module LockDiff
         @client.releases(repository).empty?
       end
 
-      def contents(repository)
+      def contents(repository, options = {})
         return [] unless repository
-        @client.contents(repository).map do |content|
+        @client.contents(repository, options).map do |content|
           Content.new(content)
         end
       end
 
-      def tag_names(repository)
+      def tag_names(repository, options = {})
         return [] unless repository
-        @client.tags(repository).map(&:name)
+        @client.tags(repository, options).map(&:name)
       end
 
       def add_comment(repository, number, comment)

data/lib/lock_diff/option_parser.rb

@@ -0,0 +1,48 @@
+require "optparse"
+
+module LockDiff
+  class OptionParser
+    class << self
+      def parse(args, require_flags:)
+        new(require_flags).parse(args)
+      end
+    end
+
+    def initialize(require_flags)
+      @require_flags = require_flags
+    end
+
+    def parse(args)
+      options = {
+        post_comment: false
+      }
+      opt = ::OptionParser.new
+
+      opt.separator("Require flags")
+      if @require_flags.include? :repository
+        opt.on('-r', '--repository=REPOSITORY', 'Like as "user/repository"') { |v| options[:repository] = v }
+      end
+      if @require_flags.include? :number
+        opt.on('-n', '--number=PULL_REQUEST_NUMBER') { |v| options[:number] = v }
+      end
+
+      opt.separator("\nOptional flags")
+      opt.on('--post-comment=true or false', 'Print result to stdout when false. (default is false)') { |v| options[:post_comment] = v }
+      opt.on("-v", "--verbose", "Run verbosely") { |v| LockDiff.logger.level = :debug }
+      opt.on_tail("--version", "Show version") do
+        $stdout.puts LockDiff::VERSION
+        exit
+      end
+      opt.parse!(args)
+
+      if @require_flags.all? { |flag| options.has_key?(flag) }
+        options
+      else
+        puts options
+        $stdout.puts opt.help
+        exit
+      end
+    end
+
+  end
+end

data/lib/lock_diff/version.rb

@@ -1,3 +1,3 @@
 module LockDiff
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/lock_diff.rb

@@ -28,7 +28,7 @@ module LockDiff
     end
 
     def run_by_latest_tachikoma(repository:, post_comment: false)
-      pr = Github.client.latest_pull_request(repository, limit: 10).
+      pr = Github.client.latest_pull_request(repository).
         find { |pull_request| pull_request.head_ref.include?("tachikoma") }
       if pr
         run(repository: repository, number: pr.number, post_comment: post_comment)
@@ -41,5 +41,5 @@ module LockDiff
   self.client_class = Github
   self.formatter = Formatter::GithubMarkdown
   self.strategy = Gem
-  self.logger = Logger.new($stdout)
+  self.logger = Logger.new($stdout, level: :info)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lock_diff
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - vividmuimui
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -118,9 +118,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -148,6 +148,7 @@ files:
 - lib/lock_diff/github/github_url_detector.rb
 - lib/lock_diff/github/pull_request.rb
 - lib/lock_diff/github/repository_name_detector.rb
+- lib/lock_diff/option_parser.rb
 - lib/lock_diff/pull_request.rb
 - lib/lock_diff/version.rb
 - lock_diff.gemspec

data/.circleci/config.yml

@@ -1,34 +0,0 @@
-version: 2
-jobs:
-  build:
-    working_directory: ~/lock_diff
-    docker:
-      - image: circleci/ruby:2.4.1-node
-    steps:
-      - checkout
-
-      # Restore bundle cache
-      - type: cache-restore
-        key: bundle-cache-{{ checksum "Gemfile.lock" }}
-
-      # Bundle install dependencies
-      - run: bundle install --path vendor/bundle
-
-      # Store bundle cache
-      - type: cache-save
-        key: bundle-cache-{{ checksum "Gemfile.lock" }}
-        paths:
-          - vendor/bundle
-
-      # Run rspec in parallel
-      - type: shell
-        command: |
-          bundle exec rspec --profile 10 \
-                            --format RspecJunitFormatter \
-                            --out /tmp/test-results/rspec.xml \
-                            --format progress \
-                            $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
-
-      # Save artifacts
-      - type: store_test_results
-        path: /tmp/test-results