junoser 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1712996f972e957b0606905fdad4a5e1888623d
-  data.tar.gz: 05fe617f94ace5f76847da3da6e950b6661bda4f
+  metadata.gz: 2ab1a9524ecd186fab65751afc3848b778d5277c
+  data.tar.gz: ef24a5f3ecc523eac099d383abe46d3d63afbd6c
 SHA512:
-  metadata.gz: 8055f567929e8499ceb8b2ace5415ab82526f82e76aee1bfd72fa56eca5972dda99374daf725c4de823c52b52faae1d7fcfd48523a6173f9536dcb35c7ec5c9b
-  data.tar.gz: 98733286e456322ce034ad6be647cb2d33f4d4481ecab034a7224284aac3a3f6d05237d7b292ad2f44ee3855bd18894b52f82bd90842e0ed84d2b8a2db2d26ad
+  metadata.gz: 185e14132f29d80aacf8e9020ce185a1b202b9337fa00bde2b7363803aac0f5680cf1a39b7af2df352671371035843ee4e5480af6e06911c026632fe5b1f19d2
+  data.tar.gz: cced7a834060b3a786b607cc9c51b961fb3161c5bab457d4d085aa5bf26d19b31de7909f992205e062753b729b9b2c9a2c4460eb5156f03df1e07b77808d2921

data/lib/junoser/cli.rb

@@ -34,18 +34,7 @@ module Junoser
 
       def commit_check_display_set(config)
         parser = Junoser::Parser.new
-        passed = true
-
-        config.split("\n").each do |line|
-          begin
-            parser.parse line
-          rescue Parslet::ParseFailed
-            $stderr.puts "Invalid syntax:  #{line}"
-            passed = false
-          end
-        end
-
-        passed
+        parser.parse_lines(config)
       end
     end
   end

data/lib/junoser/display/config_store.rb

@@ -7,9 +7,12 @@ module Junoser
 
       OFFSET = '    '
 
+      attr_accessor :deactivated
+
       def initialize(depth=0)
         @hash = {}
         @depth = depth
+        @deactivated = false
       end
 
       def push(str)
@@ -22,10 +25,34 @@ module Junoser
       end
       alias << push
 
+      def deactivate(deactivated_line)
+        statement, store = matched(deactivated_line)
+
+        if statement
+          if statement == deactivated_line
+            store.deactivated = true
+          else
+            store.deactivate(deactivated_line.sub(/^#{statement} */, ''))
+          end
+        else
+          statement, store = inverse_matched(deactivated_line)
+          if statement
+            store.deactivated = true
+          end
+        end
+      end
+
+      def each_with_inactive(&block)
+        each do |k, v|
+          k = "inactive: #{k}" if v.deactivated
+          yield k, v
+        end
+      end
+
       def to_s
         str = ''
 
-        each do |k, v|
+        each_with_inactive do |k, v|
           if v.empty?
             str << OFFSET*@depth << "#{k};\n"
           else
@@ -47,6 +74,24 @@ module Junoser
         str.gsub!(/arg\((.*)\)/) { "#$1" }
         str
       end
+
+      def matched(str)
+        each do |statement, store|
+          # NOTE: return the first object
+          return [statement, store] if str =~ /^#{statement}/
+        end
+
+        []
+      end
+
+      def inverse_matched(str)
+        each do |statement, store|
+          # NOTE: return the first object
+          return [statement, store] if statement =~ /^#{str}/
+        end
+
+        []
+      end
     end
   end
 end

data/lib/junoser/display/set.rb

@@ -19,25 +19,15 @@ module Junoser
       end
 
       def commit_check(&block)
-        parser = Junoser::Parser.new
-        passed = true
-
-        process do |current_stack, str|
-          config = transform_line(current_stack, str)
-
-          begin
-            parser.parse config
-          rescue Parslet::ParseFailed
-            $stderr.puts "Invalid syntax:  #{config}"
-            passed = false
-          end
+        begin
+          lines = transform
+        rescue
+          $stderr.puts $!
+          return false
         end
 
-      rescue
-        $stderr.puts $!
-        passed = false
-      ensure
-        return passed
+        parser = Junoser::Parser.new
+        parser.parse_lines(lines)
       end
 
 
@@ -65,17 +55,22 @@ module Junoser
       end
 
       def transform_line(current_stack, str)
-        statement = if current_stack.empty?
-                      str
-                    else
-                      statement = "#{current_stack.join(' ')} #{str}"
-                    end
+        statements = []
+        current_statement = ''
 
-        if statement.gsub!('inactive: ', '')
-          "deactivate #{statement}"
-        else
-          "set #{statement}"
+        current_stack.each do |stack|
+          if stack.gsub!('inactive: ', '')
+            statements << "deactivate #{current_statement}#{stack}"
+          end
+          current_statement << "#{stack} "
         end
+
+        if str.gsub!('inactive: ', '')
+          statements << "deactivate #{current_statement}#{str}"
+        end
+
+        statements.unshift "set #{current_statement}#{str}"
+        statements.join("\n")
       end
 
       def struct(stack, statement, offset=2)

data/lib/junoser/display/structure.rb

@@ -15,12 +15,19 @@ module Junoser
         parser = Junoser::Parser.new
         transform = Junoser::Transformer.new
 
-        Junoser::Input.new(@input).read.split("\n").each do |line|
+        config = Junoser::Input.new(@input).read.split("\n")
+        deactivated_lines = config.grep(/^deactivate /).map {|l| l.sub(/^deactivate /, '') }
+
+        config.each do |line|
+          next if line =~ /^deactivate /
+
           transformed = transform.apply(parser.parse(line))
           raise "ERROR: parse failed" unless transformed.is_a?(String)
           @config << transformed
         end
 
+        deactivated_lines.each {|l| @config.deactivate l }
+
         @config.to_s
       end
     end

data/lib/junoser/parser.rb

@@ -2,6 +2,29 @@ require 'parslet'
 
 module Junoser
   class Parser < Parslet::Parser
+    def parse_lines(config)
+      lines = config.split("\n")
+      lines_without_deactivate = lines.reject {|l| l =~ /^deactivate/ }
+
+      lines.inject(true) do |passed, line|
+        if line =~ /^deactivate/
+          if lines_without_deactivate.grep(/^#{line.sub(/^deactivate/, 'set')}/).empty?
+            next false
+          else
+            next passed
+          end
+        end
+
+        begin
+          parse line
+          passed
+        rescue Parslet::ParseFailed
+          $stderr.puts "Invalid syntax:  #{line}"
+          false
+        end
+      end
+    end
+
     # block with children maybe
     def b(object, *children)
       children.inject(object) {|rule, child| rule.as(:label) >> (space >> child.as(:child) | eos) }
@@ -46,7 +69,7 @@ module Junoser
     rule(:prefix ) { address >> (str('/') >> match('[0-9]').repeat(1)).maybe }
 
     root(:set)
-    rule(:set) { (str('set') | str('deactivate')) >> space >> configuration.as(:config) >> comment.maybe }
+    rule(:set) { str('set') >> space >> configuration.as(:config) >> comment.maybe }
 
     rule(:comment) { space.maybe >> (hash_comment | slash_asterisk) }
     rule(:hash_comment) { str('#') >> any.maybe }

data/lib/junoser/ruler.rb

@@ -163,6 +163,29 @@ require 'parslet'
 
 module Junoser
   class Parser < Parslet::Parser
+    def parse_lines(config)
+      lines = config.split("\\n")
+      lines_without_deactivate = lines.reject {|l| l =~ /^deactivate/ }
+
+      lines.inject(true) do |passed, line|
+        if line =~ /^deactivate/
+          if lines_without_deactivate.grep(/^\#{line.sub(/^deactivate/, 'set')}/).empty?
+            next false
+          else
+            next passed
+          end
+        end
+
+        begin
+          parse line
+          passed
+        rescue Parslet::ParseFailed
+          $stderr.puts "Invalid syntax:  \#{line}"
+          false
+        end
+      end
+    end
+
     # block with children maybe
     def b(object, *children)
       children.inject(object) {|rule, child| rule.as(:label) >> (space >> child.as(:child) | eos) }
@@ -207,7 +230,7 @@ module Junoser
     rule(:prefix ) { address >> (str('/') >> match('[0-9]').repeat(1)).maybe }
 
     root(:set)
-    rule(:set) { (str('set') | str('deactivate')) >> space >> configuration.as(:config) >> comment.maybe }
+    rule(:set) { str('set') >> space >> configuration.as(:config) >> comment.maybe }
 
     rule(:comment) { space.maybe >> (hash_comment | slash_asterisk) }
     rule(:hash_comment) { str('#') >> any.maybe }

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet