ftest 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5738d3080893d015b14e3ce706c0d4dab1f20319
-  data.tar.gz: c4ae4ac2674e3afcd9b0fabc1e8dd8cc0e0f7aba
+  metadata.gz: 7bfcd5052fd652390aed5654ef14e7cc10e4c395
+  data.tar.gz: 66de21d81e67dc06e70bbbe5f740c9f190b87092
 SHA512:
-  metadata.gz: 516e5a0a8d5910a9347b4e09eb12f25e6226fc76d2a4e8ba31acd56d2d960e37cc4b17e2c9aa627422287d085a71a58a1ae5bf7a35743154c472aa03709c9d11
-  data.tar.gz: aa759bfee38c2c92ab08da83ae723a1e30c3501a87335e5d56d3a09cf2c61656a2078a538cb7f644991c199aeb54b0060d66686a08796168b7a56816ebe338bc
+  metadata.gz: 4daaea4200efd5fd14457617934d1c826cb153a57c03eeea1cdd0a0bfebabb0b717dee76d84f9ab9bb61da69bff911670e25d6908a54a02b7df67d8922fc1c85
+  data.tar.gz: e100fb037ddb93e2db9e7ff47c2636e28329536443d1eff2c906b02b2c32f30186ef59fb37ac209e1e8d33a1672d7b6248eda57658ca3e5aefe593527267c259

data/lib/ftest.rb

@@ -23,10 +23,13 @@ module FTest
     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
+  # Describe, context, it, and specify can help break up a larger test script
+  # into chunks. Blocks are run # immediately; this is cosmetic enhancement
+  # that also enables some degree of compatibility with other frameworks.
+  %i(context describe it specify).each do |method_name|
+    define_method method_name do |msg, &blk|
+      blk.() if blk
+    end
   end
 
   def self.included target

data/lib/ftest/cli.rb

@@ -17,7 +17,7 @@ module FTest
     def call
       @options = ArgvParser.(@argv)
       setup_config
-      Runner.(resolve_files) or exit 1
+      Runner.(filter_files) or exit 1
     end
 
     def setup_config
@@ -35,6 +35,12 @@ module FTest
       logger
     end
 
+    def filter_files
+      resolve_files.reject do |path|
+        path.end_with? "init.rb"
+      end
+    end
+
     def resolve_files
       options.paths.flat_map do |path|
         if path.end_with? ".rb"
@@ -153,6 +159,10 @@ If no PATH(s) are specified, ./tests is assumed
             exit 0
           end
 
+          opts.on "-m", "--monkeypatch", "Turn on monkeypatching (equivalent to `require \"ftest/script\"'" do
+            require "ftest/script"
+          end
+
           opts.on "-n", "--num=COUNT", "Max number of sub processes to run concurrently" do |num|
             @options.child_count = num
           end

data/lib/ftest/colored_logger.rb

@@ -0,0 +1,62 @@
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ftest
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Nathan Ladd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger-logging
@@ -42,6 +42,7 @@ 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