eac_launcher 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd361cfa7ad448a1aeee023d843863bf0419744a0b17de9406399da242d0a6ee
-  data.tar.gz: d93808ebacfada34ac429c36bdb446908e7c67359f9dd2e52cbe93f763d242b5
+  metadata.gz: f453a237fe5a382f052500e8178c85135a8583557818ea13452d775f3579bddd
+  data.tar.gz: c51e91c7a7529219470a359a706f9655b5a5c2b5305ccbbb2a2a7b390032380c
 SHA512:
-  metadata.gz: 18d69da69e448fff130c5cb94d74943c706f7999af039443979091217822ed5444b6dd9998f1b59804d1ae6a8df71cd0ecfc548bb70ead6d7a0197a357fcd2c4
-  data.tar.gz: c3a5e35ca0ed7739fb2defe422d86511ce6e5ba95ab21a67341bf170ed745cc7ec101c7e33c1630f59b64b6dda728c610e75da7f5a0b5d51535bd6e00ae4ab1b
+  metadata.gz: 9fbd53bb2c9c6b8b58fe1fe2de939a4f971df5c6afa0833fe5d75228008879cf8d02a279c02ff8df544988d8a6399fa7254504ea9631514af2f9177f24dff2a0
+  data.tar.gz: fd25983e2b02d4a216be0bba799e6b5a0d67f6557ca46034353e97b469474fbcdac419f6eddd10fcd0ce9e7e6341374069897ab1388678e182305b1145071c7a

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Declare your gem's dependencies in users_support.gemspec.

data/lib/eac_launcher/context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/hash/indifferent_access'
 require 'eac_ruby_utils/simple_cache'
 require 'eac_ruby_utils/console/speaker'
@@ -12,7 +14,7 @@ module EacLauncher
     include ::EacRubyUtils::SimpleCache
     include ::EacRubyUtils::Console::Speaker
 
-    DEFAULT_PROJECTS_ROOT = '.'.freeze
+    DEFAULT_PROJECTS_ROOT = '.'
     DEFAULT_SETTINGS_FILE = ::File.join(ENV['HOME'], '.config', 'eac_launcher', 'settings.yml')
     DEFAULT_CACHE_ROOT = ::File.join(ENV['HOME'], '.cache', 'eac_launcher')
 

data/lib/eac_launcher/context/instance_discovery.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ruby-progressbar'
 require 'eac_launcher/instances/base'
 
@@ -11,7 +13,7 @@ module EacLauncher
         @progress = ::ProgressBar.create(title: 'Instance discovery', total: 1)
         @instances = path_instances(@context.root, nil)
       ensure
-        @progress.finish if @progress
+        @progress&.finish
       end
 
       private
@@ -33,8 +35,8 @@ module EacLauncher
         r = []
         begin
           yield(r) if path.included?
-        rescue StandardError => ex
-          warn("#{path}: #{ex}")
+        rescue StandardError => e
+          warn("#{path}: #{e}")
         end
         r
       end

data/lib/eac_launcher/context/instance_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require('yaml')
 
 module EacLauncher
@@ -24,7 +26,7 @@ module EacLauncher
       private
 
       def instances_uncached
-        (cached_instances ? cached_instances : search_instances).select(&:included?)
+        (cached_instances || search_instances).select(&:included?)
       end
 
       def search_instances
@@ -34,6 +36,7 @@ module EacLauncher
       def cached_instances
         return nil if @context.recache
         return nil unless cached_instances_file_content
+
         CachedInstances.new(cached_instances_file_content).instances
       end
 
@@ -61,6 +64,7 @@ module EacLauncher
         data = cached_instances_file_content
         return false unless data[instance.logical]
         return false unless data[instance.logical][:publish_state].is_a?(Hash)
+
         data[instance.logical][:publish_state].any? do |_k, v|
           ::EacLauncher::Publish::CheckResult.pending_status?(v)
         end
@@ -76,12 +80,13 @@ module EacLauncher
           @content.keys.map { |k| by_logical_path(k) }
         end
 
-        def by_logical_path(k)
-          return @instances[k] if @instances.key?(k)
-          h = @content[k]
+        def by_logical_path(key)
+          return @instances[key] if @instances.key?(key)
+
+          h = @content[key]
           parent_instance = h[:parent] ? by_logical_path(h[:parent]) : nil
           path = ::EacLauncher::Paths::Logical.from_h(@context, h)
-          @instances[k] = ::EacLauncher::Instances::Base.instanciate(path, parent_instance)
+          @instances[key] = ::EacLauncher::Instances::Base.instanciate(path, parent_instance)
         end
       end
     end

data/lib/eac_launcher/context/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_ruby_utils/simple_cache'
 require 'yaml'
 require 'eac_launcher/instances/settings'
@@ -37,6 +39,7 @@ module EacLauncher
       def node_value(data, path)
         return data if path.empty?
         return nil unless data.is_a?(Hash)
+
         node_value(data[path.first], path.drop(1))
       end
     end

data/lib/eac_launcher/git.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/git/base'
 require 'eac_launcher/git/error'
 require 'eac_launcher/git/mirror_update'

data/lib/eac_launcher/git/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_ruby_utils/simple_cache'
 require 'eac_ruby_utils/envs'
 require 'eac_launcher/paths/real'
@@ -22,6 +24,7 @@ module EacLauncher
         r.strip! if r.is_a?(String)
         return r if r.present?
         return nil unless required
+
         raise "Reference \"#{ref}\" not found"
       end
 
@@ -41,6 +44,7 @@ module EacLauncher
       def descendant?(descendant, ancestor)
         base = merge_base(descendant, ancestor)
         return false if base.blank?
+
         revparse = execute!('rev-parse', '--verify', ancestor).strip
         base == revparse
       end
@@ -50,6 +54,7 @@ module EacLauncher
         while refs.count > 1
           refs[1] = merge_base_pair(refs[0], refs[1])
           return nil if refs[1].blank?
+
           refs.shift
         end
         refs.first
@@ -105,8 +110,8 @@ module EacLauncher
 
       private
 
-      def merge_base_pair(c1, c2)
-        execute!('merge-base', c1, c2, exit_outputs: { 256 => '' }).strip
+      def merge_base_pair(commit1, commit2)
+        execute!('merge-base', commit1, commit2, exit_outputs: { 256 => '' }).strip
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/object'
 
 module EacLauncher
@@ -7,8 +9,10 @@ module EacLauncher
         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
 
@@ -16,16 +20,18 @@ module EacLauncher
           h = subrepo_status(subrepo_path)
           url = h['Remote URL']
           return url if url.present?
+
           raise "Remote URL is blank for subrepo \"#{subrepo_path}\" (Subrepo status: #{h})"
         end
 
         private
 
-        def subrepo_status_parse_output(s)
+        def subrepo_status_parse_output(output)
           r = {}.with_indifferent_access
-          s.each_line do |l|
+          output.each_line do |l|
             m = /\A([^\:]+)\:(.*)\z/.match(l.strip)
             next unless m && m[2].present?
+
             r[m[1].strip] = m[2].strip
           end
           r

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_ruby_utils/envs'
 require 'git'
 require 'eac_launcher/paths/real'

data/lib/eac_launcher/git/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EacLauncher
   module Git
     class Error < StandardError

data/lib/eac_launcher/git/mirror_update.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/git/base'
 
 module EacLauncher

data/lib/eac_launcher/git/publish_base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_ruby_utils/simple_cache'
 require 'eac_ruby_utils/simple_cache'
 require 'eac_launcher/publish/base'
@@ -51,6 +53,7 @@ module EacLauncher
 
       def local_following?
         return true if remote_sha.blank?
+
         sgit.descendant?(local_sha, remote_sha)
       end
 

data/lib/eac_launcher/git/sub_warp_base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/instances/error'
 
 module EacLauncher
@@ -8,11 +10,13 @@ module EacLauncher
       def parent_instance_uncached
         r = find_parent_instance(instance.parent)
         return r if r
+
         ::EacLauncher::Instances::Error.new('Git parent not found')
       end
 
       def find_parent_instance(current)
         return current if current.stereotype?(::EacLauncher::Stereotypes::Git)
+
         current.parent ? find_parent_instance(current.parent) : nil
       end
 

data/lib/eac_launcher/git/warp_base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/git/mirror_update'
 require 'eac_launcher/vendor/github'
 
@@ -10,7 +12,7 @@ module EacLauncher
     class WarpBase < ::EacLauncher::Paths::Real
       include ::EacRubyUtils::SimpleCache
 
-      TARGET_REMOTE = 'target'.freeze
+      TARGET_REMOTE = 'target'
 
       def initialize(instance)
         @instance = instance

data/lib/eac_launcher/instances.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/instances/base'
 require 'eac_launcher/instances/error'
 require 'eac_launcher/instances/runner_helper'

data/lib/eac_launcher/instances/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base/cache'
 
 module EacLauncher
@@ -14,6 +16,7 @@ module EacLauncher
         def instanciate(path, parent)
           unless path.is_a?(::EacLauncher::Instances::Base)
             raise "#{path} is not a project" unless path.project?
+
             path.extend(::EacLauncher::Instances::Base)
             path.parent = parent
           end
@@ -33,6 +36,7 @@ module EacLauncher
 
       def to_parent_path
         return self unless @parent
+
         logical.gsub(/\A#{Regexp.quote(@parent.logical)}/, '')
       end
 
@@ -43,6 +47,7 @@ module EacLauncher
       def publish_run
         stereotypes.each do |s|
           next unless publish?(s)
+
           infov(name, "publishing #{s.stereotype_name_in_color}")
           s.publish_class.new(self).run
         end
@@ -51,6 +56,7 @@ module EacLauncher
       def publish_check
         stereotypes.each do |s|
           next unless publish?(s)
+
           puts "#{name.to_s.cyan}|#{s.stereotype_name_in_color}|" \
             "#{s.publish_class.new(self).check}"
         end
@@ -72,6 +78,7 @@ module EacLauncher
 
       def publish?(stereotype)
         return false unless stereotype.publish_class
+
         filter = ::EacLauncher::Context.current.publish_options[:stereotype]
         filter.blank? ? true : filter == stereotype.name.demodulize
       end

data/lib/eac_launcher/instances/base/cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EacLauncher
   module Instances
     module Base
@@ -9,6 +11,7 @@ module EacLauncher
         def cache_key(key, &block)
           v = cache_key_get(key)
           return v if v.present? || block.nil?
+
           v = yield
           cache_key_write(key, v)
           v

data/lib/eac_launcher/instances/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EacLauncher
   module Instances
     class Error < StandardError

data/lib/eac_launcher/instances/runner_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/console/speaker'
 
@@ -17,6 +19,7 @@ module EacLauncher
       def find_instance!(instance_path)
         instance = find_instance(instance_path)
         return instance if instance
+
         raise "Instance not found in \"#{instance_path}\""
       end
 

data/lib/eac_launcher/instances/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EacLauncher
   module Instances
     class Settings

data/lib/eac_launcher/paths.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/paths/logical'
 require 'eac_launcher/paths/real'

data/lib/eac_launcher/paths/logical.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/paths/real'
 require 'eac_launcher/stereotypes'
 
@@ -7,9 +9,9 @@ module EacLauncher
       include ::EacRubyUtils::SimpleCache
 
       class << self
-        def from_h(context, h)
-          parent_path = h[:parent_path] ? from_h(context, h[:parent_path]) : nil
-          new(context, parent_path, h[:real], h[:logical])
+        def from_h(context, hash)
+          parent_path = hash[:parent_path] ? from_h(context, hash[:parent_path]) : nil
+          new(context, parent_path, hash[:real], hash[:logical])
         end
       end
 
@@ -40,6 +42,7 @@ module EacLauncher
           c_path = ::File.join(warped, c)
           next unless ::File.directory?(c_path)
           next if c.start_with?('.')
+
           r << build_child(c)
         end
         r

data/lib/eac_launcher/paths/real.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 module EacLauncher
   module Paths
     class Real < String
       def initialize(path)
         raise "Argument path is not a string: \"#{path}\"|#{path.class}" unless path.is_a?(String)
+
         super(path)
       end
 
@@ -16,12 +19,14 @@ module EacLauncher
 
       def dirname
         return nil if self == '/'
+
         self.class.new(::File.dirname(self))
       end
 
       def find_file_with_extension(extension)
         r = find_files_with_extension(extension)
         return r.first if r.any?
+
         raise "Extension \"#{extension}\" not found in directory \"#{self}\""
       end
 

data/lib/eac_launcher/project.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EacLauncher
   class Project
     attr_reader :name, :instances

data/lib/eac_launcher/publish.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/publish/base'
 require 'eac_launcher/publish/check_result'

data/lib/eac_launcher/publish/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/instances/error'
 
 module EacLauncher
@@ -13,6 +15,7 @@ module EacLauncher
         s = check
         info("Check: #{s}")
         return unless s.status == ::EacLauncher::Publish::CheckResult::STATUS_PENDING
+
         publish
       end
 
@@ -32,10 +35,10 @@ module EacLauncher
 
       def check_with_rescue
         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}")
+      rescue ::EacLauncher::Instances::Error => e
+        ::EacLauncher::Publish::CheckResult.blocked("Error: #{e}")
+      rescue ::EacLauncher::Git::Error => e
+        ::EacLauncher::Publish::CheckResult.blocked("Git error: #{e}")
       end
     end
   end

data/lib/eac_launcher/publish/check_result.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'active_support/concern' # Missing on "eac/listable"
 require 'active_support/hash_with_indifferent_access'
-require 'eac/listable'
+require 'eac_ruby_utils/listable'
 
 module EacLauncher
   module Publish
     class CheckResult
-      include ::Eac::Listable
+      include ::EacRubyUtils::Listable
 
       lists.add_string :status, :updated, :pending, :blocked, :outdated
 
@@ -44,6 +46,7 @@ module EacLauncher
       def initialize(status, message)
         raise "Status \"#{status}\" not in #{self.class.lists.status.values}" unless
         self.class.lists.status.values.include?(status)
+
         @status = status
         @message = message
       end

data/lib/eac_launcher/ruby.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/ruby/gem'

data/lib/eac_launcher/ruby/gem.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/ruby/gem/build'
 require 'eac_launcher/ruby/gem/specification'

data/lib/eac_launcher/ruby/gem/build.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tmpdir'
 require 'eac_ruby_utils/console/speaker'
 require 'eac_ruby_utils/envs'
@@ -15,6 +17,7 @@ module EacLauncher
 
         def output_file
           return nil unless @gem_root
+
           @gem_root.find_files_with_extension('.gem').first
         end
 
@@ -24,6 +27,7 @@ module EacLauncher
 
         def build
           return if builded?
+
           copy_gem_files
           build_gem
           check_gem_empty_size
@@ -85,12 +89,14 @@ module EacLauncher
         def check_gem_version
           spec = ::EacLauncher::Ruby::Gem::Specification.new(gemspec_file)
           return if ::File.basename(output_file, '.gem') == spec.full_name
+
           raise("Builded gem is not the same version of gemspec (#{spec}, #{output_file})")
         end
 
         def bundle_dependencies
           gemfile = @gem_root.subpath('Gemfile')
           return unless ::File.exist?(gemfile)
+
           Dir.chdir(@gem_root) do
             EacRubyUtils::Envs.local.command('bundle', 'install').execute!
           end
@@ -105,7 +111,7 @@ module EacLauncher
           old_values.keys.each { |k| ENV.delete(k) }
           yield
         ensure
-          old_values.each { |k, v| ENV[k] = v } if old_values
+          old_values&.each { |k, v| ENV[k] = v }
         end
 
         def envvars_starting_with(start_with_vars)

data/lib/eac_launcher/ruby/gem/specification.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/object'
 
 module EacLauncher
@@ -21,6 +23,7 @@ module EacLauncher
         def version
           v = self.class.parse_version_file(version_file)
           return v if v.present?
+
           raise "Version not found on file \"#{version_file}\""
         end
 
@@ -45,6 +48,7 @@ module EacLauncher
         def version_file
           f = ::File.join(gem_root, 'lib', *namespace_parts, 'version.rb')
           return f if ::File.exist?(f)
+
           raise "Version file \"#{f}\" does not exist"
         end
 

data/lib/eac_launcher/runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_launcher/runner/instances'
 require 'eac_launcher/runner/projects'
@@ -5,7 +7,7 @@ require 'eac_launcher/runner/publish'
 
 module EacLauncher
   class Runner < ::EacRubyUtils::Console::DocoptRunner
-    DOC = <<DOCOPT.freeze
+    DOC = <<DOCOPT
 Utilities to deploy applications and libraries.
 
 Usage:

data/lib/eac_launcher/runner/instances.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/instances/runner_helper'
 
 module EacLauncher
   class Runner < ::EacRubyUtils::Console::DocoptRunner
     class Instances < ::EacLauncher::Instances::RunnerHelper
-      DOC = <<DOCOPT.freeze
+      DOC = <<DOCOPT
 Mostra informações sobre instâncias.
 
 Usage:
@@ -24,11 +26,11 @@ DOCOPT
 
       private
 
-      def show_instance(i)
-        puts instance_label(i)
-        infov('  * Parent', (i.parent ? instance_label(i.parent) : '-'))
-        infov('  * Git current revision', i.options.git_current_revision)
-        infov('  * Git publish remote', i.options.git_publish_remote)
+      def show_instance(instance)
+        puts instance_label(instance)
+        infov('  * Parent', (instance.parent ? instance_label(instance.parent) : '-'))
+        infov('  * Git current revision', instance.options.git_current_revision)
+        infov('  * Git publish remote', instance.options.git_publish_remote)
       end
 
       def instance_path

data/lib/eac_launcher/runner/projects.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/context'
 require 'eac_launcher/instances/runner_helper'
 
 module EacLauncher
   class Runner < ::EacRubyUtils::Console::DocoptRunner
     class Projects < ::EacLauncher::Instances::RunnerHelper
-      DOC = <<DOCOPT.freeze
+      DOC = <<DOCOPT
 Shows available projects.
 
 Usage:
@@ -27,16 +29,17 @@ DOCOPT
 
       private
 
-      def show_project(p)
-        puts project_label(p)
+      def show_project(project)
+        puts project_label(project)
         return unless options['--instances']
-        p.instances.each do |i|
+
+        project.instances.each do |i|
           puts "  * #{instance_label(i)}"
         end
       end
 
-      def project_label(p)
-        p.to_s.cyan.to_s
+      def project_label(project)
+        project.to_s.cyan.to_s
       end
     end
   end

data/lib/eac_launcher/runner/publish.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module EacLauncher
   class Runner < ::EacRubyUtils::Console::DocoptRunner
     class Publish < ::EacLauncher::Instances::RunnerHelper
-      DOC = <<DOCOPT.freeze
+      DOC = <<DOCOPT
 Publica projetos ou instâncias.
 
 Usage:
@@ -27,6 +29,7 @@ DOCOPT
         build_publish_options
         instances.each do |i|
           next unless i.options.publishable?
+
           i.send(instance_method)
         end
       end

data/lib/eac_launcher/stereotype.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/string/inflections'
 
 module EacLauncher

data/lib/eac_launcher/stereotypes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/stereotypes/git'
 require 'eac_launcher/stereotypes/git_subrepo'
 require 'eac_launcher/stereotypes/git_subtree'

data/lib/eac_launcher/stereotypes/git.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/stereotype'
 
 module EacLauncher

data/lib/eac_launcher/stereotypes/git/publish.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/git/publish_base'
 
 module EacLauncher
   module Stereotypes
     class Git
       class Publish < ::EacLauncher::Git::PublishBase
-        PUBLISH_GIT_REMOTE_NAME = 'publish'.freeze
+        PUBLISH_GIT_REMOTE_NAME = 'publish'
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/git/warp_base'
 
 module EacLauncher

data/lib/eac_launcher/stereotypes/git_subrepo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/git/error'
 require 'eac_launcher/stereotype'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/git/publish_base'
 
 module EacLauncher

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_ruby_utils/simple_cache'
 require 'eac_launcher/git/sub_warp_base'
 require 'eac_launcher/instances/error'
@@ -28,6 +30,7 @@ module EacLauncher
         def check_parent
           return if parent_git_warped.rev_parse(subrepo_parent_hash) &&
                     parent_git_warped.descendant?('HEAD', subrepo_parent_hash)
+
           raise EacLauncher::Instances::Error, "Subrepo parent hash \"#{subrepo_parent_hash}\""\
             " not found in \"#{parent_git_warped}\""
         end
@@ -36,6 +39,7 @@ module EacLauncher
           data = parent_git_warped.subrepo_status(to_parent_git_path)
           h = data['Pull Parent']
           return h if h.present?
+
           raise EacLauncher::Instances::Error, "Subrepo parent hash is blank: #{data}"
         end
 

data/lib/eac_launcher/stereotypes/git_subtree.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/stereotype'
 require 'eac_launcher/stereotypes/git'
 
@@ -10,8 +12,10 @@ module EacLauncher
         def match?(path)
           return false if other_git_stereotype?(path)
           return false unless other_nogit_stereotype?(path)
+
           parent = parent_git(path.parent_path)
           return false unless parent
+
           ::Git.open(parent.real).remote(path.real.basename).url ? true : false
         end
 
@@ -19,9 +23,14 @@ module EacLauncher
           :green
         end
 
-        def parent_git(p)
-          return nil unless p
-          ::EacLauncher::Stereotypes::Git.match?(p) ? p : parent_git(p.parent_path)
+        def parent_git(parent_path)
+          return nil unless parent_path
+
+          if ::EacLauncher::Stereotypes::Git.match?(parent_path)
+            parent_path
+          else
+            parent_git(parent_path.parent_path)
+          end
         end
 
         def other_git_stereotype?(path)

data/lib/eac_launcher/stereotypes/git_subtree/publish.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EacLauncher
   module Stereotypes
     class GitSubtree

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EacLauncher
   module Stereotypes
     class GitSubtree

data/lib/eac_launcher/stereotypes/rails.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/stereotype'
 
 module EacLauncher

data/lib/eac_launcher/stereotypes/redmine_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/stereotype'
 
 module EacLauncher

data/lib/eac_launcher/stereotypes/ruby_gem.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/ruby/gem/specification'
 require 'eac_launcher/stereotype'
 require 'eac_launcher/stereotypes/ruby_gem/publish'

data/lib/eac_launcher/stereotypes/ruby_gem/publish.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'curb'
 require 'json'
 require 'eac_ruby_utils/simple_cache'
@@ -98,6 +100,7 @@ module EacLauncher
           http = Curl.get("https://rubygems.org/api/v1/versions/#{gem_spec.name}.json")
           return JSON.parse!(http.body_str) if /\A2/ =~ http.status
           return [] if /\A4/ =~ http.status
+
           raise "#{http} code error: #{http.status}"
         end
 

data/lib/eac_launcher/vendor.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'eac_launcher/vendor/github'

data/lib/eac_launcher/vendor/github.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 module EacLauncher
   module Vendor
     module Github
       class << self
         def to_ssh_url(url)
           return nil if url.blank?
+
           m = %r{\Ahttps://github.com/([^/]+)/([^/]+)\z}.match(url.to_s)
           m ? "git@github.com:#{m[1]}/#{m[2]}.git" : url
         end

data/lib/eac_launcher/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_launcher
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -59,39 +59,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.4
 - !ruby/object:Gem::Dependency
-  name: eac_rails_utils
+  name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.14
+        version: 0.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.14
-- !ruby/object:Gem::Dependency
-  name: eac_ruby_utils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -140,14 +126,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0.74'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0.74'
 description: 
 email: 
 executables: