ufo 6.2.2 → 6.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e630cb6fc68958a6b7f7264e6b0ff03a2d41ae13d9a1648bd13fa601d9f9aae0
-  data.tar.gz: 2693b4ca4e3e5ffa31ff881f706de093792d93a4ff7263820308565d44685c38
+  metadata.gz: 2fd574a73d9028bd0627e5c7d74b5bb516ee62aa1ae2a0d3c85f01470ef39284
+  data.tar.gz: 96fcdff5429e785572cff2f4face5cc2100a1ce95a912adf6bfc275343471518
 SHA512:
-  metadata.gz: 116244ca9466e2458845904b34d99bc1fd2e7d1d8379c32066d2f90d70cfe7eb84628552a8250f7d4cca13dcdcf1cdad0ba812e602ba1df25c4f0b383131c057
-  data.tar.gz: 7e7aa81c1595f231465f1694a80dc7e4f0a8f7f7c77399e28b12b71c109a2c5ea0b9674fd0e8a9b485792253e16c4fd4a27734a121affd01bb69e163fb6e9f51
+  metadata.gz: 11fccb6c4b62fe986f77a12e2aeb2d67ec7d2874ca1a9eed9afab32317a94e5235340896bd7fc590abf665b06bccfe4961fda78a0b77b2749cfbaffb4361dca3
+  data.tar.gz: 32e9654b2700f3445a2383a84e323458bc1b81368901c3d83dac7c4d809fa7c5ef5d6bf5405dbd858b95f0ff34f8939f4660ee35118a11b5fa8976868c6f9b93

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [6.2.3] - 2022-03-20
+- [#157](https://github.com/tongueroo/ufo/pull/157) layering.show_for_commands option
+
 ## [6.2.2] - 2022-03-20
 - [#155](https://github.com/tongueroo/ufo/pull/155) layering.show option ability to show layers
 - [#156](https://github.com/tongueroo/ufo/pull/156) extra layering support

data/lib/ufo/config/parse.rb

@@ -0,0 +1,39 @@
+# Some limitations:
+#
+# * Only parsing one file: .ufo/config.rb
+# * If user is using Ruby code that cannot be parse will fallback to default
+#
+# Think it's worth it so user only has to configure
+#
+#     config.layering.show = true
+#
+class Ufo::Config
+  class Parse
+    def for(config, type: :boolean)
+      lines = IO.readlines("#{Ufo.root}/.ufo/config.rb")
+      config_line = lines.find do |l|
+        # IE: Regexp.new("config\.layering.show.*=")
+        regexp = Regexp.new("config\.#{config}.*=")
+        l =~ regexp && l !~ /^\s+#/
+      end
+      return false unless config_line # default is false
+      config_value = config_line.gsub(/.*=/,'').strip.gsub(/["']/,'')
+      case type
+      when :boolean
+        config_value != "false" && config_value != "nil"
+      when :array
+        eval(config_value) # IE: '["a"]' => ["a"]
+      else
+        raise "Type #{type.inspect} not supported"
+      end
+    rescue Exception => e
+      # if ENV['UFO_DEBUG']
+        puts "#{e.class} #{e.message}".color(:yellow)
+        puts "WARN: Unable to parse for config.layering.show".color(:yellow)
+        puts "Using default: config.layering.show = false"
+      # end
+      false
+    end
+  end
+end
+

data/lib/ufo/config.rb

@@ -86,7 +86,8 @@ module Ufo
       config.exec.enabled = true        # EcsService EnableExecuteCommand
 
       config.layering = ActiveSupport::OrderedOptions.new
-      config.layering.show = show_layers?
+      config.layering.show = parsed_layering_show
+      config.layering.show_for_commands = parsed_layering_show_for
 
       config.log = ActiveSupport::OrderedOptions.new
       config.log.root = Ufo.log_root
@@ -165,7 +166,7 @@ module Ufo
       end
       # load_project_config gets called so early that logger is not yet configured.
       # Cannot use Ufo.config yet and cannot use logger which relies on Ufo.config
-      # Use puts and use show_layers? which parses for the config
+      # Use puts and use parsed_layering_show
       show = show_layers?
       puts "Config Layers" if show
       layers.each do |layer|
@@ -180,34 +181,25 @@ module Ufo
     end
 
     def show_layers?
-      ENV['UFO_LAYERS'] || parse_for_layering_show
+      show_for = parsed_layering_show_for
+      command = ARGV[0]
+      parsed_layering_show && show_for.include?(command)
     end
-    private :show_layers?
 
-    # Some limitations:
-    #
-    # * Only parsing one file: .ufo/config.rb
-    # * If user is using Ruby code that cannot be parse will fallback to default
-    #
-    # Think it's worth it so user only has to configure
-    #
-    #     config.layering.show = true
-    #
-    def parse_for_layering_show
-      lines = IO.readlines("#{Ufo.root}/.ufo/config.rb")
-      config_line = lines.find { |l| l =~ /config\.layering.show.*=/ && l !~ /^\s+#/ }
-      return false unless config_line # default is false
-      config_value = config_line.gsub(/.*=/,'').strip.gsub(/["']/,'')
-      config_value != "false" && config_value != "nil"
-    rescue Exception => e
-      if ENV['UFO_DEBUG']
-        puts "#{e.class} #{e.message}".color(:yellow)
-        puts "WARN: Unable to parse for config.layering.show".color(:yellow)
-        puts "Using default: config.layering.show = false"
-      end
-      false
+    def parsed_layering_show_for
+      parse.for("layering.show_for_commands", type: :array) || %w[build ship] # IE: ps exec logs are not shown
+    end
+    memoize :parsed_layering_show_for
+
+    def parsed_layering_show
+      ENV['UFO_LAYERS'] || parse.for("layering.show", type: :boolean)
+    end
+    private :parsed_layering_show
+
+    def parse
+      Parse.new
     end
-    memoize :parse_for_layering_show
+    memoize :parse
 
     # Works similiar to Layering::Layer. Consider combining the logic and usin Layering::Layer
     #

data/lib/ufo/layering/layer.rb

@@ -75,7 +75,7 @@ module Ufo::Layering
       paths.each do |path|
         if ENV['UFO_LAYERS_ALL']
           logger.info "    #{pretty_path(path)}"
-        elsif Ufo.config.layering.show
+        elsif Ufo.config.show_layers?
           logger.info "    #{pretty_path(path)}" if File.exist?(path)
         end
       end

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "6.2.2"
+  VERSION = "6.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 6.2.2
+  version: 6.2.3
 platform: ruby
 authors:
 - Tung Nguyen
@@ -594,6 +594,7 @@ files:
 - lib/ufo/config/callable_option.rb
 - lib/ufo/config/callable_option/concern.rb
 - lib/ufo/config/inits.rb
+- lib/ufo/config/parse.rb
 - lib/ufo/core.rb
 - lib/ufo/docker/builder.rb
 - lib/ufo/docker/cleaner.rb