tmux-erb-parser 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1609219d3c43082d5419e05ce2b64430b0524f0b6b09acb1e447e1efd4a5f243
-  data.tar.gz: 841d87ef8ccf1c9d618a301df1de3248cff2bac12d790f4ce8025c679fbcc626
+  metadata.gz: 7da9078d32cc8302a89b36462a0cd9bc9329679e205e8be50cfdc0e839b019e0
+  data.tar.gz: c3ef1b2b8c8105d7f4a32515853920aabb72f337a009bfae36a2c8840a04f624
 SHA512:
-  metadata.gz: ab1579f7d6bd609b12cfc58423e612595dbd534af28335ac7574766234fd6faa40dcf1f00695fb5afcfd8ae00bdc6e7f28077d960f87e7f91172cf527be7632f
-  data.tar.gz: e52c39ca365fc048fbdf0b4b2547ab76196b9c634c6de3b3b6f473512c11519fb9549ef4d52f3aee646f3f710a1f6e91ccdf13bfbedc66d070a1af4fbbab3d32
+  metadata.gz: 7150f31dfd4bef069c6799cc25cdcd28c529eff87746e774f5560eb4a611c69c3306c9c9a15120ffc5e534b1c672c87e96f65846624e452916ddf0703ecc0133
+  data.tar.gz: 300d0087b6e77ae478d31ddb57d441e68536c61b4f31dbeb2aa1fce560d9fbf55fce66e1da414b4b27db77d44f088fba71d3a7e9d572edfba74f4323efd07d9d

data/README.md

@@ -20,7 +20,7 @@ A Tmux plugin to load tmux.conf.erb
 2. Install tmux-erb-parser and run tmux!
 
 ### Install with tpm (Tmux Plugin Manager)
-* Put this at the bottom of `~/.tmux.conf` (**Not your tmux.conf.erb !**):
+* Put this at the bottom of `~/.tmux.conf` (**Not your tmux.conf.erb!**):
     ```tmux
     setenv -g TMUX_CONF_EXT_PATH "path/to/tmux.conf.erb" # set your tmux.conf.erb's path
     # Note: You can specify multiple files using glob expressions. This is parsed by bash.
@@ -35,16 +35,21 @@ A Tmux plugin to load tmux.conf.erb
 
 * Run tmux and press `Prefix + I` to install plugins!
 
-### Install and configure with git
+### Install and configure with git/rubygems
 * Install:
-    ```bash
-    git clone https://github.com/epaew/tmux-erb-parser ~/.tmux/plugins/tmux-erb-parser
-    ```
+    * with git:
+        ```bash
+        git clone https://github.com/epaew/tmux-erb-parser ~/.tmux/plugins/tmux-erb-parser
+        ```
+    * from rubygems:
+        ```bash
+        gem install tmux-erb-parser
+        ```
 
 * Configure:
-    * Put this in `~/.tmux.conf`:
+    * Put this in `~/.tmux.conf` (**Not your tmux.conf.erb!**):
     ```tmux
-    run '~/.tmux/plugins/tmux-erb-parser/bin/tmux-erb-parser --inline path/to/tmux.conf.erb'
+    run 'path/to/bin/tmux-erb-parser --inline path/to/tmux.conf.erb'
     ```
 
 ## License

data/bin/tmux-erb-parser

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# vim:set ft=ruby:
-
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'tmux-erb-parser'
 

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

@@ -34,22 +34,6 @@ module TmuxERBParser
       raise ArgumentError, msg if msg
     end
 
-    def process
-      check_args
-
-      args = @args.dup
-      args.each do |arg|
-        @logger.info "open #{arg}."
-        File.open(arg, 'r') do |input|
-          p = Parser.new(input,
-                         @options[:output],
-                         File.extname(arg.downcase)[1..-1].to_sym,
-                         @options)
-          p.parse
-        end
-      end
-    end
-
     def command_opts(opts) # rubocop:disable Metrics/MethodLength
       opts.banner = "Usage: #{@command_name} INPUT_FILES [options]"
 
@@ -78,5 +62,41 @@ module TmuxERBParser
         exit
       end
     end
+
+    def exec(commands, output = nil)
+      if output
+        commands.each(&output.method(:puts))
+      else
+        commands.inject(+'', &method(:exec_tmux))
+      end
+    end
+
+    def exec_tmux(buf, line)
+      buf << line
+      return buf if buf.empty?
+
+      if buf.end_with?('\\')
+        buf.chop!
+      else
+        command = "tmux #{buf.gsub(%(\\;), %( '\\;'))}"
+        @logger.debug "exec: #{command}"
+
+        `#{command}` unless ENV['DEBUG']
+        +''
+      end
+    end
+
+    def process
+      check_args
+
+      @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?)
+          exec(commands, @options[:output])
+        end
+      end
+    end
   end
 end

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

@@ -10,54 +10,33 @@ module TmuxERBParser
   class ParseError < StandardError; end
 
   class Parser
-    def initialize(input, output, type = :erb, options = {})
-      @input = input
-      @output = output
+    def initialize(input, type = :erb)
+      @input = case input
+               when IO     then input.read
+               when Array  then input.join('\n')
+               when String then input
+               else raise ArgumentError
+               end
       @type = type
-      @options = options
-      @logger = Logger.instance
     end
 
-    def parse
-      conf_lines = parse_file(@input, @type)
-      converted_lines = conf_lines.map(&method(:replace_source_file))
-      exec(converted_lines, @output)
-    end
-
-    private
-
-    def exec(commands, output = nil)
-      if output
-        commands.each(&output.method(:puts))
-      else
-        commands.inject(+'', &method(:exec_tmux))
+    def parse(strip_comments = false)
+      parse_string(@input, @type).map do |line|
+        line = replace_source_file(line)
+        line = strip_comment(line) if strip_comments
+        line
       end
     end
 
-    def exec_tmux(buf, line)
-      buf = +buf if buf.frozen?
-      buf << line
-      buf = strip_comments(buf)
-      return buf if buf.empty?
-
-      if buf.end_with?('\\')
-        buf.chop!
-      else
-        command = "tmux #{buf.gsub(%(\\;), %( '\\;'))}"
-        @logger.debug "exec: #{command}"
-
-        `#{command}` unless ENV['DEBUG']
-        buf.clear
-      end
-    end
+    private
 
     def generate_conf(_structured)
       # TODO
       parse_result = []
     end
 
-    def parse_file(input, type)
-      erb_result = ERB.new(input.read).result
+    def parse_string(input, type)
+      erb_result = ERB.new(input).result
 
       case type
       when :json
@@ -88,32 +67,35 @@ module TmuxERBParser
       line
     end
 
-    def strip_comments(str)
+    def strip_comment(str)
       return '' if str.empty? || str.lstrip.start_with?('#')
 
-      strip_eol_comments(str)
+      strip_eol_comment(str)
     end
 
-    # TODO: refactoring
-    def strip_eol_comments(str)
+    def strip_eol_comment(str)
       flags = {}
       str = str.each_char.inject(+'') do |result, char|
-        case char
-        when '\''
-          if !flags[:double] || (flags[:single] && result[-1] != '\\')
-            flags[:single] = !flags[:single]
-          end
-        when '"'
-          if !flags[:single] || (flags[:double] && result[-1] != '\\')
-            flags[:double] = !flags[:double]
-          end
-        when '#'
-          break result if flags.values.none?
-        end
+        flags = update_flags(flags, char)
+        break result if char == '#' && flags.values.none?
 
         result << char
       end
       str.rstrip
     end
+
+    def update_flags(current_flags, char)
+      result = current_flags.dup
+      result.delete(:'\\')
+
+      case char
+      when '\\'
+        result[char.to_sym] = !current_flags[char.to_sym]
+      when '\'', '"'
+        result[char.to_sym] =
+          current_flags.delete(char.to_sym) ^ current_flags.values.none?
+      end
+      result
+    end
   end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tmux-erb-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - epaew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-15 00:00:00.000000000 Z
+date: 2018-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler