easytest 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e042e91fa6e5c9b2c64188574118fbe3df09705081e9ef999cdf78ce50ba6633
-  data.tar.gz: 6e556cfb345aba74ec5eef4883b9f2bb33863c041223e8dfe3337f16dc2b3501
+  metadata.gz: 42389cdde1ebd51de0f636f3c5ec0e67ffe842ff91029f71617795799841d47b
+  data.tar.gz: 559dadc55a86bfc6da11234b05f1fd9a5477311379f94ea41565731516271405
 SHA512:
-  metadata.gz: a064dadb35c5af370821737bca2e59bcbfea6e3b4ecb6179779fe34f0e17998d3778fc4eb978f997b7a876be9a95b13e13798c8a378eb9993e58f804bca2fb17
-  data.tar.gz: fef643dcd0e347880cb202653575c832edf431f6004216f0c054d5cc7246aade6427638d6b7f434b9c327c15255a55bb9f1927ead6e57c272418738b080540e1
+  metadata.gz: e4d9cc9b6bc5a76ecccf5f98d076e123eeddabe7a16c42a093050e154c3c32565a80c99301ed615ab0be95e2b7b7e0773088d3d5dc621ddc2fda3f69e28ed184
+  data.tar.gz: 8a8612f4baf5bc8bc026ecb20fbbe906ad32044f22c9232137dc68b5bb32940d634aed10703d6455f339518bba18c8a433bee66d2ed30afbcff2c93cbe03ec57

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 0.1.2
+
+- Fix the `easytest` command exit code.
+
 ## 0.1.1
 
 No code changes.

data/exe/easytest

@@ -5,7 +5,4 @@ $LOAD_PATH << File.join(Dir.pwd, "test")
 
 require "easytest"
 
-test_files = Dir.glob("test/**/*_test.rb").filter do |file|
-  ARGV.empty? || ARGV.any? { |pattern| file.include?(pattern) }
-end
-test_files.each { |file| load file }
+exit Easytest::CLI.new(ARGV).run

data/lib/easytest/cli.rb

@@ -0,0 +1,29 @@
+module Easytest
+  class CLI
+    SUCCESS = 0
+    FAILURE = 1
+
+    attr_reader :argv
+    attr_reader :start_time
+
+    def initialize(argv)
+      @argv = argv
+      @start_time = Time.now
+    end
+
+    def run
+      Easytest.start
+      setup
+      successful = Easytest.run
+      successful ? SUCCESS : FAILURE
+    end
+
+    private
+
+    def setup
+      Dir.glob(Easytest.test_files_location)
+        .filter { |file| argv.empty? || argv.any? { |pattern| file.include?(pattern) } }
+        .each { |test_file| load test_file }
+    end
+  end
+end

data/lib/easytest/dsl.rb

@@ -6,8 +6,8 @@ module Easytest
         Easytest.add_case Case.new(name: name, file: file, &block)
       end
 
-      def expect(actual)
-        Expectation.new(actual)
+      def expect(actual = nil, &block)
+        Expectation.new(actual, &block)
       end
     end
   end

data/lib/easytest/expectation.rb

@@ -1,19 +1,41 @@
 module Easytest
   class Expectation
-    def initialize(actual)
+    attr_reader :actual
+    attr_reader :block
+
+    def initialize(actual, &block)
       @actual = actual
+      @block = block
     end
 
     def to_eq(expected)
-      Matcher::Equal.new(actual: @actual, expected: expected).match!
+      Matcher::Equal.new(actual: eval_actual, expected: expected).match!
     end
 
     def to_be(expected)
-      Matcher::Be.new(actual: @actual, expected: expected).match!
+      Matcher::Be.new(actual: eval_actual, expected: expected).match!
     end
 
     def to_be_nil
-      Matcher::BeNil.new(actual: @actual).match!
+      Matcher::BeNil.new(actual: eval_actual).match!
+    end
+
+    def to_raise(exception_class)
+
+    end
+
+    def to_not_raise(exception_class)
+
+    end
+
+    private
+
+    def eval_actual
+      if block
+        block.call
+      else
+        actual
+      end
     end
   end
 end

data/lib/easytest/matcher/base.rb

@@ -12,6 +12,16 @@ module Easytest
       end
 
       def match!
+        unless match?
+          raise UnmatchedError.new(message: message, actual: actual, expected: expected)
+        end
+      end
+
+      def expected
+        raise NotImplementedError
+      end
+
+      def message
         raise NotImplementedError
       end
     end

data/lib/easytest/matcher/be.rb

@@ -12,10 +12,8 @@ module Easytest
         actual.equal? expected
       end
 
-      def match!
-        unless match?
-          raise UnmatchedError.new(message: "should be same", actual: actual, expected: expected)
-        end
+      def message
+        "should be same"
       end
     end
   end

data/lib/easytest/matcher/be_nil.rb

@@ -5,10 +5,12 @@ module Easytest
         actual.nil?
       end
 
-      def match!
-        unless match?
-          raise UnmatchedError.new(message: "should be `nil`", actual: actual, expected: nil)
-        end
+      def expected
+        nil
+      end
+
+      def message
+        "should be nil"
       end
     end
   end

data/lib/easytest/matcher/equal.rb

@@ -12,11 +12,15 @@ module Easytest
         actual == expected
       end
 
-      def match!
-        unless match?
-          raise UnmatchedError.new(message: "should equal", actual: actual, expected: expected)
-        end
+      def message
+        "should equal"
       end
+
+      #  def match!
+      #   unless match?
+      #     raise UnmatchedError.new(message: "should equal", actual: actual, expected: expected)
+      #   end
+      # end
     end
   end
 end

data/lib/easytest/runner.rb

@@ -0,0 +1,94 @@
+module Easytest
+  class Runner
+    attr_reader :start_time
+    attr_accessor :passed_count
+    attr_accessor :failed_count
+    attr_accessor :file_count
+
+    def initialize(start_time: Time.now)
+      @start_time = start_time
+      @passed_count = 0
+      @failed_count = 0
+      @file_count = 0
+    end
+
+    def run
+      cases_by_file = cases.group_by { |c| c.file }
+      cases_by_file.each do |file, cases|
+        self.file_count += 1
+        reports = []
+
+        cases.each do |c|
+          passed = c.run
+
+          if passed
+            self.passed_count += 1
+          else
+            self.failed_count += 1
+            reports << c.report.gsub(/^/, "  ")
+          end
+        end
+
+        link = Utils.terminal_hyperlink(file)
+        if reports.empty?
+          puts "#{Rainbow(" PASS ").bright.bg(:green)} #{link}"
+        else
+          puts "#{Rainbow(" FAIL ").bright.bg(:red)} #{link}"
+          reports.each { |report| puts report ; puts "" }
+        end
+      end
+
+      if no_tests?
+        puts Rainbow("Oops. No tests found!").red.bright
+        puts ""
+        puts "Write `#{Easytest.test_files_location}` files to include at least one `test` block,"
+        puts "or specify a matching pattern to the `easytest` command."
+        false
+      else
+        puts ""
+        puts " #{Rainbow('Tests:').bright}  #{summary}"
+        puts " #{Rainbow('Time:').bright}   #{elapsed_time.round(5)} seconds"
+        all_passed?
+      end
+    end
+
+    def cases
+      @cases ||= []
+    end
+
+    def add_case(new_case)
+      cases << new_case
+    end
+
+    private
+
+    def total_count
+      passed_count + failed_count
+    end
+
+    def all_passed?
+      failed_count == 0
+    end
+
+    def no_tests?
+      total_count == 0
+    end
+
+    def elapsed_time
+      Time.now - start_time
+    end
+
+    def summary
+      summary = ""
+
+      if failed_count == 0
+        summary << Rainbow("#{passed_count} passed").green.bright
+      else
+        summary << Rainbow("#{failed_count} failed").red.bright
+        summary << ", #{Rainbow("#{passed_count} passed").green.bright}"
+      end
+
+      summary << ", #{total_count} total #{Rainbow("(#{file_count} files)").dimgray}"
+    end
+  end
+end

data/lib/easytest/version.rb

@@ -1,3 +1,3 @@
 module Easytest
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/easytest.rb

@@ -4,6 +4,7 @@ require "rainbow"
 require_relative "easytest/version"
 
 require_relative "easytest/case"
+require_relative "easytest/cli"
 require_relative "easytest/dsl"
 require_relative "easytest/errors"
 require_relative "easytest/expectation"
@@ -12,75 +13,23 @@ require_relative "easytest/matcher/be"
 require_relative "easytest/matcher/be_nil"
 require_relative "easytest/matcher/equal"
 require_relative "easytest/reporter"
+require_relative "easytest/runner"
 require_relative "easytest/utils"
 
 module Easytest
-  def self.run
-    passed_count = 0
-    failed_count = 0
-    file_count = 0
-
-    cases_by_file = cases.group_by { |c| c.file }
-    cases_by_file.each do |file, cases|
-      file_count += 1
-      reports = []
-
-      cases.each do |c|
-        passed = c.run
-
-        if passed
-          passed_count += 1
-        else
-          failed_count += 1
-          reports << c.report.gsub(/^/, "  ")
-        end
-      end
-
-      link = Utils.terminal_hyperlink(file)
-      if reports.empty?
-        puts "#{Rainbow(" PASS ").bright.bg(:green)} #{link}"
-      else
-        puts "#{Rainbow(" FAIL ").bright.bg(:red)} #{link}"
-        reports.each { |report| puts report ; puts "" }
-      end
-    end
-
-    [passed_count, failed_count, file_count]
-  end
-
-  def self.cases
-    @cases ||= []
+  def self.start
+    @runner = Runner.new
   end
 
   def self.add_case(new_case)
-    cases << new_case
+    @runner.cases << new_case
   end
-end
-
-start_time = Time.now
-
-at_exit do
-  passed_count, failed_count, file_count = Easytest.run
-  total_count = passed_count + failed_count
 
-  time = Time.now - start_time
-
-  if total_count == 0
-    puts Rainbow("A test suite should have at least one test case!").red.bright
-    puts ""
-    puts "Please put `test/**/*_test.rb` files or specify valid patterns to the `easytest` command."
-  else
-    summary = ""
-    if failed_count == 0
-      summary << Rainbow("#{passed_count} passed").green.bright
-    else
-      summary << Rainbow("#{failed_count} failed").red.bright
-      summary << ", #{Rainbow("#{passed_count} passed").green.bright}"
-    end
-    summary << ", #{total_count} total #{Rainbow("(#{file_count} files)").dimgray}"
+  def self.run
+    @runner.run
+  end
 
-    puts ""
-    puts " #{Rainbow('Tests:').bright}  #{summary}"
-    puts " #{Rainbow('Time:').bright}   #{time.round(5)} seconds"
+  def self.test_files_location
+    "test/**/*_test.rb"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easytest
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Masafumi Koba
@@ -38,6 +38,7 @@ files:
 - exe/easytest
 - lib/easytest.rb
 - lib/easytest/case.rb
+- lib/easytest/cli.rb
 - lib/easytest/dsl.rb
 - lib/easytest/errors.rb
 - lib/easytest/expectation.rb
@@ -46,6 +47,7 @@ files:
 - lib/easytest/matcher/be_nil.rb
 - lib/easytest/matcher/equal.rb
 - lib/easytest/reporter.rb
+- lib/easytest/runner.rb
 - lib/easytest/utils.rb
 - lib/easytest/version.rb
 homepage: https://github.com/ybiquitous/easytest