fix 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a60b163dcfc45938625b447954255573f72bf830
-  data.tar.gz: 9fe9f4a65edadfd535d84431917a9214afa4a285
+  metadata.gz: 1c74dde05a82712b08d657679c40f2bee2637145
+  data.tar.gz: e3cc1b4cda3ef6197eccbcafb42af91fa9898b5d
 SHA512:
-  metadata.gz: 187e7ea75c9fc59c78c58109db558b70b1fb9c1344629f4735a04fe8fdcb2094a30b52daa73068ddaa96dd390eb6a9f0c687e64bfed80e118ce693718574ff5e
-  data.tar.gz: 9c7c0e1d345f02619aee188b52cce2a2ea22b078fc2c27da88c51a80c986f83fcd8885234cd00ea091031805ac5e7d8f81a1e8136ed8b8d2ade53b98c72f1ed6
+  metadata.gz: 1d01283957a2dedad6e1d1e5f090bb038267921d5bf75d9b0200e309c173c1d6057d45b6596239c30e4463b2a7f8755b0344a59fb24171355c9eced5c305b067
+  data.tar.gz: 2b3451fa7adce9a3c424c2974642cae18f9dd80b789a4ce640c7bca47ef78a94c9cc853a6034d0bd81d85cbd324261a5165cf687fda37b0b977e8d145990c8b7

data/README.md

@@ -43,7 +43,7 @@ $ gem install fix
 
 ### Minimalist
 
-With ~400 lignes of **simple code** built on top of [Spectus expectation library](https://github.com/fixrb/spectus), facilities such as benchmarking and mocking are not supported. Fix offers however a **consistent** syntax to **DRY** and focus your BDD.
+With 674 lignes of **simple code** built on top of [Spectus expectation library](https://github.com/fixrb/spectus), facilities such as benchmarking and mocking are not supported. Fix offers however a **consistent** syntax to **DRY** and focus your BDD.
 
 ### Resistant
 
@@ -51,7 +51,7 @@ While specs behave like **documents** which can be logic-less, their interpretat
 
 ### Complexity
 
-Monkey-patching, magic tricks and friends are not included. Instead, animated by **authentic** and **immutable** Ruby objects, unambiguous, understandable and structured specs are encouraged.
+Monkey-patching, magic tricks and friends are not included. Instead, animated by **authentic** and **unmuted** Ruby objects, unambiguous, understandable and structured specs are encouraged.
 
 ### Objective
 
@@ -80,6 +80,31 @@ require 'fix'
 
 extend Fix::DSL
 
+require 'stringio'
+module Spectus
+  module Matcher
+    # Provides the implementation for `capture_stdout` custom matcher.
+    class CaptureStdout
+      def initialize expected
+        @expected = expected
+      end
+
+      # @return [Boolean] Comparison between actual and expected values.
+      def matches?
+        begin
+          orig_std  = $stdout
+          $stdout   = StringIO.new
+
+          yield
+          $stdout.string.eql? @expected
+        ensure
+          $stdout   = orig_std
+        end
+      end
+    end
+  end
+end
+
 subject @bird
 
 on :swims do

data/VERSION.semver

@@ -1 +1 @@
-0.6.0
+0.6.1

data/fix.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency             'spectus',    '~> 1.0.1'
+  spec.add_dependency             'spectus',    '~> 1.1.1'
 
   spec.add_development_dependency 'bundler',    '~> 1.7'
   spec.add_development_dependency 'rake',       '~> 10.0'

data/lib/fix.rb

@@ -12,10 +12,12 @@ module Fix
     process_args args
     file_paths = fetch_file_paths args
 
-    print "> fix --seed #{SEED}"
-    print ' --color'    if defined? COLOR
-    print ' --debug'    if $DEBUG
-    print ' --warnings' if $VERBOSE
+    print '> fix'
+    print ' --color'          if defined? COLOR
+    print ' --debug'          if $DEBUG
+    print ' --hide_progress'  if defined? HIDE_PROGRESS
+    print " --seed #{SEED}"   if defined? SEED
+    print ' --warnings'       if $VERBOSE
 
     puts ' ' + file_paths.to_a.join(' ')
 
@@ -25,10 +27,11 @@ module Fix
 
   def self.process_args args
     options = {
-      seed:     Random.new_seed,
-      color:    false,
-      debug:    false,
-      warnings: false
+      color:          false,
+      debug:          false,
+      hide_progress:  false,
+      seed:           Random.new_seed,
+      warnings:       false
     }
 
     opt_parser = OptionParser.new do |opts|
@@ -41,14 +44,18 @@ module Fix
         options[:color] = (const_set :COLOR, true)
       end
 
-      opts.on('--seed [INTEGER]', Integer, 'Order of the tests') do |seed|
-        options[:seed] = seed
-      end
-
       opts.on('--debug', 'Enable ruby debug') do
         options[:debug] = $DEBUG = true
       end
 
+      opts.on('--hide_progress', 'Disable progress reporter in the output.') do
+        options[:hide_progress] = (const_set :HIDE_PROGRESS, true)
+      end
+
+      opts.on('--seed [INTEGER]', Integer, 'Order of the tests') do |seed|
+        options[:seed] = seed
+      end
+
       opts.on('--warnings', 'Enable ruby warnings') do
         options[:warnings] = $VERBOSE = true
       end
@@ -69,7 +76,7 @@ module Fix
 
     opt_parser.parse! args
     const_set :SEED, options.fetch(:seed)
-    options.freeze
+    options
   end
 
   def self.fetch_file_paths args
@@ -91,6 +98,6 @@ module Fix
       exit 1
     end
 
-    absolute_paths.freeze
+    absolute_paths
   end
 end

data/lib/fix/db.rb

@@ -2,7 +2,13 @@ require 'singleton'
 
 module Fix
   unless defined? DB
-    random = Random.new(defined?(SEED) ? SEED : Random.new_seed)
+    random = Random.new(
+      if defined? SEED
+        SEED
+      else
+        Random.new_seed
+      end
+    )
 
     db = Class.new Hash do
       include Singleton

data/lib/fix/expectation.rb

@@ -15,8 +15,6 @@ module Fix
       @args       = args
       @priority   = DB.instance.random.rand
 
-      freeze
-
       DB.instance.update(object => SortedSet[]) unless DB.instance.key? object
       DB.instance.fetch(object).add self
     end
@@ -25,6 +23,23 @@ module Fix
       self.priority <=> other.priority
     end
 
+    def evaluate front_object
+      Thread.new {
+        subject = Subject.new front_object, *@args
+        got     = nil
+
+        report = begin
+          expect { got = subject.actual }.__send__ target, @definition
+        rescue => e
+          e
+        end
+
+        data = presenter report, got, subject
+
+        Hash[ data.to_a + meta(subject).to_a ].merge object: front_object
+      }.value
+    end
+
     private
 
     def exception result
@@ -55,7 +70,11 @@ module Fix
     end
 
     def target
-      negated? ? :not_to : :to
+      if negated?
+        :not_to
+      else
+        :to
+      end
     end
   end
 end

data/lib/fix/expectation_high.rb

@@ -2,18 +2,6 @@ require_relative 'expectation'
 
 module Fix
   class ExpectationHigh < Expectation
-    def evaluate front_object
-      subject = Subject.new front_object, *@args
-      got     = nil
-
-      Thread.new {
-        report = expect { got = subject.actual }.public_send target, @definition
-        data   = presenter report, got, subject
-
-        Hash[ data.to_a + meta(subject).to_a ].merge object: front_object
-      }.value
-    end
-
     private
 
     def pass result, _subject

data/lib/fix/expectation_low.rb

@@ -2,18 +2,6 @@ require_relative 'expectation_medium'
 
 module Fix
   class ExpectationLow < ExpectationMedium
-    def evaluate front_object
-      subject = Subject.new front_object, *@args
-      got     = nil
-
-      Thread.new {
-        report = expect { got = subject.actual }.public_send target, @definition
-        data   = presenter report, got, subject
-
-        Hash[ data.to_a + meta(subject).to_a ].merge object: front_object
-      }.value
-    end
-
     private
 
     def pass result, subject

data/lib/fix/expectation_medium.rb

@@ -2,22 +2,16 @@ require_relative 'expectation_high'
 
 module Fix
   class ExpectationMedium < ExpectationHigh
-    def evaluate front_object
-      subject = Subject.new front_object, *@args
-      got     = nil
-
-      Thread.new {
-        report = expect { got = subject.actual }.public_send target, @definition
-        data   = presenter report, got, subject
-
-        Hash[ data.to_a + meta(subject).to_a ].merge object: front_object
-      }.value
-    end
-
     private
 
     def pass result, _subject
-      super || (exception(result).nil? ? nil : false)
+      if super
+        true
+      elsif exception(result).nil?
+        nil
+      else
+        false
+      end
     end
 
     def level

data/lib/fix/helper/let_reader_helper.rb

@@ -2,7 +2,11 @@ module Fix
   module Helper
     module LetReaderHelper
       def method_missing name, *args, &block
-        @defs.key?(name) ? @defs.fetch(name).call : super
+        if @defs.key? name
+          @defs.fetch(name).call
+        else
+          super
+        end
       end
     end
   end

data/lib/fix/it.rb

@@ -8,8 +8,6 @@ module Fix
       @object = object
       @defs   = defs
       @args   = args
-
-      freeze
     end
   end
 end

data/lib/fix/its.rb

@@ -8,8 +8,6 @@ module Fix
       @object = object
       @defs   = defs
       @args   = args
-
-      freeze
     end
   end
 end

data/lib/fix/on.rb

@@ -14,8 +14,6 @@ module Fix
       @object = object
       @defs   = defs
       @args   = args
-
-      freeze
     end
   end
 end

data/lib/fix/subject.rb

@@ -9,23 +9,21 @@ module Fix
       @last_arg     = -1
 
       begin
-        @cache_value = params.inject(input) do |mem, param|
+        @cache_value = params.inject input do |mem, param|
           @implemented  = mem.respond_to? param.first, false
           @last_arg     = @last_arg.next
 
-          mem.public_send(*param)
+          mem.__send__(*param)
         end
 
         @last_arg = @last_arg.next
       rescue => @error
       end
-
-      freeze
     end
 
     def actual
       if @error.nil?
-        @cache_value.public_send(*challenge)
+        @cache_value.__send__(*challenge)
       else
         raise @error
       end
@@ -40,7 +38,7 @@ module Fix
     end
 
     def implemented?
-      @implemented && @error.nil? && @cache_value.respond_to?(challenge.first, false)
+      @error.nil? && @implemented && @cache_value.respond_to?(challenge.first, false)
     end
   end
 end

data/lib/fix/test.rb

@@ -4,14 +4,20 @@ module Fix
   class Test
     attr_reader :total_time
 
-    def initialize io = $stdout, color: defined?(COLOR)
+    def initialize io = $stdout, color: defined?(COLOR), hide_progress: defined?(HIDE_PROGRESS)
       @io     = io
       @color  = color
 
       start_time = Time.now
 
       @results = DB.instance.flat_map do |object, expectations|
-        expectations.map {|expectation| log expectation.evaluate(object) }
+        expectations.map do |expectation|
+          if hide_progress
+            expectation.evaluate object
+          else
+            log expectation.evaluate(object)
+          end
+        end
       end
 
       @total_time = Time.now - start_time
@@ -37,8 +43,6 @@ module Fix
       @io.puts about "Ran #{@results.length} tests in #{@total_time} seconds"
       @io.puts statistics
 
-      freeze
-
       exit 1 if fail?
     end
 
@@ -136,7 +140,11 @@ module Fix
     private
 
     def truncate string
-      string.length > 16 ? string[0..16].concat('[...]') : string
+      if string.length > 16
+        string[0..16].concat '[...]'
+      else
+        string
+      end
     end
 
     def returned_value result
@@ -150,19 +158,25 @@ module Fix
     def expectation_level result
       case result.fetch :level
       when 1
-        result.fetch(:negated) ? 'MUST_NOT' : 'MUST'
+        if result.fetch :negated
+          'MUST_NOT'
+        else
+          'MUST'
+        end
       when 2
-        result.fetch(:negated) ? 'SHOULD_NOT' : 'SHOULD'
+        if result.fetch :negated
+          'SHOULD_NOT'
+        else
+          'SHOULD'
+        end
       when 3
         'MAY'
       end
     end
 
     def matcher_with_expected_if_given result
-      definition = Array result.fetch(:definition)
-
-      definition.flatten(1)[0].to_s +
-      if definition.flatten(1).length > 1
+      definition = Array result.fetch :definition
+      definition.flatten(1)[0].to_s + if definition.flatten(1).length > 1
         ' ' + definition.flatten(1)[1].inspect
       else
         ''
@@ -176,7 +190,11 @@ module Fix
     end
 
     def colorize state, string
-      @color ? "\e[#{state}m#{string}\e[0m" : string
+      if @color
+        "\e[#{state}m#{string}\e[0m"
+      else
+        string
+      end
     end
 
     def about string

data/lib/fix/version.rb

@@ -5,5 +5,5 @@ module Fix
   # Gem version
   VERSION = File.open(
     Pathname.new(__FILE__).join '..', '..', '..', 'VERSION.semver'
-  ).read.chomp.to_sym
+  ).read.chomp.to_sym unless defined? VERSION
 end

data/spec/fix/bin/help_spec.rb

@@ -5,8 +5,9 @@ subject Proc.new { `#{BIN_PATH} --help` }
 its :call do
   MUST match: /Usage: fix <files or directories> \[options\]/
   MUST match: / --color /
-  MUST match: / --seed /
   MUST match: / --debug /
+  MUST match: / --hide_progress /
+  MUST match: / --seed /
   MUST match: / --warnings /
   MUST match: / --version /
 end

data/spec/fix/bin/hide_progress.rb

@@ -0,0 +1,17 @@
+require_relative 'spec_helper'
+
+subject Proc.new {
+  `#{BIN_PATH} #{Pathname.new(__FILE__).join '..', '..', '..', 'support', 'examples', 'duck', 'success', 'test.rb'}`
+}
+
+its :call do
+  MUST match: /^......$/
+end
+
+subject Proc.new {
+  `#{BIN_PATH} #{Pathname.new(__FILE__).join '..', '..', '..', 'support', 'examples', 'duck', 'success', 'test.rb'} --hide_progress`
+}
+
+its :call do
+  MUST_NOT match: /^......$/
+end

data/spec/fix/lib/may/error_spec.rb

@@ -5,5 +5,5 @@ subject -> {
 }
 
 its :call do
-  MUST match: /^0% compliant - 0 infos, 0 failures, 2 errors$/
+  MUST match: /^0% compliant - 0 infos, 0 failures, 1 errors$/
 end

data/spec/fix/lib/may/info_spec.rb

@@ -5,5 +5,5 @@ subject -> {
 }
 
 its :call do
-  MUST match: /^100% compliant - 2 infos, 0 failures, 0 errors$/
+  MUST match: /^100% compliant - 1 infos, 0 failures, 0 errors$/
 end

data/spec/fix/lib/must/error_spec.rb

@@ -5,5 +5,5 @@ subject -> {
 }
 
 its :call do
-  MUST match: /^0% compliant - 0 infos, 0 failures, 1 errors$/
+  MUST match: /^0% compliant - 0 infos, 0 failures, 2 errors$/
 end

data/spec/fix/lib/should/error_spec.rb

@@ -5,5 +5,5 @@ subject -> {
 }
 
 its :call do
-  MUST match: /^0% compliant - 0 infos, 0 failures, 1 errors$/
+  MUST match: /^0% compliant - 0 infos, 0 failures, 2 errors$/
 end

data/spec/support/coverage.rb

@@ -1,3 +1,9 @@
+require 'simplecov'
 require 'coveralls'
 
-Coveralls.wear!
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+
+SimpleCov.start

data/spec/support/examples/42/may/error/spec.rb

@@ -4,8 +4,4 @@
   subject front_object
 
   its(:/, 0) { MAY equal: 4 }
-
-  on :/, 0 do
-    it { MAY equal: 4 }
-  end
 }

data/spec/support/examples/42/may/info/spec.rb

@@ -4,8 +4,4 @@
   subject front_object
 
   its(:to_i) { MAY equal: 4 }
-
-  on :to_i do
-    it { MAY equal: 4 }
-  end
 }

data/spec/support/examples/42/may/success/spec.rb

@@ -4,5 +4,9 @@
   subject front_object
 
   its(:to_i)  { MAY equal: 42 }
-  its(:foo)   { MAY equal: 42 }
+  its(:foo)   { MAY equal: 4 }
+
+  on :foo do
+    its(:bar) { MAY equal: 4 }
+  end
 }

data/spec/support/examples/42/must/error/spec.rb

@@ -4,4 +4,8 @@
   subject front_object
 
   its(:foo) { MUST equal: 4 }
+
+  on :foo do
+    its(:bar) { MUST equal: 4 }
+  end
 }

data/spec/support/examples/42/should/error/spec.rb

@@ -4,4 +4,8 @@
   subject front_object
 
   its(:foo) { SHOULD equal: 4 }
+
+  on :foo do
+    its(:bar) { SHOULD equal: 4 }
+  end
 }

data/spec/support/examples/duck/success/spec.rb

@@ -1,6 +1,53 @@
 @specs = ->(front_object) {
   extend Fix::DSL
 
+  require 'stringio'
+
+  module Spectus
+    module Matcher
+
+      # Provides the implementation for `capture_stderr`.
+      class CaptureStderr
+        def initialize expected
+          @expected = expected
+        end
+
+        # @return [Boolean] Comparison between actual and expected values.
+        def matches?
+          begin
+            orig_std  = $stderr
+            $stderr   = StringIO.new
+
+            yield
+            $stderr.string.eql? @expected
+          ensure
+            $stderr   = orig_std
+          end
+        end
+      end
+
+      # Provides the implementation for `capture_stdout`.
+      class CaptureStdout
+        def initialize expected
+          @expected = expected
+        end
+
+        # @return [Boolean] Comparison between actual and expected values.
+        def matches?
+          begin
+            orig_std  = $stdout
+            $stdout   = StringIO.new
+
+            yield
+            $stdout.string.eql? @expected
+          ensure
+            $stdout   = orig_std
+          end
+        end
+      end
+    end
+  end
+
   subject front_object
 
   let(:word) { "Quaaa" }

data/spec/support/immutable.rb

@@ -0,0 +1,12 @@
+class Object
+  alias_method :overridden_initialize, :initialize
+
+  def initialize
+    overridden_initialize
+
+    if  !self.class.ancestors.include?(SimpleCov::Formatter::MultiFormatter) &&
+        !self.class.ancestors.include?(SimpleCov::Formatter::HTMLFormatter)
+      freeze
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fix
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Cyril Wack
@@ -30,7 +30,7 @@ cert_chain:
   sQCgS9KCAyZ+aWNO1bUJcE3Bx1XXkMO3JEyVR1CoEcexg5Ci03/lAm7lL84DmlKR
   3I7UWtomapPFbzC0J/5jzQ==
   -----END CERTIFICATE-----
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spectus
@@ -38,14 +38,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,7 @@ files:
 - spec/fix/bin/color_spec.rb
 - spec/fix/bin/exit_status_spec.rb
 - spec/fix/bin/help_spec.rb
+- spec/fix/bin/hide_progress.rb
 - spec/fix/bin/spec_helper.rb
 - spec/fix/bin/version_spec.rb
 - spec/fix/lib/may/error_spec.rb
@@ -187,6 +188,7 @@ files:
 - spec/support/examples/duck/app.rb
 - spec/support/examples/duck/success/spec.rb
 - spec/support/examples/duck/success/test.rb
+- spec/support/immutable.rb
 homepage: http://fixrb.org/
 licenses:
 - MIT
@@ -215,6 +217,7 @@ test_files:
 - spec/fix/bin/color_spec.rb
 - spec/fix/bin/exit_status_spec.rb
 - spec/fix/bin/help_spec.rb
+- spec/fix/bin/hide_progress.rb
 - spec/fix/bin/spec_helper.rb
 - spec/fix/bin/version_spec.rb
 - spec/fix/lib/may/error_spec.rb
@@ -258,4 +261,5 @@ test_files:
 - spec/support/examples/duck/app.rb
 - spec/support/examples/duck/success/spec.rb
 - spec/support/examples/duck/success/test.rb
+- spec/support/immutable.rb
 has_rdoc: