ecg 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d22e44c0a03b9a540006d7c0502e8c3c73101f7c446c9c05393ba5319bdc57ae
-  data.tar.gz: 03e5ed33aacd6ef40dfb7d7c0da2533d572259f444ce08e57d6a077bf4a64436
+  metadata.gz: 260ccf7bd2c398c65719d3f5f9b58ca7665a50921440e05a3be2937873f8b2d0
+  data.tar.gz: e98ff38808434920d59cd1d1ce9b32e8dab5e3df756f6a32dbbed8db3ef30bd9
 SHA512:
-  metadata.gz: a6177f797de5728e5daf1f30b2178cb4f25c6281dc1cf2c9452afa88c9d1f5de54eabd3aa5afb12a40a05512e819a551bc052a92d7bbbeb17f3b35b008c37272
-  data.tar.gz: 59e1caa2a49b47af62ce27ee6b7b008ad3c8df286d7e84a77d0224892b9dd14dc9226d3586a50f637efe13e55e6869055797ec9b78673172168bd6fbbe506c74
+  metadata.gz: 560ea77d18fcc83091068017084cdc86e4b6ae660dfe8a2f4d703e38ef2c561a073b5560a7b57ea27d4b39a998fecc2927df3255397b0db859f9c231a163437c
+  data.tar.gz: 473ceabbce68c12f01e99499bcfe128815fcbbfa502bd6a4d5dc6fea760875ec48cce840f7704a38a8f25af89e0d6302144be49d278ee9962dd2fd6b6f0d65e0

data/bin/ecg

@@ -4,5 +4,5 @@
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'ecg'
 
-cmd = ECG::Command.new(ARGV)
+cmd = ECG::Command.new
 cmd.execute

data/lib/ecg/command.rb

@@ -5,16 +5,18 @@ require_relative 'option_parser'
 
 module ECG
   class Command
-    def initialize(args)
-      @parser = OptionParser.new(args)
+    def initialize
+      @context = Context.instance
     end
 
-    def execute(input = $stdin, output = $stdout)
-      context = @parser.context
+    def execute
+      @context.parser.parse!
       # NOTE: ERB.new's non-keyword arguments are deprecated in 2.6
       # erb = ERB.new(input.read, trim_mode: context.trim_mode)
-      erb = ERB.new(input.read, nil, context.trim_mode)
-      output.puts erb.result(context.values.binding)
+      @context.targets.each do |input, output|
+        erb = ERB.new(input.read, nil, @context.trim_mode)
+        output.puts erb.result(@context.binding)
+      end
     end
   end
 end

data/lib/ecg/context.rb

@@ -1,42 +1,47 @@
 # frozen_string_literal: true
 
+require 'singleton'
 require_relative 'store'
+require_relative 'plugin/load_file_values'
+require_relative 'plugin/load_option_values'
 
 module ECG
   class Context
-    attr_reader :trim_mode
+    include Singleton
+    prepend Plugin::LoadFileValues
+    prepend Plugin::LoadOptionValues
 
-    def initialize(filepath:, trim_mode:, values:)
-      @trim_mode = trim_mode
-      @values_file = filepath
-      @values_option = values
-    end
+    attr_reader :parser, :targets, :values
 
-    def values
-      Store.new(merged_hash)
+    def initialize
+      @parser = OptionParser.instance
+      @targets = { $stdin => $stdout }
+      @values = Store.new
     end
 
-    private
+    def binding
+      setup
+      super # NOTE: Kernel.#binding is private
+    end
 
-    def load_file(path)
-      case File.extname(path)
-      when '.json'
-        require 'json'
-        File.open(path) { |f| JSON.parse(f.read) }
-      when /\A\.ya?ml\z/
-        require 'yaml'
-        # NOTE: YAML.safe_load's non-keyword arguments are deprecated in 2.6
-        # File.open(path) { |f| YAML.safe_load(f.read, aliases: true) }
-        File.open(path) { |f| YAML.safe_load(f.read, [], [], true) }
+    def method_missing(name, *args, &block)
+      if @values.respond_to?(name)
+        @values.public_send(name, *args, &block)
       else
-        raise ArgumentError,
-              "Cannot load file `#{path}`. Only JSON/YAML are allowed."
+        super
       end
     end
 
-    def merged_hash
-      hash = @values_file.nil? ? {} : load_file(@values_file)
-      hash.merge(@values_option)
+    def respond_to_missing?(name, include_private = false)
+      @values.respond_to?(name) || super
+    end
+
+    def trim_mode
+      @parser.trim_mode
     end
+
+    private
+
+    def setup; end
   end
 end

data/lib/ecg/option_parser.rb

@@ -1,115 +1,53 @@
 # frozen_string_literal: true
 
 require 'optparse'
-require_relative 'context'
+require 'singleton'
 require_relative 'version'
 
 module ECG
-  class OptionParser
-    def initialize(args = [])
-      @args = args
-      @options = { filepath: nil, trim_mode: '<>', values: {} }
-    end
+  class OptionParser < ::OptionParser
+    include Singleton
+    attr_reader :args, :trim_mode
 
-    def context
-      return @context if instance_variable_defined?(:@context)
+    def initialize
+      super
 
-      parse!
-      @context = Context.new(@options)
-    end
+      @args = ARGV.dup
+      @trim_mode = '<>'
 
-    private
+      on_tail(
+        '-t', '--trim-mode MODE', %(Set ERB's trim_mode. Default is "<>".)
+      ) do |v|
+        @trim_mode = v
+      end
+      on_tail('-V', '--version', 'Print version information') do
+        puts ver
+        exit
+      end
+      on_tail('-h', '--help', 'Print this help message', &method(:print_help))
+    end
 
     def banner
-      <<~__BANNER__
-        Usage: ecg [config.{json,yaml}] [options]
-      __BANNER__
+      'Usage: ecg [config.{json,yaml}] [options]'
     end
 
-    def filepath
-      print_help(false) if @args.length > 1
-      return nil if @args.empty?
-
-      path = @args.first
-      extname = File.extname(path)
-      if %w[.json .yml .yaml].none? { |ext| ext == extname }
-        raise ArgumentError,
-              "Cannot load file `#{path}`. Only JSON/YAML are allowed."
-      end
-
-      path
-    end
+    undef_method :parse
 
     def parse!
       print_help(false) if @args.empty?
 
-      parser.parse!(@args)
-      @options[:filepath] = filepath
-      self
+      super(@args)
     end
 
-    def parser # rubocop:disable Style/MethodLength
-      ::OptionParser.new do |opt|
-        opt.banner = banner
-        opt.version = VERSION
-
-        opt.on('-v', '--values Key=Value', <<~__DESC__) do |str|
-          Set the key-value mapping to be embedded in the template.
-        __DESC__
-
-          set_option_value(*str.split('=', 2))
-        end
-        opt.on('-t', '--trim-mode MODE', <<~__DESC__) do |v|
-          Set ERB's trim_mode. Default is "<>".
-        __DESC__
-          @options[:trim_mode] = v
-        end
-        opt.on('-V', '--version', 'Print version information') do
-          puts opt.ver
-          exit
-        end
-        opt.on('-h', '--help', 'Print this help message', &method(:print_help))
-      end
+    def version
+      VERSION
     end
 
+    private
+
     def print_help(bool)
-      warn parser.help
+      Kernel.warn help
       exit bool
     end
-
-    def set_option_value(key, value)
-      keys = key.split('.').map(&:to_sym)
-      if keys.count == 1
-        set_single_option_value(keys.first, value)
-      else
-        set_nested_option_value(keys, value)
-      end
-    end
-
-    def set_single_option_value(key, value)
-      values = @options[:values]
-      if values[key].is_a? Hash
-        raise ArgumentError, 'Reaf keys cannot have own value.'
-      end
-
-      values[key] = value
-      values
-    end
-
-    def set_nested_option_value(keys, value)
-      values = @options[:values]
-      last_key = keys.pop
-
-      nested = keys.inject(values) do |result, key|
-        result[key] ||= {}
-        unless result[key].is_a? Hash
-          raise ArgumentError, 'Reaf keys cannot have own value.'
-        end
-
-        result[key]
-      end
-      nested[last_key] = value
-      values
-    end
   end
 end

data/lib/ecg/plugin/load_file_values.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require_relative '../option_parser'
+
+module ECG
+  module Plugin
+    module LoadFileValues
+      class LoadError < ::StandardError; end
+
+      private
+
+      def setup
+        super
+
+        parser = OptionParser.instance
+        parser.args.inject(@values) do |result, path|
+          result.merge!(load_file(path))
+        end
+        self
+      end
+
+      def load_file(path)
+        case File.extname(path)
+        when '.json'
+          require 'json'
+          File.open(path) { |f| JSON.parse(f.read) }
+        when /\A\.ya?ml\z/
+          require 'yaml'
+          # NOTE: YAML.safe_load's non-keyword arguments are deprecated in 2.6
+          # File.open(path) { |f| YAML.safe_load(f.read, aliases: true) }
+          File.open(path) { |f| YAML.safe_load(f.read, [], [], true) }
+        else
+          raise LoadError,
+                "Cannot load file `#{path}`. Only JSON/YAML are allowed."
+        end
+      end
+    end
+  end
+end

data/lib/ecg/plugin/load_option_values.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require_relative '../option_parser'
+
+module ECG
+  module Plugin
+    module LoadOptionValues
+      class LoadError < ::StandardError; end
+
+      class << self
+        attr_reader :option_values
+
+        def prepended(_mod)
+          return if instance_variable_defined?(:@option_values)
+
+          @option_values = {}
+          parser = OptionParser.instance
+
+          parser.on('-v', '--values Key=Value', <<~__DESC__) do |str|
+            Set the key-value mapping to be embedded in the template.
+          __DESC__
+
+            @option_values.store(*str.split('=', 2))
+          end
+        end
+      end
+
+      private
+
+      def setup
+        super
+
+        @values.merge!(
+          transform_values(LoadOptionValues.option_values)
+        )
+        self
+      end
+
+      def transform_values(option_values)
+        option_values.inject({}) do |result, (key, value)|
+          keys = key.split('.').map(&:to_sym)
+
+          if keys.count == 1
+            set_single_option_value(result, keys.first, value)
+          else
+            set_nested_option_value(result, keys, value)
+          end
+        end
+      end
+
+      def set_single_option_value(option_values, key, value)
+        if option_values[key].is_a? Hash
+          raise LoadError, 'Reaf keys cannot have own value.'
+        end
+
+        option_values[key] = value
+        option_values
+      end
+
+      def set_nested_option_value(option_values, keys, value)
+        last_key = keys.pop
+
+        nested = keys.inject(option_values) do |result, key|
+          result[key] ||= {}
+          unless result[key].is_a? Hash
+            raise LoadError, 'Reaf keys cannot have own value.'
+          end
+
+          result[key]
+        end
+        nested[last_key] = value
+        option_values
+      end
+    end
+  end
+end

data/lib/ecg/store.rb

@@ -2,45 +2,49 @@
 
 module ECG
   class Store
-    def initialize(hash)
-      map = hash.map { |k, v| [k.to_sym, transform_value(v)] }
-      @store = map.to_h
+    def initialize(values = {})
+      @values = values.map { |k, v| [k.to_sym, transform_value(v)] }.to_h
     end
 
     def initialize_copy(obj)
       super
-      @store = @store.dup
-    end
-
-    def binding
-      super # NOTE: Kernel.#binding is private
+      @values = @values.dup
     end
 
     def inspect
-      detail = @store.map { |k, v| " @#{k}=#{v.inspect}" }.join(',')
+      detail = @values.map { |k, v| " @#{k}=#{v.inspect}" }.join(',')
       "#<#{self.class}:#{object_id << 1}#{detail}>"
     end
 
-    def method_missing(name, *args)
-      name = name.to_sym
+    def merge(*others)
+      others.inject(dup, &method(:deep_merge))
+    end
+
+    def merge!(*others)
+      others.inject(self, &method(:deep_merge))
+    end
 
-      if @store.key?(name)
-        transform_value(@store[name])
-      elsif @store.respond_to?(name)
-        @store.public_send(name, *args)
+    def method_missing(name, *args, &block)
+      if @values.key?(name)
+        @values[name]
+      elsif @values.respond_to?(name)
+        @values.public_send(name, *args, &block)
       else
         super
       end
     end
 
-    def respond_to_missing?(symbol, include_private = false)
-      symbol = symbol.to_sym
+    def respond_to_missing?(name, include_private = false)
+      @values.key?(name) || @values.respond_to?(name) || super
+    end
 
-      @store.key?(symbol) || @store.respond_to?(symbol) || super
+    def store(key, value)
+      @values.store(key.to_sym, transform_value(value))
     end
+    alias []= store
 
     def to_h
-      @store.transform_values(&method(:intransform_value))
+      @values.transform_values(&method(:intransform_value))
     end
 
     def to_json(*args)
@@ -56,6 +60,20 @@ module ECG
 
     private
 
+    def deep_merge(source, other)
+      other.keys.each do |key|
+        value = transform_value(other[key])
+
+        if source[key].is_a?(Store) && value.is_a?(Store)
+          source[key].merge!(value)
+        elsif !value.nil?
+          source[key] = value
+        end
+      end
+
+      source
+    end
+
     def intransform_value(value)
       case value
       when self.class

data/lib/ecg/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ECG
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecg
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - epaew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-20 00:00:00.000000000 Z
+date: 2019-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,6 +138,8 @@ files:
 - lib/ecg/command.rb
 - lib/ecg/context.rb
 - lib/ecg/option_parser.rb
+- lib/ecg/plugin/load_file_values.rb
+- lib/ecg/plugin/load_option_values.rb
 - lib/ecg/store.rb
 - lib/ecg/version.rb
 homepage: https://github.com/epaew/ecg
@@ -160,8 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ecg is an ERB(eRuby) based, simple and powerful configration file generator