suture 1.1.1 → 1.2.0

data/lib/suture/error/invalid_plan.rb

@@ -3,36 +3,36 @@ module Suture::Error
     HEADER = "Suture was unable to create your seam, because options passed to `Suture.create` were invalid."
 
     def self.missing_requirements(requirements)
-      new <<-MSG.gsub(/^ {8}/,'')
+      new <<-MSG.gsub(/^ {8}/, "")
         #{HEADER}
 
         The following options are required:
 
-          #{requirements.map {|(name,explanation)|
+          #{requirements.map { |(name, explanation)|
               "* #{name.inspect} - #{explanation}"
             }.join("\n  ")}
       MSG
     end
 
     def self.invalid_options(invalids)
-      new <<-MSG.gsub(/^ {8}/,'')
+      new <<-MSG.gsub(/^ {8}/, "")
         #{HEADER}
 
         The following options were invalid:
 
-          #{invalids.map {|(name,rule)|
+          #{invalids.map { |(name, rule)|
               "* #{name.inspect} - #{rule[:message]}"
             }.join("\n  ")}
       MSG
     end
 
     def self.conflicting_options(conflicts)
-      new <<-MSG.gsub(/^ {8}/,'')
+      new <<-MSG.gsub(/^ {8}/, "")
         #{HEADER}
 
         Suture isn't sure how to best handle the combination of options passed:
 
-          #{conflicts.map {|message|
+          #{conflicts.map { |message|
               "* #{message}"
             }.join("\n  ")}
       MSG

data/lib/suture/error/observation_conflict.rb

@@ -9,7 +9,7 @@ module Suture::Error
     end
 
     def message
-      <<-MSG.gsub(/^ {8}/,'')
+      <<-MSG.gsub(/^ {8}/, "")
         At seam #{@name.inspect}, we just recorded a duplicate call, but the same arguments
         resulted in a different output. Read on for details:
 

data/lib/suture/error/result_mismatch.rb

@@ -7,7 +7,7 @@ module Suture::Error
     end
 
     def message
-      <<-MSG.gsub(/^ {8}/,'')
+      <<-MSG.gsub(/^ {8}/, "")
         The results from the old & new code paths did not match for the seam
         #{@plan.name.inspect} and Suture is raising this error because the `:call_both`
         option is enabled, because both code paths are expected to return the

data/lib/suture/error/schema_version.rb

@@ -6,7 +6,7 @@ module Suture::Error
     end
 
     def message
-      "Your suture gem is too #{@expected > @actual ? "new" : "old"} for this schema. Either delete your database or #{@expected > @actual ? "upgrade" : "downgrade"} the gem (expected schema version #{@expected}, was #{@actual})"
+      "Your suture gem is too #{(@expected > @actual) ? "new" : "old"} for this schema. Either delete your database or #{(@expected > @actual) ? "upgrade" : "downgrade"} the gem (expected schema version #{@expected}, was #{@actual})"
     end
   end
 end

data/lib/suture/error/verification_failed.rb

@@ -22,7 +22,7 @@ module Suture::Error
     private
 
     def intro
-      <<-MSG.gsub(/^ {8}/,'')
+      <<-MSG.gsub(/^ {8}/, "")
 
         # Verification of your seam failed!
 
@@ -31,7 +31,7 @@ module Suture::Error
     end
 
     def summarize(results)
-      <<-MSG.gsub(/^ {8}/,'')
+      <<-MSG.gsub(/^ {8}/, "")
         # Result Summary
 
           - Passed........#{results.passed_count}
@@ -49,7 +49,7 @@ module Suture::Error
         results.all.size
       )
       percent = Suture::Util::Numbers.percent(results.passed.size, results.all.size)
-      <<-MSG.gsub(/^ {8}/,'')
+      <<-MSG.gsub(/^ {8}/, "")
         ## Progress
 
         Here's what your progress to initial completion looks like so far:
@@ -61,7 +61,7 @@ module Suture::Error
     end
 
     def configuration(plan)
-      <<-MSG.gsub(/^ {8}/,'')
+      <<-MSG.gsub(/^ {8}/, "")
         # Configuration
 
         This is the configuration used by this test run:
@@ -81,7 +81,7 @@ module Suture::Error
     end
 
     def describe_comparator(comparator)
-      if comparator.kind_of?(Proc)
+      if comparator.is_a?(Proc)
         "Proc # (in: `#{describe_source_location(*comparator.source_location)}`)"
       elsif comparator.respond_to?(:method) && comparator.method(:call)
         "#{comparator.inspect}.new, # (in: `#{describe_source_location(*comparator.method(:call).source_location)}`)"
@@ -90,7 +90,7 @@ module Suture::Error
 
     def describe_source_location(file, line)
       root = File.join(Dir.getwd, "/")
-      path = file.start_with?(root) ? file.gsub(root, '') : file
+      path = file.start_with?(root) ? file.gsub(root, "") : file
       "#{path}:#{line}"
     end
 
@@ -108,7 +108,7 @@ module Suture::Error
 
     def describe_failure(failure, index)
       expected = failure[:observation]
-      return <<-MSG.gsub(/^ {8}/,'')
+      <<-MSG.gsub(/^ {8}/, "")
         #{index + 1}.) Recorded call for seam #{expected.name.inspect} (ID: #{expected.id}) ran and #{failure[:error] ? "raised an error" : "failed comparison"}.
 
           Arguments: ```
@@ -122,8 +122,7 @@ module Suture::Error
                 stringify_error(failure[:error])
               else
                 failure[:new_result].value.inspect
-              end
-            }
+              end}
           ```
 
           Ideas to fix this:
@@ -138,7 +137,7 @@ module Suture::Error
     end
 
     def describe_general_failure_advice(plan)
-      <<-MSG.gsub(/^ {8}/,'')
+      <<-MSG.gsub(/^ {8}/, "")
         ### Fixing these failures
 
         #### Custom comparator
@@ -156,7 +155,7 @@ module Suture::Error
         behavior somewhere in your subject's code.
 
         #{if !plan.random_seed.nil?
-            <<-MOAR.gsub(/^ {14}/,'')
+            <<-MOAR.gsub(/^ {14}/, "")
               To re-run the tests with the same random seed as was used in this run,
               set the env var `SUTURE_RANDOM_SEED=#{plan.random_seed}` or the config entry
               `:random_seed => #{plan.random_seed}`.
@@ -167,7 +166,7 @@ module Suture::Error
               `:random_seed => nil`.
             MOAR
           else
-            <<-MOAR.gsub(/^ {14}/,'')
+            <<-MOAR.gsub(/^ {14}/, "")
               This test was run in insertion order (by the primary key of the table
               that stores calls, ascending). This is sometimes necessary when the
               code has an order-dependent side effect, but shouldn't be set unless it's
@@ -180,7 +179,6 @@ module Suture::Error
       MSG
     end
 
-
     def stringify_error(error)
       s = error.inspect
       s += "\n" + error.backtrace.join("\n") if error.backtrace

data/lib/suture/reset.rb

@@ -6,4 +6,3 @@ module Suture
     Adapter::Log.reset!
   end
 end
-

data/lib/suture/surgeon/auditor.rb

@@ -24,11 +24,9 @@ module Suture::Surgeon
     private
 
     def result_for(plan, path)
-      begin
-        Suture::Value::Result.returned(@scalpel.cut(plan, path))
-      rescue StandardError => error
-        Suture::Value::Result.errored(error)
-      end
+      Suture::Value::Result.returned(@scalpel.cut(plan, path))
+    rescue => error
+      Suture::Value::Result.errored(error)
     end
 
     def comparable?(plan, old_result, new_result)
@@ -53,12 +51,12 @@ module Suture::Surgeon
       if result.errored?
         raise result.value
       else
-        return result.value
+        result.value
       end
     end
 
     def log_warning(plan, old_result, new_result)
-      log_warn <<-MSG.gsub(/^ {8}/,'')
+      log_warn <<-MSG.gsub(/^ {8}/, "")
         Seam #{plan.name.inspect} is set to :call_both the :new and :old code
         paths, but they did not match.
 

data/lib/suture/surgeon/no_op.rb

@@ -3,7 +3,7 @@ require "suture/util/scalpel"
 module Suture::Surgeon
   class NoOp
     def operate(plan)
-      if code_path = code_path_for(plan)
+      if (code_path = code_path_for(plan))
         Suture::Util::Scalpel.new.cut(plan, code_path)
       end
     end

data/lib/suture/surgeon/observer.rb

@@ -9,8 +9,8 @@ module Suture::Surgeon
         Suture::Util::Scalpel.new.cut(plan, :old).tap do |result|
           dictaphone.record(result)
         end
-      rescue StandardError => error
-        if plan.expected_error_types.any? {|e| error.kind_of?(e) }
+      rescue => error
+        if plan.expected_error_types.any? { |e| error.is_a?(e) }
           dictaphone.record_error(error)
         end
         raise error
@@ -18,4 +18,3 @@ module Suture::Surgeon
     end
   end
 end
-

data/lib/suture/surgeon/remediator.rb

@@ -7,14 +7,12 @@ module Suture::Surgeon
     end
 
     def operate(plan)
-      begin
-        @scalpel.cut(plan ,:new)
-      rescue StandardError => actual_error
-        if plan.expected_error_types.any? { |e| actual_error.is_a?(e) }
-          raise actual_error
-        else
-          @scalpel.cut(plan, :old)
-        end
+      @scalpel.cut(plan, :new)
+    rescue => actual_error
+      if plan.expected_error_types.any? { |e| actual_error.is_a?(e) }
+        raise actual_error
+      else
+        @scalpel.cut(plan, :old)
       end
     end
   end

data/lib/suture/util/compares_results.rb

@@ -8,7 +8,7 @@ module Suture::Util
       if expected.errored? != actual.errored?
         false
       elsif expected.errored?
-        actual.value.kind_of?(expected.value.class) &&
+        actual.value.is_a?(expected.value.class) &&
           expected.value.message == actual.value.message
       else
         @comparator.call(expected.value, actual.value)

data/lib/suture/util/env.rb

@@ -2,16 +2,16 @@ module Suture::Util
   module Env
     def self.to_map(excludes = {})
       Hash[
-        ENV.keys.
-            select { |k| k.start_with?("SUTURE_") }.
-            map { |k| [to_sym(k), sanitize_value(ENV[k])] }
-      ].reject { |(k,_)| excludes.include?(k) }
+        ENV.keys
+          .select { |k| k.start_with?("SUTURE_") }
+          .map { |k| [to_sym(k), sanitize_value(ENV[k])] }
+      ].reject { |(k, _)| excludes.include?(k) }
     end
 
     # private
 
     def self.to_sym(name)
-      name.gsub(/^SUTURE\_/,'').downcase.to_sym
+      name.gsub(/^SUTURE_/, "").downcase.to_sym
     end
 
     def self.sanitize_value(value)

data/lib/suture/util/scalpel.rb

@@ -10,7 +10,7 @@ module Suture::Util
         plan.send(location).call(*args).tap do |result|
           call_after_hook(plan, location, args, result)
         end
-      rescue StandardError => error
+      rescue => error
         log_error_details(plan, location, args, error)
         call_error_hook(plan, location, args, error)
         raise error
@@ -20,13 +20,13 @@ module Suture::Util
     private
 
     def call_after_hook(plan, location, args, result)
-      return unless after_hook = try(plan, "after_#{location}")
+      return unless (after_hook = try(plan, "after_#{location}"))
       after_hook.call(args, result)
     end
 
     def log_error_details(plan, location, args, error)
       return if expected_error?(plan, error)
-      log_error <<-MSG.gsub(/^ {8}/,'')
+      log_error <<-MSG.gsub(/^ {8}/, "")
         Suture invoked the #{plan.name.inspect} seam's #{location.inspect} code path with args: ```
           #{args.inspect}
         ```
@@ -38,12 +38,12 @@ module Suture::Util
 
     def call_error_hook(plan, location, args, error)
       return if expected_error?(plan, error)
-      return unless error_hook = try(plan, "on_#{location}_error")
+      return unless (error_hook = try(plan, "on_#{location}_error"))
       error_hook.call(plan.name, args, error)
     end
 
     def expected_error?(plan, error)
-      plan.expected_error_types.any? {|e| error.kind_of?(e) }
+      plan.expected_error_types.any? { |e| error.is_a?(e) }
     end
 
     def args_for(plan, args_override)
@@ -62,6 +62,5 @@ module Suture::Util
       return unless plan.respond_to?(method)
       plan.send(method)
     end
-
   end
 end

data/lib/suture/util/shuffle.rb

@@ -7,7 +7,7 @@ module Suture::Util
         index = random.rand(old_array.size)
         new_array << old_array.delete_at(index)
       end
-      return new_array
+      new_array
     end
   end
 end

data/lib/suture/value/observation.rb

@@ -13,7 +13,7 @@ module Suture::Value
     end
 
     def result
-      @expectation ||= @error ? Result.errored(@error) : Result.returned(@return_value)
+      @result ||= @error ? Result.errored(@error) : Result.returned(@return_value)
     end
   end
 end

data/lib/suture/value/plan.rb

@@ -1,10 +1,10 @@
 module Suture::Value
   class Plan
     attr_reader :name, :old, :new, :args, :after_new, :after_old, :on_new_error,
-                :on_old_error, :database_path, :record_calls, :comparator,
-                :call_both, :raise_on_result_mismatch,
-                :return_old_on_result_mismatch, :fallback_on_error,
-                :expected_error_types, :disable, :dup_args
+      :on_old_error, :database_path, :record_calls, :comparator,
+      :call_both, :raise_on_result_mismatch,
+      :return_old_on_result_mismatch, :fallback_on_error,
+      :expected_error_types, :disable, :dup_args
 
     def initialize(attrs = {})
       @name = attrs[:name]

data/lib/suture/value/result.rb

@@ -19,7 +19,7 @@ module Suture::Value
     end
 
     def ==(other)
-      other.kind_of?(self.class) && other.state == state
+      other.is_a?(self.class) && other.state == state
     end
 
     alias_method :eql?, :==

data/lib/suture/value/test_plan.rb

@@ -1,17 +1,17 @@
 module Suture::Value
   class TestPlan
     attr_accessor :name, :subject,
-                  :verify_only, :fail_fast, :call_limit, :time_limit,
-                  :error_message_limit, :random_seed, :comparator,
-                  :database_path, :after_subject, :on_subject_error,
-                  :expected_error_types
+      :verify_only, :fail_fast, :call_limit, :time_limit,
+      :error_message_limit, :random_seed, :comparator,
+      :database_path, :after_subject, :on_subject_error,
+      :expected_error_types
 
     def initialize(attrs = {})
       assign_simple_ivars!(attrs, :name, :subject, :comparator,
-                                  :database_path, :after_subject,
-                                  :on_subject_error)
+        :database_path, :after_subject,
+        :on_subject_error)
       assign_integral_ivars!(attrs, :verify_only, :call_limit, :time_limit,
-                                   :error_message_limit)
+        :error_message_limit)
       @fail_fast = !!attrs[:fail_fast]
       @expected_error_types = attrs[:expected_error_types] || []
       @random_seed = determine_random_seed(attrs)
@@ -26,18 +26,18 @@ module Suture::Value
     end
 
     def assign_integral_ivars!(attrs, *names)
-      assign_simple_ivars!(massage_values(attrs, names) {|v| v.to_i }, *names)
+      assign_simple_ivars!(massage_values(attrs, names, &:to_i), *names)
     end
 
-    def massage_values(attrs, names, &blk)
+    def massage_values(attrs, names)
       Hash[
-        attrs.select {|(k,_)| names.include?(k) }.
-              map { |(k,v)| [k, v.nil? ? nil : blk.call(v) ]}
+        attrs.select { |(k, _)| names.include?(k) }
+          .map { |(k, v)| [k, v.nil? ? nil : yield(v)] }
       ]
     end
 
     def determine_random_seed(attrs)
-      if attrs.has_key?(:random_seed)
+      if attrs.key?(:random_seed)
         if attrs[:random_seed].nil? || attrs[:random_seed] == "nil"
           nil
         else

data/lib/suture/value/test_results.rb

@@ -45,4 +45,3 @@ module Suture::Value
     end
   end
 end
-

data/lib/suture/verify/administers_test.rb

@@ -16,7 +16,7 @@ module Suture
           :new_result => result,
           :passed => compares_results.compare(observation.result, result)
         }
-      rescue StandardError => error
+      rescue => error
         if observation.result.errored?
           result = Value::Result.errored(error)
           {
@@ -24,7 +24,7 @@ module Suture
             :passed => compares_results.compare(observation.result, result)
           }
         else
-          { :error => error, :passed => false }
+          {:error => error, :passed => false}
         end
       end
     end

data/lib/suture/verify/interprets_results.rb

@@ -8,5 +8,3 @@ module Suture
     end
   end
 end
-
-

data/lib/suture/verify/prescribes_test_plan.rb

@@ -4,13 +4,13 @@ require "suture/util/env"
 module Suture
   class PrescribesTestPlan
     UN_ENV_IABLE_OPTIONS = [:name, :subject, :comparator, :after_subject,
-                            :on_subject_error, :expected_error_types]
+      :on_subject_error, :expected_error_types]
 
     def prescribe(name, options = {})
-      Value::TestPlan.new(Suture.config.
-                          merge(options).
-                          merge(:name => name).
-                          merge(Suture::Util::Env.to_map(UN_ENV_IABLE_OPTIONS)))
+      Value::TestPlan.new(Suture.config
+                          .merge(options)
+                          .merge(:name => name)
+                          .merge(Suture::Util::Env.to_map(UN_ENV_IABLE_OPTIONS)))
     end
   end
 end

data/lib/suture/verify/tests_patient.rb

@@ -39,7 +39,7 @@ module Suture
 
     def validate_test_plan!(test_plan)
       if !test_plan.subject || !test_plan.subject.respond_to?(:call)
-        raise Suture::Error::InvalidTestPlan.new
+        raise Suture::Error::InvalidTestPlan
       end
     end
 
@@ -56,7 +56,7 @@ module Suture
         test_plan.random_seed
       ).tap do |test_cases|
         next if test_cases.size > 0
-        log_warn <<-MSG.gsub(/^ {10}/,'')
+        log_warn <<-MSG.gsub(/^ {10}/, "")
           Suture.verify found no recorded calls for seam #{test_plan.name.inspect}.
           As a result, verify will have no effect and cannot provide any assurance
           that the subject is working as expected.
@@ -70,4 +70,3 @@ module Suture
     end
   end
 end
-

data/lib/suture/verify.rb

@@ -11,4 +11,3 @@ module Suture
     end
   end
 end
-

data/lib/suture/version.rb

@@ -1,3 +1,3 @@
 module Suture
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/lib/suture/wrap/logger.rb

@@ -12,12 +12,12 @@ module Suture::Wrap
       end
 
       @logger.level = if options[:log_level]
-                        ::Logger.const_get(options[:log_level])
-                      else
-                        ::Logger::INFO
-                      end
+        ::Logger.const_get(options[:log_level])
+      else
+        ::Logger::INFO
+      end
 
-      @logger.formatter = proc { |_, time , _, msg|
+      @logger.formatter = proc { |_, time, _, msg|
         formatted_time = time.strftime("%Y-%m-%dT%H:%M:%S.%6N")
         "[#{formatted_time}] Suture: #{msg}\n".tap { |out|
           puts out if options[:log_stdout]
@@ -25,19 +25,39 @@ module Suture::Wrap
         }
       }
 
-      return @logger
+      @logger
     end
 
     class NullIO
-      def gets; end
-      def each; end
-      def read(count=nil,buffer=nil); (count && count > 0) ? nil : ""; end
-      def rewind; 0; end
-      def close; end
-      def size; 0; end
-      def sync=(*args); end
-      def puts(*args); end
-      def write(*args); end
+      def gets
+      end
+
+      def each
+      end
+
+      def read(count = nil, _buffer = nil)
+        (count && count > 0) ? nil : ""
+      end
+
+      def rewind
+        0
+      end
+
+      def close
+      end
+
+      def size
+        0
+      end
+
+      def sync=(*args)
+      end
+
+      def puts(*args)
+      end
+
+      def write(*args)
+      end
     end
   end
 end

data/lib/suture/wrap/sqlite.rb

@@ -4,7 +4,7 @@ require "suture/error/schema_version"
 
 module Suture::Wrap
   module Sqlite
-    SCHEMA_VERSION=2
+    SCHEMA_VERSION = 2
     def self.init(location)
       full_path = File.join(Dir.getwd, location)
       FileUtils.mkdir_p(File.dirname(full_path))
@@ -16,7 +16,7 @@ module Suture::Wrap
         SQL
         db.execute("insert or ignore into suture_schema_info values (?)", [SCHEMA_VERSION])
         actual_schema_version = db.execute("select * from suture_schema_info").first[0]
-        if SCHEMA_VERSION != actual_schema_version
+        if actual_schema_version != SCHEMA_VERSION
           raise Suture::Error::SchemaVersion.new(SCHEMA_VERSION, actual_schema_version)
         end
 

data/lib/suture.rb

@@ -5,4 +5,3 @@ require "suture/verify"
 require "suture/delete"
 require "suture/config"
 require "suture/reset"
-