testrbl 0.5.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6512a4285a824c0bb92db42df4dc797a4df84254
-  data.tar.gz: 53b3b9c920952bf895f889d937a37d380db6efe4
+SHA256:
+  metadata.gz: 49534563e8d2c43647b84e457e1fd35873167eaa70b1687a63217d6005a11c5c
+  data.tar.gz: e5bc529fee2b1791547b4dc0f053c7138de70a9477b325d9fd2981eb8c040e40
 SHA512:
-  metadata.gz: a7330868c50baf797bcf4c02e0218240281f20f2d5a16ef477f43f1af5c3170035036da6ecca33a6fad9b75b972cceeae71e394f91ba5bffc8da8575d2d2b5dd
-  data.tar.gz: 10729f1d80db2d57a8bf07ad4acb3f1ce67a71723a5118ae1a5bc9afa53e129ae247d5be5ec726a2cd4527bc72ac59ed7f19f1dc2ca079beef601f3beba4ec07
+  metadata.gz: d1222308ab263f3098cdad5f0a99bf5abddecc6b61a7b5cb2a80066fefa1541ac88fbe1a722aa0e5182fea897df2ad6ad50a3afe20f91326a455de220e9fdb12
+  data.tar.gz: b5f502bcb6064306ffe14d6d9b58dd01a4e1f5c214720de65cec275047e1f60d8366c5beeb656bd71ecd172493a9924a3ae69e154340f1236d44aa147b5f31a3

data/.travis.yml

@@ -1,8 +1,12 @@
-before_script:
+sudo: false
+before_install:
  - git config --global user.email "you@example.com"
  - git config --global user.name "Your Name"
+ - gem install bundler
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-
+  - 2.1.8
+  - 2.2.3
+branches:
+  only: master

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    testrbl (0.5.2)
+    testrbl (0.9.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     activesupport (2.3.14)
-    bump (0.3.3)
+    bump (0.5.2)
     diff-lcs (1.1.3)
     minitest (5.0.3)
     rake (0.9.2.2)
@@ -38,3 +38,6 @@ DEPENDENCIES
   shoulda
   test-unit
   testrbl!
+
+BUNDLED WITH
+   2.1.4

data/Readme.md

@@ -20,7 +20,7 @@ Usage
 testrbl test/unit/xxx_test.rb:123 # test by line number
 testrbl test/unit                 # everything _test.rb in a folder (on 1.8 this would be test/unit/*)
 testrbl xxx_test.rb yyy_test.rb   # multiple files
-testrbl --changed                 # run changed tests
+testrbl --changed                 # run changed tests or files in last commit
 ```
 
 Tips

data/lib/testrbl.rb

@@ -2,175 +2,189 @@ require 'testrbl/version'
 
 module Testrbl
   PATTERNS = [
-    /^(\s+)(should|test|it)\s+['"](.*)['"]\s+do\s*(?:#.*)?$/,
-    /^(\s+)(context|describe)\s+['"]?(.*?)['"]?\s+do\s*(?:#.*)?$/,
-    /^(\s+)def\s+(test_)([a-z_\d]+)\s*(?:#.*)?$/
+    /^(\s+)(should|test|it)(\s+|\s*\(\s*)['"](.*)['"](\s*\))?\s+do\s*(?:#.*)?$/,
+    /^(\s+)(context|describe)(\s+|\s*\(\s*)['"]?(.*?)['"]?(\s*\))?\s+do\s*(?:#.*)?$/,
+    /^(\s+)def(\s+)(test_)([a-z_\d]+)\s*(?:#.*)?$/
   ]
 
-  OPTION_WITH_ARGUMENT = ["-I", "-r", "-n", "-e", "--seed"]
+  OPTION_WITH_ARGUMENT = ["-I", "-r", "-n", "--name", "-e", "--exclude", "-s", "--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 changed_files
+      changed_files = sh("git status -s").split("\n").map { |l| l.strip.split(/\s+/, 2)[1] }
+
+      if changed_files.empty?
+        # user wants to test last commit and not current diff
+        changed_files = sh("git show --name-only").split("\n\n").last.split("\n")
+      end
 
-  def self.ruby
-    if File.file?("Gemfile")
-      ["ruby", "-rbundler/setup"] # faster then bundle exec ruby
-    else
-      ["ruby"]
+      # we only want test files that were added or changed (not deleted)
+      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 sh(command)
+      result = `#{command}`
+      raise "Failed: #{command} -> #{result}" unless $?.success?
+      result
+    end
 
-  def self.block_start_from_line(line)
-    if line =~ /^(\s*).* do( \|.*\|)?$/
-      [$1, nil]
+    def ruby
+      if File.file?("Gemfile")
+        ["ruby", "-rbundler/setup"] # faster then bundle exec ruby
+      else
+        ["ruby"]
+      end
     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 run(command)
+      puts command.join(" ")
+      STDOUT.flush # if exec fails horribly we at least see some output
+      Kernel.exec *command
     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
-    end
-
-    regex.gsub("'", ".")
-  end
+    def block_start_from_line(line)
+      if line =~ /^(\s*).* do( \|.*\|)?$/
+        [$1, nil]
+      end
+    end
+
+    def test_pattern_from_line(line)
+      PATTERNS.each do |r|
+        next unless line =~ r
+        whitespace, method, test_name = $1, $2, $4
+        return [whitespace, test_pattern_from_match(method, test_name)]
+      end
+      nil
+    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
 
-  def self.via_shoulda?
-    return @via_shoulda if defined?(@via_shoulda)
-    @via_shoulda = !File.exist?("Gemfile.lock") || File.read("Gemfile.lock").include?(" shoulda-context ")
+      regex.gsub("'", ".")
+    end
+
+    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

data/lib/testrbl/version.rb

@@ -1,3 +1,3 @@
 module Testrbl
-  VERSION = '0.5.2'
+  VERSION = '0.9.0'
 end

data/spec/testrbl_spec.rb

@@ -89,6 +89,11 @@ describe Testrbl do
       result.should include "1234"
     end
 
+    it "seeds with -s" do
+      result = testrbl "0_test.rb:6 -s 1234"
+      result.should include "1234"
+    end
+
     it "seeds multiple files" do
       result = Bundler.with_clean_env { testrbl "0_test.rb 1_test.rb --seed 1234" } # adding --seed triggers minitest to be loaded in a weird way and then the second version is loaded via bundler :/
       result.should include "1234"
@@ -341,6 +346,16 @@ describe Testrbl do
           it "b./_-d" do
             puts "-EFG-"
           end
+
+          it("f-g") do
+            puts "-HIJ-"
+          end
+        end
+
+        describe("h-j") do
+          it "i-k" do
+            puts "-KLM-"
+          end
         end
       RUBY
     end
@@ -365,6 +380,14 @@ describe Testrbl do
     it "runs nested it" do
       run_line("13").should == ["CDE"]
     end
+
+    it "runs it with parens" do
+      run_line("28").should == ["HIJ"]
+    end
+
+    it "runs describe with parens" do
+      run_line("33").should == ["KLM"]
+    end
   end
 
   context "multiple files / folders" do
@@ -515,6 +538,12 @@ describe Testrbl do
       result.should include "DEF"
       result.should_not include "ABC"
     end
+
+    it "runs last commit when no files are changed" do
+      result = testrbl("--changed")
+      result.should include "ABC"
+      result.should include "BCD"
+    end
   end
 
   describe ".test_pattern_from_file" do
@@ -552,7 +581,7 @@ describe Testrbl do
 
   describe ".test_pattern_from_line" do
     def call(line)
-      Testrbl.test_pattern_from_line(line)
+      Testrbl.send(:test_pattern_from_line, line)
     end
 
     it "finds simple tests" do
@@ -603,12 +632,18 @@ describe Testrbl do
       call("  context \"c\#{111}b\" do\n").should == ["  ", "c.*b"]
     end
 
-    it "finds minitest it do calls" do
-      call("  it \"xx xx\" do\n").should == ["  ", "#test_\\d+_xx xx$"]
-    end
+    describe "minitest id do" do
+      it "finds simple" do
+        call("  it \"xx xx\" do\n").should == ["  ", "#test_\\d+_xx xx$"]
+      end
 
-    it "finds complex minitest it do calls" do
-      call("  it \"xX ._-..  ___ Xx\" do\n").should == ["  ", "#test_\\d+_xX ._-..  ___ Xx$"]
+      it "finds complex" do
+        call("  it \"xX ._-..  ___ Xx\" do\n").should == ["  ", "#test_\\d+_xX \\._\\-\\.\\.  ___ Xx$"]
+      end
+
+      it "finds with special characters" do
+        call("  it \"hmm? it's weird\\\"?\" do\n").should == ["  ", "#test_\\d+_hmm\\? it.s weird\\\\\"\\?$"]
+      end
     end
 
     it "finds minitest describe do calls" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testrbl
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -47,8 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Run ruby Test::Unit/Shoulda tests by line-number / folder / the dozen