maxitest 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 762f7f18cf39bd8543ca82c2285fbbddc581413d
-  data.tar.gz: 16220c358d60e86e53c69042c3b2688ae1a2c0e0
+  metadata.gz: 7db9e9766430fc0c6600b33feed4c231238b6b9d
+  data.tar.gz: 0b4915abe95300cb7d2c1406e742cd0393130565
 SHA512:
-  metadata.gz: e739f73c1e4c97fa9161d43f43475a63b1bd467358fe7f5b3a96cf901da2f1ad9bc3f46c3757271c3f6f34356f00bc9dcdb4b66e99f0eef803323004b14d3dab
-  data.tar.gz: c93a3b274ac3c0ae61f291699cff90b4aa4cf2ec48e1ef4b38608cd01d66d5ba79a805d2a2b0c8ba61cf6addff4f7860dc5cafbda61632d8f26d569885eef2ae
+  metadata.gz: 8b25f64c7b30d48c4f2e95b6dfc6f1fd1d0c3310330c8ed83bb03ceee8ae970dc7cf092d6e7b49bdfb8ac47a9b5c05403587340149b27140a96c5ac90993ece4
+  data.tar.gz: e0c6750d5f66a53d5e28b25beae1659418e19a502ccd39b6d8e0dabe1a5e9198328703c127d09adc9bcaf90c792ee3781300c0a01a801fd5798eabf0bcbb3ddc

data/lib/maxitest/pending.rb

@@ -1,11 +1,17 @@
 module Maxitest
   module Pending
     def pending(reason=nil)
-      yield
-    rescue Minitest::Assertion
-      skip reason
-    else
-      raise "Fixed"
+      if block_given?
+        begin
+          yield
+        rescue StandardError, Minitest::Assertion
+          skip reason
+        else
+          raise "Fixed"
+        end
+      else
+        raise ArgumentError, "Need a block to execute"
+      end
     end
   end
 end

data/lib/maxitest/vendor/testrbl.rb

@@ -13,168 +13,170 @@ module Maxitest
     OPTION_WITH_ARGUMENT = ["-I", "-r", "-n", "-e", "--seed"]
     INTERPOLATION = /\\\#\\\{.*?\\\}/
 
-    def self.run_from_cli(argv)
-      files, options = partition_argv(argv)
-      files.concat(changed_files) if options.delete("--changed")
-      files = files.map { |f| localize(f) }
-      load_options, options = partition_options(options)
-
-      if files.size == 1 and files.first =~ /^(\S+):(\d+)$/
-        file = $1
-        line = $2
-        run(ruby + load_options + line_pattern_option(file, line) + options)
-      else
-        if files.size == 1 and File.file?(files.first)
-          run(ruby + load_options + files + options)
-        elsif options.none? { |arg| arg =~ /^-n/ }
-          seed = if seed = options.index("--seed")
-            ["--"] + options.slice!(seed, 2)
-          else
-            []
+    class << self
+      def run_from_cli(argv)
+        files, options = partition_argv(argv)
+        files.concat(changed_files) if options.delete("--changed")
+        files = files.map { |f| localize(f) }
+        load_options, options = partition_options(options)
+
+        if files.size == 1 and files.first =~ /^(\S+):(\d+)$/
+          file = $1
+          line = $2
+          run(ruby + load_options + line_pattern_option(file, line) + options)
+        else
+          if files.size == 1 and File.file?(files.first)
+            run(ruby + load_options + files + options)
+          elsif options.none? { |arg| arg =~ /^-n/ }
+            seed = if seed = options.index("--seed")
+              ["--"] + options.slice!(seed, 2)
+            else
+              []
+            end
+            files = files.map { |f| File.directory?(f) ? all_test_files_in(f) : f }.flatten
+            run(ruby + load_options + files.map { |f| "-r#{f}" } + options + ["-e", ""] + seed)
+          else # pass though
+            # no bundle exec: projects with mini and unit-test do not run well via bundle exec testrb
+            run ["testrb"] + argv
           end
-          files = files.map { |f| File.directory?(f) ? all_test_files_in(f) : f }.flatten
-          run(ruby + load_options + files.map { |f| "-r#{f}" } + options + ["-e", ""] + seed)
-        else # pass though
-          # no bundle exec: projects with mini and unit-test do not run well via bundle exec testrb
-          run ["testrb"] + argv
         end
       end
-    end
 
-    # overwritten by maxitest to just return line
-    def self.line_pattern_option(file, line)
-      [file, "-n", "/#{pattern_from_file(File.readlines(file), line)}/"]
-    end
+      # overwritten by maxitest to just return line
+      def line_pattern_option(file, line)
+        [file, "-n", "/#{pattern_from_file(File.readlines(file), line)}/"]
+      end
 
-    # usable via external tools like zeus
-    def self.pattern_from_file(lines, line)
-      possible_lines = lines[0..(line.to_i-1)].reverse
+      # usable via external tools like zeus
+      def pattern_from_file(lines, line)
+        possible_lines = lines[0..(line.to_i-1)].reverse
 
-      found = possible_lines.map { |line| test_pattern_from_line(line) || block_start_from_line(line) }.compact
+        found = possible_lines.map { |line| test_pattern_from_line(line) || block_start_from_line(line) }.compact
 
-      # pattern and the groups it is nested under (like describe - describe - it)
-      last_spaces = " " * 100
-      patterns = found.select do |spaces, name|
-        last_spaces = spaces if spaces.size < last_spaces.size
-      end.map(&:last).compact
+        # pattern and the groups it is nested under (like describe - describe - it)
+        last_spaces = " " * 100
+        patterns = found.select do |spaces, name|
+          last_spaces = spaces if spaces.size < last_spaces.size
+        end.map(&:last).compact
 
-      return filter_duplicate_final(patterns).reverse.join(".*") if found.size > 0
+        return filter_duplicate_final(patterns).reverse.join(".*") if found.size > 0
 
-      raise "no test found before line #{line}"
-    end
+        raise "no test found before line #{line}"
+      end
 
-    # only keep 1 pattern that stops matching via $
-    def self.filter_duplicate_final(patterns)
-      found_final = 0
-      patterns.reject { |p| p.end_with?("$") and (found_final += 1) > 1 }
-    end
+      # only keep 1 pattern that stops matching via $
+      def filter_duplicate_final(patterns)
+        found_final = 0
+        patterns.reject { |p| p.end_with?("$") and (found_final += 1) > 1 }
+      end
 
-    private
+      private
 
-    def self.all_test_files_in(folder)
-      Dir[File.join(folder, "{**/,}*_{test,spec}.rb")].uniq
-    end
+      def all_test_files_in(folder)
+        Dir[File.join(folder, "{**/,}*_{test,spec}.rb")].uniq
+      end
 
-    def self.partition_options(options)
-      next_is_before = false
-      options.partition do |option|
-        if next_is_before
-          next_is_before = false
-          true
-        else
-          if option =~ /^-(r|I)/
-            next_is_before = (option.size == 2)
+      def partition_options(options)
+        next_is_before = false
+        options.partition do |option|
+          if next_is_before
+            next_is_before = false
             true
           else
-            false
+            if option =~ /^-(r|I)/
+              next_is_before = (option.size == 2)
+              true
+            else
+              false
+            end
           end
         end
       end
-    end
 
-    # fix 1.9 not being able to load local files
-    def self.localize(file)
-      file =~ /^[-a-z\d_]/ ? "./#{file}" : file
-    end
+      # fix 1.9 not being able to load local files
+      def localize(file)
+        file =~ /^[-a-z\d_]/ ? "./#{file}" : file
+      end
 
-    def self.partition_argv(argv)
-      next_is_option = false
-      argv.partition do |arg|
-        if next_is_option
-          next_is_option = false
-        else
-          if arg =~ /^-.$/ or  arg =~ /^--/ # single letter option followed by argument like -I test or long options like --verbose
-            next_is_option = true if OPTION_WITH_ARGUMENT.include?(arg)
-            false
-          elsif arg =~ /^-/ # multi letter option like -Itest
-            false
+      def partition_argv(argv)
+        next_is_option = false
+        argv.partition do |arg|
+          if next_is_option
+            next_is_option = false
           else
-            true
+            if arg =~ /^-.$/ or  arg =~ /^--/ # single letter option followed by argument like -I test or long options like --verbose
+              next_is_option = true if OPTION_WITH_ARGUMENT.include?(arg)
+              false
+            elsif arg =~ /^-/ # multi letter option like -Itest
+              false
+            else
+              true
+            end
           end
         end
       end
-    end
 
-    def self.changed_files
-      changed_files = `git status -s`.split("\n").map { |l| l.strip.split(/\s+/, 2)[1] }
-      raise "Failed: #{changed_files}" unless $?.success?
-      changed_files.select { |f| f =~ /_(test|spec)\.rb$/ && File.exist?(f) }
-    end
-
-    def self.ruby
-      if File.file?("Gemfile")
-        ["ruby", "-rbundler/setup"] # faster then bundle exec ruby
-      else
-        ["ruby"]
+      def changed_files
+        changed_files = `git status -s`.split("\n").map { |l| l.strip.split(/\s+/, 2)[1] }
+        raise "Failed: #{changed_files}" unless $?.success?
+        changed_files.select { |f| f =~ /_(test|spec)\.rb$/ && File.exist?(f) }
       end
-    end
 
-    def self.run(command)
-      puts command.join(" ")
-      STDOUT.flush # if exec fails horribly we at least see some output
-      Kernel.exec *command
-    end
+      def ruby
+        if File.file?("Gemfile")
+          ["ruby", "-rbundler/setup"] # faster then bundle exec ruby
+        else
+          ["ruby"]
+        end
+      end
 
-    def self.block_start_from_line(line)
-      if line =~ /^(\s*).* do( \|.*\|)?$/
-        [$1, nil]
+      def run(command)
+        puts command.join(" ")
+        STDOUT.flush # if exec fails horribly we at least see some output
+        Kernel.exec *command
       end
-    end
 
-    def self.test_pattern_from_line(line)
-      PATTERNS.each do |r|
-        next unless line =~ r
-        whitespace, method, test_name = $1, $2, $3
-        return [whitespace, test_pattern_from_match(method, test_name)]
+      def block_start_from_line(line)
+        if line =~ /^(\s*).* do( \|.*\|)?$/
+          [$1, nil]
+        end
       end
-      nil
-    end
 
-    def self.test_pattern_from_match(method, test_name)
-      regex = Regexp.escape(test_name).gsub("\\ "," ").gsub(INTERPOLATION, ".*")
-
-      regex = if method == "test"
-        # test "xxx -_ yyy"
-        # test-unit:     "test: xxx -_ yyy"
-        # activesupport: "test_xxx_-__yyy"
-        "^test(: |_)#{regex.gsub(" ", ".")}$"
-      elsif method == "describe" || (method == "context" && !via_shoulda?)
-        "#{test_name}(::)?"
-      elsif method == "should" && via_shoulda?
-        optional_test_name = "(?:\(.*\))?"
-        "#{method} #{regex}\. #{optional_test_name}$"
-      elsif ["it", "should"].include?(method) # minitest aliases for shoulda
-        "#test_\\d+_#{test_name}$"
-      else
-        regex
+      def test_pattern_from_line(line)
+        PATTERNS.each do |r|
+          next unless line =~ r
+          whitespace, method, test_name = $1, $2, $3
+          return [whitespace, test_pattern_from_match(method, test_name)]
+        end
+        nil
       end
 
-      regex.gsub("'", ".")
-    end
+      def test_pattern_from_match(method, test_name)
+        regex = Regexp.escape(test_name).gsub("\\ "," ").gsub(INTERPOLATION, ".*")
+
+        regex = if method == "test"
+          # test "xxx -_ yyy"
+          # test-unit:     "test: xxx -_ yyy"
+          # activesupport: "test_xxx_-__yyy"
+          "^test(: |_)#{regex.gsub(" ", ".")}$"
+        elsif method == "describe" || (method == "context" && !via_shoulda?)
+          "#{regex}(::)?"
+        elsif method == "should" && via_shoulda?
+          optional_test_name = "(?:\(.*\))?"
+          "#{method} #{regex}\. #{optional_test_name}$"
+        elsif ["it", "should"].include?(method) # minitest aliases for shoulda
+          "#test_\\d+_#{regex}$"
+        else
+          regex
+        end
+
+        regex.gsub("'", ".")
+      end
 
-    def self.via_shoulda?
-      return @via_shoulda if defined?(@via_shoulda)
-      @via_shoulda = !File.exist?("Gemfile.lock") || File.read("Gemfile.lock").include?(" shoulda-context ")
+      def via_shoulda?
+        return @via_shoulda if defined?(@via_shoulda)
+        @via_shoulda = !File.exist?("Gemfile.lock") || File.read("Gemfile.lock").include?(" shoulda-context ")
+      end
     end
   end
 end

data/lib/maxitest/version.rb

@@ -1,3 +1,3 @@
 module Maxitest
-  VERSION = "1.5.3"
+  VERSION = "1.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maxitest
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest