compare_linker 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af95f0a2fa32ca45c3466eaea99a42a60f459ee8
-  data.tar.gz: c326f2ce50e6ee13d95fb6902fd5485c670388cc
+  metadata.gz: 4057ff1e3a27a008b165f7c0a8e9c66778b3c81a
+  data.tar.gz: a12d3dfceac57651d84af749f494af6a8ec0bfe1
 SHA512:
-  metadata.gz: f2658bdebc63b821bfe21fe64ac000ebcbef6ae64bf9259f694bb50dda824bcc866e2d9f12e7c308ea62b13132d3b5e49e77ae36458751471db8bb7159c41dc8
-  data.tar.gz: 7141938c57780fee24b2e814cdc01b4fabcb21f23060969c14a9564c88d88fe95a4d5310d0c8c5ef55e688895ce4c04f19251bb105dd645ae46abb7bc52f67b4
+  metadata.gz: 11a2efd1e0e96eec69a7b2b9485f2680ffbac561a8f4215b3eb7c9e21b5f3a70047a183fde4ef5f35f81789a4219eab6c7629aa5244e7db4d6d0caec2397d42c
+  data.tar.gz: 354661c22002a122751b6e2b8d0bd2f39de82a5e47d79aab0d7eebb9b14bacbc4be4a9e3aad8987fe926ff1e5f554364521be4406660587c4ee7bab06942f30c

data/.gitignore

@@ -1,4 +1,4 @@
-/.bundle/config
+/.bundle
 /.envrc
 /pkg
 /vendor/bundle

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 2.2.0
-  - 2.1.0
-  - 2.0.0
+  - 2.2.1
+  - 2.1.5
+  - 2.0.0-p643

data/Gemfile

@@ -1,4 +1,3 @@
 source "https://rubygems.org"
-ruby '2.2.0'
 
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    compare_linker (1.1.1)
+    compare_linker (1.1.2)
       httpclient
       octokit
 

data/README.md

@@ -1,5 +1,4 @@
-Compare Linker
-==============
+# Compare Linker [![Build Status][travis-badge]][travis-link] [![Gem Version][gem-badge]][gem-link]
 
 Create GitHub's compare view URLs for pull request from diff of `Gemfile.lock` (and post comment to pull request).
 
@@ -7,9 +6,13 @@ Create GitHub's compare view URLs for pull request from diff of `Gemfile.lock` (
 
 [GitHub Compare View](https://github.com/blog/612-introducing-github-compare-view) rocks.But [diff of Gemfile.lock](https://github.com/kyanny/compare_linker_demo/pull/14/files) sucks. So I made Compare Linker.
 
-Rack app for listening GitHub Webhook
--------------------------------------
+## Rack app for listening GitHub Webhook
 
 There's rack application for Compare Linker with GitHub's Webhook.
 
 https://github.com/kyanny/compare_linker_rack_app
+
+[travis-badge]: https://travis-ci.org/masutaka/compare_linker.svg?branch=master
+[travis-link]: https://travis-ci.org/masutaka/compare_linker
+[gem-badge]: https://badge.fury.io/rb/compare_linker.svg
+[gem-link]: http://badge.fury.io/rb/compare_linker

data/lib/compare_linker.rb

@@ -1,4 +1,5 @@
 require "octokit"
+require_relative "compare_linker/formatter/base"
 require_relative "compare_linker/formatter/text"
 require_relative "compare_linker/formatter/markdown"
 require_relative "compare_linker/github_link_finder"

data/lib/compare_linker/formatter/base.rb

@@ -0,0 +1,16 @@
+class CompareLinker
+  class Formatter
+    class Base
+      private
+
+      def downgrade?(old_ver, new_ver, old_tag, new_tag)
+        Gem::Version.new(new_ver) < Gem::Version.new(old_ver) ||
+          (old_tag && new_tag && Gem::Version.new(to_ver(new_tag)) < Gem::Version.new(to_ver(old_tag)))
+      end
+
+      def to_ver(tag)
+        tag.sub(/\Av/, '')
+      end
+    end
+  end
+end

data/lib/compare_linker/formatter/markdown.rb

@@ -2,7 +2,7 @@ require "ostruct"
 
 class CompareLinker
   class Formatter
-    class Markdown
+    class Markdown < Base
       def format(gem_info)
         g = OpenStruct.new(gem_info)
 
@@ -19,7 +19,7 @@ class CompareLinker
           "* #{g.gem_name}: (link not found) #{g.old_ver} => #{g.new_ver}"
         end
 
-        if (g.old_tag && g.new_tag && g.new_tag.to_f < g.old_tag.to_f) || g.new_ver.to_f < g.old_ver.to_f
+        if downgrade?(g.old_ver, g.new_ver, g.old_tag, g.new_tag)
           text += " (downgrade)"
         end
 

data/lib/compare_linker/formatter/text.rb

@@ -2,7 +2,7 @@ require "ostruct"
 
 class CompareLinker
   class Formatter
-    class Text
+    class Text < Base
       def format(gem_info)
         g = OpenStruct.new(gem_info)
 
@@ -19,7 +19,7 @@ class CompareLinker
           "#{g.gem_name} (link not found): #{g.old_ver} => #{g.new_ver}"
         end
 
-        if (g.old_tag && g.new_tag && g.new_tag.to_f < g.old_tag.to_f) || g.new_ver.to_f < g.old_ver.to_f
+        if downgrade?(g.old_ver, g.new_ver, g.old_tag, g.new_tag)
           text += " (downgrade)"
         end
 

data/lib/compare_linker/github_link_finder.rb

@@ -1,5 +1,6 @@
 require "json"
 require "httpclient"
+require "net/http"
 
 class CompareLinker
   class GithubLinkFinder
@@ -22,6 +23,7 @@ class CompareLinker
       if github_url.nil?
         @homepage_uri = gem_info["homepage_uri"]
       else
+        github_url = redirect_url(github_url)
         _, @repo_owner, @repo_name = github_url.match(%r!github\.com/([^/]+)/([^/]+)!).to_a
       end
     end
@@ -29,5 +31,20 @@ class CompareLinker
     def repo_full_name
       "#{@repo_owner}/#{repo_name}"
     end
+
+    private
+
+    def redirect_url(url, limit = 5)
+      raise ArgumentError, 'HTTP redirect too deep' if limit <= 0
+      response = Net::HTTP.get_response(URI.parse(url))
+      case response
+      when Net::HTTPSuccess
+        url
+      when Net::HTTPRedirection
+        redirect_url(response['location'], limit - 1)
+      else
+        raise ItemNotFound
+      end
+    end
   end
 end

data/lib/compare_linker/version.rb

@@ -1,3 +1,3 @@
 class CompareLinker
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compare_linker
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Kensuke Nagae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -98,6 +98,7 @@ files:
 - compare_linker.gemspec
 - guides/jenkins_setup_guide.md
 - lib/compare_linker.rb
+- lib/compare_linker/formatter/base.rb
 - lib/compare_linker/formatter/markdown.rb
 - lib/compare_linker/formatter/text.rb
 - lib/compare_linker/github_link_finder.rb