junoser 0.1.2 → 0.1.3

data/exe/junoser

@@ -5,7 +5,7 @@ require 'pathname'
 
 $: << File.expand_path('../../lib', Pathname.new(__FILE__).realpath)
 
-require 'junoser/cli'
+require 'junoser'
 
 
 command = nil
@@ -34,6 +34,7 @@ opts = OptionParser.new do |opts|
 
   opts.on_tail '-v', '--version', 'Show version' do
     puts Junoser::VERSION
+    exit
   end
 end
 opts.parse!
@@ -42,9 +43,9 @@ case command
 when :check
   abort unless Junoser::Cli.commit_check($<)
 when :display_set
-  Junoser::Cli.display_set $<
+  puts Junoser::Cli.display_set($<)
 when :struct
-  Junoser::Cli.struct $<
+  puts Junoser::Cli.struct($<)
 else
   puts opts
   abort

data/junoser.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{PEG parser for JUNOS configuration.}
   spec.description   = %q{PEG parser to vefiry and translate into different formats for JUNOS configuration.}
-  spec.homepage      = "https://github.com/codeout/sakura-cli"
+  spec.homepage      = "https://github.com/codeout/junoser"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "activesupport"
   spec.add_development_dependency "nokogiri"
+  spec.add_development_dependency "test-unit"
 end

data/lib/junoser/cli.rb

@@ -1,5 +1,6 @@
 require 'parslet'
 require 'junoser/display'
+require 'junoser/input'
 require 'junoser/parser'
 
 
@@ -7,11 +8,7 @@ module Junoser
   module Cli
     class << self
       def commit_check(io_or_string)
-        config = if io_or_string.respond_to?(:read)
-                   io_or_string.read
-                 else
-                   io_or_string.to_s
-                 end
+        config = Junoser::Input.new(io_or_string).read
 
         if Junoser::Display.display_set?(config)
           commit_check_display_set config
@@ -37,18 +34,18 @@ module Junoser
 
       def commit_check_display_set(config)
         parser = Junoser::Parser.new
-        failed = false
+        passed = true
 
         config.split("\n").each do |line|
           begin
             parser.parse line
           rescue Parslet::ParseFailed
             $stderr.puts "Invalid syntax:  #{line}"
-            failed = true
+            passed = false
           end
         end
 
-        abort if failed
+        passed
       end
     end
   end

data/lib/junoser/display/set.rb

@@ -1,15 +1,21 @@
 require 'parslet'
-require 'junoser/display/base'
+require 'junoser/input'
 
 module Junoser
   module Display
     class Set
-      include Base
+      def initialize(io_or_string)
+        @input = io_or_string
+      end
 
       def transform
+        result = ''
+
         process do |current_stack, str|
-          @output.puts transform_line(current_stack, str)
+          result << transform_line(current_stack, str) << "\n"
         end
+
+        result
       end
 
       def commit_check(&block)
@@ -40,7 +46,7 @@ module Junoser
       def process(&block)
         stack = []
 
-        read_io_or_string.split("\n").each do |line|
+        Junoser::Input.new(@input).read.split("\n").each do |line|
           case line
           when /(.*){/
             stack.push $1.strip

data/lib/junoser/display/structure.rb

@@ -1,3 +1,4 @@
+require 'junoser/input'
 require 'junoser/display/config_store'
 require 'junoser/parser'
 require 'junoser/transformer'
@@ -5,10 +6,8 @@ require 'junoser/transformer'
 module Junoser
   module Display
     class Structure
-      include Base
-
       def initialize(io_or_string)
-        super
+        @input = io_or_string
         @config = Junoser::Display::ConfigStore.new
       end
 
@@ -16,13 +15,13 @@ module Junoser
         parser = Junoser::Parser.new
         transform = Junoser::Transformer.new
 
-        read_io_or_string.split("\n").each do |line|
+        Junoser::Input.new(@input).read.split("\n").each do |line|
           transformed = transform.apply(parser.parse(line))
           raise "ERROR: parse failed" unless transformed.is_a?(String)
           @config << transformed
         end
 
-        @output.puts @config.to_s
+        @config.to_s
       end
     end
   end

data/lib/junoser/input.rb

@@ -0,0 +1,34 @@
+module Junoser
+  class Input
+    def initialize(io_or_string)
+      @io_or_string = io_or_string
+    end
+
+    def read
+      content = if @io_or_string.respond_to?(:read)
+                  @io_or_string.read
+                else
+                  @io_or_string.to_s
+                end
+
+      content = remove_blank_and_comment_line(content)
+      content = unify_carriage_return(content)
+    end
+
+
+    private
+
+    # As for comment line, a trailing comment after configuration will be processed by parslet
+    def remove_blank_and_comment_line(str)
+      str.gsub! /^\s*#.*/, ''
+      str.gsub! /^\s*\/\*((?!\*\/).)*\*\//m, ''
+      str.gsub! /\n\s*/, "\n"
+      str.strip
+    end
+
+    def unify_carriage_return(str)
+      str.gsub! /\r\n?/, "\n"
+      str
+    end
+  end
+end