junoser 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04241a9dee01f2996227ba94241a5d072b5c8968
-  data.tar.gz: a1c7851253a38cb45aec788d987a166cf64c0c90
+  metadata.gz: db6b2a917c2763fad5155635ea974d5a0c361f1b
+  data.tar.gz: 08de52d21a5f010b650b6675c509250009e5b356
 SHA512:
-  metadata.gz: 9145301bba9640fc462b7ee7136af70730f77f7cd8b056b468b5ad66eef1e841b67b05ba170e5b27c3b41008859f1c8bc04f1c815a4d2e7cb9f12cd19c18ce72
-  data.tar.gz: dab4dc7ce5b7d618c4555425215c4e3c2120db84958b36d9d64669e8f2ba64a510df2bf7de620c5b926c9c70ed897b61828658c76f8a576f8b7fd6ee8f78877d
+  metadata.gz: cf53ced06ef52a8882b510109e3bca652b729c3c5dd53a113a8699ad32e6174cf5e359890d82053773216a2e185b4e63cedbb0c1d341f348379171c746d394cf
+  data.tar.gz: 26de1af70c0c1c113ec6fd55b0aaba04734de319d64155db08cc756f07895263db4ae184f86ac68c54c2e4d8b7282c89a51462711a84753bd1f07ee494509296

data/exe/junoser

@@ -40,7 +40,7 @@ opts.parse!
 
 case command
 when :check
-  Junoser::Cli.commit_check $<
+  abort unless Junoser::Cli.commit_check($<)
 when :display_set
   Junoser::Cli.display_set $<
 when :struct

data/lib/junoser/cli.rb

@@ -8,7 +8,7 @@ module Junoser
     class << self
       def commit_check(io_or_string)
         config = if io_or_string.respond_to?(:read)
-                   $<.read
+                   io_or_string.read
                  else
                    io_or_string.to_s
                  end

data/lib/junoser/display/set.rb

@@ -1,3 +1,4 @@
+require 'parslet'
 require 'junoser/display/base'
 
 module Junoser
@@ -13,7 +14,7 @@ module Junoser
 
       def commit_check(&block)
         parser = Junoser::Parser.new
-        failed = false
+        passed = true
 
         process do |current_stack, str|
           config = transform_line(current_stack, str)
@@ -21,12 +22,16 @@ module Junoser
           begin
             parser.parse config
           rescue Parslet::ParseFailed
-            $stderr.puts "Invalid syntax:\n#{struct(current_stack.dup, str)}"
-            failed = true
+            $stderr.puts "Invalid syntax:  #{config}"
+            passed = false
           end
         end
 
-        abort if failed
+      rescue
+        $stderr.puts $!
+        passed = false
+      ensure
+        passed
       end
 
 
@@ -48,7 +53,7 @@ module Junoser
           when /(.*);/
             yield stack, $1
           else
-            raise "ERROR* unknown statement:  #{line}"
+            raise "ERROR: unknown statement:  #{line}"
           end
         end
       end

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/junoser.rb

@@ -1,3 +1,4 @@
+require 'junoser/cli'
 require 'junoser/display'
 require 'junoser/parser'
 require 'junoser/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Shintaro Kojima