eac_launcher 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f453a237fe5a382f052500e8178c85135a8583557818ea13452d775f3579bddd
-  data.tar.gz: c51e91c7a7529219470a359a706f9655b5a5c2b5305ccbbb2a2a7b390032380c
+  metadata.gz: 565fc4ab1f27c68e3cfd0004bdae700508cedf36b1e6ada6e768f77e6a47fbd9
+  data.tar.gz: 18c26e86d04b2e1e0bf0f058af24ef3f6402132e0fff33cac07ff6dba2f25754
 SHA512:
-  metadata.gz: 9fbd53bb2c9c6b8b58fe1fe2de939a4f971df5c6afa0833fe5d75228008879cf8d02a279c02ff8df544988d8a6399fa7254504ea9631514af2f9177f24dff2a0
-  data.tar.gz: fd25983e2b02d4a216be0bba799e6b5a0d67f6557ca46034353e97b469474fbcdac419f6eddd10fcd0ce9e7e6341374069897ab1388678e182305b1145071c7a
+  metadata.gz: ef72bcbda016a06d3c67263dc0edc9da63909365d3680a6d6fc38669ec8abf4b05215478fa7b76a1dbb797cdfbbf38326a2e12f5fbe3f4c28dc8e499689bc892
+  data.tar.gz: 36c0cbb61f3085af3b019b752dffc11a880e405ce0c8c8231094b2de5288dbe06bcf9d8350d9348c94c7d2fc5521ade3bff497b8ad2706ae836aa03334580436

data/lib/eac_launcher/git/base.rb

@@ -92,7 +92,7 @@ module EacLauncher
 
       def fetch(remote_name, options = {})
         args = ['fetch', '-p', remote_name]
-        args << '--tags' if options[:tags]
+        args += %w[--tags --prune-tags --force] if options[:tags]
         execute!(*args)
       end
 

data/lib/eac_launcher/git/publish_base.rb

@@ -10,38 +10,55 @@ module EacLauncher
       include ::EacRubyUtils::SimpleCache
       include ::EacRubyUtils::Console::Speaker
 
-      CHECKERS = %w[publish_remote_no_exist remote_equal remote_following local_following].freeze
+      CHECKERS = %w[remote_fetch publish_remote_no_exist remote_equal remote_following
+                    local_following].freeze
+
+      REMOTE_UNAVAILABLE_MESSAGES = ['could not resolve hostname', 'connection timed out',
+                                     'no route to host'].map(&:downcase).freeze
 
       protected
 
       def internal_check
-        CHECKERS.each { |checker| return send("#{checker}_check_result") if send("#{checker}?") }
+        CHECKERS.each do |checker|
+          result = send("#{checker}_check_result")
+          return result if result
+        end
         divergent_result_check_result
       end
 
       private
 
-      def publish_remote_no_exist?
-        !sgit.remote_exist?(::EacLauncher::Git::WarpBase::TARGET_REMOTE)
+      def remote_fetch_check_result
+        remote_fetch
+        nil
+      rescue ::StandardError => e
+        raise e unless remote_unavailable_error?(e)
+
+        ::EacLauncher::Publish::CheckResult.blocked(e.message)
       end
 
-      def publish_remote_no_exist_check_result
-        ::EacLauncher::Publish::CheckResult.blocked('Remote does not exist')
+      def remote_unavailable_error?(error)
+        error_message = error.message.downcase
+        REMOTE_UNAVAILABLE_MESSAGES.any? do |message|
+          error_message.include?(message)
+        end
       end
 
-      def remote_equal?
-        remote_sha.present? && remote_sha == local_sha
+      def publish_remote_no_exist_check_result
+        return nil if sgit.remote_exist?(::EacLauncher::Git::WarpBase::TARGET_REMOTE)
+
+        ::EacLauncher::Publish::CheckResult.blocked('Remote does not exist')
       end
 
       def remote_equal_check_result
-        ::EacLauncher::Publish::CheckResult.updated('Remote equal')
-      end
+        return nil unless remote_sha.present? && remote_sha == local_sha
 
-      def remote_following?
-        remote_sha.present? && sgit.descendant?(remote_sha, local_sha)
+        ::EacLauncher::Publish::CheckResult.updated('Remote equal')
       end
 
       def remote_following_check_result
+        return nil unless remote_sha.present? && sgit.descendant?(remote_sha, local_sha)
+
         ::EacLauncher::Publish::CheckResult.outdated('Remote following')
       end
 
@@ -77,10 +94,14 @@ module EacLauncher
       end
 
       def remote_sha_uncached
-        sgit.fetch(::EacLauncher::Git::WarpBase::TARGET_REMOTE)
+        remote_fetch
         b = sgit.git.branches["#{::EacLauncher::Git::WarpBase::TARGET_REMOTE}/master"]
         b ? b.gcommit.sha : nil
       end
+
+      def remote_fetch_uncached
+        sgit.fetch(::EacLauncher::Git::WarpBase::TARGET_REMOTE)
+      end
     end
   end
 end

data/lib/eac_launcher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacLauncher
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_launcher
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport