junoser 0.1.2 → 0.1.3

data/lib/junoser/ruler.rb

@@ -39,6 +39,7 @@ module Junoser
     def process_reserved_element(str)
       str.gsub! /"\$\S+"/, 'arg'
       str.gsub! '"as-number" arg', 'arg'
+      str.gsub! '"confederation-as" arg', 'arg'
       str.gsub! '"equal-literal"', '"="'
       str.gsub! '"plus-literal"', '"+"'
       str.gsub! '"minus-literal"', '"-"'
@@ -79,6 +80,14 @@ module Junoser
                 '  )'], $1)
       end
 
+      str.gsub!(/^rule\(:regular_expression\) do\s*((?!end).)*\s*end/) do
+        "rule(:regular_expression) do
+  (quote | arg).as(:arg)
+end"
+      end
+
+      str.gsub!(/("next-hop" \(\s*sc\(\s*c\(\s*[^)]*)"address" \(\s*ipaddr\s*\)/) { "#{$1}ipaddr" }
+
       %w[metric metric2 metric3 metric4 tag tag2 preference preference2 color color2 local-preference].each do |key|
         str.gsub!(/^(\s*"#{key}" \(\s*sc\(\s*c\(\s*)"#{key}" arg/) { "#{$1}arg" }
       end
@@ -151,13 +160,17 @@ module Junoser
     rule(:space)   { match('\\s').repeat(1) }
     rule(:any)     { match('.').repeat(1) }
     rule(:eos)     { match('$') }
-    rule(:dotted)  { match('[^. \\t\\n\\r\\f]').repeat(1) >> match('\.') >> match('[^. \\t\\n\\r\\f]').repeat(1) }
-    rule(:quote)   { match('"') >> match('[^"]').repeat(1) >> match('"') }
+    rule(:dotted)  { match('[^. \\t\\n\\r\\f]').repeat(1) >> str('.') >> match('[^. \\t\\n\\r\\f]').repeat(1) }
+    rule(:quote)   { str('"') >> match('[^"]').repeat(1) >> str('"') }
     rule(:address) { match('[0-9a-fA-F:\.]').repeat(1) }
-    rule(:prefix ) { address >> (match('/') >> match('[0-9]').repeat(1)).maybe }
+    rule(:prefix ) { address >> (str('/') >> match('[0-9]').repeat(1)).maybe }
 
     root(:set)
-    rule(:set) { (str('set') | str('deactivate')) >> space >> configuration.as(:config) }
+    rule(:set) { (str('set') | str('deactivate')) >> space >> configuration.as(:config) >> comment.maybe }
+
+    rule(:comment) { space.maybe >> (hash_comment | slash_asterisk) }
+    rule(:hash_comment) { str('#') >> any.maybe }
+    rule(:slash_asterisk) { str('/*') >> match('(?!\\*\\/).').repeat(0) >> str('*/') }
 
       EOS
     end

data/lib/junoser/transformer.rb

@@ -23,6 +23,7 @@ module Junoser
     end
 
     rule(label: simple(:label), child: sequence(:children)) do
+      Junoser::Transformer.remove_slash_asterisk children
       %[#{label}\n#{children.join("\n")}]
     end
 
@@ -31,11 +32,24 @@ module Junoser
     end
 
     rule(statement: simple(:statement), argument: sequence(:arguments)) do
+      Junoser::Transformer.remove_slash_asterisk arguments
       %[#{statement}\n#{arguments.join("\n")}]
     end
 
     rule(oneline: simple(:str)) do
-      str.gsub "\n", ' '
+      str.to_s.gsub("\n", ' ')
+    end
+
+
+    def self.remove_slash_asterisk(array)
+      open = array.index("arg(/*)\n")
+      close = array.index("arg(*/)")
+
+      if open && close
+        (open..close).reverse_each do |i|
+          array.delete_at i
+        end
+      end
     end
   end
 end

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/junoser/xsd/base.rb

@@ -36,7 +36,7 @@ module Junoser
       private
 
       def oneliner?
-        @oneliner ||= !xml.xpath('./xsd:annotation/xsd:appinfo/flag[contains(text(), "oneliner")]').empty?
+        @oneliner ||= !xml.xpath('./xsd:annotation/xsd:appinfo/flag[text()="oneliner"]').empty?
       end
 
       def has_single_child_of?(klass)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  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'
 description: PEG parser to vefiry and translate into different formats for JUNOS configuration.
 email:
 - goodies@codeout.net
@@ -102,10 +116,10 @@ files:
 - lib/junoser/cli.rb
 - lib/junoser/development.rb
 - lib/junoser/display.rb
-- lib/junoser/display/base.rb
 - lib/junoser/display/config_store.rb
 - lib/junoser/display/set.rb
 - lib/junoser/display/structure.rb
+- lib/junoser/input.rb
 - lib/junoser/parser.rb
 - lib/junoser/ruler.rb
 - lib/junoser/transformer.rb
@@ -119,7 +133,7 @@ files:
 - lib/junoser/xsd/restriction.rb
 - lib/junoser/xsd/sequence.rb
 - lib/junoser/xsd/simple_content.rb
-homepage: https://github.com/codeout/sakura-cli
+homepage: https://github.com/codeout/junoser
 licenses: []
 metadata: {}
 post_install_message: 

data/lib/junoser/display/base.rb

@@ -1,40 +0,0 @@
-module Junoser
-  module Display
-    module Base
-      attr_accessor :output
-
-      def initialize(io_or_string)
-        @input = io_or_string
-        @output = $stdout
-      end
-
-
-      private
-
-      def read_io_or_string
-        return @read_io_or_string if @read_io_or_string
-
-        config = if @input.respond_to?(:read)
-                   @input.read
-                 else
-                   @input.to_s
-                 end
-
-        @read_io_or_string = remove_blank_and_comment(config)
-        @read_io_or_string = unify_carriage_return(@read_io_or_string)
-      end
-
-      def remove_blank_and_comment(str)
-        str.gsub! /#.*/, ''
-        str.gsub! /\/\*((?!\*\/).)*\*\//m, ''
-        str.gsub! /\n\s*/, "\n"
-        str.strip
-      end
-
-      def unify_carriage_return(str)
-        str.gsub! /\r\n?/, "\n"
-        str
-      end
-    end
-  end
-end