eac_launcher 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ab5bf921659df3c88a83fe103ebd637cdf31867
-  data.tar.gz: cecdcb2756bc6a5588631da4c3add9c69af43169
+  metadata.gz: fa09c1db1d7f7920eda7d026847a546e94b65bc2
+  data.tar.gz: 96b777bdb3d914eaa887068900ec1b7d70f7a753
 SHA512:
-  metadata.gz: 7ce5c60b145385320aafc6e051246e4dd3b11b8d8406d22743a99c3b3561f2f67ec2f15a9b5ce70cb8dcb87e8f8770fbd1df3549d48999112653ece979343491
-  data.tar.gz: 0eaea78113863318f8a0579cd377b47fb4487962a38bf76bd9a54f271880de0e3a29ce22204458548b45d7a7ec67432d77764798636ac4dbd3cc96166e7cb68a
+  metadata.gz: ac3ba7b71c29973e5f709dec912b6cb87809312b4ea7c2424e51ed64efeb378ab8f287b6b7999d7846cd73f616e0e8896bf1fb6450f03cabe54ffc9f99df1bd8
+  data.tar.gz: 1dec30133f1e3544012e458bf4c89aa0cf28ed53e9ab4adeed854f89fb3452741158d2e5aff4f31546571ccfd153254a8ff53bb5698518c71586a55eb2b1cae8

data/lib/eac_launcher.rb

@@ -19,6 +19,7 @@ module EacLauncher
   require 'eac_launcher/stereotype'
   require 'eac_launcher/context/settings'
   require 'eac_launcher/git/base'
+  require 'eac_launcher/git/error'
   require 'eac_launcher/git/mirror_update'
   require 'eac_launcher/git/publish_base'
   require 'eac_launcher/git/warp_base'

data/lib/eac_launcher/git/base.rb

@@ -14,11 +14,12 @@ module EacLauncher
         File.exist?(subpath('.git'))
       end
 
-      def rev_parse(ref)
+      def rev_parse(ref, required = false)
         r = execute!('rev-parse', ref, exit_outputs: { 128 => nil, 32_768 => nil })
         r.strip! if r.is_a?(String)
-        r = nil if r == ''
-        r
+        return r if r.present?
+        return nil unless required
+        raise "Reference \"#{ref}\" not found"
       end
 
       def remote_hashs(remote_name)
@@ -95,6 +96,10 @@ module EacLauncher
         execute!('reset', '--hard', ref)
       end
 
+      def raise(message)
+        ::Kernel.raise EacLauncher::Git::Error.new(self, message)
+      end
+
       private
 
       def merge_base_pair(c1, c2)

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

@@ -4,6 +4,15 @@ module EacLauncher
       module Subrepo
         def subrepo_status(subrepo_path)
           s = execute!('subrepo', 'status', subrepo_path.gsub(%r{\A/}, ''))
+          raise s.strip.to_s if s.include?('is not a subrepo')
+          r = subrepo_status_parse_output(s)
+          raise "Empty subrepo status for |#{s}|\n" unless r.any?
+          r
+        end
+
+        private
+
+        def subrepo_status_parse_output(s)
           r = {}.with_indifferent_access
           s.each_line do |l|
             m = /\A([^\:]+)\:(.*)\z/.match(l.strip)

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

@@ -12,6 +12,11 @@ module EacLauncher
           ::EacRubyUtils::Envs.local.command(*args).system!(options)
         end
 
+        def init
+          git
+          self
+        end
+
         private
 
         def build_args(args)

data/lib/eac_launcher/git/error.rb

@@ -0,0 +1,9 @@
+module EacLauncher
+  module Git
+    class Error < StandardError
+      def initialize(git_instance, message)
+        super("#{message} (Repository: #{git_instance})")
+      end
+    end
+  end
+end

data/lib/eac_launcher/git/mirror_update.rb

@@ -24,9 +24,7 @@ module EacLauncher
       end
 
       def reset_source_rev
-        h = @source_git.rev_parse(@source_rev)
-        raise "Hash not found for ref. \"#{@source_rev}\" in \"#{@source_git}\"" unless h
-        @target_git.reset_hard(h)
+        @target_git.reset_hard(@source_git.rev_parse(@source_rev, true))
       end
     end
   end

data/lib/eac_launcher/publish/base.rb

@@ -12,6 +12,8 @@ module EacLauncher
         internal_check
       rescue ::EacLauncher::Instances::Error => ex
         ::EacLauncher::Publish::CheckResult.blocked("Error: #{ex}")
+      rescue ::EacLauncher::Git::Error => ex
+        ::EacLauncher::Publish::CheckResult.blocked("Git error: #{ex}")
       end
     end
   end

data/lib/eac_launcher/stereotypes/git_subrepo.rb

@@ -17,7 +17,7 @@ module EacLauncher
             m = /remote\s*=\s(.+)/.match(l)
             return m[1] if m
           end
-          raise "\"remote = ... \" not found (Path: #{path})"
+          raise ::EacLauncher::Git::Error.new(path, '"remote = ... " not found')
         end
       end
     end

data/lib/eac_launcher/stereotypes/git_subrepo/warp.rb

@@ -10,8 +10,7 @@ module EacLauncher
           @instance = instance
           check_parent
           init_aux
-          fetch
-          push
+          push_to_aux
           reset
           assert_target_remote
           super(cache_git)
@@ -27,9 +26,10 @@ module EacLauncher
         end
 
         def subrepo_parent_hash
-          h = parent_cache_git.subrepo_status(instance.to_parent_path)['Pull Parent']
+          data = parent_cache_git.subrepo_status(instance.to_parent_path)
+          h = data['Pull Parent']
           return h if h.present?
-          raise 'Subrepo parent hash is blank'
+          raise EacLauncher::Instances::Error, "Subrepo parent hash is blank: #{data}"
         end
 
         def init_aux
@@ -56,13 +56,10 @@ module EacLauncher
           ::EacLauncher::Git::Base.new(instance.cache_path('git_repository'))
         end
 
-        def fetch
-          parent_cache_git.execute!('subrepo', 'clean', subrepo_subdir)
-          parent_cache_git.execute!('subrepo', 'fetch', subrepo_subdir)
-        end
-
-        def push
-          parent_cache_git.execute!('subrepo', 'push', subrepo_subdir, '-r', aux_path, '-f')
+        def push_to_aux
+          parent_cache_git.execute!('subrepo', 'branch', subrepo_subdir, '-fF')
+          h = parent_cache_git.rev_parse("subrepo/#{subrepo_subdir}", true)
+          parent_cache_git.execute!('push', aux_path, "#{h}:refs/heads/master", '--force')
         end
 
         def subrepo_subdir

data/lib/eac_launcher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacLauncher
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.1.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_launcher
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -154,6 +154,7 @@ files:
 - lib/eac_launcher/git/base.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/warp_base.rb