lock_diff 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af0bcd9242683ea9865b9a683ca202573d9aa487
-  data.tar.gz: a733cd081d65ad74fe452589c3632f69c0e6c3de
+  metadata.gz: b23d1f7cfd4a3dc35e0f44687cd981ef4b26c799
+  data.tar.gz: 2f81347131f8db3a177410c439ad8c24385b59bf
 SHA512:
-  metadata.gz: 5067df24ba8bbcba4704bda9087219c837e2129dd429884fe1bd21569611f47968553b48808195571869d3e3c8b59f7c424bede48ce605730929d2314634cb21
-  data.tar.gz: ebfe14362656f428129637dd292454ef01230f3b209b0b5df84764e5236cc9fb5f3e39ea819eb16f7b0b8815817fb9411a54115d0af010ab1dbeb7d4d7997888
+  metadata.gz: af50f03dcb70ad72b5ac821556c7818227e5c62d9578dbad00e4c0304d477699d77fea202d34d92f999ca8c17788fbd688123fa3fc4ffcf42aa9e75e65b1bba6
+  data.tar.gz: 28523b56956162aa7c840ab450982c31e0c244f170d2cd9a33ab88f44b8f19dd46e0c2e05fdd3326220a0559bafe5ec21920432ab0d9b8fdcd7d7982f7d21a35

data/lib/lock_diff/diff_info.rb

@@ -1,36 +1,48 @@
 module LockDiff
   class DiffInfo
+    extend Forwardable
+
     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
+    attr_reader :old_package, :new_package
+    def_delegators :package, :name, :url
+
+    def initialize(old_package:, new_package:)
+      @old_package = old_package
+      @new_package = new_package
     end
 
     def changed?
-      @old_version.different?(@new_version)
+      @old_package.different?(@new_package)
     end
 
     def status
       case
-      when @old_version.version && @new_version.version
-        if @old_version.version < @new_version.version
+      when @old_package.version && @new_package.version
+        if @old_package.version < @new_package.version
           UPGRADE
         else
           DOWNGRADE
         end
-      when @old_version.version
+      when @old_package.version
         DELETE
-      when @new_version.version
+      when @new_package.version
         NEW
       end
     end
 
+    def package
+      case status
+      when UPGRADE, NEW
+        @new_package
+      when DOWNGRADE, DELETE
+        @old_package
+      end
+    end
+
     def status_emoji
       case status
       when UPGRADE
@@ -44,57 +56,57 @@ module LockDiff
       end
     end
 
-    def change_log_url
-      @change_log_url ||= begin
+    def changelog_url
+      @changelog_url ||= begin
         ref =
           case status
           when UPGRADE, NEW
-            @new_version.ref
+            @new_package.ref
           when DOWNGRADE, DELETE
             nil # default branch(master)
           end
 
-        Github::ChangeLogUrlFinder.new(
-          repository: @repository,
-          github_url: @github_url,
+        Github::ChangelogUrlFinder.new(
+          repository: package.repository,
+          github_url: package.github_url,
           ref: ref
         ).call
       end
     end
 
-    def change_log_name
-      File.basename(change_log_url)
+    def changelog_name
+      File.basename(changelog_url)
     end
 
     def commits_url
-      return unless @github_url
-      old_ref = @old_version.ref
-      new_ref = @new_version.ref
+      return unless package.github_url
+      old_ref = @old_package.ref
+      new_ref = @new_package.ref
       commits_url =
         case status
         when UPGRADE
-          "compare/#{old_ref}...#{new_ref}"
+          "compare/#{old_ref}...#{new_ref}" if old_ref && new_ref
         when DOWNGRADE
-          "compare/#{new_ref}...#{old_ref}"
+          "compare/#{new_ref}...#{old_ref}" if old_ref && new_ref
         when DELETE
-          "commits/#{old_ref}"
+          "commits/#{old_ref}" if old_ref
         when NEW
-          "commits/#{new_ref}"
+          "commits/#{new_ref}" if new_ref
         end
 
-      "#{@github_url}/#{commits_url}"
+      "#{package.github_url}/#{commits_url}" if commits_url
     end
 
     def commits_url_text
       case status
       when UPGRADE
-        "#{@old_version}...#{@new_version}"
+        "#{@old_package.version_str}...#{@new_package.version_str}"
       when DOWNGRADE
-        "#{@new_version}...#{@old_version}"
+        "#{@new_package.version_str}...#{@old_package.version_str}"
       when DELETE
-        "#{@old_version}"
+        "#{@old_package.version_str}"
       when NEW
-        "#{@new_version}"
+        "#{@new_package.version_str}"
       end
     end
 

data/lib/lock_diff/formatter/github_markdown.rb

@@ -29,7 +29,7 @@ module LockDiff
 
       class DiffFormmater
         def initialize(diff_info)
-          LockDiff.logger.debug diff_info.name
+          LockDiff.logger.info { diff_info.name }
           @diff_info = diff_info
         end
 
@@ -38,7 +38,7 @@ module LockDiff
           text << name
           text << status
           text << commits_text
-          text << change_log
+          text << changelog
           "| #{text.join(' | ')} |"
         end
 
@@ -51,7 +51,11 @@ module LockDiff
         end
 
         def name
-          "[#{diff_info.name}](#{diff_info.url})"
+          if diff_info.url
+            "[#{diff_info.name}](#{diff_info.url})"
+          else
+            diff_info.name
+          end
         end
 
         def commits_text
@@ -62,9 +66,9 @@ module LockDiff
           end
         end
 
-        def change_log
-          if diff_info.change_log_url
-            "[#{diff_info.change_log_name}](#{diff_info.change_log_url})"
+        def changelog
+          if diff_info.changelog_url
+            "[#{diff_info.changelog_name}](#{diff_info.changelog_url})"
           else
             ""
           end

data/lib/lock_diff/gem/lockfile_comparator.rb

@@ -14,14 +14,14 @@ module LockDiff
       end
 
       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
+        old_specs_by_name = Spec.new(@old_lockfile).map { |spec| [spec.name, spec] }.to_h
+        new_specs_by_name = Spec.new(@new_lockfile).map { |spec| [spec.name, spec] }.to_h
         names = (old_specs_by_name.keys + new_specs_by_name.keys).uniq
 
         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)
+          DiffInfo.new(
+            old_package: (old_specs_by_name[name] || NullSpec.new(name)).to_package,
+            new_package: (new_specs_by_name[name] || NullSpec.new(name)).to_package
           )
         }.select(&:changed?)
       end

data/lib/lock_diff/gem/{version.rb → package.rb}

@@ -1,13 +1,11 @@
 module LockDiff
   module Gem
-    class Version
+    class Package
       extend Forwardable
-      include Comparable
 
-      def_delegators :@spec, :revision, :version
+      def_delegators :@spec, :name, :revision, :version, :github_url
 
-      def initialize(gem:, spec:)
-        @gem = gem
+      def initialize(spec)
         @spec = spec
       end
 
@@ -15,7 +13,7 @@ module LockDiff
         revision || git_tag
       end
 
-      def to_s
+      def version_str
         revision || version.to_s
       end
 
@@ -23,13 +21,12 @@ module LockDiff
         revision != other.revision || version != other.version
       end
 
-      def <=>(other)
-        case
-        when version && other.version
-          version.send("<=>", other.version)
-        else
-          nil
-        end
+      def url
+        @spec.github_url || @spec.homepage_url
+      end
+
+      def repository
+        Github::RepositoryNameDetector.new(@spec.github_url).call
       end
 
       private
@@ -38,13 +35,12 @@ module LockDiff
         return unless version
         return @git_tag if defined? @git_tag
         @git_tag = Github::TagFinder.new(
-          repository: @gem.repository,
-          gem_name: @gem.name,
+          repository: repository,
+          package_name: name,
           version_str: version.to_s
         ).call
       end
 
     end
-
   end
 end

data/lib/lock_diff/gem/ruby_gem.rb

@@ -1,5 +1,6 @@
 require "httpclient"
 require 'ostruct'
+require 'json'
 
 module LockDiff
   module Gem
@@ -7,9 +8,6 @@ module LockDiff
     class RubyGem
       extend Forwardable
 
-      def_delegator :@ruby_gem, :homepage_uri, :homepage_url
-      def_delegator :@ruby_gem, :source_code_uri, :source_code_url
-
       def initialize(name)
         content = HTTPClient.get_content("https://rubygems.org/api/v1/gems/#{name}.json")
         @ruby_gem = OpenStruct.new(JSON.parse(content))
@@ -22,6 +20,16 @@ module LockDiff
         @github_url ||= Github::GithubUrlDetector.new([source_code_url, homepage_url]).call
       end
 
+      def homepage_url
+        @ruby_gem.homepage_uri
+      end
+
+      private
+
+      def source_code_url
+        @ruby_gem.source_code_uri
+      end
+
     end
 
     class NullRubyGem
@@ -35,9 +43,6 @@ module LockDiff
       def source_code_uri
       end
 
-      def github_url
-      end
-
     end
   end
 end

data/lib/lock_diff/gem/ruby_gem_repository.rb

@@ -0,0 +1,23 @@
+module LockDiff
+  module Gem
+    class RubyGemRepository
+      class << self
+        def find(name)
+          ruby_gem = repository[name]
+          return ruby_gem if ruby_gem
+          repository[name] = RubyGem.new(name)
+        end
+
+        def repository
+          @repository ||= {}
+        end
+
+        def clear
+          @repository = {}
+        end
+      end
+
+    end
+
+  end
+end

data/lib/lock_diff/gem/spec.rb

@@ -1,29 +1,68 @@
 module LockDiff
   module Gem
     # wrapper of lazy_specification
-    class Spec
-      extend Forwardable
+    module Spec
+      class UnSupportSource < StandardError; end
 
-      def_delegators :@spec, :name, :version
-
-      def self.specs_by(lockfile)
+      def self.new(lockfile)
         Bundler::LockfileParser.new(lockfile).specs.map do |lazy_specification|
-          new(lazy_specification)
+          case lazy_specification.source
+          when Bundler::Source::Rubygems
+            RubyGemSpec.new(lazy_specification)
+          when Bundler::Source::Git
+            GitSpec.new(lazy_specification)
+          when Bundler::Source::Path
+            PathSpec.new(lazy_specification)
+          else
+            raise UnSupportSource, "#{lazy_specification.source.class} source by #{lazy_specification.name} is not supported"
+          end
         end
       end
 
-      def initialize(lazy_specification)
-        @spec = lazy_specification
+      class Base
+        extend Forwardable
+
+        def_delegators :@spec, :name, :version
+
+        def initialize(lazy_specification)
+          @spec = lazy_specification
+        end
+
+        def revision
+          @spec.git_version&.strip
+        end
+
+        def to_package
+          Package.new(self)
+        end
+
+        def github_url; end
+        def homepage_url; end
       end
 
-      def revision
-        @spec.git_version&.strip
+      class RubyGemSpec < Base
+        def_delegators :ruby_gem, :github_url, :homepage_url
+
+        private
+
+        def ruby_gem
+          @ruby_gem ||= RubyGemRepository.find(@spec.name)
+        end
+      end
+
+      class GitSpec < Base
+        def github_url
+          @github_url ||= Github::GithubUrlDetector.new(@spec.source.uri).call
+        end
       end
 
+      class PathSpec < Base
+      end
     end
 
     class NullSpec
       attr_reader :name
+
       def initialize(name)
         @name = name
       end
@@ -34,6 +73,13 @@ module LockDiff
       def version
         nil
       end
+
+      def github_url; end
+      def homepage_url; end
+
+      def to_package
+        Package.new(self)
+      end
     end
 
   end

data/lib/lock_diff/gem.rb

@@ -1,11 +1,9 @@
 require "bundler"
-require_relative "gem/diff_info"
-require_relative "gem/gem"
 require_relative "gem/lockfile_comparator"
-require_relative "gem/pr_lockfile"
+require_relative "gem/package"
 require_relative "gem/ruby_gem"
+require_relative "gem/ruby_gem_repository"
 require_relative "gem/spec"
-require_relative "gem/version"
 
 module LockDiff
   module Gem
@@ -13,7 +11,7 @@ module LockDiff
       class NotChangedLockfile < StandardError; end
 
       def lock_file_diffs(pull_request)
-        pr_lockfile = PrLockfile.new(pull_request)
+        pr_lockfile = Github::PrLockfile.new(pull_request, 'Gemfile.lock')
         raise NotChangedLockfile unless pr_lockfile.changed?
         LockfileComparator.compare_by(pr_lockfile)
       end

data/lib/lock_diff/github/{change_log_url_finder.rb → changelog_url_finder.rb}

@@ -1,6 +1,6 @@
 module LockDiff
   module Github
-    class ChangeLogUrlFinder
+    class ChangelogUrlFinder
       CHANGE_LOG_CANDIDATES = %w(
         changelog
         changes

data/lib/lock_diff/github/github_url_detector.rb

@@ -3,7 +3,8 @@ require "httpclient"
 module LockDiff
   module Github
     class GithubUrlDetector
-      REGEXP = %r!https?://([^/]+)\.github\.[^/]+/([^/]+)! # github.com, github.io
+      # xxx.github.aaa/yyyy
+      REGEXP = %r!https?://([^/]+)\.github\.[^/]+/([^/]+)!
 
       def initialize(urls)
         @urls = Array(urls).compact
@@ -13,8 +14,13 @@ module LockDiff
         url = @urls.find { |url| url.include?("github.com") }
         return unless url
 
-        response = HTTPClient.get(url, follow_redirect: true)
-        url = response.header.request_uri.to_s
+        begin
+          response = HTTPClient.get(url, follow_redirect: true)
+          url = response.header.request_uri.to_s
+        rescue
+          repository = RepositoryNameDetector.new(url).call
+          url = "https://github.com/#{repository}"
+        end
 
         if url.match?(REGEXP)
           _, owner, repo = url.match(REGEXP).to_a

data/lib/lock_diff/{gem → github}/pr_lockfile.rb

@@ -1,8 +1,9 @@
 module LockDiff
-  module Gem
+  module Github
     class PrLockfile
-      def initialize(pull_request)
+      def initialize(pull_request, lockfile_name)
         @pr = pull_request
+        @lockfile_name = lockfile_name
       end
 
       def changed?
@@ -10,7 +11,7 @@ module LockDiff
       end
 
       def path
-        @path ||= @pr.find_content_path("Gemfile.lock")
+        @path ||= @pr.find_content_path(@lockfile_name)
       end
 
       def base_file

data/lib/lock_diff/github/repository_name_detector.rb

@@ -1,7 +1,7 @@
 module LockDiff
   module Github
     class RepositoryNameDetector
-      REGEXP = %r!github\.com/([^/]+)/([^/]+)!
+      REGEXP = %r!github\.com[/:](.*?)(?:.git)?\z!
 
       def initialize(url)
         @url = url
@@ -9,8 +9,9 @@ module LockDiff
 
       def call
         return unless @url
-        _, repo_owner, repo_name = @url.match(REGEXP).to_a
-        "#{repo_owner}/#{repo_name}"
+        @url.match(REGEXP).to_a.last.
+          split("/").first(2).
+          join("/")
       end
 
     end

data/lib/lock_diff/github/tag_finder.rb

@@ -1,9 +1,9 @@
 module LockDiff
   module Github
     class TagFinder
-      def initialize(repository:, gem_name:, version_str:)
+      def initialize(repository:, package_name:, version_str:)
         @repository = repository
-        @gem_name = gem_name
+        @package_name = package_name
         @version_str = version_str
       end
 
@@ -20,13 +20,13 @@ module LockDiff
         tag = fetched_tags.find do |tag_name|
           tag_name == @version_str ||
             tag_name == "v#{@version_str}" ||
-            tag_name == "#{@gem_name}-#{@version_str}"
+            tag_name == "#{@package_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}"}
+          LockDiff.logger.debug { "Not found tag of #{@package_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

data/lib/lock_diff/github.rb

@@ -1,8 +1,9 @@
 require_relative "github/access_token"
-require_relative "github/change_log_url_finder"
+require_relative "github/changelog_url_finder"
 require_relative "github/client"
 require_relative "github/content"
 require_relative "github/github_url_detector"
+require_relative "github/pr_lockfile"
 require_relative "github/pull_request"
 require_relative "github/repository_name_detector"
 require_relative "github/tag_finder"

data/lib/lock_diff/option_parser.rb

@@ -28,7 +28,8 @@ module LockDiff
 
       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("-v", "--verbose", "Run verbosely") { LockDiff.logger.level = :info }
+      opt.on("--move-verbose", "Run move verbosely") { LockDiff.logger.level = :debug }
       opt.on_tail("--version", "Show version") do
         $stdout.puts LockDiff::VERSION
         exit

data/lib/lock_diff/version.rb

@@ -1,3 +1,3 @@
 module LockDiff
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/lock_diff.rb

@@ -10,16 +10,24 @@ require "lock_diff/version"
 
 module LockDiff
   class << self
-    attr_accessor :client_class, :formatter, :strategy, :logger
+    attr_accessor :config
+
+    def init!
+      self.config = Config.new
+    end
 
     def client
-      client_class.client
+      config.client_class.client
+    end
+
+    def logger
+      config.logger
     end
 
     def run(repository:, number:, post_comment: false)
       pr = PullRequest.new(repository: repository, number: number)
-      lockfile_diff_infos = strategy.lock_file_diffs(pr)
-      result = formatter.format(lockfile_diff_infos)
+      lockfile_diff_infos = config.strategy.lock_file_diffs(pr)
+      result = config.formatter.format(lockfile_diff_infos)
 
       if post_comment
         client.add_comment(repository, number, result)
@@ -34,13 +42,21 @@ module LockDiff
       if pr
         run(repository: repository, number: pr.number, post_comment: post_comment)
       else
-        LockDiff.logger.info("Not found pull request by tachikoma. (Hint: search pull request by whether branch name includes 'tachikoma'")
+        LockDiff.logger.warn("Not found pull request by tachikoma. (Hint: search pull request by whether branch name includes 'tachikoma'")
       end
     end
-  end
 
-  self.client_class = Github
-  self.formatter = Formatter::GithubMarkdown
-  self.strategy = Gem
-  self.logger = Logger.new($stdout, level: :info)
+    class Config
+      attr_accessor :client_class, :formatter, :strategy, :logger
+
+      def initialize
+        @client_class = Github
+        @formatter = Formatter::GithubMarkdown
+        @strategy = Gem
+        @logger = Logger.new($stdout, level: :warn)
+      end
+    end
+  end
 end
+
+LockDiff.init!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lock_diff
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - vividmuimui
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -134,19 +134,18 @@ files:
 - 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
-- lib/lock_diff/gem/gem.rb
 - lib/lock_diff/gem/lockfile_comparator.rb
-- lib/lock_diff/gem/pr_lockfile.rb
+- lib/lock_diff/gem/package.rb
 - lib/lock_diff/gem/ruby_gem.rb
+- lib/lock_diff/gem/ruby_gem_repository.rb
 - lib/lock_diff/gem/spec.rb
-- lib/lock_diff/gem/version.rb
 - lib/lock_diff/github.rb
 - lib/lock_diff/github/access_token.rb
-- lib/lock_diff/github/change_log_url_finder.rb
+- lib/lock_diff/github/changelog_url_finder.rb
 - lib/lock_diff/github/client.rb
 - lib/lock_diff/github/content.rb
 - lib/lock_diff/github/github_url_detector.rb
+- lib/lock_diff/github/pr_lockfile.rb
 - lib/lock_diff/github/pull_request.rb
 - lib/lock_diff/github/repository_name_detector.rb
 - lib/lock_diff/github/tag_finder.rb

data/lib/lock_diff/gem/diff_info.rb

@@ -1,31 +0,0 @@
-module LockDiff
-  module Gem
-    class DiffInfo
-      extend Forwardable
-
-      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)
-        new(
-          gem: gem,
-          old_version: Version.new(gem: gem, spec: old_spec),
-          new_version: Version.new(gem: gem, spec: new_spec)
-        )
-      end
-
-      def initialize(gem:, old_version:, new_version:)
-        @gem = gem
-        @diff_info = LockDiff::DiffInfo.new(
-          old_version: old_version,
-          new_version: new_version,
-          github_url: gem.github_url,
-          repository: gem.repository
-        )
-      end
-
-    end
-  end
-end

data/lib/lock_diff/gem/gem.rb

@@ -1,24 +0,0 @@
-module LockDiff
-  module Gem
-    class Gem
-      extend Forwardable
-
-      attr_reader :name
-      def_delegator :@ruby_gem, :github_url
-
-      def initialize(name)
-        @name = name
-        @ruby_gem = RubyGem.new(name)
-      end
-
-      def url
-        @ruby_gem.github_url || @ruby_gem.homepage_url
-      end
-
-      def repository
-        Github::RepositoryNameDetector.new(@ruby_gem.github_url).call
-      end
-
-    end
-  end
-end