eac_launcher 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59a443736eaaf23cbf3cb9690e04f5ff625d2325
-  data.tar.gz: a2d16dda60c6c7584121401bbe8bedb4e69c4313
+  metadata.gz: 52aa71693d4a4209ac7290124875448649aaed7b
+  data.tar.gz: 16cd264adfe0fbd7803a0f1226211071fc9c47f6
 SHA512:
-  metadata.gz: 0b24a6b4c192e00298cd8126b559447c1d8bb7d1397657e95ad2a1a7501009c5056df1f5a15a51cfcf9d3eef16f1ca2d2bbf003cadf3ebe9ed15001ed291c7eb
-  data.tar.gz: e692b08209116dc4d56d0526378e0d24b10b0e1c9fa2cab3585a91ca29fe029c44938d9661301421e0d9175e36ae08f4f39f2e310b79c956cbd758132c9a57ac
+  metadata.gz: 647bcc691051e3f74abf673997c289ba5246b51104278ebc3e4c9d48669ffb54e3d01c7fcd904f6172d523bdf29cb9610aa5084c43e6fd3ff25bf3a3620dc363
+  data.tar.gz: 29a16f00a5abd889bc15719dd3e1c3e2a9c8d22ace0a9b41181e397178b3886d5ff9a42ac7199c21fa27d61a1bff5e26c767b40d654c8fb1d0d010c516178a2c

data/lib/eac_launcher.rb

@@ -14,7 +14,8 @@ require('yaml')
 
 module EacLauncher
   require 'eac_launcher/context'
-  require 'eac_launcher/path'
+  require 'eac_launcher/paths/logical'
+  require 'eac_launcher/paths/real'
   require 'eac_launcher/project'
   require 'eac_launcher/stereotype'
   require 'eac_launcher/context/settings'

data/lib/eac_launcher/context.rb

@@ -1,6 +1,7 @@
 module EacLauncher
   class Context
     include ::Eac::SimpleCache
+    include ::EacRubyUtils::Console::Speaker
 
     DEFAULT_PROJECTS_ROOT = '.'.freeze
     DEFAULT_SETTINGS_FILE = ::File.join(ENV['HOME'], '.config', 'eac_launcher', 'settings.yml')
@@ -23,7 +24,7 @@ module EacLauncher
 
     def initialize(options = {})
       @options = options.with_indifferent_access
-      @root = ::EacLauncher::Instances::Base.new(build_option(:projects_root), nil)
+      @root = ::EacLauncher::Paths::Logical.new(nil, build_option(:projects_root), '/')
       @settings = ::EacLauncher::Context::Settings.new(build_option(:settings_file))
       @cache_root = build_option(:cache_root)
       @publish_options = { new: false, confirm: false, stereotype: nil }
@@ -50,30 +51,34 @@ module EacLauncher
     def projects_uncached
       r = {}
       instances.each do |i|
-        r[i.basename] ||= []
-        r[i.basename] << i
+        r[i.project_name] ||= []
+        r[i.project_name] << i
       end
       r.map { |name, instances| ::EacLauncher::Project.new(name, instances) }
-       .select { |p| include_project?(p) }
     end
 
     def instances_uncached
-      instance_instances(root)
+      path_instances(root, nil)
     end
 
-    def instance_instances(i)
-      r = []
-      r << i if include_instance?(i)
-      r += i.children.flat_map { |c| instance_instances(c) }
-      r
-    end
-
-    def include_project?(p)
-      !@settings.excluded_projects.include?(p.name)
+    def path_instances(path, parent_instance)
+      on_rescued_path_instances(path) do |r|
+        if path.project?
+          parent_instance = ::EacLauncher::Instances::Base.instanciate(path, self, parent_instance)
+          r << path if path.included?
+        end
+        r.concat(path.children.flat_map { |c| path_instances(c, parent_instance) })
+      end
     end
 
-    def include_instance?(i)
-      i.project? && !@settings.excluded_projects.include?(i.project_name)
+    def on_rescued_path_instances(path)
+      r = []
+      begin
+        yield(r)
+      rescue StandardError => ex
+        warn("#{path}: #{ex}")
+      end
+      r
     end
   end
 end

data/lib/eac_launcher/git/base.rb

@@ -3,7 +3,7 @@ require_relative 'base/subrepo'
 
 module EacLauncher
   module Git
-    class Base < ::EacLauncher::Path
+    class Base < ::EacLauncher::Paths::Real
       include ::Eac::SimpleCache
       include ::EacLauncher::Git::Base::Subrepo
       include ::EacLauncher::Git::Base::Underlying

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

@@ -1,6 +1,6 @@
 module EacLauncher
   module Git
-    class Base < ::EacLauncher::Path
+    class Base < ::EacLauncher::Paths::Real
       module Subrepo
         def subrepo_status(subrepo_path)
           s = execute!('subrepo', 'status', subrepo_path.gsub(%r{\A/}, ''))
@@ -10,6 +10,13 @@ module EacLauncher
           r
         end
 
+        def subrepo_remote_url(subrepo_path)
+          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)

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

@@ -1,6 +1,6 @@
 module EacLauncher
   module Git
-    class Base < ::EacLauncher::Path
+    class Base < ::EacLauncher::Paths::Real
       module Underlying
         def execute!(*args)
           args, options = build_args(args)

data/lib/eac_launcher/git/mirror_update.rb

@@ -1,6 +1,6 @@
 module EacLauncher
   module Git
-    class MirrorUpdate < ::EacLauncher::Path
+    class MirrorUpdate < ::EacLauncher::Paths::Real
       include ::Eac::SimpleCache
 
       def initialize(target_path, source_path, source_rev)
@@ -20,7 +20,8 @@ module EacLauncher
 
       def fetch_remote_source
         @target_git.git
-        @target_git.fetch("file://#{@source_git}", tags: true)
+        @target_git.assert_remote_url('origin', @source_git)
+        @target_git.fetch('origin', tags: true)
       end
 
       def reset_source_rev

data/lib/eac_launcher/git/publish_base.rb

@@ -37,7 +37,7 @@ module EacLauncher
       end
 
       def sgit_uncached
-        ::EacLauncher::Git::Base.new(@instance.current_cache)
+        ::EacLauncher::Git::Base.new(@instance.warped)
       end
 
       def publish

data/lib/eac_launcher/git/warp_base.rb

@@ -4,7 +4,7 @@ module EacLauncher
     #  * source_instance
     #  * source_remote_name
     #  * current_ref
-    class WarpBase < ::EacLauncher::Path
+    class WarpBase < ::EacLauncher::Paths::Real
       include ::Eac::SimpleCache
 
       TARGET_REMOTE = 'target'.freeze
@@ -23,7 +23,7 @@ module EacLauncher
       def update
         ::EacLauncher::Git::MirrorUpdate.new(
           path,
-          source_instance,
+          source_instance.real,
           source_instance.options.git_current_revision
         )
       end
@@ -33,7 +33,7 @@ module EacLauncher
       end
 
       def source_git_uncached
-        ::EacLauncher::Git::Base.new(source_instance)
+        ::EacLauncher::Git::Base.new(source_instance.real)
       end
 
       def cache_git_uncached

data/lib/eac_launcher/instances/base.rb

@@ -2,41 +2,39 @@ require_relative 'base/cache'
 
 module EacLauncher
   module Instances
-    class Base < ::EacLauncher::Path
-      include ::Eac::SimpleCache
-      include ::EacRubyUtils::Console::Speaker
-      include ::EacLauncher::Instances::Base::Cache
-
-      attr_reader :parent
+    module Base
+      class << self
+        def extend_object(object)
+          object.extend ::Eac::SimpleCache
+          object.extend ::EacRubyUtils::Console::Speaker
+          object.extend ::EacLauncher::Instances::Base::Cache
+          super
+        end
 
-      def initialize(path, parent)
-        super(path)
-        @parent = parent
+        def instanciate(path, context, parent)
+          unless path.is_a?(::EacLauncher::Instances::Base)
+            raise "#{path} is not a project" unless path.project?
+            path.extend(::EacLauncher::Instances::Base)
+            path.context = context
+            path.parent = parent
+          end
+          path
+        end
       end
 
-      def name
-        to_root_path
-      end
+      attr_accessor :context, :parent
 
-      def stereotypes_uncached
-        EacLauncher::Stereotype.stereotypes.select { |s| s.match?(self) }
+      def name
+        logical
       end
 
       def stereotype?(stereotype)
         stereotypes.include?(stereotype)
       end
 
-      def children
-        scan(self)
-      end
-
       def to_parent_path
         return self unless @parent
-        gsub(/\A#{Regexp.quote(@parent)}/, '')
-      end
-
-      def to_root_path
-        gsub(/\A#{root}/, '')
+        logical.gsub(/\A#{Regexp.quote(@parent.logical)}/, '')
       end
 
       def project?
@@ -60,14 +58,11 @@ module EacLauncher
       end
 
       def project_name
-        File.basename(self)
+        ::File.basename(logical)
       end
 
-      def current_cache
-        stereotypes.each do |s|
-          return s.warp_class.new(self) if s.warp_class
-        end
-        self
+      def included?
+        !::EacLauncher::Context.current.settings.excluded_projects.include?(project_name)
       end
 
       private
@@ -81,33 +76,6 @@ module EacLauncher
       def options_uncached
         ::EacLauncher::Context.current.settings.instance_settings(self)
       end
-
-      def root_uncached
-        return self unless @parent
-        @parent.root
-      end
-
-      def scan(path)
-        r = []
-        scan_subdirectories(path) do |sp|
-          c = self.class.new(sp, self)
-          if c.stereotypes.any?
-            r << c
-          else
-            r += scan(sp)
-          end
-        end
-        r
-      end
-
-      def scan_subdirectories(path)
-        Dir.entries(path).each do |basename|
-          next if %w[. ..].include?(basename)
-          sp = path.subpath(basename)
-          next unless File.directory?(sp)
-          yield(sp)
-        end
-      end
     end
   end
 end

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

@@ -1,6 +1,6 @@
 module EacLauncher
   module Instances
-    class Base < ::EacLauncher::Path
+    module Base
       module Cache
         def cache_path(subpath)
           File.join(cache_root, subpath)

data/lib/eac_launcher/paths/logical.rb

@@ -0,0 +1,59 @@
+require 'eac_launcher/paths/real'
+
+module EacLauncher
+  module Paths
+    class Logical
+      include ::Eac::SimpleCache
+
+      attr_reader :real, :logical, :parent_path
+
+      def initialize(parent_path, real, logical)
+        @parent_path = parent_path
+        @real = ::EacLauncher::Paths::Real.new(real)
+        @logical = logical
+      end
+
+      def to_s
+        logical
+      end
+
+      def project?
+        stereotypes.any?
+      end
+
+      def children
+        r = []
+        Dir.entries(warped).each do |c|
+          c_path = ::File.join(warped, c)
+          next unless ::File.directory?(c_path)
+          next if c.start_with?('.')
+          r << build_child(c)
+        end
+        r
+      end
+
+      private
+
+      def stereotypes_uncached
+        ::EacLauncher::Stereotype.stereotypes.select { |s| s.match?(self) }
+      end
+
+      def build_child(name)
+        ::EacLauncher::Paths::Logical.new(
+          self,
+          ::File.join(warped, name),
+          ::File.join(logical, name)
+        )
+      end
+
+      def warped_uncached
+        if is_a?(::EacLauncher::Instances::Base)
+          stereotypes.each do |s|
+            return s.warp_class.new(self) if s.warp_class
+          end
+        end
+        real
+      end
+    end
+  end
+end

data/lib/eac_launcher/paths/real.rb

@@ -0,0 +1,37 @@
+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
+
+      def subpath(relative_path)
+        ::EacLauncher::Paths::Real.new(::File.expand_path(relative_path, self))
+      end
+
+      def basename
+        ::File.basename(self)
+      end
+
+      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
+
+      def find_files_with_extension(extension)
+        r = []
+        ::Dir.entries(self).each do |i|
+          r << ::File.expand_path(i, self) if i =~ /#{::Regexp.quote(extension)}\z/
+        end
+        r
+      end
+    end
+  end
+end

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

@@ -33,7 +33,7 @@ module EacLauncher
         private
 
         def copy_gem_files
-          @gem_root = ::EacLauncher::Path.new(::Dir.mktmpdir)
+          @gem_root = ::EacLauncher::Paths::Real.new(::Dir.mktmpdir)
           FileUtils.cp_r "#{@original_gem_root}/.", @gem_root
         end
 

data/lib/eac_launcher/stereotypes/git.rb

@@ -5,7 +5,7 @@ module EacLauncher
 
       class << self
         def match?(path)
-          File.directory?(path.subpath('.git'))
+          File.directory?(path.real.subpath('.git'))
         end
 
         def color

data/lib/eac_launcher/stereotypes/git_subrepo.rb

@@ -5,7 +5,7 @@ module EacLauncher
 
       class << self
         def match?(path)
-          File.exist?(path.subpath('.gitrepo')) && subrepo_url(path) != 'none'
+          File.exist?(path.real.subpath('.gitrepo')) && subrepo_url(path.real) != 'none'
         end
 
         def color

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

@@ -1,7 +1,7 @@
 module EacLauncher
   module Stereotypes
     class GitSubrepo
-      class Warp < ::EacLauncher::Path
+      class Warp < ::EacLauncher::Paths::Real
         include ::Eac::SimpleCache
 
         attr_reader :instance
@@ -41,11 +41,11 @@ module EacLauncher
         end
 
         def parent_git_uncached
-          ::EacLauncher::Git::Base.new(instance.parent)
+          ::EacLauncher::Git::Base.new(parent_instance.real)
         end
 
         def parent_cache_git_uncached
-          ::EacLauncher::Git::Base.new(parent_instance.current_cache)
+          ::EacLauncher::Git::Base.new(parent_instance.warped)
         end
 
         def aux_path
@@ -77,7 +77,7 @@ module EacLauncher
 
         def target_remote_url
           ::EacLauncher::Vendor::Github.to_ssh_url(
-            parent_git.git.remote("subrepo/#{subrepo_subdir}").url
+            parent_cache_git.subrepo_remote_url(subrepo_subdir)
           )
         end
       end

data/lib/eac_launcher/stereotypes/git_subtree.rb

@@ -5,12 +5,11 @@ module EacLauncher
 
       class << self
         def match?(path)
-          return false if ::EacLauncher::Stereotypes::Git.match?(path) ||
-                          ::EacLauncher::Stereotypes::GitSubrepo.match?(path)
+          return false if other_git_stereotype?(path)
           return false unless other_nogit_stereotype?(path)
-          parent = parent_git(path.parent)
+          parent = parent_git(path.parent_path)
           return false unless parent
-          ::Git.open(parent).remote(File.basename(path)).url ? true : false
+          ::Git.open(parent.real).remote(path.real.basename).url ? true : false
         end
 
         def color
@@ -19,7 +18,12 @@ module EacLauncher
 
         def parent_git(p)
           return nil unless p
-          ::EacLauncher::Stereotypes::Git.match?(p) ? p : parent_git(p.parent)
+          ::EacLauncher::Stereotypes::Git.match?(p) ? p : parent_git(p.parent_path)
+        end
+
+        def other_git_stereotype?(path)
+          ::EacLauncher::Stereotypes::Git.match?(path) ||
+            ::EacLauncher::Stereotypes::GitSubrepo.match?(path)
         end
 
         def other_nogit_stereotype?(path)

data/lib/eac_launcher/stereotypes/rails.rb

@@ -5,7 +5,7 @@ module EacLauncher
 
       class << self
         def match?(path)
-          File.exist?(path.subpath('config.ru')) && File.basename(path) != 'dummy'
+          File.exist?(path.real.subpath('config.ru')) && path.real.basename != 'dummy'
         end
 
         def color

data/lib/eac_launcher/stereotypes/redmine_plugin.rb

@@ -5,7 +5,7 @@ module EacLauncher
 
       class << self
         def match?(path)
-          File.exist?(path.subpath('init.rb'))
+          File.exist?(path.real.subpath('init.rb'))
         end
 
         def color

data/lib/eac_launcher/stereotypes/ruby_gem.rb

@@ -5,7 +5,7 @@ module EacLauncher
 
       class << self
         def match?(path)
-          Dir.glob(File.join(path, '*.gemspec')).any?
+          Dir.glob(File.join(path.real, '*.gemspec')).any?
         end
 
         def color

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

@@ -27,7 +27,7 @@ module EacLauncher
         private
 
         def source_uncached
-          @instance.current_cache
+          @instance.warped
         end
 
         def gem_spec_uncached

data/lib/eac_launcher/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_launcher
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -163,7 +163,8 @@ files:
 - lib/eac_launcher/instances/error.rb
 - lib/eac_launcher/instances/runner_helper.rb
 - lib/eac_launcher/instances/settings.rb
-- lib/eac_launcher/path.rb
+- lib/eac_launcher/paths/logical.rb
+- lib/eac_launcher/paths/real.rb
 - lib/eac_launcher/project.rb
 - lib/eac_launcher/publish/base.rb
 - lib/eac_launcher/publish/check_result.rb

data/lib/eac_launcher/path.rb

@@ -1,25 +0,0 @@
-module EacLauncher
-  class Path < String
-    def subpath(relative_path)
-      ::EacLauncher::Path.new(::File.expand_path(relative_path, self))
-    end
-
-    def basename
-      ::File.basename(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
-
-    def find_files_with_extension(extension)
-      r = []
-      ::Dir.entries(self).each do |i|
-        r << ::File.expand_path(i, self) if i =~ /#{::Regexp.quote(extension)}\z/
-      end
-      r
-    end
-  end
-end