regtest 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 28b2ce644b776836dc3a87811ecc3c8accc4365e
-  data.tar.gz: 64b940c2ab67af77fb2bbbf205abdd2e4122f0c1
+SHA256:
+  metadata.gz: f5b02a7c607d5735101137dcc7e5bac179d8edb3be167ff73b8b68d0dee9e4b0
+  data.tar.gz: 317570205b1fabd4134fcf8760a5cea3205b9b52f9a4e8275b0d786f782a1ebe
 SHA512:
-  metadata.gz: c1bb833f9ae90d7cbbcbb63c503b72a6341df21728378aebabdb4ebcee97168b4567fbf6ca3185ee738434e986f7671f75a207df5d9aed9bcd1f5d151fef7337
-  data.tar.gz: ab381db6009de48d6698aeca01fcc550b3cc860022ecc88880942270ba4731509ee109273d94b43479635707c95a410679499dacf9554d2ca888a73e4d1430dd
+  metadata.gz: 7af88f7231a95bc5b98544bcd22f6b9a2e6ee8fd5fea378a86dcf80a344ca4d0dedd13d9bd2777cc15362802dd887e05abe70330bdb5c7b1bcc8ad4d6753d00c
+  data.tar.gz: d3f6c5f59cbf50915b6f8ce54f56713f0a60bdf8bd54c9a0120a1c2ca4a7884a51fc2d967d9cc6d0e87280d600e8be104b1f4f6b8852130e69c548cf2dbeece6

data/.aspell.pws

@@ -1,4 +1,4 @@
-personal_ws-1.1 en 26 
+personal_ws-1.1 en 27 
 NOREGTESTRC
 md
 dir
@@ -25,3 +25,4 @@ regtestrc
 metatest
 README
 OpenStruct
+gettime

data/Changelog

@@ -1,3 +1,8 @@
+2.1.0
+Use Process.clock_gettime for time measurements.
+Eliminate dependency to colorize gem. So Regtest has no longer any
+dependency.
+
 2.0.0 Major Release
 
 Incompatibilities to regtest 1.x

data/LICENSE

@@ -1,3 +1,3 @@
-Copyright 2014-2017 by Jan Friedrich <janfri26@gmail.com>
+Copyright 2014, 2015, 2017-2019 by Jan Friedrich <janfri26@gmail.com>
 
 Regtest is licensed under the same terms as Ruby itself.

data/Rakefile

@@ -34,7 +34,6 @@ Rim.setup do |p|
   END
   p.homepage = 'https://github.com/janfri/regtest'
   p.ruby_version = '>=2.1.0'
-  p.dependencies << %w(colorize ~>0.8)
 end
 
 # JRuby does not support escaping of filenames with spaces in Open3.capture3

data/lib/regtest.rb

@@ -3,7 +3,7 @@
 #
 # Regtest - Simple Regression Testing With Ruby
 #
-# Copyright 2014, 2015, 2017 by Jan Friedrich <janfri26@gmail.com>
+# Copyright 2014, 2015, 2017-2019 by Jan Friedrich <janfri26@gmail.com>
 # License: Regtest is licensed under the same terms as Ruby itself.
 #
 
@@ -13,7 +13,7 @@ require 'yaml'
 
 module Regtest
 
-  @start = Time.now
+  @start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
   @results = {}
   @exit_codes = Hash.new(1)
   @exit_codes.merge!({success: 0, unknown_result: 1, fail: 2})
@@ -80,7 +80,8 @@ module Regtest
 
     # Report some statistics, could be overwritten by plugins.
     def report_statistics
-      time = Time.now - start
+      now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      time = now - start
       sample_count = results.values.map(&:size).reduce(0, &:+)
       report format("\n\n%d samples executed in %.2f s (%d samples/s)", sample_count, time, sample_count / time), type: :statistics
     end

data/lib/regtest/colorize.rb

@@ -1,48 +1,8 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-begin
-  module Regtest
+require 'regtest/colors'
 
-    # Regtest plugin to have colorized reports.
-    # It uses the great colorize gem
-    # (see https://rubygems.org/gems/colorize)
-    module Colorize
+Regtest::Colorize = Regtest::Colors
 
-      @mapping = (%i(success fail unknown_result filename).zip %i(green red yellow blue)).to_h
-      @mapping[:statistics] = {mode: :italic}
-
-      class << self
-        # Color mapping (all parameters of ColorizedString.colorize are supported
-        # (see https://github.com/fazibear/colorize#usage)
-        # Examples:
-        #   Regtest::Colorize.mapping[:filename] = :light_blue
-        #   Regtest::Colorize.mapping[:statistics] = {color: :cyan, mode: :italic}
-        attr_accessor :mapping
-      end
-
-      require 'colorized_string'
-      # If loading of colorized_string (gem colorize) fails the accessor above is
-      # available in .regtestrc files but method redefinition of Regtest.report and
-      # prepending of Colorize is skipped.
-
-      # Redefine Regtest.report.
-      def report *args, type: nil
-        color = Colorize.mapping[type]
-        if color && $stdout.tty?
-          args = args.map {|a| ColorizedString[a.to_s].colorize(color)}
-        end
-        puts *args
-      end
-
-    end
-
-    class << self
-      prepend Colorize
-    end
-
-  end
-rescue LoadError
-  warn 'gem colorize not found'
-  warn 'plugin regtest/colorize disabled'
-end
+warn 'regtest/colorize is deprecated. use regtest/colors instead.'

data/lib/regtest/colors.rb

@@ -0,0 +1,63 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module Regtest
+
+  module Colors
+
+    # Redefine Regtest.report
+    def report *args, type: nil
+      color = Colors.mapping[type]
+      if color && $stdout.tty?
+        args = args.map {|a| Colors.apply(a.to_s, color)}
+      end
+      puts *args
+    end
+
+    class << self
+      # Color mapping
+      # Examples:
+      #   Regtest::Colors.mapping[:filename] = :lightblue
+      #   Regtest::Colors.mapping[:fail] = :@red # '@' prefix means background color
+      #   Regtest::Colors.mapping[:statistics] = %i(cyan italic) # more than one color code is possible
+      attr_accessor :mapping
+
+      # Apply color codes to a string
+      def apply str, *codes
+        codes.flatten.each do |c|
+          num = @codes[c.to_sym]
+          fail format('Code %s not supported.', c) unless num
+          str = format("\e[%dm%s", num, str)
+        end
+        format("%s\e[0m", str)
+      end
+
+      # Get available color codes
+      def codes
+        @codes.keys
+      end
+    end
+
+    private
+
+    @mapping = (%i(success fail unknown_result filename).zip %i(green red yellow blue)).to_h
+    @codes = {}
+
+    %i(bold faint italic underline).each_with_index do |mode, i|
+      @codes[mode] = 1 + i
+    end
+
+    %i(black red green yellow blue magenta cyan white).each_with_index do |color, i|
+      @codes[color] = 30 + i
+      @codes[format('@%s', color).to_sym] = 40 + i
+      @codes[format('light%s', color).to_sym] = 90 + i
+      @codes[format('@light%s', color).to_sym] = 100 + i
+    end
+
+  end
+
+  class << self
+    prepend Colors
+  end
+
+end

data/lib/regtest/task.rb

@@ -1,9 +1,5 @@
 # encoding: utf-8
 # frozen_string_literal: true
-#
-# Copyright 2014, 2016, 2017 by Jan Friedrich <janfri26@gmail.com>
-# License: Regtest is licensed under the same terms as Ruby itself.
-#
 
 # Regtest sample files (= Ruby files)
 REGTEST_FILES_RB = FileList.new('regtest/**/*.rb')

data/lib/regtest/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Regtest
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/regtest.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# stub: regtest 2.0.0 ruby lib
+# stub: regtest 2.1.0 ruby lib
 #
 # This file is automatically generated by rim.
 # PLEASE DO NOT EDIT IT DIRECTLY!
@@ -7,39 +7,36 @@
 
 Gem::Specification.new do |s|
   s.name = "regtest"
-  s.version = "2.0.0"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jan Friedrich"]
-  s.date = "2017-09-22"
+  s.date = "2019-03-04"
   s.description = "This library supports a very simple way to do regression testing with Ruby. It\nis not limited to Ruby projects you can use it also in other contexts where you\ncan extract data with Ruby.\n\nYou write Ruby scripts with samples. Run these and get the sample results as\nresults files besides your scripts. Check both the scripts and the results\nfiles in you Source Code Management System (SCM). When you run the scrips on a\nlater (or even previous) version of your code a simple diff show you if and how\nthe changes in your code or environment impact the results of your samples.\n\nThis is not a replacement for unit testing but a complement: You can produce a\nlot of samples with a small amount of Ruby code (e.g. a large number of\ncombinations of data).\n"
   s.email = "janfri26@gmail.com"
-  s.files = ["./.aspell.pws", "Changelog", "Gemfile", "LICENSE", "README.md", "Rakefile", "lib/regtest", "lib/regtest.rb", "lib/regtest/colorize.rb", "lib/regtest/git.rb", "lib/regtest/task.rb", "lib/regtest/version.rb", "regtest.gemspec", "regtest/combinations.rb", "regtest/combinations.yml", "regtest/examples.rb", "regtest/examples.yml", "regtest/filename with spaces.rb", "regtest/filename with spaces.yml", "regtest/metatest.rb", "regtest/metatest.yml", "regtest/metatest_git.rb", "regtest/metatest_git.yml", "regtest/no_samples.rb"]
+  s.files = ["./.aspell.pws", "Changelog", "Gemfile", "LICENSE", "README.md", "Rakefile", "lib/regtest", "lib/regtest.rb", "lib/regtest/colorize.rb", "lib/regtest/colors.rb", "lib/regtest/git.rb", "lib/regtest/task.rb", "lib/regtest/version.rb", "regtest.gemspec", "regtest/combinations.rb", "regtest/combinations.yml", "regtest/examples.rb", "regtest/examples.yml", "regtest/filename with spaces.rb", "regtest/filename with spaces.yml", "regtest/metatest.rb", "regtest/metatest.yml", "regtest/metatest_git.rb", "regtest/metatest_git.yml", "regtest/no_samples.rb"]
   s.homepage = "https://github.com/janfri/regtest"
   s.licenses = ["Ruby"]
   s.required_ruby_version = Gem::Requirement.new(">= 2.1.0")
-  s.rubygems_version = "2.6.13"
+  s.rubygems_version = "2.7.6"
   s.summary = "Simple regression testing with Ruby."
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<colorize>, ["~> 0.8"])
       s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rim>, ["~> 2.15"])
-      s.add_development_dependency(%q<regtest>, ["~> 1.0"])
+      s.add_development_dependency(%q<rim>, ["~> 2.17"])
+      s.add_development_dependency(%q<regtest>, ["~> 2"])
     else
-      s.add_dependency(%q<colorize>, ["~> 0.8"])
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rim>, ["~> 2.15"])
-      s.add_dependency(%q<regtest>, ["~> 1.0"])
+      s.add_dependency(%q<rim>, ["~> 2.17"])
+      s.add_dependency(%q<regtest>, ["~> 2"])
     end
   else
-    s.add_dependency(%q<colorize>, ["~> 0.8"])
     s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rim>, ["~> 2.15"])
-    s.add_dependency(%q<regtest>, ["~> 1.0"])
+    s.add_dependency(%q<rim>, ["~> 2.17"])
+    s.add_dependency(%q<regtest>, ["~> 2"])
   end
 end

data/regtest/metatest_git.rb

@@ -3,10 +3,11 @@
 
 # If git isn't available skip this file
 begin
+  require 'open3'
   Open3.capture2e('git --version')
 
   require 'fileutils'
-  require 'open3'
+  require 'regtest'
   require 'regtest/git'
   require 'tmpdir'
 

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: regtest
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2019-03-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '2.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '2.17'
 - !ruby/object:Gem::Dependency
   name: regtest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2'
 description: |
   This library supports a very simple way to do regression testing with Ruby. It
   is not limited to Ruby projects you can use it also in other contexts where you
@@ -93,6 +79,7 @@ files:
 - Rakefile
 - lib/regtest.rb
 - lib/regtest/colorize.rb
+- lib/regtest/colors.rb
 - lib/regtest/git.rb
 - lib/regtest/task.rb
 - lib/regtest/version.rb
@@ -128,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Simple regression testing with Ruby.