ehbrs-tools 0.16.2 → 0.18.0

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/command/envvars.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  module Envs
+    class Command
+      module Envvars
+        def envvar(name, value)
+          duplicate_by_extra_options(envvars: envvars.merge(name => value))
+        end
+
+        private
+
+        def append_envvars(command)
+          e = envvars.map { |k, v| "#{Shellwords.escape(k)}=#{Shellwords.escape(v)}" }.join(' ')
+          e.present? ? "#{e} #{command}" : command
+        end
+
+        def envvars
+          extra_options[:envvars] ||= {}.with_indifferent_access
+        end
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/command/extra_options.rb

@@ -12,39 +12,18 @@ module EacRubyUtils
           duplicate_by_extra_options(chdir: dir)
         end
 
-        def envvar(name, value)
-          duplicate_by_extra_options(envvars: envvars.merge(name => value))
-        end
-
         def status_result(status_code, result)
           duplicate_by_extra_options(status_results: status_results.merge(status_code => result))
         end
 
-        def pipe(other_command)
-          duplicate_by_extra_options(pipe: other_command)
-        end
-
         private
 
         attr_reader :extra_options
 
-        def envvars
-          extra_options[:envvars] ||= {}.with_indifferent_access
-        end
-
         def status_results
           extra_options[:status_results] ||= {}.with_indifferent_access
         end
 
-        def append_envvars(command)
-          e = envvars.map { |k, v| "#{Shellwords.escape(k)}=#{Shellwords.escape(v)}" }.join(' ')
-          e.present? ? "#{e} #{command}" : command
-        end
-
-        def append_pipe(command)
-          extra_options[:pipe].present? ? "#{command} | #{extra_options[:pipe].command}" : command
-        end
-
         def append_chdir(command)
           extra_options[:chdir].present? ? "(cd '#{extra_options[:chdir]}' ; #{command} )" : command
         end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/traverser.rb

@@ -57,8 +57,6 @@ module EacRubyUtils
           user_check_file(path)
         elsif path.directory?
           inner_check_directory(path, level)
-        else
-          raise "Unknown filesystem object: #{path}"
         end
       end
 

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/inflector.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
+require 'active_support/inflector'
+
 module EacRubyUtils
   class Inflector
     class << self
       VARIABLE_NAME_PATTERN = /[_a-z][_a-z0-9]*/i.freeze
 
       def variableize(string)
-        r = string.gsub(/[^_a-z0-9]/i, '_').gsub(/_+/, '_').gsub(/_\z/, '').gsub(/\A_/, '').downcase
+        r = ::ActiveSupport::Inflector.transliterate(string).gsub(/[^_a-z0-9]/i, '_')
+                                      .gsub(/_+/, '_').gsub(/_\z/, '').gsub(/\A_/, '').downcase
         m = VARIABLE_NAME_PATTERN.match(r)
         return r if m
 

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/local_time_zone.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/object/blank'
+require 'active_support/values/time_zone'
+
+module EacRubyUtils
+  module LocalTimeZone
+    DEBIAN_CONFIG_PATH = '/etc/timezone'
+
+    class << self
+      TIMEDATECTL_TIMEZONE_LINE_PATTERN = %r{\s*Time zone:\s*(\S+/\S+)\s}.freeze
+
+      def auto
+        %w[tz_env debian_config offset].lazy.map { |s| send("by_#{s}") }.find(&:present?)
+      end
+
+      def by_debian_config
+        path = ::Pathname.new(DEBIAN_CONFIG_PATH)
+        path.exist? ? path.read.strip.presence : nil
+      end
+
+      def by_offset
+        ::ActiveSupport::TimeZone[::Time.now.getlocal.gmt_offset].name
+      end
+
+      def by_timedatectl
+        executable = ::EacRubyUtils::Envs.local.executable('timedatectl', '--version')
+        return nil unless executable.exist?
+
+        TIMEDATECTL_TIMEZONE_LINE_PATTERN.if_match(executable.command.execute!) { |m| m[1] }
+      end
+
+      def by_tz_env
+        ENV['TZ'].presence
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/kernel.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/kernel/nyi.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Kernel
+  # Raise exception with text "Not yet implemented".
+  def nyi
+    raise "Not yet implemented (Called in #{caller.first})"
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/template.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/string/inflections'
+require 'eac_ruby_utils/templates/searcher'
+
+class Module
+  def template
+    @template ||= ::EacRubyUtils::Templates::Searcher.default.template(name.underscore)
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/template.rb

@@ -1,15 +1,8 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/string/inflections'
-require 'eac_ruby_utils/templates/searcher'
+require 'eac_ruby_utils/patches/module/template'
 
 class Object
-  class << self
-    def template
-      @template ||= ::EacRubyUtils::Templates::Searcher.default.template(name.underscore)
-    end
-  end
-
   def template
     self.class.template
   end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/basename_sub.rb

@@ -3,7 +3,7 @@
 require 'pathname'
 
 class Pathname
-  def basename_sub
-    parent.join(yield(basename))
+  def basename_sub(suffix = '')
+    parent.join(yield(basename(suffix)))
   end
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/time/default_time_zone_set.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/patches/time/local_time_zone'
+require 'active_support/core_ext/time/zones'
+require 'eac_ruby_utils/local_time_zone'
 
-::Time.zone = ::Time.local_time_zone
+::Time.zone = ::EacRubyUtils::LocalTimeZone.auto

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/struct.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
 require 'active_support/hash_with_indifferent_access'
+require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/blank'
 
 module EacRubyUtils
   class Struct
     def initialize(initial_data = {})
-      self.data = ::ActiveSupport::HashWithIndifferentAccess.new(initial_data)
+      self.data = initial_data.symbolize_keys
     end
 
     def [](key)
@@ -19,6 +20,11 @@ module EacRubyUtils
       bool ? fetch(key).present? : data.fetch(key)
     end
 
+    def merge(other)
+      other = self.class.new(other) unless other.is_a?(self.class)
+      self.class.new(to_h.merge(other.to_h))
+    end
+
     def method_missing(method_name, *arguments, &block)
       property_method?(method_name) ? fetch(method_name) : super
     end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.53.0'
+  VERSION = '0.58.0'
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/yaml.rb

@@ -14,10 +14,18 @@ module EacRubyUtils
         ::YAML.dump(sanitize(object))
       end
 
+      def dump_file(path, object)
+        ::File.write(path.to_s, dump(object))
+      end
+
       def load(string)
         ::YAML.safe_load(string, permitted_classes)
       end
 
+      def load_file(path)
+        load(::File.read(path.to_s))
+      end
+
       def permitted_classes
         DEFAULT_PERMITTED_CLASSES
       end

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/common_concern_spec.rb

@@ -9,34 +9,57 @@ RSpec.describe ::EacRubyUtils::CommonConcern do
     end
   end
 
-  module MyModule
-    module ClassMethods
-      def my_class_method
-        'class'
+  let(:stub_module) do
+    ::Module.new do
+      module ClassMethods # rubocop:disable RSpec/LeakyConstantDeclaration
+        def my_class_method
+          'class'
+        end
       end
-    end
 
-    module InstanceMethods
-      def my_instance_method
-        'instance'
+      module InstanceMethods # rubocop:disable RSpec/LeakyConstantDeclaration
+        def my_instance_method
+          'from_module'
+        end
       end
     end
   end
 
-  class MyClass
-    class << self
-      attr_accessor :valor
+  let(:stub_class) do
+    ::Class.new do
+      class << self
+        attr_accessor :valor
+      end
+
+      def my_instance_method
+        'from_class'
+      end
     end
   end
 
-  let(:subject) { MyClass.new }
+  let(:stub_class_instance) { stub_class.new }
 
   before do
-    instance.setup(MyModule)
-    MyClass.include MyModule
+    instance.setup(stub_module)
   end
 
-  it { expect(subject.my_instance_method).to eq('instance') }
-  it { expect(subject.class.my_class_method).to eq('class') }
-  it { expect(subject.class.valor).to eq('changed') }
+  context 'when included' do
+    before do
+      stub_class.include stub_module
+    end
+
+    it { expect(stub_class_instance.my_instance_method).to eq('from_class') }
+    it { expect(stub_class_instance.class.my_class_method).to eq('class') }
+    it { expect(stub_class_instance.class.valor).to eq('changed') }
+  end
+
+  context 'when prepended' do
+    before do
+      stub_class.prepend stub_module
+    end
+
+    it { expect(stub_class_instance.my_instance_method).to eq('from_module') }
+    it { expect(stub_class_instance.class.my_class_method).to eq('class') }
+    it { expect(stub_class_instance.class.valor).to eq('changed') }
+  end
 end

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/common_constructor_spec.rb

@@ -3,34 +3,122 @@
 require 'eac_ruby_utils/common_constructor'
 
 RSpec.describe ::EacRubyUtils::CommonConstructor do
-  ARG_LIST = %i[a b c d].freeze
+  ARG_LIST = %i[a b c d].freeze # rubocop:disable RSpec/LeakyConstantDeclaration
+
   let(:instance) do
     described_class.new(*ARG_LIST, default: %w[Vcc Vd]) do
       @z = 'Vz'
     end
   end
 
-  class MyClass
-    attr_reader :z
+  let(:a_class) do
+    ::Class.new do
+      attr_reader :z
+    end
   end
 
-  let(:subject) { MyClass.new('Va', 'Vb', 'Vc') }
+  let(:a_class_instance) { a_class.new('Va', 'Vb', 'Vc') }
 
   before do
-    instance.setup_class(::MyClass)
+    instance.setup_class(a_class)
   end
 
-  it { expect(subject.z).to eq('Vz') }
+  it { expect(a_class_instance.z).to eq('Vz') }
 
   ARG_LIST.each do |attr|
     expected_value = "V#{attr}"
     it "attribute \"#{attr}\" equal to \"#{expected_value}\"" do
-      expect(subject.send(attr)).to eq(expected_value)
+      expect(a_class_instance.send(attr)).to eq(expected_value)
     end
 
     [false, true].each do |include_all|
       it "respond_to?('#{attr}', #{include_all}) == #{include_all}" do
-        expect(subject.respond_to?("#{attr}=", include_all)).to eq(include_all)
+        expect(a_class_instance.respond_to?("#{attr}=", include_all)).to eq(include_all)
+      end
+    end
+  end
+
+  context 'with super class' do
+    let(:super_class) do
+      ::Class.new do
+        attr_reader :super_a, :super_b
+
+        def initialize(a, b) # rubocop:disable Naming/MethodParameterName
+          @super_a = a
+          @super_b = b
+        end
+      end
+    end
+
+    let(:sub_class) do
+      sub_constructor.setup_class(::Class.new(super_class))
+    end
+
+    let(:sub_object) { sub_class.new(1, 2, 3, 4) }
+
+    context 'with super_args parameter' do
+      let(:sub_constructor) do
+        described_class.new(:c, :a, :b, :d, super_args: -> { [c, a] })
+      end
+
+      it { expect(sub_object.a).to eq(2) }
+      it { expect(sub_object.b).to eq(3) }
+      it { expect(sub_object.c).to eq(1) }
+      it { expect(sub_object.d).to eq(4) }
+      it { expect(sub_object.super_a).to eq(1) }
+      it { expect(sub_object.super_b).to eq(2) }
+    end
+
+    context 'without super_args parameter' do
+      let(:sub_constructor) do
+        described_class.new(:c, :a, :b, :d)
+      end
+
+      it { expect(sub_object.a).to eq(2) }
+      it { expect(sub_object.b).to eq(3) }
+      it { expect(sub_object.c).to eq(1) }
+      it { expect(sub_object.d).to eq(4) }
+      it { expect(sub_object.super_a).to eq(2) }
+      it { expect(sub_object.super_b).to eq(3) }
+    end
+
+    context 'with undefined super arguments' do
+      let(:sub_constructor) do
+        described_class.new(:x, :y, :w, :a)
+      end
+
+      it do
+        expect { sub_object }.to raise_error(::ArgumentError)
+      end
+    end
+  end
+
+  context 'with class hierarchy mixed with and without common_constructor' do
+    let(:klass_0) do
+      described_class.new(:a_param).setup_class(::Class.new)
+    end
+
+    let(:klass_1) do
+      ::Class.new(klass_0) do
+        def initialize(a_param)
+          super(a_param)
+        end
+      end
+    end
+
+    let(:klass_2) do
+      ::Class.new(klass_1)
+    end
+
+    let(:klass_3) do
+      described_class.new(:a_param).setup_class(::Class.new(klass_2))
+    end
+
+    4.times.each do |i|
+      context "wit #{i}-th class" do
+        let(:class_instance) { send("klass_#{i}").new(:a) }
+
+        it { expect(class_instance.a_param).to eq(:a) }
       end
     end
   end