lock_diff 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a8a4d4f0d1b66bbec94910baa92602f0082f7ff
-  data.tar.gz: 0c8931abd27edbfb1850e1ff5a67d1a5665d8c35
+  metadata.gz: 98e0f6cd6557833bfc489091d82b2cd47c378b53
+  data.tar.gz: c4428c319eb30d33df943619e0c9f5eb681f8f01
 SHA512:
-  metadata.gz: 5b3804677178fa3eb873db61726546715f0e192256125614429994de2ed6b232de4e4dec27742ab3c3e1e89da8a2e9904aff06f96144efd122e182f7d610f034
-  data.tar.gz: f7128f0eb571051ce4b4b64e06e409734d01bd09527c9fa05609f17c4f81b65673bbdd3f6591af928a94ec0d7a48a8e202a8ef6d896a1ab5195b9250f98f8d2b
+  metadata.gz: b4a8c1c5a632bb6eaac19862c0e5ecfd65db4573044e953beaa0342e0322d20277fb29c2390dfc2024af3cc8419347c412bfc97345a55ef2eb1837d8d4cd1057
+  data.tar.gz: e9648a4468bd361793fb2ff2ac7e8cc4b914e64f00c7e457d0c1c4119bdbba3aedf6b6161f4b6ca3ff5b989ea842b98e901765138ee67534300dc06838664506

data/lib/lock_diff/diff_info.rb

@@ -0,0 +1,102 @@
+module LockDiff
+  class DiffInfo
+    UPGRADE   = 'upgrade'
+    DOWNGRADE = 'downgrade'
+    DELETE    = 'delete'
+    NEW       = 'new'
+
+    def initialize(old_version:, new_version:, repository:, github_url:)
+      @old_version = old_version
+      @new_version = new_version
+      @repository = repository
+      @github_url = github_url
+    end
+
+    def changed?
+      @old_version.different?(@new_version)
+    end
+
+    def status
+      case
+      when @old_version.version && @new_version.version
+        if @old_version.version < @new_version.version
+          UPGRADE
+        else
+          DOWNGRADE
+        end
+      when @old_version.version
+        DELETE
+      when @new_version.version
+        NEW
+      end
+    end
+
+    def status_emoji
+      case status
+      when UPGRADE
+        ':chart_with_upwards_trend:'
+      when DOWNGRADE
+        ':chart_with_downwards_trend:'
+      when DELETE
+        ':x:'
+      when NEW
+        ':new:'
+      end
+    end
+
+    def change_log_url
+      @change_log_url ||= begin
+        ref =
+          case status
+          when UPGRADE, NEW
+            @new_version.ref
+          when DOWNGRADE, DELETE
+            nil # default branch(master)
+          end
+
+        Github::ChangeLogUrlFinder.new(
+          repository: @repository,
+          github_url: @github_url,
+          ref: ref
+        ).call
+      end
+    end
+
+    def change_log_name
+      File.basename(change_log_url)
+    end
+
+    def commits_url
+      return unless @github_url
+      old_ref = @old_version.ref
+      new_ref = @new_version.ref
+      commits_url =
+        case status
+        when UPGRADE
+          "compare/#{old_ref}...#{new_ref}"
+        when DOWNGRADE
+          "compare/#{new_ref}...#{old_ref}"
+        when DELETE
+          "commits/#{old_ref}"
+        when NEW
+          "commits/#{new_ref}"
+        end
+
+      "#{@github_url}/#{commits_url}"
+    end
+
+    def commits_url_text
+      case status
+      when UPGRADE
+        "#{@old_version}...#{@new_version}"
+      when DOWNGRADE
+        "#{@new_version}...#{@old_version}"
+      when DELETE
+        "#{@old_version}"
+      when NEW
+        "#{@new_version}"
+      end
+    end
+
+  end
+end

data/lib/lock_diff/formatter/github_markdown.rb

@@ -18,8 +18,8 @@ module LockDiff
 
       def headers
         [
-          "| gem_name | diff | change log |",
-          "|----------|------|------------|"
+          "| name | status | commits | changelog |",
+          "|------|--------|---------|-----------|"
         ]
       end
 
@@ -36,7 +36,8 @@ module LockDiff
         def call
           text = []
           text << name
-          text << diff_text
+          text << status
+          text << commits_text
           text << change_log
           "| #{text.join(' | ')} |"
         end
@@ -45,15 +46,19 @@ module LockDiff
 
         attr_reader :diff_info
 
+        def status
+          diff_info.status_emoji
+        end
+
         def name
           "[#{diff_info.name}](#{diff_info.url})"
         end
 
-        def diff_text
-          if diff_info.diff_url
-            "[#{diff_info.old_version}...#{diff_info.new_version}](#{diff_info.diff_url})"
+        def commits_text
+          if diff_info.commits_url
+            "[#{diff_info.commits_url_text}](#{diff_info.commits_url})"
           else
-            "#{diff_info.old_version}...#{diff_info.new_version}"
+            diff_info.commits_url_text
           end
         end
 

data/lib/lock_diff/gem/diff_info.rb

@@ -5,6 +5,7 @@ module LockDiff
 
       attr_reader :old_version, :new_version
       def_delegators :@gem, :name, :url
+      def_delegators :@diff_info, :changed?, :status, :status_emoji, :change_log_url, :change_log_name, :commits_url, :commits_url_text
 
       def self.by(old_spec:, new_spec:)
         gem = Gem.new(new_spec.name)
@@ -17,30 +18,12 @@ module LockDiff
 
       def initialize(gem:, old_version:, new_version:)
         @gem = gem
-        @old_version = old_version
-        @new_version = new_version
-      end
-
-      def changed?
-        @old_version.revision != @new_version.revision ||
-          @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}"
+        @diff_info = LockDiff::DiffInfo.new(
+          old_version: old_version,
+          new_version: new_version,
+          github_url: gem.github_url,
+          repository: gem.repository
+        )
       end
 
     end

data/lib/lock_diff/gem/lockfile_comparator.rb

@@ -15,12 +15,15 @@ module LockDiff
 
       def call
         old_specs_by_name = Spec.specs_by(@old_lockfile).map { |spec| [spec.name, spec] }.to_h
+        new_specs_by_name = Spec.specs_by(@new_lockfile).map { |spec| [spec.name, spec] }.to_h
+        names = (old_specs_by_name.keys + new_specs_by_name.keys).uniq
 
-        Spec.specs_by(@new_lockfile).map do |new_spec|
-          old_spec = old_specs_by_name[new_spec.name]
-          next unless old_spec
-          DiffInfo.by(old_spec: old_spec, new_spec: new_spec)
-        end.compact.select(&:changed?)
+        names.map { |name|
+          DiffInfo.by(
+            old_spec: old_specs_by_name[name] || NullSpec.new(name),
+            new_spec: new_specs_by_name[name] || NullSpec.new(name)
+          )
+        }.select(&:changed?)
       end
     end
   end

data/lib/lock_diff/gem/spec.rb

@@ -21,5 +21,20 @@ module LockDiff
       end
 
     end
+
+    class NullSpec
+      attr_reader :name
+      def initialize(name)
+        @name = name
+      end
+
+      def revision
+      end
+
+      def version
+        nil
+      end
+    end
+
   end
 end

data/lib/lock_diff/gem/version.rb

@@ -2,6 +2,7 @@ module LockDiff
   module Gem
     class Version
       extend Forwardable
+      include Comparable
 
       def_delegators :@spec, :revision, :version
 
@@ -18,34 +19,32 @@ module LockDiff
         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)
+      def different?(other)
+        revision != other.revision || version != other.version
       end
 
-      def find_tag(page: 1, limit:, per_page:)
-        return nil if page > limit
-
-        version_str = version.to_s
-        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
+      def <=>(other)
+        case
+        when version && other.version
+          version.send("<=>", other.version)
         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
+          nil
         end
       end
 
+      private
+
+      def git_tag
+        return unless version
+        return @git_tag if defined? @git_tag
+        @git_tag = Github::TagFinder.new(
+          repository: @gem.repository,
+          gem_name: @gem.name,
+          version_str: version.to_s
+        ).call
+      end
+
     end
+
   end
 end

data/lib/lock_diff/github/tag_finder.rb

@@ -0,0 +1,38 @@
+module LockDiff
+  module Github
+    class TagFinder
+      def initialize(repository:, gem_name:, version_str:)
+        @repository = repository
+        @gem_name = gem_name
+        @version_str = version_str
+      end
+
+      def call
+        find_tag(limit: 4, per_page: 50)
+      end
+
+      private
+
+      def find_tag(page: 1, limit:, per_page:)
+        return nil if page > limit
+
+        fetched_tags = LockDiff.client.tag_names(@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
+  end
+end

data/lib/lock_diff/github.rb

@@ -5,6 +5,7 @@ require_relative "github/content"
 require_relative "github/github_url_detector"
 require_relative "github/pull_request"
 require_relative "github/repository_name_detector"
+require_relative "github/tag_finder"
 
 module LockDiff
   module Github

data/lib/lock_diff/version.rb

@@ -1,3 +1,3 @@
 module LockDiff
-  VERSION = "0.1.7"
+  VERSION = "0.2.0"
 end

data/lib/lock_diff.rb

@@ -1,6 +1,7 @@
 require "logger"
 require "forwardable"
 
+require "lock_diff/diff_info"
 require "lock_diff/formatter/github_markdown"
 require "lock_diff/gem"
 require "lock_diff/github"
@@ -33,7 +34,7 @@ module LockDiff
       if pr
         run(repository: repository, number: pr.number, post_comment: post_comment)
       else
-        LockDiff.logger.info("Not found pull request by tachikoma.")
+        LockDiff.logger.info("Not found pull request by tachikoma. (Hint: search pull request by whether branch name includes 'tachikoma'")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lock_diff
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - vividmuimui
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -131,6 +131,7 @@ files:
 - exe/lock_diff
 - exe/lock_diff_for_tachikoma
 - lib/lock_diff.rb
+- lib/lock_diff/diff_info.rb
 - lib/lock_diff/formatter/github_markdown.rb
 - lib/lock_diff/gem.rb
 - lib/lock_diff/gem/diff_info.rb
@@ -148,6 +149,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/github/tag_finder.rb
 - lib/lock_diff/option_parser.rb
 - lib/lock_diff/pull_request.rb
 - lib/lock_diff/version.rb