tachikoma_ai 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57446d98a983297938aacb973884a7c46c4ac7fc
-  data.tar.gz: cc41502034a9dc63de29b10c1d32e563a4cba7c9
+  metadata.gz: 036d35e5edb505f39725fea36fb6ae032e9bcf27
+  data.tar.gz: a7e00c50e8f9122a9f7f3d97aaa87bc29a2f02c3
 SHA512:
-  metadata.gz: e359165c3aad51aa63a70ccb92facc111c2cbe0304607b8d14d5676e1fb8b9c925e5cee6d738e76d61f29c995701234a7c6091e23bce6e4e6d8c385a91e52d84
-  data.tar.gz: c9d70bdf10302e27795d0712f1c3e1be039a865fcf07b164284fffabfa8556142eff8247cefcb8e85c5cd3b2a1e66161cad89c41713b77fe502926ac471704af
+  metadata.gz: e69c17916d85dc6ecbb956e271b3b20aa0da0a75e02cc6ae15cb62cc704f7a278c24fd6f03d8a315ca0b99575a0a2eb77152c95031d5767d1532c1e23611effc
+  data.tar.gz: 2eadf556ad0f42d58d83baf2029bca06a1144edc89c3a2de934ec22663bb3e7fff09ad41befc804f31584cd143d51537eaf44d2733047ddaa4cfd25db2efeebf

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## master (unreleased)
 
+## v0.3.1
+
+- :bug: Fix an error that occurs when GitHub API returns 301
+
+## v0.3.0
+
 - :bug: Fix crash when specify a github repository in Gemfile
 - :sparkles: Support gems that have the official page
  - [lib/tachikoma_ai/strategies/bundler/urls.json](https://github.com/sinsoku/tachikoma_ai/blob/master/lib/tachikoma_ai/strategies/bundler/urls.json)

data/lib/tachikoma_ai/repository.rb

@@ -29,9 +29,23 @@ module TachikomaAi
     def tags
       return @tags if @tags
 
-      res = Net::HTTP.get_response URI.parse(api_tags_url)
+      res = fetch(api_tags_url)
       json = JSON.parse(res.body)
       @tags = json.map { |tag| tag['ref'].gsub('refs/tags/', '') }
     end
+
+    def fetch(uri_str, limit = 10)
+      raise ArgumentError, 'HTTP redirect too deep' if limit == 0
+
+      response = Net::HTTP.get_response URI.parse(uri_str)
+      case response
+      when Net::HTTPSuccess
+        response
+      when Net::HTTPRedirection
+        fetch(response['location'], limit - 1)
+      else
+        response.value
+      end
+    end
   end
 end

data/lib/tachikoma_ai/strategies/bundler/gem.rb

@@ -5,21 +5,15 @@ module TachikomaAi
   module Strategies
     class Bundler
       class Gem
-        STRING_PATTERN = /[-|\+]\s+(\S+)\s\((.+?)\)/
         major, minor = RUBY_VERSION.split('.')
         SPECS_PATH = "vendor/bundle/ruby/#{major}.#{minor}.0/specifications/".freeze
         URLS = JSON.parse(File.read(File.expand_path('urls.json', __dir__)))
 
-        attr_reader :name, :version
-        attr_accessor :from
+        attr_reader :name, :from, :version
 
-        def self.parse(s)
-          m = s.match STRING_PATTERN
-          new m[1], m[2]
-        end
-
-        def initialize(name, version)
+        def initialize(name, from, version)
           @name = name
+          @from = from
           @version = version
         end
 

data/lib/tachikoma_ai/strategies/bundler.rb

@@ -1,4 +1,5 @@
 require 'tachikoma_ai/strategies/bundler/gem'
+require 'bundler'
 
 module TachikomaAi
   module Strategies
@@ -20,26 +21,19 @@ module TachikomaAi
       def updated_gems
         return @updated_gems if @updated_gems
 
-        names = plus_gems.map(&:name) & minus_gems.map(&:name)
-        @updated_gems = plus_gems.select { |g| names.include? g.name }
-        @updated_gems.each do |g|
-          g.from = minus_gems.find { |mg| mg.name == g.name }.version
+        previous = lockfile('HEAD^')
+        @updated_gems = diff_specs(previous, lockfile('HEAD')).map do |spec|
+          before = previous.specs.find { |s| s.name == spec.name }
+          Gem.new(spec.name, before.version.to_s, spec.version.to_s)
         end
-        @updated_gems
       end
 
-      def diff
-        @diff ||= `git show --format= HEAD`.split("\n")
+      def diff_specs(previous, current)
+        current.specs.reject { |s| previous.specs.include?(s) }
       end
 
-      def minus_gems
-        @minus_gems ||= diff.select { |s| s =~ /^- {4}\S/ }
-                            .map { |s| Gem.parse(s) }
-      end
-
-      def plus_gems
-        @plus_gems ||= diff.select { |s| s =~ /^\+ {4}\S/ }
-                           .map { |s| Gem.parse(s) }
+      def lockfile(ref)
+        ::Bundler::LockfileParser.new(`git show #{ref}:Gemfile.lock`)
       end
 
       def compare_urls

data/lib/tachikoma_ai/version.rb

@@ -1,3 +1,3 @@
 module TachikomaAi
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tachikoma_ai
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - sinsoku
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-17 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tachikoma