tmux-erb-parser 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfb0e75db1dafde63630267ce708bbd43162673eaa36404c9d01ab04aa261d97
-  data.tar.gz: 9a4c16207774dde887524d40fe603baf375ffcd218be9048ec25775d68466834
+  metadata.gz: b21b6279300cff2863e40a40358e778886c3edcf47a7de559847aa48d7007fae
+  data.tar.gz: 354e717ab451bb2ea70bfbf121fdb12048c2250e6db18c4c2eb1d42561579315
 SHA512:
-  metadata.gz: 79398b044ce99cf705241ac6ba0790bb8d81d9e72aa18376351f90d3d97db9209b2bb9a92438b5c6f881f98dcd141d38cbaca488ecbe63fc4f2c89f71965092e
-  data.tar.gz: 73fd791b56c59b811cfd7818647a60c654a65df6033e254a372d49a0fc259942b4af16aee5d79709698c67aecadc1256576886beaa40acb0fa07e09c1cdba9c9
+  metadata.gz: 69945ff6ac0d8a61860ea885b93c9a6edb86a5bb09e312678c94936502d19e708663cc57d93a6542ffa44e974bddddb1d14b039164888f0cfa39f581ebe6f06f
+  data.tar.gz: 5ac5c80541ef86f2c87c2cdc5de3b478bcdbe96b77509eb547ec2af83cebeb9fe4553f7ef4f1a248a78f0f6c9f601120f1328763f6a36c5f1530318ec38b8e49

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)
 
@@ -20,7 +20,9 @@ A Tmux plugin for loading tmux.conf written in Ruby (eRuby) notation.
 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/converter.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module TmuxERBParser
+  class Converter
+    class << self
+      def convert(structured)
+        structured = [structured] if structured.is_a?(Hash)
+
+        structured.inject([]) do |result, hash|
+          result << '' unless result.empty?
+
+          comment = hash.is_a?(Hash) && hash.delete('comment')
+          result << "# #{comment}" if comment
+
+          result.concat([*convert_structured(hash)])
+        end
+      end
+
+      private
+
+      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/parser.rb

@@ -3,6 +3,7 @@
 require 'erb'
 require 'json'
 require 'yaml'
+require_relative 'converter'
 require_relative 'helpers'
 
 module TmuxERBParser
@@ -31,27 +32,24 @@ 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)
 
       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
+        # rubocop:disable Layout/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)
+        # rubocop:enable Layout/LineLength
       end
     end
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tmux-erb-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - epaew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
+date: 2020-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,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