eac_launcher 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 565fc4ab1f27c68e3cfd0004bdae700508cedf36b1e6ada6e768f77e6a47fbd9
-  data.tar.gz: 18c26e86d04b2e1e0bf0f058af24ef3f6402132e0fff33cac07ff6dba2f25754
+  metadata.gz: 7072e95fd5469a713475499353cb9afaa0d1c26fe7c75f12118ba8ed4b9fa741
+  data.tar.gz: c7baa168a8b4032895bfe9671ef666b9c78226e0472ae0d1ef61bf624c321359
 SHA512:
-  metadata.gz: ef72bcbda016a06d3c67263dc0edc9da63909365d3680a6d6fc38669ec8abf4b05215478fa7b76a1dbb797cdfbbf38326a2e12f5fbe3f4c28dc8e499689bc892
-  data.tar.gz: 36c0cbb61f3085af3b019b752dffc11a880e405ce0c8c8231094b2de5288dbe06bcf9d8350d9348c94c7d2fc5521ade3bff497b8ad2706ae836aa03334580436
+  metadata.gz: 39e340849a2e5031388fac6b0ddb457aaee69702b99cc035e6d3c9790fc421763ba8da8aead169a462350ac787318220c2de899b8bdb4b4368811ef7767815bc
+  data.tar.gz: 808fc5482fb750e82d53a25e71a6a51172e7ee7c843cf85bb2760e24fa0335fa1798a18e4257044a8a5bafef0ec6b0054436bf50748a2de58522ac497b94dfe4

data/lib/eac_launcher/git/base.rb

@@ -5,6 +5,7 @@ require 'eac_ruby_utils/envs'
 require 'eac_launcher/paths/real'
 require 'eac_launcher/git/base/underlying'
 require 'eac_launcher/git/base/subrepo'
+require 'eac_launcher/git/error'
 
 module EacLauncher
   module Git
@@ -12,6 +13,7 @@ module EacLauncher
       include ::EacRubyUtils::SimpleCache
       include ::EacLauncher::Git::Base::Subrepo
       include ::EacLauncher::Git::Base::Underlying
+      require_relative ::File.join(__dir__, 'base', '_remotes')
 
       def init_bare
         FileUtils.mkdir_p(self)
@@ -28,19 +30,6 @@ module EacLauncher
         raise "Reference \"#{ref}\" not found"
       end
 
-      def remote_hashs(remote_name)
-        r = {}
-        execute!(['ls-remote', remote_name]).each_line do |line|
-          x = line.strip.split(/\s+/)
-          r[x[1]] = x[0]
-        end
-        r
-      end
-
-      def remote_exist?(remote_name)
-        git.remote(remote_name).url.present?
-      end
-
       def descendant?(descendant, ancestor)
         base = merge_base(descendant, ancestor)
         return false if base.blank?
@@ -64,19 +53,6 @@ module EacLauncher
         execute!('subtree', '-q', 'split', '-P', prefix).strip
       end
 
-      def assert_remote_url(remote_name, url)
-        r = git.remote(remote_name)
-        if !r.url || r.url != url
-          r.remove if r.url
-          git.add_remote(remote_name, url)
-        end
-        r
-      end
-
-      def remote_branch_sha(remote_name, branch_name)
-        remote_hashs(remote_name)["refs/heads/#{branch_name}"]
-      end
-
       def push(remote_name, refspecs, options = {})
         refspecs = [refspecs] unless refspecs.is_a?(Array)
         args = ['push']

data/lib/eac_launcher/git/base/_remotes.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_launcher/git/remote'
+
+module EacLauncher
+  module Git
+    class Base < ::EacLauncher::Paths::Real
+      # @return [EacLauncher::Git::Remote]
+      def remote(name)
+        ::EacLauncher::Git::Remote.new(self, name)
+      end
+
+      def remote_hashs(remote_name)
+        remote(remote_name).ls
+      end
+
+      def remote_exist?(remote_name)
+        remote(remote_name).exist?
+      end
+
+      def assert_remote_url(remote_name, url)
+        r = git.remote(remote_name)
+        if !r.url || r.url != url
+          r.remove if r.url
+          git.add_remote(remote_name, url)
+        end
+        r
+      end
+
+      def remote_branch_sha(remote_name, branch_name)
+        remote_hashs(remote_name)["refs/heads/#{branch_name}"]
+      end
+    end
+  end
+end

data/lib/eac_launcher/git/publish_base.rb

@@ -10,7 +10,7 @@ module EacLauncher
       include ::EacRubyUtils::SimpleCache
       include ::EacRubyUtils::Console::Speaker
 
-      CHECKERS = %w[remote_fetch publish_remote_no_exist remote_equal remote_following
+      CHECKERS = %w[remote_url remote_fetch publish_remote_no_exist remote_equal remote_following
                     local_following].freeze
 
       REMOTE_UNAVAILABLE_MESSAGES = ['could not resolve hostname', 'connection timed out',
@@ -28,6 +28,12 @@ module EacLauncher
 
       private
 
+      def remote_url_check_result
+        return if sgit.remote(remote_name).url.present?
+
+        ::EacLauncher::Publish::CheckResult.blocked("Remote \"#{remote_name}\" has blank path")
+      end
+
       def remote_fetch_check_result
         remote_fetch
         nil
@@ -45,7 +51,7 @@ module EacLauncher
       end
 
       def publish_remote_no_exist_check_result
-        return nil if sgit.remote_exist?(::EacLauncher::Git::WarpBase::TARGET_REMOTE)
+        return nil if sgit.remote_exist?(remote_name)
 
         ::EacLauncher::Publish::CheckResult.blocked('Remote does not exist')
       end
@@ -84,7 +90,7 @@ module EacLauncher
 
       def publish
         info 'Pushing...'
-        sgit.push(::EacLauncher::Git::WarpBase::TARGET_REMOTE, 'HEAD:master',
+        sgit.push(remote_name, 'HEAD:master',
                   dryrun: !::EacLauncher::Context.current.publish_options[:confirm])
         info 'Pushed!'
       end
@@ -95,12 +101,16 @@ module EacLauncher
 
       def remote_sha_uncached
         remote_fetch
-        b = sgit.git.branches["#{::EacLauncher::Git::WarpBase::TARGET_REMOTE}/master"]
+        b = sgit.git.branches["#{remote_name}/master"]
         b ? b.gcommit.sha : nil
       end
 
       def remote_fetch_uncached
-        sgit.fetch(::EacLauncher::Git::WarpBase::TARGET_REMOTE)
+        sgit.fetch(remote_name)
+      end
+
+      def remote_name
+        ::EacLauncher::Git::WarpBase::TARGET_REMOTE
       end
     end
   end

data/lib/eac_launcher/git/remote.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacLauncher
+  module Git
+    class Remote
+      common_constructor :git, :name
+
+      def exist?
+        git.execute!('remote').each_line.any? { |line| line.strip == name }
+      end
+
+      def ls
+        execute!(['ls-remote', name]).each_line.map do |line|
+          x = line.strip.split(/\s+/)
+          [x[1], x[0]]
+        end.to_h
+      end
+
+      # +git remote add ...+
+      def add(url)
+        git.execute!('remote', 'add', name, url)
+      end
+
+      # +git remote rm ...+
+      def remove
+        git.execute!('remote', 'rm', name)
+      end
+
+      # +git remote get-url ...+
+      def url
+        git.execute!('remote', 'get-url', name).strip.if_present(nil)
+      end
+
+      # git remote set-url ...
+      def url_set(url)
+        git.execute!('remote', 'set-url', name, url)
+      end
+
+      # Add or set URL if +url+ is present, remove remote if is blank.
+      def url=(url)
+        if exist? && url.blank?
+          remove
+        elsif exist? && self.url != url
+          url_set(url)
+        elsif !exist?
+          add(url)
+        end
+      end
+    end
+  end
+end

data/lib/eac_launcher/git/warp_base.rb

@@ -2,6 +2,7 @@
 
 require 'eac_launcher/git/mirror_update'
 require 'eac_launcher/vendor/github'
+require 'eac_launcher/stereotypes/git/publish'
 
 module EacLauncher
   module Git
@@ -12,12 +13,12 @@ module EacLauncher
     class WarpBase < ::EacLauncher::Paths::Real
       include ::EacRubyUtils::SimpleCache
 
-      TARGET_REMOTE = 'target'
+      TARGET_REMOTE = ::EacLauncher::Stereotypes::Git::Publish::PUBLISH_GIT_REMOTE_NAME
 
       def initialize(instance)
         @instance = instance
         cache_git.git.reset_hard(current_ref)
-        cache_git.assert_remote_url(TARGET_REMOTE, target_remote_url)
+        cache_git.remote(TARGET_REMOTE).url = target_remote_url
         super(path)
       end
 

data/lib/eac_launcher/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_launcher
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -64,20 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -151,11 +145,13 @@ files:
 - lib/eac_launcher/context/settings.rb
 - lib/eac_launcher/git.rb
 - lib/eac_launcher/git/base.rb
+- lib/eac_launcher/git/base/_remotes.rb
 - lib/eac_launcher/git/base/subrepo.rb
 - lib/eac_launcher/git/base/underlying.rb
 - lib/eac_launcher/git/error.rb
 - lib/eac_launcher/git/mirror_update.rb
 - lib/eac_launcher/git/publish_base.rb
+- lib/eac_launcher/git/remote.rb
 - lib/eac_launcher/git/sub_warp_base.rb
 - lib/eac_launcher/git/warp_base.rb
 - lib/eac_launcher/instances.rb