dokaz 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTE0MmZmNzRmMjlkOGE1ZTFmNjRiYjUwYmU5ZDlhNzQzZGE2Mjc4Yg==
+    YmVmYmJhOGQ4YWFjNWM2MDg3ZjIxODcxOGNkYjc0Yjg4ZGY2ODUzOA==
   data.tar.gz: !binary |-
-    NTkxNjdlMDk0Mjk5NDZiYmU0ODBlMDE2YjUzYTJjMzliM2YyN2UyZg==
+    YWY4ZGM3MDZmYjQ5ZWJiZmNkZjVmMzc2NWVhZGY5ZjM3YWZjMzJiMQ==
 SHA512:
   metadata.gz: !binary |-
-    MjI2NDRlZTJkYjlkNWQxYzA0N2UwYWZiZjA0YWYxNzgwZmFkNDJlMWVlNzA2
-    YWEyNDk0OTZkOGVmYjg5ZDcwNWIxYTc5OGM2ODMzNzRmNTljZTY3Y2VkOGM1
-    ZmEzZWM5Zjg1NjQ2ZmU2MWZhZTQwYWZjMjE1MDFiNmYzOGY5OGU=
+    YjQ4YzBlMThjZmJiN2Y0NjQ0MDRjZmMyYTM2Yjg4NjRiOWRlNTk0YzNjNGY5
+    MmYzNjRmZTRlNjdjNjQ3OWY3YTg2OGNiNDAxZTJjOTdjYjBhMTI0NjNjOWY0
+    NzkzMmVhZTAzMzA1NzlmNTNjOWFiZjVlYThlMzQ0NGE5NmM2ZGI=
   data.tar.gz: !binary |-
-    Y2JmMGY4ODljN2QxZjE0ODA4ZDYwN2Y4Mjg0MmM1M2EwYWNkYjM1YTBjYzIw
-    YTU2MTYwMjllOTc1NzgyMzUyODQxZmIyN2Y1NWQyMWNlM2E3ZWFmZmFlNThk
-    OTcyMjVjMjE5ZmI3ZWUwYTZhZGM5MjE4MTEwYTM0MTA0OGU1ZGY=
+    MjhkNTU2YWQ3ZTMwN2JlNjMyOTEzNjAzMjRjYzE3MDMyZjEzZmY1Y2RiNGY3
+    OGRkM2JhZjg5ZjJhZjVhMWY1NDNkZjExM2E5ZDc3ODc4YTY1MDAzYTI1YWY4
+    NmQ3NmYyNTEyMWRkMWNlY2Q1Mjk2ZDQ0OTAxMDQyM2EwMTk5ZDM=

data/dokaz.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'dokaz'
-  s.version  = '0.0.3'
+  s.version  = '0.0.4'
   s.authors  = ['Victor Shepelev']
   s.email    = 'zverok.offline@gmail.com'
   s.homepage = 'https://github.com/zverok/dokaz'
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'ansi'
   s.add_dependency 'slop', '~> 3'
+  s.add_dependency 'rouge'
 
   s.add_development_dependency 'rspec', '~> 3'
   s.add_development_dependency 'rspec-its', '~> 1'

data/lib/dokaz/formatters.rb

@@ -1,8 +1,14 @@
 # encoding: utf-8
 require 'ansi/code'
+require 'rouge'
 
 class Dokaz
   class Formatter
+    def initialize
+      @rouge = Rouge::Formatters::Terminal256.new
+      @lexer = Rouge::Lexers::Ruby.new
+    end
+    
     def start_block(block)
     end
 
@@ -35,6 +41,14 @@ class Dokaz
         color(:dark, str)
       end
 
+      def code(str)
+        if STDOUT.tty?
+          @rouge.format(@lexer.lex(str))
+        else
+          code + "\n"
+        end
+      end
+
       def color(code, str)
         if STDOUT.tty?
           ANSI.send(code){str}
@@ -46,6 +60,7 @@ class Dokaz
   
   class SpecFormatter < Formatter
     def initialize
+      super
       @ok = 0
       @errors = []
     end
@@ -65,8 +80,8 @@ class Dokaz
       puts
       puts
 
-      @errors.each do |code, e|
-        puts code
+      @errors.each do |src, e|
+        print code(src)
         puts( error("#{e.message} (#{e.class})\n  " + filter_backtrace(e.backtrace).join("\n  ") + "\n"))
       end
 
@@ -97,16 +112,16 @@ class Dokaz
       puts "#{block.caption}\n#{'=' * block.caption.size}\n\n"
     end
     
-    def output(code, res, out)
-      puts code
+    def output(src, res, out)
+      print code(src)
       unless out.empty?
         puts comment("# Prints: \n#  " + out.split("\n").join("\n#    "))
       end
       puts comment("# => " + res.inspect.split("\n").join("\n#    "))
     end
 
-    def output_err(code, e)
-      puts code
+    def output_err(src, e)
+      print code(src)
       puts comment("# Throws: #{e.message} (#{e.class})")
     end
 

data/lib/dokaz/parser.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'strscan'
+require 'stringio'
 
 class Dokaz
   class Block

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dokaz
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Victor Shepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement