tmux-erb-parser 0.1.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfb0e75db1dafde63630267ce708bbd43162673eaa36404c9d01ab04aa261d97
-  data.tar.gz: 9a4c16207774dde887524d40fe603baf375ffcd218be9048ec25775d68466834
+  metadata.gz: fa36f112f4bf7d15b5cbf20d8d19343cab7299dfdac7b2ed81918731ef97ef57
+  data.tar.gz: 45543c76a828931350e9e1bf86cef902576201748b50eae34bf6150542a04a8a
 SHA512:
-  metadata.gz: 79398b044ce99cf705241ac6ba0790bb8d81d9e72aa18376351f90d3d97db9209b2bb9a92438b5c6f881f98dcd141d38cbaca488ecbe63fc4f2c89f71965092e
-  data.tar.gz: 73fd791b56c59b811cfd7818647a60c654a65df6033e254a372d49a0fc259942b4af16aee5d79709698c67aecadc1256576886beaa40acb0fa07e09c1cdba9c9
+  metadata.gz: '083f5f3dc8d93410fcf156dbe34ce415f6108ea2d1641763b7ca0893262fc843a3235bcea87f54c0f0786ff8dfffcaa645071c81e8b04799fbbac2ea3f68b41a'
+  data.tar.gz: 77eeefd48f4a0f795e02b6d866c3008dc9c1236fa520b93f3ed377b1045a88789d172ccade6bf3f2134ccba25d397b53bf18073b6eb7fedd03943cb94a104089

data/README.md

@@ -1,6 +1,6 @@
 # Tmux ERB Parser
 [![Gem Version](https://badge.fury.io/rb/tmux-erb-parser.svg)](https://badge.fury.io/rb/tmux-erb-parser)
-[![Build Status](https://travis-ci.org/epaew/tmux-erb-parser.svg?branch=master)](https://travis-ci.org/epaew/tmux-erb-parser)
+[![Build Status](https://github.com/epaew/tmux-erb-parser/workflows/Run%20TestUnit/badge.svg)](https://github.com/epaew/tmux-erb-parser/actions?query=workflow%3A%22Run+TestUnit%22+branch%3A%22master%22)
 [![Maintainability](https://api.codeclimate.com/v1/badges/a4c67b3c8ba8e555d98f/maintainability)](https://codeclimate.com/github/epaew/tmux-erb-parser/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/a4c67b3c8ba8e555d98f/test_coverage)](https://codeclimate.com/github/epaew/tmux-erb-parser/test_coverage)
 
@@ -13,14 +13,16 @@ A Tmux plugin for loading tmux.conf written in Ruby (eRuby) notation.
     * You can use whatever you like as the default shell.
 * git
 * ruby:
-    * 2.5 or higher is required.
+    * 2.7 or higher is required.
 * tmux
 
 ## How to use
 1. Create your `tmux.conf.erb` and place it.
     * By default, tmux-erb-parser loads all `*.erb` files in `~/.config/tmux/`
     * Or you can change the load path. (Please see below.)
-    * Sample configuration file: [sample.tmux.conf.erb](test/fixtures/sample.tmux.conf.erb)
+    * Sample configuration file:
+        * [sample.tmux.conf.erb](test/fixtures/sample.tmux.conf.erb)
+        * [sample.tmux.conf.yaml](test/fixtures/sample.tmux.conf.yaml)
 2. Install tmux-erb-parser and run tmux!
 
 ### Install with tpm (Tmux Plugin Manager)

data/lib/tmux-erb-parser/command.rb

@@ -27,9 +27,7 @@ module TmuxERBParser
 
     def check_args
       msg = 'INPUT_ERB_FILES are required.' if @args.empty?
-      unless @options[:inline] ^ @options[:output]
-        msg = 'Please specify either --inline or --output option.'
-      end
+      msg = 'Please specify either --inline or --output option.' unless @options[:inline] ^ @options[:output]
 
       raise ArgumentError, msg if msg
     end
@@ -37,17 +35,13 @@ module TmuxERBParser
     def command_opts(opts) # rubocop:disable Metrics/MethodLength
       opts.banner = "Usage: #{@command_name} INPUT_FILES [options]"
 
-      opts.on('-i',
-              '--inline',
-              'Exec tmux subcommands to the current tmux-server.') do
+      opts.on('-i', '--inline', 'Exec tmux subcommands to the current tmux-server.') do
         @options[:inline] = true
       end
 
-      opts.on('-o',
-              '--output [OUTPUT_FILE_NAME]',
-              String,
-              'Output the configuration to a file with the specified name.'\
-              ' If the file name is omitted, output to stdout') do |fname|
+      opts.on('-o', '--output [OUTPUT_FILE_NAME]', String, <<~DESC) do |fname|
+        Output the configuration to a file with the specified name. If the file name is omitted, output to stdout
+      DESC
         @options[:output] = File.open(fname, 'w') if fname
         @options[:output] ||= $stdout
       end
@@ -89,8 +83,8 @@ module TmuxERBParser
       @args.each do |arg|
         @logger.info "open #{arg}."
         File.open(arg, 'r') do |input|
-          p = Parser.new(input, File.extname(arg.downcase)[1..-1].to_sym)
-          commands = p.parse(@options[:output].nil?)
+          p = Parser.new(input, File.extname(arg.downcase)[1..].to_sym)
+          commands = p.parse(strip_comments: @options[:output].nil?)
           exec(commands, @options[:output])
         end
       end

data/lib/tmux-erb-parser/converter.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module TmuxERBParser
+  class Converter
+    class << self
+      def convert(structured)
+        structured = [structured] if structured.is_a?(Hash)
+
+        structured.inject([], &method(:convert_line))
+      end
+
+      private
+
+      def convert_line(result, line)
+        result << '' unless result.empty?
+
+        comment = line.is_a?(Hash) && line.delete('comment')
+        result << "# #{comment}" if comment
+
+        result.push(*convert_structured(line))
+      end
+
+      def convert_hash(hash, prefix = [])
+        converted = hash.map do |key, value|
+          case key
+          when '"'
+            convert_structured(value, [*prefix, %('"')])
+          when 'if', 'if-shell', 'run', 'run-shell'
+            convert_structured_shell(value, [*prefix, key])
+          when /style/
+            convert_structured_style(value, [*prefix, key])
+          else
+            convert_structured(value, [*prefix, key])
+          end
+        end
+        converted.flatten
+      end
+
+      def convert_string(string, prefix = [])
+        [*prefix, string].join(' ')
+      end
+
+      def convert_structured(item, prefix = [])
+        case item
+        when Array
+          item.map { |i| convert_structured(i, prefix) }
+        when Hash
+          convert_hash(item, prefix)
+        else
+          convert_string(item, prefix)
+        end
+      end
+
+      def convert_structured_shell(item, prefix = [])
+        case item
+        when Array
+          args = item.map { |i| convert_structured(i, []) }
+          args = args.flatten.map do |arg|
+            arg.include?(' ') ? %('#{arg}') : arg
+          end
+
+          [*prefix, *args].join(' ')
+        else
+          convert_string(item, prefix)
+        end
+      end
+
+      def convert_structured_style(item, prefix = [])
+        case item
+        when Array
+          convert_string(item.join(','), prefix)
+        when Hash
+          convert_string(
+            item.map { |key, value| "#{key}=#{value}" }.join(','),
+            prefix
+          )
+        else
+          convert_string(item, prefix)
+        end
+      end
+    end
+  end
+end

data/lib/tmux-erb-parser/helpers/environment_helper.rb

@@ -3,6 +3,8 @@
 module TmuxERBParser
   module Helpers
     module EnvironmentHelper
+      module_function
+
       def prefix_key
         `tmux show-option -g prefix`.split[1]
       end

data/lib/tmux-erb-parser/helpers/format_helper.rb

@@ -3,6 +3,8 @@
 module TmuxERBParser
   module Helpers
     module FormatHelper
+      module_function
+
       def format_and(*args)
         return args.first if args.length < 2
 

data/lib/tmux-erb-parser/helpers.rb

@@ -1,32 +1,17 @@
 # frozen_string_literal: true
 
-module TmuxERBParser
-  module Classifyable
-    refine String do
-      def classify
-        snake_case = File.basename(self, '.rb')
-        splitted = snake_case.split('_').map do |w|
-          w[0] = w[0].upcase
-          w
-        end
-        splitted.join
-      end
-    end
-  end
+require_relative 'helpers/environment_helper'
+require_relative 'helpers/format_helper'
 
+module TmuxERBParser
   module Helpers
-    using Classifyable
+    extend EnvironmentHelper
+    extend FormatHelper
 
-    Dir[File.expand_path('helpers/*.rb', __dir__)].sort.each do |h|
-      require h
-      klass = const_get(h.classify)
-      self.class.class_eval do
-        prepend klass
-      end
-    end
+    module_function
 
-    def self.binding
-      super # NOTE: Kernel.#binding is private
+    def binding # rubocop:disable Lint/UselessMethodDefinition: super(= Kernel.#binding) is private
+      super
     end
   end
 end

data/lib/tmux-erb-parser/parser.rb

@@ -3,6 +3,7 @@
 require 'erb'
 require 'json'
 require 'yaml'
+require_relative 'converter'
 require_relative 'helpers'
 
 module TmuxERBParser
@@ -21,7 +22,7 @@ module TmuxERBParser
       @type = type
     end
 
-    def parse(strip_comments = false)
+    def parse(strip_comments: false)
       parse_string(@input, @type).map do |line|
         line = replace_source_file(line)
         line = strip_comment(line) if strip_comments
@@ -31,33 +32,32 @@ module TmuxERBParser
 
     private
 
-    def generate_conf(_structured)
-      # TODO
-      # parse_result = []
-    end
-
     def parse_string(input, type)
       erb_result = ERB.new(input).result(TmuxERBParser::Helpers.binding)
 
+      parse_structure(erb_result, type)
+    end
+
+    def parse_structure(erb_result, type)
       case type
       when :json
-        generate_conf(JSON.parse(erb_result))
+        Converter.convert(JSON.parse(erb_result))
       when :yml, :yaml
-        generate_conf(YAML.load_stream(erb_result))
+        if RUBY_VERSION.to_f < 2.6
+          Converter.convert(YAML.safe_load(erb_result, [], [], true))
+        else
+          Converter.convert(YAML.safe_load(erb_result, aliases: true))
+        end
       else
-        # rubocop:disable Metrics/LineLength
         erb_result
-          .gsub(/(\R){3,}/) { Regexp.last_match(1) * 2 } # reduce continuity blanklines
-          .gsub(/(\R)+\z/) { Regexp.last_match(1) }      # remove blankline at EOF
-          .each_line
-          .map(&:chomp)
-        # rubocop:enable Metrics/LineLength
+          .gsub(/(\R){3,}/) { Regexp.last_match(1) * 2 } # reduce continuity blankline
+          .each_line(chomp: true)
       end
     end
 
     def replace_source_file(line)
       # source file -> run-shell "parser --inline file"
-      if line =~ /source/ && line !~ /run(-shell)?/
+      if line.include?('source') && line !~ /run(-shell)?/
         line = line.gsub(/"source(-file)?( -q)?\s([^\s\\;]+)"/) do
           %("run-shell \\"#{PARSER_CMD} --inline #{Regexp.last_match(3)}\\"")
         end

data/lib/tmux-erb-parser/version.rb

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

data/lib/tmux-erb-parser.rb

@@ -1,3 +1,8 @@
 # frozen_string_literal: true
 
-Dir[File.expand_path('tmux-erb-parser/*.rb', __dir__)].each(&method(:require))
+require_relative 'tmux-erb-parser/command'
+require_relative 'tmux-erb-parser/converter'
+require_relative 'tmux-erb-parser/helpers'
+require_relative 'tmux-erb-parser/logger'
+require_relative 'tmux-erb-parser/parser'
+require_relative 'tmux-erb-parser/version'

metadata

@@ -1,127 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: tmux-erb-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.3.0
 platform: ruby
 authors:
 - epaew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.18'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.18'
-- !ruby/object:Gem::Dependency
-  name: simplecov-console
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: test-unit-rr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+date: 2023-04-29 00:00:00.000000000 Z
+dependencies: []
 description: A Tmux plugin for loading tmux.conf written in Ruby (eRuby) notation.
 email:
 - epaew.333@gmail.com
@@ -136,6 +24,7 @@ files:
 - erb-parser.tmux
 - lib/tmux-erb-parser.rb
 - lib/tmux-erb-parser/command.rb
+- lib/tmux-erb-parser/converter.rb
 - lib/tmux-erb-parser/helpers.rb
 - lib/tmux-erb-parser/helpers/environment_helper.rb
 - lib/tmux-erb-parser/helpers/format_helper.rb
@@ -147,6 +36,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -155,7 +45,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -164,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - bash
 - tmux
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A Tmux plugin for loading tmux.conf written in Ruby (eRuby) notation.