ftest 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b936435d56deda1792974d6e8a9b7e6e3268925
-  data.tar.gz: a3d68f8cfc0e04898d8383c93fe27c781c6a9deb
+  metadata.gz: c74881d078896ac38442c877ecca6dbdad5d739f
+  data.tar.gz: 2e7146641d9f0bfefd920e0edb2fb5e2656747a5
 SHA512:
-  metadata.gz: 023ffd02a8feee884bb483284d68f149febb8c4da6612878b6deb6c5a83f824ce500b906ae031f90073d137b3727e228f2c4896561ee5dbb9acf965b4c13c59c
-  data.tar.gz: 94fb9e42376f7c2fecca5bc7efc87de17f0e7acdf03ff8a5b0130997e7f4385cc6f097b7e951a1ef58ae74b35033948bd59a2b8814faa6998cc1b0b96db7540b
+  metadata.gz: 33b69d60643c7622583be04bbbf308b8b49b97e0d7ddfb28dacc535b380d3af6862e0745e000f96e628efd0aac1668974afc184cc19bfd9de4b2bbfcdc8eaa1d
+  data.tar.gz: 7099432413a94b4b85f12ded3ce90a5fc0dd3f4834928d729d38399b6342ecb0c9c9f57900b4ab05778beae8c11d2bf5b614406be7930c9e41bfa7e4c866f760

data/lib/ftest.rb

@@ -2,6 +2,7 @@ require "logger"
 
 module FTest
   autoload :Assert, "ftest/assert"
+  autoload :BacktraceFilter, "ftest/backtrace_filter"
   autoload :ColoredLogger, "ftest/colored_logger"
   autoload :Config, "ftest/config"
   autoload :CLI, "ftest/cli"
@@ -15,10 +16,18 @@ module FTest
   #
   # logger.info "hi"
   # assert true
+  #
+  # You can also require "ftest/script" to automatically include FTest
   def logger
     Config.logger
   end
 
+  # Describe can help break up a larger test script into chunks. Blocks are run
+  # immediately; this is a pure cosmetic enhancement.
+  def describe msg
+    yield
+  end
+
   def self.included target
     Assert::Syntax.infect target
   end

data/lib/ftest/assert.rb

@@ -6,32 +6,10 @@ require_relative "assert/syntax"
 
 module FTest
   module Assert
-    extend self
-
-    def inspect object, truncate = 100
+    def self.inspect object, truncate = 100
       raw = object.inspect
       return raw if raw.size <= truncate
       "#{raw[0..truncate - 2]} …\""
     end
-
-    def filter_trace trace
-      return trace unless Config.trim_backtrace
-
-      entry_point = trace.last
-      ftest_root = File.expand_path "../..", __FILE__
-
-      first_pass = trace.drop_while do |location|
-        full_path = File.expand_path location.path
-        full_path.start_with? ftest_root
-      end
-
-      second_pass = first_pass.take_while do |location|
-        full_path = File.expand_path location.path
-        not full_path.start_with? ftest_root
-      end
-
-      second_pass << entry_point unless second_pass.last == entry_point
-      second_pass
-    end
   end
 end

data/lib/ftest/assert/assertion.rb

@@ -78,7 +78,7 @@ module FTest
       end
 
       def trace
-        Assert.filter_trace @trace
+        BacktraceFilter.(@trace)
       end
 
       class Refutation < Assertion

data/lib/ftest/backtrace_filter.rb

@@ -0,0 +1,25 @@
+module FTest
+  module BacktraceFilter
+    extend self
+
+    def call trace
+      return trace unless Config.trim_backtraces
+
+      entry_point = trace.last
+      ftest_root = File.expand_path "../..", __FILE__
+
+      first_pass = trace.drop_while do |location|
+        full_path = File.expand_path location.to_s
+        full_path.start_with? ftest_root
+      end
+
+      second_pass = first_pass.take_while do |location|
+        full_path = File.expand_path location.to_s
+        not full_path.start_with? ftest_root
+      end
+
+      second_pass << entry_point unless second_pass.last == entry_point
+      second_pass
+    end
+  end
+end

data/lib/ftest/cli.rb

@@ -25,8 +25,8 @@ module FTest
       Config.child_count = options.child_count
       Config.fail_fast = options.fail_fast?
       Config.logger = build_logger
-      Config.reverse_stack_traces = options.reverse_stack_traces?
-      Config.trim_backtrace = !options.full_backtrace?
+      Config.reverse_backtraces = options.reverse_backtraces?
+      Config.trim_backtraces = options.trim_backtraces?
     end
 
     def build_logger
@@ -54,7 +54,6 @@ module FTest
       def initialize
         @paths = []
         @log_level = Logger::WARN
-        @child_count = 2
       end
 
       def add_path path
@@ -85,20 +84,21 @@ module FTest
         @full_backtrace = !@full_backtrace
       end
 
-      def full_backtrace?
-        @full_backtrace
+      def trim_backtraces?
+        return nil if @full_backtrace.nil?
+        not @full_backtrace
       end
 
       def quiet
         @log_level += 1
       end
 
-      def reverse_stack_traces
-        @reverse_stack_traces = !@reverse_stack_traces
+      def reverse_backtraces
+        @reverse_backtraces = !@reverse_backtraces
       end
 
-      def reverse_stack_traces?
-        @reverse_stack_traces
+      def reverse_backtraces?
+        @reverse_backtraces
       end
 
       def verbose
@@ -156,7 +156,7 @@ If no PATH is specified, ./tests is assumed
             @options.quiet
           end
           opts.on "-r", "--reverse-traces", "Reverse the order of stack traces" do
-            @options.reverse_stack_traces
+            @options.reverse_backtraces
           end
           opts.on "-v", "--verbose", "Increases log verbosity" do
             @options.verbose

data/lib/ftest/colored_logger.rb

@@ -25,7 +25,8 @@ module FTest
     end
 
     %i(unknown fatal error warn info debug).each do |log_level|
-      define_method log_level do |msg|
+      define_method log_level do |msg = nil, &block|
+        msg ||= block[]
         colored_msg = format log_level, msg
         @logger.public_send log_level, colored_msg
       end

data/lib/ftest/config.rb

@@ -5,15 +5,19 @@ module FTest
     attr_writer :child_count
     attr_writer :fail_fast
     attr_writer :logger
-    attr_writer :reverse_stack_traces
-    attr_writer :trim_backtrace
+    attr_writer :reverse_backtraces
+    attr_writer :trim_backtraces
 
     def child_count
-      @child_count or 1
+      Option::Number.evaluate @child_count do
+        ENV.fetch "FTEST_CHILD_COUNT", 1
+      end
     end
 
     def fail_fast
-      @fail_fast or false
+      Option::Boolean.evaluate @fail_fast do
+        ENV["FTEST_FAIL_FAST"]
+      end
     end
 
     def logger
@@ -24,12 +28,48 @@ module FTest
       @default_logger ||= Logger.new $stdout
     end
 
-    def reverse_stack_traces
-      @reverse_stack_traces or false
+    def reverse_backtraces
+      Option::Boolean.evaluate @reverse_backtraces do
+        ENV["FTEST_REVERSE_BACKTRACES"]
+      end
     end
 
-    def trim_backtrace
-      @trim_backtrace or false
+    def trim_backtraces
+      Option::Boolean.evaluate @trim_backtraces do
+        ENV.fetch "FTEST_TRIM_BACKTRACES", true
+      end
+    end
+
+    class Option
+      def self.evaluate value, &block
+        instance = new value
+        instance.fetch &block
+      end
+
+      def initialize value
+        @value = value
+      end
+
+      def fetch
+        @value = yield unless set?
+        value
+      end
+
+      def set?
+        not @value.nil?
+      end
+
+      class Number < Option
+        def value
+          @value.to_i
+        end
+      end
+
+      class Boolean < Option
+        def value
+          not [nil, false, "", "0", "n", "no", "false"].include? @value
+        end
+      end
     end
   end
 end

data/lib/ftest/runner.rb

@@ -117,11 +117,12 @@ module FTest
         def print_stacktrace error
           locations = error.backtrace
           final_location = locations.shift
+          locations = FTest::BacktraceFilter.(locations)
 
           lines = locations.map do |loc| "\tfrom #{loc}" end
           lines.unshift "#{final_location}: #{error.message}"
 
-          lines.reverse! if Config.reverse_stack_traces
+          lines.reverse! if Config.reverse_backtraces
           Config.logger.error "Exception:\n#{lines * "\n"}"
         end
 

data/lib/ftest/script.rb

@@ -0,0 +1,2 @@
+require "ftest"
+include FTest

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ftest
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Nathan Ladd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies: []
 description: Fork based runner for tests written as simple ruby scripts
 email: nathanladd+github@gmail.com
@@ -26,10 +26,12 @@ files:
 - lib/ftest/assert/checks/registry.rb
 - lib/ftest/assert/errors.rb
 - 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
 - lib/ftest/util.rb
 homepage: https://github.com/ntl/ftest
 licenses: