dokaz 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2ZlMjgzMWE1M2FiMWQ0ZjNiODJkZDgzMzAxZGU2MzcxOWZiNGI3NA==
+    OTE0MmZmNzRmMjlkOGE1ZTFmNjRiYjUwYmU5ZDlhNzQzZGE2Mjc4Yg==
   data.tar.gz: !binary |-
-    ZGIyYTAxYTAxOTUyZTRlNzQ0ZGQ5N2JjOTQxZmEwNGE0MTg0ZTJmNw==
+    NTkxNjdlMDk0Mjk5NDZiYmU0ODBlMDE2YjUzYTJjMzliM2YyN2UyZg==
 SHA512:
   metadata.gz: !binary |-
-    ZGRhODA3NmJjMzc5YTMwNmQwZTJlMzA5MWRkZjhjMTVkN2YwNTViZmIzMzVi
-    NjQ0YzliZjE2ODk5N2IxN2IxYThmNDVkZGQzNGQ2YTc3NmI3ODAyZjM0ZDZj
-    YjhkNDExOTVkMTgzZTk3OTM4M2YwZWQyM2Y2ODk3MzBkNTlkYjc=
+    MjI2NDRlZTJkYjlkNWQxYzA0N2UwYWZiZjA0YWYxNzgwZmFkNDJlMWVlNzA2
+    YWEyNDk0OTZkOGVmYjg5ZDcwNWIxYTc5OGM2ODMzNzRmNTljZTY3Y2VkOGM1
+    ZmEzZWM5Zjg1NjQ2ZmU2MWZhZTQwYWZjMjE1MDFiNmYzOGY5OGU=
   data.tar.gz: !binary |-
-    ZTdlMzJkYjlhMjEwN2U0YzAwODhlYmEzODU2ZDY4MjFiYjM0MzVkYTg1NDZh
-    NTRiYTk3YzE0NDUwYjkxNzQ1ZTM2ZjhmMGU4Njg2MzMxNTc5NTZiNWRlZTMy
-    ZDJkOGQ3NDg4M2NhNTA1ZWIxYjY4NzhlZTkyZGRjYjMzNmRjN2Q=
+    Y2JmMGY4ODljN2QxZjE0ODA4ZDYwN2Y4Mjg0MmM1M2EwYWNkYjM1YTBjYzIw
+    YTU2MTYwMjllOTc1NzgyMzUyODQxZmIyN2Y1NWQyMWNlM2E3ZWFmZmFlNThk
+    OTcyMjVjMjE5ZmI3ZWUwYTZhZGM5MjE4MTEwYTM0MTA0OGU1ZGY=

data/dokaz.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'dokaz'
-  s.version  = '0.0.2'
+  s.version  = '0.0.3'
   s.authors  = ['Victor Shepelev']
   s.email    = 'zverok.offline@gmail.com'
   s.homepage = 'https://github.com/zverok/dokaz'

data/lib/dokaz/formatters.rb

@@ -22,6 +22,26 @@ class Dokaz
       def filter_backtrace(trace)
         trace.take_while{|ln| ln !~ /lib\/dokaz/}
       end
+
+      def ok(str)
+        color(:green, str)
+      end
+
+      def error(str)
+        color(:red, str)
+      end
+
+      def comment(str)
+        color(:dark, str)
+      end
+
+      def color(code, str)
+        if STDOUT.tty?
+          ANSI.send(code){str}
+        else
+          str
+        end
+      end
   end
   
   class SpecFormatter < Formatter
@@ -37,7 +57,7 @@ class Dokaz
     def finish_block(block)
       unless @err
         @ok += 1 
-        print ANSI.green{'.'}
+        print ok('.')
       end
     end
 
@@ -47,27 +67,27 @@ class Dokaz
 
       @errors.each do |code, e|
         puts code
-        puts( ANSI.red{"#{e.message} (#{e.class})\n  " + filter_backtrace(e.backtrace).join("\n  ") + "\n"})
+        puts( error("#{e.message} (#{e.class})\n  " + filter_backtrace(e.backtrace).join("\n  ") + "\n"))
       end
 
       puts
       @errors.each do |code, e|
         ln = e.backtrace.first.sub(/:in .*$/, '')
-        puts ANSI.red{"dokaz #{ln}"} + ANSI.cyan{" # #{e.message} (#{e.class})"}
+        puts error("dokaz #{ln}") + comment(" # #{e.message} (#{e.class})")
       end
 
       puts
       puts [
         "#{@ok + @errors.count} total",
-        !@ok.zero? && ANSI.green{"#{@ok} ok"},
-        !@errors.empty? && ANSI.red{"#{@errors.count} errors"}
+        !@ok.zero? && ok("#{@ok} ok"),
+        !@errors.empty? && error("#{@errors.count} errors")
       ].select{|l| l}.join(', ')
       
     end
     
     def output_err(code, e)
       @errors << [code, e]
-      print ANSI.red{'F'}
+      print error('F')
       @err = true
     end
   end
@@ -93,10 +113,5 @@ class Dokaz
     def finish_block(block)
       puts "\n\n"
     end
-
-    private
-      def comment(str)
-        ANSI.dark{str}
-      end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dokaz
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Victor Shepelev