cspec 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8614fd567ad97eaea1795b6784a114231372e2a06958ed27ab8159b1826df43d
-  data.tar.gz: 8232cd508d0bb084224329b08fdbe9fe036887a293a5441576c0c9abf9481b9c
+  metadata.gz: 4de36af904dcb6411a59838e1ed2f415bbf82103db8bdaad599c6be4f3afc5e1
+  data.tar.gz: 19da5e138539e167c6084040eea3c1ef5e165e833d56e2cc0e15960f24c824d8
 SHA512:
-  metadata.gz: 831a347acc12b8ac8a5f81af9f426f3bd6a9730818406c5303bb41b2e67b3b21e6354112dd361eae91917db677be0a1499b355b33e1627bab70da13b38bc8887
-  data.tar.gz: 10132f08dd3fe64a7f14406adcecee1c3374e5988f94562387ceec35aa7043877c8713761900e2e9a4acb7c87f3aefb0f255282a13406c530478eebbb0511252
+  metadata.gz: 558cad6ce6e23b6519c3d78cf518c4d49d6554e680ca9a7cfc5187eaa1eab52a57a5c386e23b2b6ebc6844feb55cb8dd24e1f87c97af262c0430aece81683a9b
+  data.tar.gz: 2a31cc1c832f7e65fedacb7047a6e178065ff3675ddf5e190bb31f6c20f60135d036df8c1cec5376bae044e2be3dbbe7d7845697cd607417e34eeea6778bd787

data/Gemfile.lock

@@ -1,13 +1,18 @@
 PATH
   remote: .
   specs:
-    cspec (0.2.0)
+    cspec (0.2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.3)
     diff-lcs (1.5.0)
     docile (1.4.0)
+    method_source (1.0.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rake (10.5.0)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -35,6 +40,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.17)
   cspec!
+  pry
   rake (~> 10.0)
   rspec (~> 3.0)
   simplecov

data/README.md

@@ -12,7 +12,7 @@ The goal of this project is to have a centralised location where all specs can b
 ```
 * Create a CSV named `specs.csv` with the following spec
 ```csv
-class,name,type,initialize_params_1,method,method_args_1,expected
+class,name,type,initialization_arg_1,method,method_arg_1,expected
 MyClass,my test,,hello,,world
 ```
 * Create a file named `my_csv_specs.rb` to run the specs
@@ -31,4 +31,4 @@ result = CSpec::Runner.run!("#{Dir.pwd}/specs.csv")
 puts "Success: #{result}"
 ```
 
-* Run with `ruby my_csv_specs.rb`
+* Run with `ruby my_csv_specs.rb`

data/cspec.gemspec

@@ -7,7 +7,7 @@ require 'cspec/version'
 Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.5.0'
   spec.name          = 'cspec'
-  spec.version       = Cspec::VERSION
+  spec.version       = CSpec::VERSION
   spec.authors       = ['Jarrod Folino']
   spec.email         = ['jarrod.folino@coderacademy.edu.au']
 
@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.17'
+  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'simplecov'

data/examples/advance/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    cspec (0.2.0)
+    cspec (0.2.3)
 
 PLATFORMS
   ruby

data/examples/advance/myspec.rb

@@ -8,6 +8,26 @@ class MyClass
   end
 end
 
+class Util
+  def build_array(val1, val2, val3)
+    [val1, val2, val3]
+  end
+
+  def sum_array(array)
+    array.sum
+  end
+end
+
+class Calculator
+  def self.add(val1, val2)
+    val1 + val2
+  end
+
+  def self.multi_subtract(val1, val2, val3)
+    val1 - val2 - val3
+  end
+end
+
 result = CSpec::Runner.run!("#{Dir.pwd}/specs.csv")
 puts "Success: #{result}"
 exit result ? 0 : 1

data/examples/advance/specs.csv

@@ -1,2 +1,6 @@
-class,name,type,method,method_arg_1,method_arg_2,expected
-MyClass,my test,instance,greet,Bob,Jones,"Hello, Bob Jones"
+class,name,type,method,method_arg_1,method_arg_2,method_arg_3,expected
+MyClass,my test,instance,greet,Bob,Jones,,"Hello, Bob Jones"
+Calculator,another test,class,add,1,2,,3
+Calculator,another test,class,multi_subtract,6,2,1,3
+Util,another test,instance,build_array,6,2,1,"[6, 2, 1]"
+Util,another test,instance,sum_array,"[6, 2, 1]",,,9

data/examples/basic/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    cspec (0.2.0)
+    cspec (0.2.3)
 
 PLATFORMS
   ruby

data/examples/basic/myspec.rb

@@ -6,6 +6,10 @@ class MyClass
   def hello
     'world'
   end
+
+  def ok?
+    true
+  end
 end
 
 result = CSpec::Runner.run!("#{Dir.pwd}/specs.csv")

data/examples/basic/specs.csv

@@ -1,2 +1,3 @@
 class,name,type,method,expected
 MyClass,my test,instance,hello,world
+MyClass,my test,instance,ok?,true

data/examples/class_methods/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    cspec (0.2.0)
+    cspec (0.2.3)
 
 PLATFORMS
   ruby

data/examples/method_args/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    cspec (0.2.0)
+    cspec (0.2.1)
 
 PLATFORMS
   ruby

data/lib/cspec/data_type.rb

@@ -2,6 +2,16 @@
 
 module CSpec
   module DataType
+    MATCHERS = [
+      { condition: /^\d+\.\d+$/, proc: proc { |input| input.to_f } },
+      { condition: /^\d+$/, proc: proc { |input| input.to_i } },
+      { condition: /true/, proc: proc { true } },
+      { condition: /^\[.*\]$/, proc: proc { |input| eval(input) } },
+      { condition: /false/, proc: proc { false } },
+      { condition: /nil/, proc: proc { nil } },
+      { condition: /^$/, proc: proc { nil } }
+    ].freeze
+
     def self.convert_all(inputs)
       return nil unless inputs
 
@@ -12,10 +22,9 @@ module CSpec
       return input unless input.instance_of?(String)
 
       input = input.strip
-      return input.to_f if input =~ /^\d+\.\d+$/
-      return input.to_i if input =~ /^\d+$/
-      return eval(input) if input =~ /^\[.*\]$/
-      return nil if ['', nil, 'nil'].include?(input)
+      MATCHERS.each do |matcher|
+        return matcher[:proc].call(input) if input.match?(matcher[:condition])
+      end
 
       input.to_s
     end

data/lib/cspec/loader.rb

@@ -18,14 +18,14 @@ module CSpec
     def self.process_arg(spec, regex, aggregate_key)
       spec.merge({
                    aggregate_key => spec.keys
-                 .select { |k| k.match?(regex) && spec[k] != nil }
+                 .select { |k| k.match?(regex) && !spec[k].nil? }
                  .inject([]) { |values, key| values << spec[key] }
                  })
     end
 
-    def self.validate(filename)
+    def self.validate_structure(filename)
       headers = CSV.open(filename, &:readline)
-      ::CSpec::Validator.validate(headers)
+      ::CSpec::Validator.validate_structure(headers)
     end
   end
 end

data/lib/cspec/result.rb

@@ -23,7 +23,7 @@ module CSpec
     end
 
     def to_s
-      "spec: #{spec}\n" \
+      "#{spec}, " \
         "error: #{error}"
     end
   end

data/lib/cspec/runner.rb

@@ -3,16 +3,17 @@
 module CSpec
   module Runner
     def self.run!(filepath)
-      errors = Loader.validate(filepath)
-      unless errors.empty?
-        puts errors
-        return false
-      end
+      return false if process_errors(Loader.validate_structure(filepath))
+
       specs = Loader.load(filepath)
+      return false if process_errors(::CSpec::Validator.validate_specs(specs))
+
       results = run(specs)
 
       return true if CSpec::Result.success?(results)
 
+      puts results.inspect
+      puts '#######################'
       ResultsOutputter.display(results)
       false
     end
@@ -27,5 +28,10 @@ module CSpec
         Result.from_spec(spec, e.inspect)
       end
     end
+
+    def self.process_errors(errors)
+      puts errors unless errors.empty?
+      !errors.empty?
+    end
   end
 end

data/lib/cspec/spec.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'pry'
 module CSpec
   class Spec
     attr_reader :class,
@@ -29,8 +30,36 @@ module CSpec
         initialization_args == other.initialization_args
     end
 
+    def error
+      return ["#{self.class} does not exist"] unless Object.const_defined?(self.class)
+
+      errors = []
+
+      errors += send("#{type}_errors")
+
+      errors.size.positive? ? errors.flatten : nil
+    end
+
     def to_s
-      "name: #{name}, class: #{self.class}, method: #{method},"
+      "name: #{name}, class: #{self.class}, method: #{method}, method_args: #{method_args}"
+    end
+
+    private
+
+    def class_errors
+      if Object.const_get(self.class).respond_to?(method.to_sym)
+        []
+      else
+        ["#{type} method: #{self.class}##{method} does not exist"]
+      end
+    end
+
+    def instance_errors
+      if !Object.const_get(self.class)&.method_defined?(method.to_sym)
+        ["#{type} method: #{self.class}##{method} does not exist"]
+      else
+        []
+      end
     end
   end
 end

data/lib/cspec/validator.rb

@@ -2,10 +2,14 @@
 
 module CSpec
   module Validator
-    def self.validate(headers)
+    def self.validate_structure(headers)
       %w[class type name method expected].map do |required_header|
         "Need header: #{required_header}" unless headers.include?(required_header)
       end.reject(&:nil?)
     end
+
+    def self.validate_specs(specs)
+      specs.map(&:error).reject(&:nil?).flatten
+    end
   end
 end

data/lib/cspec/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-module Cspec
-  VERSION = '0.2.1'
+module CSpec
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cspec
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
 platform: ruby
 authors:
 - Jarrod Folino
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-06 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.17'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement