eac_launcher 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cbf92881899793eadfed0da3d1f071b4c4e3ab2e
-  data.tar.gz: 2b6b80b197ac17d6f8fe0dd10dddce9c06b15769
+SHA256:
+  metadata.gz: 290a1a038cf1980ae1a6d85a3428f79f50acf5b86ce12bae24913be01c88636f
+  data.tar.gz: 03e46414c9e8e234f6165ae76d67880caf0e71ae4ffdb2256fd4d276f8f185f8
 SHA512:
-  metadata.gz: 5d248573f77e07ffc6603bd99688cd9918c4700e04799ae81b97670440efe1152965a9b924d960f67369ca6792848d9b117f21f7c5d969f2f9a8f6049eb21aae
-  data.tar.gz: c930ed45b92017191a9ec5fa96a93d1430742e69c77f06c948a0b162984ce8aba496068012848cdb4ab214cbb0574916f74af77de730a3443de8b0fbae277da8
+  metadata.gz: e6cd81ae0be28005ca445b19b5a5ea4daed91774975ac4c426ac468cafdbe8fc43171c7f20b956e85c9ff556753ef1e922dcdde79469ca446585d57fd1b129de
+  data.tar.gz: f7fab0d8008fb44cc760a6fc53090f65df1f235464126aad656834e88c9d00d315d5d57d4cbe0845e14caeade73e2813b647a2825552bf80d82160bd27442479

data/exe/eac_launcher_instance

@@ -16,12 +16,14 @@ Usage:
 Options:
   -h --help             Show this screen.
   --all            Get all instances.
+  --recache        Rewrite instances cache.
 
 DOCOPT
 
   private
 
   def run
+    ::EacLauncher::Context.current.recache = options['--recache']
     instances.each { |i| show_instance(i) }
   end
 

data/exe/eac_launcher_projects

@@ -16,12 +16,14 @@ Usage:
 Options:
   -h --help        Show this screen.
   -i --instances   Show instances.
+  --recache        Rewrite instances cache.
 
 DOCOPT
 
   private
 
   def run
+    ::EacLauncher::Context.current.recache = options['--recache']
     ::EacLauncher::Context.current.projects.each do |p|
       show_project(p)
     end

data/exe/eac_launcher_publish

@@ -17,6 +17,7 @@ Options:
   --new                 Publish projects not published before.
   -s --stereotype=<st>  Publish only for stereotype <stereotype>.
   --all            Publish all instances.
+  --recache             Rewrite instances cache.
 
 DOCOPT
 
@@ -27,6 +28,7 @@ DOCOPT
   private
 
   def run
+    ::EacLauncher::Context.current.recache = options['--recache']
     build_publish_options
     instances.each do |i|
       next unless i.options.publishable?

data/lib/eac_launcher.rb

@@ -8,6 +8,7 @@ require('eac/simple_cache')
 require('eac_ruby_utils')
 require('git')
 require('json')
+require('ruby-progressbar')
 require('rubygems')
 require('shellwords')
 require('yaml')
@@ -21,6 +22,8 @@ module EacLauncher
   require 'eac_launcher/paths/real'
   require 'eac_launcher/project'
   require 'eac_launcher/stereotype'
+  require 'eac_launcher/context/instance_discovery'
+  require 'eac_launcher/context/instance_manager'
   require 'eac_launcher/context/settings'
   require 'eac_launcher/git/base'
   require 'eac_launcher/git/error'

data/lib/eac_launcher/context.rb

@@ -20,20 +20,26 @@ module EacLauncher
     end
 
     attr_reader :root, :settings, :cache_root
-    attr_accessor :publish_options
+    attr_accessor :publish_options, :recache
 
     def initialize(options = {})
       @options = options.with_indifferent_access
-      @root = ::EacLauncher::Paths::Logical.new(nil, build_option(:projects_root), '/')
+      @root = ::EacLauncher::Paths::Logical.new(self, 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 }
+      @instance_manager = ::EacLauncher::Context::InstanceManager.new(self)
+      @recache = false
     end
 
     def instance(name)
       instances.find { |i| i.name == name }
     end
 
+    def instances
+      @instance_manager.instances
+    end
+
     private
 
     def build_option(key)
@@ -56,29 +62,5 @@ module EacLauncher
       end
       r.map { |name, instances| ::EacLauncher::Project.new(name, instances) }
     end
-
-    def instances_uncached
-      path_instances(root, nil)
-    end
-
-    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 on_rescued_path_instances(path)
-      r = []
-      begin
-        yield(r)
-      rescue StandardError => ex
-        warn("#{path}: #{ex}")
-      end
-      r
-    end
   end
 end

data/lib/eac_launcher/context/instance_discovery.rb

@@ -0,0 +1,49 @@
+module EacLauncher
+  class Context
+    class InstanceDiscovery
+      attr_reader :instances
+
+      def initialize(context)
+        @context = context
+        @progress = ::ProgressBar.create(title: 'Instance discovery', total: 1)
+        @instances = path_instances(@context.root, nil)
+      ensure
+        @progress.finish if @progress
+      end
+
+      private
+
+      def path_instances(path, parent_instance)
+        update_progress_format(path)
+        on_rescued_path_instances(path) do |r|
+          if path.project?
+            parent_instance = ::EacLauncher::Instances::Base.instanciate(path, parent_instance)
+            r << path
+          end
+          children = path.children
+          update_progress_count(children)
+          r.concat(children.flat_map { |c| path_instances(c, parent_instance) })
+        end
+      end
+
+      def on_rescued_path_instances(path)
+        r = []
+        begin
+          yield(r) if path.included?
+        rescue StandardError => ex
+          warn("#{path}: #{ex}")
+        end
+        r
+      end
+
+      def update_progress_format(path)
+        @progress.format = "%t (Paths: %c/%C, Current: #{path.logical}) |%B| %a"
+      end
+
+      def update_progress_count(children)
+        @progress.total += children.count
+        @progress.increment
+      end
+    end
+  end
+end

data/lib/eac_launcher/context/instance_manager.rb

@@ -0,0 +1,63 @@
+module EacLauncher
+  class Context
+    class InstanceManager
+      include ::Eac::SimpleCache
+
+      def initialize(context)
+        @context = context
+      end
+
+      private
+
+      def instances_uncached
+        (cached_instances ? cached_instances : search_instances).select(&:included?)
+      end
+
+      def search_instances
+        cache_instances(::EacLauncher::Context::InstanceDiscovery.new(@context).instances)
+      end
+
+      def cached_instances
+        return nil if @context.recache
+        return nil unless cached_instances_file_content
+        CachedInstances.new(cached_instances_file_content).instances
+      end
+
+      def cached_instances_file_content_uncached
+        r = YAML.load_file(cache_file_path)
+        r.is_a?(::Hash) ? r : nil
+      rescue Errno::ENOENT
+        nil
+      end
+
+      def cache_instances(instances)
+        r = Hash[instances.map { |i| [i.logical, i.to_h] }]
+        ::File.write(cache_file_path, r.to_yaml)
+        instances
+      end
+
+      def cache_file_path
+        ::File.join(@context.cache_root, 'instances.yml')
+      end
+
+      class CachedInstances
+        def initialize(content)
+          @content = content
+          @instances = {}
+        end
+
+        def instances
+          @content.keys.map { |k| by_logical_path(k) }
+        end
+
+        def by_logical_path(k)
+          return @instances[k] if @instances.key?(k)
+          h = @content[k]
+          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)
+        end
+      end
+    end
+  end
+end

data/lib/eac_launcher/context/settings.rb

@@ -17,6 +17,10 @@ module EacLauncher
         enum_value(%w[Projects Exclude])
       end
 
+      def excluded_paths_uncached
+        enum_value(%w[Paths Exclude])
+      end
+
       def enum_value(path)
         r = value(path)
         r.is_a?(Enumerable) ? r : []

data/lib/eac_launcher/instances/base.rb

@@ -11,18 +11,17 @@ module EacLauncher
           super
         end
 
-        def instanciate(path, context, parent)
+        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.context = context
             path.parent = parent
           end
           path
         end
       end
 
-      attr_accessor :context, :parent
+      attr_accessor :parent
 
       def name
         logical
@@ -65,6 +64,10 @@ module EacLauncher
         !::EacLauncher::Context.current.settings.excluded_projects.include?(project_name)
       end
 
+      def to_h
+        super.to_h.merge(parent: parent ? parent.logical : nil)
+      end
+
       private
 
       def publish?(stereotype)

data/lib/eac_launcher/paths/logical.rb

@@ -5,9 +5,17 @@ module EacLauncher
     class Logical
       include ::Eac::SimpleCache
 
-      attr_reader :real, :logical, :parent_path
+      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])
+        end
+      end
 
-      def initialize(parent_path, real, logical)
+      attr_reader :context, :real, :logical, :parent_path
+
+      def initialize(context, parent_path, real, logical)
+        @context = context
         @parent_path = parent_path
         @real = ::EacLauncher::Paths::Real.new(real)
         @logical = logical
@@ -17,6 +25,10 @@ module EacLauncher
         logical
       end
 
+      def to_h
+        { logical: logical, real: real.to_s, parent_path: parent_path ? parent_path.to_h : nil }
+      end
+
       def project?
         stereotypes.any?
       end
@@ -32,6 +44,10 @@ module EacLauncher
         r
       end
 
+      def included?
+        !context.settings.excluded_paths.include?(logical)
+      end
+
       private
 
       def stereotypes_uncached
@@ -40,6 +56,7 @@ module EacLauncher
 
       def build_child(name)
         ::EacLauncher::Paths::Logical.new(
+          context,
           self,
           ::File.join(warped, name),
           ::File.join(logical, name)

data/lib/eac_launcher/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_launcher
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-27 00:00:00.000000000 Z
+date: 2019-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -85,6 +85,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,6 +95,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +112,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +170,8 @@ files:
 - exe/eac_launcher_publish
 - lib/eac_launcher.rb
 - lib/eac_launcher/context.rb
+- lib/eac_launcher/context/instance_discovery.rb
+- lib/eac_launcher/context/instance_manager.rb
 - lib/eac_launcher/context/settings.rb
 - lib/eac_launcher/git/base.rb
 - lib/eac_launcher/git/base/subrepo.rb
@@ -391,7 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Utilities to deploy applications and libraries.