gem_check_updates 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 609509feec0f6b3360d0dbc3a61def27427e66fac1e13c2753191d405cd477fa
-  data.tar.gz: fb487070cebcecd559f3d38b191bf6dc9d141ec438106f6d9269ee4dc8214956
+  metadata.gz: c9b7dc3e55d98f1c024b2a1534bfdd13927a52d06027dacce23f22c987941f7f
+  data.tar.gz: 30d9ae7118f8eda037aa8a515bb022ed89134c11b526003004bb47da955ad7de
 SHA512:
-  metadata.gz: 11f248b064c90ef50882525514d8befee01b5d5ace0ca0b69c6e68b991c2f731364edfe927c3cd8ddc14e1e50bc39bb043a760c035b32f2c18ce8c5e60ff14da
-  data.tar.gz: c9cdaa0f6814431b8aca28a91e5f4c00f73939f47bc0fd6becfcb19b40cbf7b1cb4a8c88f7701420efddde71d8df75a8b8a007091200b82e9527b2fc45273740
+  metadata.gz: d12db39ebe1710a825e147f2ea663b63bd45128ac3da0cecc9750c7c7bab6a83d386264f89519bdf15276d361a1a7dfc1ff42bb874b4746edec8589dbe8e3bdb
+  data.tar.gz: f0c9ef650359607c43280a2ad691d039c7a4fefb847e3ef81e5b042f2bd87e2d438fd69fc841390c693cf42411a5a995367eb108165808106f4199287f344ffa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gem_check_updates (0.3.0)
+    gem_check_updates (0.3.2)
       colored (~> 1.2)
       em-http-request (~> 1.1)
       em-synchrony (~> 1.0)
@@ -55,7 +55,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.59.1)
+    rubocop (0.59.2)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)

data/lib/gem_check_updates/gem.rb

@@ -5,58 +5,54 @@ module GemCheckUpdates
     DEFAULT_SCOPE = GemCheckUpdates::VersionScope::MAJOR
 
     attr_accessor :name
-    attr_accessor :latest_version
     attr_accessor :current_version
+    attr_accessor :versions
     attr_accessor :version_range
 
     def initialize(name: nil,
                    current_version: nil,
+                   versions: [],
                    version_range: nil,
-                   latest_version: nil,
                    update_scope: DEFAULT_SCOPE)
       @name = name
       @current_version = current_version
+      @versions = versions
       @version_range = version_range
-      @latest_version = latest_version
       @update_scope = update_scope
     end
 
     def update_available?
-      !@latest_version.nil? &&
+      !latest_version.nil? &&
         !@current_version.nil? &&
-        @current_version != '0' &&
-        @latest_version > @current_version
+        @current_version.version_specified? &&
+        latest_version > @current_version
     end
 
-    def scoped_latest_version(versions)
+    def latest_version
       # Ignore pre release version (ex. beta, rc), and sort desc
-      numbers = versions.map { |v| v['number'] }
-                        .select { |v| v.split('.').size < 4 }
-                        .sort_by { |v| v.split('.').map(&:to_i)[0, 3] }
-                        .reverse
-      current_major, current_minor = @current_version.split('.')
+      versions = @versions.reject(&:pre_release)
+                          .sort_by { |v| [v.major, v.minor, v.patch] }
+                          .reverse
 
       case @update_scope
       when GemCheckUpdates::VersionScope::MINOR
-        numbers.select { |n| n.split('.').first == current_major }.first
+        versions.select { |v| v.major == @current_version.major }.first
       when GemCheckUpdates::VersionScope::PATCH
-        numbers.select do |n|
-          major, minor = n.split('.')
-          major == current_major && minor == current_minor
+        versions.select do |v|
+          v.major == @current_version.major && v.minor == @current_version.minor
         end.first
       else
         # This branch is equal to specifying major updates
-        numbers.first
+        versions.first
       end
     end
 
     def highlighted_latest_version
-      Array.new(3) do |i|
-        c = @current_version.split('.')[i]
-        l = @latest_version.split('.')[i]
+      major = @current_version.major == latest_version.major ? latest_version.major : latest_version.major.green
+      minor = @current_version.minor == latest_version.minor ? latest_version.minor : latest_version.minor.green
+      patch = @current_version.patch == latest_version.patch ? latest_version.patch : latest_version.patch.green
 
-        c == l ? l : l.green
-      end.join('.')
+      [major, minor, patch].join('.')
     end
   end
 end

data/lib/gem_check_updates/gem_version.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module GemCheckUpdates
+  class GemVersion
+    include Comparable
+
+    attr_accessor :number
+    attr_accessor :major
+    attr_accessor :minor
+    attr_accessor :patch
+    attr_accessor :pre
+    attr_accessor :pre_release
+
+    def initialize(number: '0', pre_release: false)
+      @number = number
+      @major, @minor, @patch, @pre = number.split('.')
+      @pre_release = pre_release
+    end
+
+    def version_specified?
+      @number != '0'
+    end
+
+    def <=>(other)
+      weighted_version <=> other.weighted_version
+    end
+
+    def to_s
+      @number
+    end
+
+    def weighted_version
+      weights = [100, 10, 1]
+
+      [@major, @minor, @patch].map(&:to_i)
+                              .map.with_index { |n, i| n * weights[i] }
+    end
+  end
+end

data/lib/gem_check_updates/gemfile.rb

@@ -3,7 +3,7 @@
 module GemCheckUpdates
   class Gemfile
     RUBYGEMS_API = 'https://rubygems.org/api/v1/versions'
-    CONCURRENCY = 5
+    CONCURRENCY = 3
 
     attr_reader :option
     attr_reader :file_backup
@@ -32,7 +32,8 @@ module GemCheckUpdates
     def parse(update_scope)
       Bundler::Definition.build(@option.file, nil, nil).dependencies.map do |gem|
         name = gem.name
-        version_range, version = gem.requirements_list.first.split(' ')
+        version_range, version_number = gem.requirements_list.first.split(' ')
+        version = GemCheckUpdates::GemVersion.new(number: version_number)
 
         Gem.new(name: name,
                 current_version: version,
@@ -44,10 +45,16 @@ module GemCheckUpdates
     def check_updates!
       EventMachine.synchrony do
         EventMachine::Synchrony::FiberIterator.new(@gems, CONCURRENCY).each do |gem|
-          http = EM::HttpRequest.new("#{RUBYGEMS_API}/#{gem.name}.json").get
-          versions = JSON.parse(http.response)
+          http = EventMachine::HttpRequest.new("#{RUBYGEMS_API}/#{gem.name}.json").get
+          response = JSON.parse(http.response)
+          versions = response.map do |v|
+            number = v['number']
+            pre_release = v['prerelease']
 
-          gem.latest_version = gem.scoped_latest_version(versions)
+            GemCheckUpdates::GemVersion.new(number: number, pre_release: pre_release)
+          end
+
+          gem.versions = versions
           GemCheckUpdates::Message.out('.')
         end
 
@@ -75,7 +82,7 @@ module GemCheckUpdates
             _, name, old_version = *matcher
             target = @gems.find { |gem| gem.name == name }
 
-            line.gsub!(old_version, target.latest_version) unless target.nil?
+            line.gsub!(old_version, target.latest_version.to_s) unless target.nil?
           end
 
           updated.puts(line)

data/lib/gem_check_updates/runner.rb

@@ -7,20 +7,19 @@ module GemCheckUpdates
       gemfile = Gemfile.new(option)
 
       if option.apply
-        begin
-          gemfile.backup
-          gemfile.update
-          gemfile.remove_backup
+        gemfile.backup
+        gemfile.update
+        gemfile.remove_backup
 
-          GemCheckUpdates::Message.update_completed(gemfile)
-        rescue StandardError => e
-          gemfile.restore
-
-          GemCheckUpdates::Message.out(e.message.red)
-        end
+        GemCheckUpdates::Message.update_completed(gemfile)
       else
         GemCheckUpdates::Message.updatable_gems(gemfile)
       end
+    rescue StandardError => e
+      gemfile&.restore
+
+      GemCheckUpdates::Message.out(e.message.red)
+      exit(1)
     end
   end
 end

data/lib/gem_check_updates/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GemCheckUpdates
-  VERSION = '0.3.0'
+  VERSION = '0.3.2'
 end

data/lib/gem_check_updates.rb

@@ -17,8 +17,6 @@ require 'gem_check_updates/version_scope'
 require 'gem_check_updates/option'
 require 'gem_check_updates/message'
 require 'gem_check_updates/gemfile'
+require 'gem_check_updates/gem_version'
 require 'gem_check_updates/gem'
 require 'gem_check_updates/runner'
-
-module GemCheckUpdates
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem_check_updates
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Yusuke Mukai
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-30 00:00:00.000000000 Z
+date: 2018-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,6 +161,7 @@ files:
 - gem_check_updates.gemspec
 - lib/gem_check_updates.rb
 - lib/gem_check_updates/gem.rb
+- lib/gem_check_updates/gem_version.rb
 - lib/gem_check_updates/gemfile.rb
 - lib/gem_check_updates/message.rb
 - lib/gem_check_updates/option.rb