m-spec 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc075272ba943b898b2c652bbc45a3cd6db679dc8dd3bd2f804599828e685208
-  data.tar.gz: 77ab99a93514f5a12d79c9f4a56b6c183ee337b82743b97b87befc531e0b7e54
+  metadata.gz: 6ce2fb3d3541770936da294b63f3815faea69904333bc06c63403ad76a25dfe7
+  data.tar.gz: 3ae0e86750afbb3458fd8f33cdac13c1ae72ac5a6f771de746e5967a963a7bb2
 SHA512:
-  metadata.gz: a0b57b0fe22b468c721a425e481e1cc351615bb49cb403977b06a8272bf6638010b3d60652f42065eb6ebb34f03102d9836ba4615f334e7ec1e212e4ce157475
-  data.tar.gz: d683f6752864c146fc66e8f00922cc026f038fc708b2276c436a7d53b0f1ff556ac21eb65ac44ceb1b847c7782e7785a07f5c564da67266a0f1d3a06f86c26d6
+  metadata.gz: fe13e5509c611618d7e215c77e799a44f3bc4939afe92e7d09de5404000e7e1bae2af3839f2760dd0d9c43ecf9fb610a057d84878d373d64c3586b864d926783
+  data.tar.gz: 8bed6188d906066b77d945d0e296320febf31488266661ef04994a737a51230db3a5394a0461231047a2c9d7576ca4344a28d728c5d932a8f9ba478c2346b976

data/.rubocop.yml

@@ -0,0 +1,12 @@
+#    _____               ____ ____        __     _         __
+#   / ___/ _____ ____ _ / __// __/____   / /    (_)____   / /_
+#   \__ \ / ___// __ `// /_ / /_ / __ \ / /    / // __ \ / __/
+#  ___/ // /__ / /_/ // __// __// /_/ // /___ / // / / // /_
+# /____/ \___/ \__,_//_/  /_/ 1 \____//_____//_//_/ /_/ \__/
+#
+# The linter file that doesn't lead junior developers to bad habits.
+# https://github.com/makersacademy/scaffolint
+#
+# Configure Rubocop to use the config file in the Scaffolint GitHub repo
+inherit_from:
+  - https://raw.githubusercontent.com/makersacademy/scaffolint/v1.1.0/.rubocop.yml

data/README.md

@@ -64,14 +64,25 @@ The Animal
   fails nicely
     Expected: ROAAAARRRR!
     Got: little roar!
-    /path/to/directory/spec/animal_spec.rb:11:in `block (2 levels) in <top (required)>'
+    # /path/to/directory/spec/animal_spec.rb:11:in `block (2 levels) in <top (required)>'
 stubbing
   we can mock too!
 ```
 
 It's got simple one-level indentation, simple colour coding for test passes and failures, and simple failure messages with expected and actual values and the failing spec file path and line number.
 
-Remember - you'll have to manage test setup and teardown yourself and keeping your test code dry yourself. Make sure each test runs in isolation.
+Remember - you'll have to manage yourself: test setup and teardown, keeping test code dry, each test running in isolation, and loading source code properly.
+
+## Rubocop
+
+M-spec comes with rubocop by default, using this [set of rules](https://github.com/makersacademy/scaffolint). To configure your test suite to disable rubocop or to only run rubcop, add an optional configuration file named `.m-spec` to your project root where you run your specs from. You don't need the configuration file - by default your specs will run first, followed by rubocop.
+
+You can add either of two options
+- `--no-rubocop` which will ignore running rubocop
+- `--only-rubocop` which will ignore running your tests
+
+See [rubocop documentation](https://docs.rubocop.org/rubocop/index.html) for more info - you might be interested in reading about rubocop's autocorrect command.
+
 
 ## Extending
 
@@ -88,7 +99,7 @@ m-spec [spec-file]
 ```
 
 ## Pushing to Rubygems
-Sign up for an account, check for the gem name you want, and then follow the hints and errors when you
+Sign up for an account, check for the gem name you want, change the gem metadata to represent what you want, and then follow the hints and errors when you
 ```sh
 $ bundle exec rake release
 ```

data/exe/m-spec

@@ -1,5 +1,29 @@
 #!/usr/bin/env ruby
 require 'm-spec'
 
-spec_file = ARGV[0]
-require spec_file
+def run_rubocop!
+  config = "$GEM_HOME/gems/m-spec-#{Mspec::VERSION}/.rubocop.yml"
+  system("bundle exec rubocop --config #{config}")
+end
+
+def run_specs!
+  spec_file = ARGV[0]
+  require spec_file
+end
+
+if File.exists?('./.m-spec')
+  File.open('./.m-spec', 'r') do |file|
+    options = file.read.split
+    if options.include?('--only-rubocop')
+      run_rubocop!
+    elsif options.include?('--no-rubocop')
+      run_specs!
+    else
+      run_specs!
+      run_rubocop!
+    end
+  end
+else
+  run_specs!
+  run_rubocop!
+end

data/lib/m-spec.rb

@@ -1,9 +1,12 @@
+require 'stringio'
+
 require "m-spec/version"
 
 require "m-spec/core/expect"
 require "m-spec/core/spec_error"
 require "m-spec/core/spec_result"
 require "m-spec/core/matchers/equal"
+require "m-spec/core/matchers/output"
 require "m-spec/core/helpers/readable"
 
 require "m-spec/mocks/allow"

data/lib/m-spec/core/helpers/readable.rb

@@ -1,6 +1,7 @@
 COLOUR_CODES = {
-  true => 32,
-  false => 31
+  green: 32,
+  red: 31,
+  light_blue: 36
 }
 
 def describe(str)
@@ -10,18 +11,27 @@ end
 
 def it(str)
   spec_result = yield
-  colour_code = COLOUR_CODES[spec_result.success?]
-  puts "  \e[#{colour_code}m#{str}\e[0m"
-  unless spec_result.success?
+  if spec_result.success?
+    puts "  \e[#{COLOUR_CODES[:green]}m#{str}\e[0m"
+  else
+    puts "  \e[#{COLOUR_CODES[:red]}m#{str}\e[0m"
     spec_result.failure_message.each do |line|
-      puts "  \e[#{colour_code}m#{line}\e[0m"
+      puts "    \e[#{COLOUR_CODES[:red]}m#{line}\e[0m"
     end
+    puts "    \e[#{COLOUR_CODES[:light_blue]}m# #{spec_result.trace}\e[0m"
   end
 end
 
+def expect(obj=nil, &block)
+  if !obj.nil?
+    Mspec::Expect.new(obj)
+  else
+    Mspec::Expect.new(block)
+  end
+end
 
-def expect(obj)
-  Mspec::Expect.new(obj)
+def output(string)
+  Mspec::Matchers::Output.new(string)
 end
 
 def eq(obj)

data/lib/m-spec/core/matchers/output.rb

@@ -0,0 +1,31 @@
+require 'stringio'
+
+module Mspec
+  module Matchers
+    class Output
+      attr_reader :value, :test_code_output_string
+
+      def initialize(value)
+        @value = value
+      end
+
+      def check(block)
+        output = mock_output do
+          block.call
+        end
+        @test_code_output_string = output.string
+
+        @value == @test_code_output_string
+      end
+
+      private
+
+      def mock_output(output=StringIO.new, &block)
+        $stdout = output
+        block.call
+        $stdout = STDOUT
+        output
+      end
+    end
+  end
+end

data/lib/m-spec/core/spec_result.rb

@@ -1,8 +1,8 @@
 module Mspec
   class SpecResult
     def initialize(expectation, matcher, error)
-      @expectation = expectation
-      @matcher = matcher
+      @test_code = expectation
+      @expected_result = matcher
       @error = error
     end
 
@@ -12,10 +12,23 @@ module Mspec
 
     def failure_message
       [
-        "  Expected: #{@expectation.value}",
-        "  Got: #{@matcher.value}",
-        "  #{@error.backtrace[1]}"
+        "Expected: #{@expected_result.value.inspect}",
+        "Got: #{test_code_result.inspect}",
       ]
     end
+
+    def trace
+      "#{@error.backtrace[1]}"
+    end
+
+    private
+
+    def test_code_result
+      if @test_code.value.is_a?(Proc)
+        @expected_result.test_code_output_string
+      else
+        @test_code.value
+      end
+    end
   end
 end

data/lib/m-spec/version.rb

@@ -1,3 +1,3 @@
 module Mspec
-  VERSION = "0.1.3"
+  VERSION = "0.1.8"
 end

data/m-spec.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "rubocop", "~> 0.79.0"
+
   spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", ">= 12.3.3"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: m-spec
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 platform: ruby
 authors:
 - Edward Withers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.79.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.79.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -48,6 +62,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -60,6 +75,7 @@ files:
 - lib/m-spec/core/expect.rb
 - lib/m-spec/core/helpers/readable.rb
 - lib/m-spec/core/matchers/equal.rb
+- lib/m-spec/core/matchers/output.rb
 - lib/m-spec/core/spec_error.rb
 - lib/m-spec/core/spec_result.rb
 - lib/m-spec/mocks/allow.rb