ftest 0.3.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e61f9a6be7447773cae069acd4d0bd9b8e5b83b5
-  data.tar.gz: 1a41862c915bcb998590d9dfe117b98016fb8248
+  metadata.gz: 5738d3080893d015b14e3ce706c0d4dab1f20319
+  data.tar.gz: c4ae4ac2674e3afcd9b0fabc1e8dd8cc0e0f7aba
 SHA512:
-  metadata.gz: b80e594bcd505f583f07551df8636077e2bd5e3a58bbe4744947424d7d82c6331f294547278cc551df3d69a5b8ed3b1f5710ffae6581790efc249e79fad9200e
-  data.tar.gz: 08ae6b85526670449915eb27e1dd3fc5ff9728fbf282979b928a19f95ddd0fe3fc571e276066a3704eb1a0f1f44192df7e5fdf39def76e8b68e6abe283d64a29
+  metadata.gz: 516e5a0a8d5910a9347b4e09eb12f25e6226fc76d2a4e8ba31acd56d2d960e37cc4b17e2c9aa627422287d085a71a58a1ae5bf7a35743154c472aa03709c9d11
+  data.tar.gz: aa759bfee38c2c92ab08da83ae723a1e30c3501a87335e5d56d3a09cf2c61656a2078a538cb7f644991c199aeb54b0060d66686a08796168b7a56816ebe338bc

data/lib/ftest.rb

@@ -1,4 +1,5 @@
 require "logger"
+require "logger/logging"
 
 module FTest
   autoload :Assert, "ftest/assert"

data/lib/ftest/assert/assertion.rb

@@ -22,7 +22,7 @@ module FTest
 
       def build_checks
         @checks.map do |check_name, argument|
-          FTest.logger.debug "Resolving check #{check_name.inspect}, arg=#{argument.inspect}"
+          FTest::Config.internal_logger.debug "Resolving check #{check_name.inspect}, arg=#{argument.inspect}"
           resolve_check check_name, argument
         end
       end

data/lib/ftest/cli.rb

@@ -16,7 +16,6 @@ module FTest
 
     def call
       @options = ArgvParser.(@argv)
-      options.color if @stdout.tty?
       setup_config
       Runner.(resolve_files) or exit 1
     end
@@ -30,9 +29,9 @@ module FTest
     end
 
     def build_logger
-      cls = if options.color? then ColoredLogger else Logger end
-      logger = cls.new @stdout
+      logger = Logger.new @stdout
       logger.level = options.log_level
+      logger.progname = "ftest"
       logger
     end
 
@@ -47,13 +46,22 @@ module FTest
     end
 
     class Options
+      def self.build
+        if ENV["FTEST_VERBOSE"]
+          log_level = Logger::DEBUG
+        else
+          log_level = Logger::INFO
+        end
+        new log_level
+      end
+
       attr_reader :child_count
       attr_reader :log_level
       attr_reader :paths
 
-      def initialize
+      def initialize log_level
         @paths = []
-        @log_level = Logger::WARN
+        @log_level = log_level
       end
 
       def add_path path
@@ -64,14 +72,6 @@ module FTest
         @child_count = number.to_i
       end
 
-      def color
-        @color = !@color
-      end
-
-      def color?
-        @color
-      end
-
       def fail_fast
         @fail_fast = !@fail_fast
       end
@@ -108,7 +108,7 @@ module FTest
 
     class ArgvParser
       def self.call argv
-        options = Options.new
+        options = Options.build
         parser = ArgvParser.new argv, options
         parser.()
         options
@@ -144,10 +144,6 @@ If no PATH(s) are specified, ./tests is assumed
             @options.full_backtrace
           end
 
-          opts.on "-c", "--color", "Enable/disable colored output" do
-            @options.color
-          end
-
           opts.on "-f", "--fail-fast", "When any test script fails, exit immediately" do
             @options.fail_fast
           end

data/lib/ftest/config.rb

@@ -2,9 +2,11 @@ module FTest
   module Config
     extend self
 
+    extend Logger::Logging
+
     attr_writer :child_count
     attr_writer :fail_fast
-    attr_writer :logger
+    attr_writer :internal_logger
     attr_writer :reverse_backtraces
     attr_writer :trim_backtraces
 
@@ -20,12 +22,12 @@ module FTest
       end
     end
 
-    def logger
-      @logger or default_logger
-    end
-
-    def default_logger
-      @default_logger ||= Logger.new $stdout
+    def internal_logger
+      if ENV["FTEST_INTERNAL_LOGGING"]
+        logger
+      else
+        Logger::Logging::NullLogger
+      end
     end
 
     def reverse_backtraces

data/lib/ftest/runner.rb

@@ -13,10 +13,17 @@ module FTest
     end
 
     def call
-      Config.logger.debug "ftest found #{files.size} files: #{files * ", "}"
+      Config.internal_logger.debug "ftest found #{files.size} files: #{files * ", "}"
       return if files.empty?
       result = run_all
-      Config.logger.info "finished executing files; success=#{result.inspect}"
+
+      log_msg = "finished executing files; success=#{result.inspect}"
+      if result
+        Config.logger.info log_msg
+      else
+        Config.logger.warn log_msg
+      end
+
       result
     end
 
@@ -63,7 +70,7 @@ module FTest
       def reap reads
         @set.delete_if do |process|
           next unless reads.include? process.fd
-          Config.logger.debug "Reaping #{process.file}:#{process.pid}"
+          Config.internal_logger.debug "Reaping #{process.file}:#{process.pid}"
           process.finish or @passed = false
           true
         end
@@ -120,7 +127,7 @@ module FTest
           locations = FTest::BacktraceFilter.(locations)
 
           lines = locations.map do |loc| "\tfrom #{loc}" end
-          lines.unshift "#{final_location}: #{error.message}"
+          lines.unshift "#{final_location}: #{error.message} (#{error.class.name})"
 
           lines.reverse! if Config.reverse_backtraces
           Config.logger.error "Exception:\n#{lines * "\n"}"
@@ -130,7 +137,7 @@ module FTest
           fd.read 1
           _, status = ::Process.wait2 pid
           status = status.exitstatus
-          Config.logger.debug "finished script #{@file}; status=#{status.inspect}"
+          Config.internal_logger.debug "finished script #{@file}; status=#{status.inspect}"
           status == 0
         end
       end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ftest
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Nathan Ladd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-13 00:00:00.000000000 Z
-dependencies: []
+date: 2015-09-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: logger-logging
+  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'
 description: Fork based runner for tests written as simple ruby scripts
 email: nathanladd+github@gmail.com
 executables:
@@ -28,7 +42,6 @@ files:
 - lib/ftest/assert/syntax.rb
 - lib/ftest/backtrace_filter.rb
 - lib/ftest/cli.rb
-- lib/ftest/colored_logger.rb
 - lib/ftest/config.rb
 - lib/ftest/runner.rb
 - lib/ftest/script.rb

data/lib/ftest/colored_logger.rb

@@ -1,62 +0,0 @@
-module FTest
-  class ColoredLogger
-    ANSI_COLORS = %i(black red green yellow blue magenta cyan white)
-
-    DEFAULT_PALETTE = {
-      :unknown => -> msg { bg(:blue, :bright, fg(:white, :bright, msg)) },
-      :fatal   => -> msg { bg(:red, :bright, fg(:white, :bright, msg)) },
-      :error   => -> msg { fg(:red, :bright, msg) },
-      :warn    => -> msg { fg(:yellow, :bright, msg) },
-      :info    => -> msg { fg(:default, :normal, msg) },
-      :debug   => -> msg { fg(:cyan, :bright, msg) },
-    }
-
-    attr_reader :palette
-
-    def initialize io, palette = DEFAULT_PALETTE
-      @logger  = Logger.new io
-      @palette = palette
-    end
-
-    %i(level= progname=).each do |method_name|
-      define_method method_name do |*args, &block|
-        @logger.public_send method_name, *args, &block
-      end
-    end
-
-    %i(unknown fatal error warn info debug).each do |log_level|
-      define_method log_level do |msg_or_progname = nil, &orig_block|
-        colored_msg = format log_level, msg_or_progname
-
-        if orig_block
-          progname = colored_msg
-          block = -> do format log_level, orig_block.() end
-        else
-          block = -> do colored_msg end
-        end
-
-        @logger.public_send log_level, progname, &block
-      end
-    end
-
-    def format log_level, msg
-      formatter = palette.fetch log_level
-      instance_exec msg, &formatter
-    end
-
-    def fg *args
-      col :fg, *args
-    end
-
-    def bg *args
-      col :bg, *args
-    end
-
-    def col fgbg, color_code, intensity_code, str
-      color_num = ANSI_COLORS.index color_code
-      intensity_num = { :normal => 0, :bright => 1 }.fetch intensity_code
-      fgbg_num = { :fg => 3, :bg => 4 }.fetch fgbg
-      "\e[#{fgbg_num}#{color_num};#{intensity_num}m#{str}\e[0m"
-    end
-  end
-end