inch 0.5.0.rc3 → 0.5.0.rc4

data/test/integration/api/compare/codebases.rb

@@ -1,11 +1,11 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../../../test_helper")
 
 describe ::Inch::API::Compare::Codebases do
   let(:described_class) { ::Inch::API::Compare::Codebases }
 
   it "should run" do
-    codebase1 = Inch::Codebase.parse fixture_path(:diff1)
-    codebase2 = Inch::Codebase.parse fixture_path(:diff2)
+    codebase1 = Inch::Codebase.parse fixture_path(:ruby, :diff1)
+    codebase2 = Inch::Codebase.parse fixture_path(:ruby, :diff2)
 
     compare = described_class.new(codebase1, codebase2)
     refute compare.comparisons.empty?

data/test/integration/cli/command/console_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../../../test_helper")
 
 class Inch::CLI::Command::Output::Console
   def run_pry
@@ -8,7 +8,7 @@ end
 
 describe ::Inch::CLI::Command::Console do
   before do
-    Dir.chdir fixture_path(:simple)
+    Dir.chdir fixture_path(:ruby, :simple)
     @command = ::Inch::CLI::Command::Console
   end
 
@@ -22,8 +22,8 @@ describe ::Inch::CLI::Command::Console do
   end
 
   it "should run without args" do
-    out, err = capture_io do
-      @prompt = @command.new.run()
+    _out, _err = capture_io do
+      @prompt = @command.new.run
     end
     assert @prompt.respond_to?(:all)
     assert @prompt.respond_to?(:ff)
@@ -34,7 +34,7 @@ describe ::Inch::CLI::Command::Console do
   end
 
   it "should run with a definitive object name" do
-    out, err = capture_io do
+    _out, _err = capture_io do
       @prompt = @command.new.run("Foo::Bar#method_with_full_doc")
     end
     assert !@prompt.all.empty?
@@ -46,7 +46,7 @@ describe ::Inch::CLI::Command::Console do
   end
 
   it "should run with a partial name" do
-    out, err = capture_io do
+    _out, _err = capture_io do
       @prompt = @command.new.run("Foo::Bar#")
     end
     assert @prompt.respond_to?(:all)

data/test/integration/cli/command/diff_test.rb

@@ -0,0 +1,62 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../../test_helper")
+
+require 'tmpdir'
+require 'fileutils'
+
+describe ::Inch::CLI::Command::Diff do
+  before do
+    @command = ::Inch::CLI::Command::Diff
+    @git_url = 'https://github.com/rrrene/sparkr.git'
+    @git_dir = 'sparkr'
+    @git_rev1 = '9da8aeaa64ff21daa1b39e3493134d42d67eb71a'
+    @git_rev2 = 'HEAD'
+
+    @tmp_dir = Dir.mktmpdir
+    # clone the given repo to the tmp_dir
+    Dir.chdir @tmp_dir
+    `git clone #{@git_url} 2>&1`
+    @cloned_dir = File.join(@tmp_dir, @git_dir)
+    Dir.chdir @cloned_dir
+  end
+
+  after do
+    FileUtils.rm_rf @tmp_dir
+  end
+
+  it "should not show any changes" do
+    # this runs `inch diff` on a freshly cloned repo
+    # should not show any changes
+    out, err = capture_io do
+      @command.run
+    end
+    refute out.empty?, "there should be some output"
+    assert err.empty?, "there should be no errors"
+    assert_match /\bno changes\b/i, out
+
+
+    # this runs `inch diff` on two distinct revisions
+    # should show some changes
+    out, err = capture_io do
+      @command.run(@git_rev1, @git_rev2)
+    end
+    refute out.empty?, "there should be some output"
+    assert err.empty?, "there should be no errors"
+    assert_match /\bshowing changes\b/i, out
+
+
+    # we now remove all comments in a single file
+    filename = File.join(@cloned_dir, 'lib/sparkr.rb')
+    content = File.read(filename)
+    content_without_comments = content.gsub(/\s+#(.+)/, '')
+    File.open(filename, 'w') {|f| f.write(content_without_comments) }
+
+    # running the standard `inch diff` again
+    # should now show some changes
+    out, err = capture_io do
+      @command.run
+    end
+    refute out.empty?, "there should be some output"
+    assert err.empty?, "there should be no errors"
+    assert_match /\bshowing changes\b/i, out
+  end
+end

data/test/integration/cli/command/inspect_test.rb

@@ -1,14 +1,14 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../../../test_helper")
 
 describe ::Inch::CLI::Command::Inspect do
   before do
-    Dir.chdir fixture_path(:simple)
+    Dir.chdir fixture_path(:ruby, :simple)
     @command = ::Inch::CLI::Command::Inspect
   end
 
   it "should warn and exit when run without args" do
     out, err = capture_io do
-      assert_raises(SystemExit) { @command.run() }
+      assert_raises(SystemExit) { @command.run }
     end
     assert out.empty?, "there should be no output"
     refute err.empty?, "there should be some error message"
@@ -33,7 +33,6 @@ describe ::Inch::CLI::Command::Inspect do
     assert err.empty?, "there should be no errors"
   end
 
-
   it "should output some info when run with a definitive object name" do
     out, err = capture_io do
       @command.run("Foo::Qux")
@@ -53,14 +52,14 @@ describe ::Inch::CLI::Command::Inspect do
   end
 
   it "should output colored information" do
-    out, err = capture_io do
+    out, _err = capture_io do
       @command.run("Foo::Bar#")
     end
     refute_equal out.uncolor, out, "should be colored"
   end
 
   it "should output uncolored information when asked" do
-    out, err = capture_io do
+    out, _err = capture_io do
       @command.run("Foo::Bar#", "--no-color")
     end
     assert_equal out.uncolor, out, "should not be colored"

data/test/integration/cli/command/list_test.rb

@@ -1,9 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../../../shared/base_list')
+require File.expand_path(File.dirname(__FILE__) + "/../../../test_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../../../shared/base_list")
 
 describe ::Inch::CLI::Command::List do
   before do
-    Dir.chdir fixture_path(:simple)
+    Dir.chdir fixture_path(:ruby, :simple)
     @command = ::Inch::CLI::Command::List
   end
 
@@ -11,7 +11,7 @@ describe ::Inch::CLI::Command::List do
 
   it "should run without args" do
     out, err = capture_io do
-      @command.run()
+      @command.run
     end
     refute out.empty?, "there should be some output"
     assert err.empty?, "there should be no errors"
@@ -62,4 +62,3 @@ describe ::Inch::CLI::Command::List do
     assert err.empty?, "there should be no errors"
   end
 end
-

data/test/integration/cli/command/show_test.rb

@@ -1,14 +1,14 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../../../test_helper")
 
 describe ::Inch::CLI::Command::Show do
   before do
-    Dir.chdir fixture_path(:simple)
+    Dir.chdir fixture_path(:ruby, :simple)
     @command = ::Inch::CLI::Command::Show
   end
 
   it "should warn and exit when run without args" do
     out, err = capture_io do
-      assert_raises(SystemExit) { @command.run() }
+      assert_raises(SystemExit) { @command.run }
     end
     assert out.empty?, "there should be no output"
     refute err.empty?, "there should be some error message"
@@ -44,14 +44,14 @@ describe ::Inch::CLI::Command::Show do
   end
 
   it "should output colored information" do
-    out, err = capture_io do
+    out, _err = capture_io do
       @command.run("Foo::Bar#")
     end
     refute_equal out.uncolor, out, "should be colored"
   end
 
   it "should output uncolored information when asked" do
-    out, err = capture_io do
+    out, _err = capture_io do
       @command.run("Foo::Bar#", "--no-color")
     end
     assert_equal out.uncolor, out, "should not be colored"

data/test/integration/cli/command/stats_test.rb

@@ -1,14 +1,14 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../../../test_helper")
 
 describe ::Inch::CLI::Command::Stats do
   before do
-    Dir.chdir fixture_path(:simple)
+    Dir.chdir fixture_path(:ruby, :simple)
     @command = ::Inch::CLI::Command::Stats
   end
 
   it "should run without args" do
     out, err = capture_io do
-      @command.run()
+      @command.run
     end
     refute out.empty?, "there should be some output"
     assert err.empty?, "there should be no errors"

data/test/integration/cli/command/suggest_test.rb

@@ -1,19 +1,19 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../../../test_helper")
 
 describe ::Inch::CLI::Command::Suggest do
   before do
-    Dir.chdir fixture_path(:simple)
+    Dir.chdir fixture_path(:ruby, :simple)
     @command = ::Inch::CLI::Command::Suggest
   end
 
   it "should run without args" do
     out, err = capture_io do
-      @command.run()
+      @command.run
     end
     refute out.empty?, "there should be some output"
     assert err.empty?, "there should be no errors"
     assert_match /\bFoo::Bar#method_with_wrong_doc\b/, out
-    assert_match /\bFoo::Bar#method_without_docstring\b/, out
+    assert_match /\bFoo::Bar#method_with_rdoc_doc\b/, out
     assert_match /\bFoo::Bar#method_with_unstructured_doc\b/, out
   end
 
@@ -32,18 +32,18 @@ describe ::Inch::CLI::Command::Suggest do
     refute out.empty?, "there should be some output"
     assert err.empty?, "there should be no errors"
     assert_match /\bFoo::Bar#method_with_wrong_doc\b/, out
-    assert_match /\bFoo::Bar#method_without_docstring\b/, out
+    assert_match /\bFoo::Bar#method_with_rdoc_doc\b/, out
     assert_match /\bFoo::Bar#method_with_unstructured_doc\b/, out
   end
 
   it "should run with non-existing filelist in args" do
-    out, err = capture_io do
+    _out, _err = capture_io do
       @command.run("app/**/*.rb")
     end
     # TODO: not sure what should actually happen here:
     #   no output or error message?
-    #assert out.empty?, "there should be no output"
-    #assert err.empty?, "there should be no errors"
+    # assert out.empty?, "there should be no output"
+    # assert err.empty?, "there should be no errors"
   end
 
   it "should run with --objects switch" do
@@ -53,12 +53,12 @@ describe ::Inch::CLI::Command::Suggest do
     refute out.empty?, "there should be some output"
     assert err.empty?, "there should be no errors"
     assert_match /\bFoo::Bar#method_with_wrong_doc\b/, out
-    assert_match /\bFoo::Bar#method_without_docstring\b/, out
+    assert_match /\bFoo::Bar#method_with_rdoc_doc\b/, out
     assert_match /\bFoo::Bar#method_with_unstructured_doc\b/, out
   end
 
   it "should give error when run with --unknown-switch" do
-    out, err = capture_io do
+    _out, _err = capture_io do
       assert_raises(SystemExit) { @command.run("--unknown-switch") }
     end
   end
@@ -85,8 +85,8 @@ describe ::Inch::CLI::Command::Suggest do
 
   it "should run without args on really good fixture" do
     out, err = capture_io do
-      Dir.chdir fixture_path(:really_good)
-      @command.run()
+      Dir.chdir fixture_path(:ruby, :really_good)
+      @command.run
     end
     refute out.empty?, "there should be some output"
     assert err.empty?, "there should be no errors"
@@ -94,7 +94,7 @@ describe ::Inch::CLI::Command::Suggest do
 
   it "should run with --pedantic switch" do
     out, err = capture_io do
-      Dir.chdir fixture_path(:really_good)
+      Dir.chdir fixture_path(:ruby, :really_good)
       @command.run("--pedantic")
     end
     refute out.empty?, "there should be some output"

data/test/integration/stats_options_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
 
 #
 # These format tests also broke things in the regular testsuite.
@@ -8,7 +8,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 #
 describe ::Inch::CLI::Command::List do
   before do
-    Dir.chdir fixture_path(:simple)
+    Dir.chdir fixture_path(:ruby, :simple)
     @command = "bundle exec inch stats"
   end
 
@@ -20,13 +20,13 @@ describe ::Inch::CLI::Command::List do
   end
 
   it "should run with --no-private switch" do
-    out = %x|#{@command} --format json|
+    out = `#{@command} --format json`
     refute out.empty?, "there should be some output"
     assert_parsed_output JSON[out]
   end
 
   it "should run with --no-protected switch" do
-    out = %x|#{@command} --format yaml|
+    out = `#{@command} --format yaml`
     refute out.empty?, "there should be some output"
     assert_parsed_output YAML.load(out)
   end

data/test/integration/visibility_options_test.rb

@@ -1,13 +1,13 @@
-require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
 
 describe ::Inch::CLI::Command do
   before do
-    Dir.chdir fixture_path(:visibility)
+    Dir.chdir fixture_path(:ruby, :visibility)
     @command = ::Inch::CLI::Command::List
   end
 
   it "should run without visibility switches" do
-    out, err = capture_io do
+    out, _err = capture_io do
       @command.run("--all")
     end
     refute out.empty?, "there should be some output"
@@ -18,7 +18,7 @@ describe ::Inch::CLI::Command do
   end
 
   it "should run with --no-protected switch" do
-    out, err = capture_io do
+    out, _err = capture_io do
       @command.run("--all", "--no-protected")
     end
     refute out.empty?, "there should be some output"
@@ -29,8 +29,8 @@ describe ::Inch::CLI::Command do
   end
 
   it "should run with --no-public switch" do
-    out, err = capture_io do
-      @command.run(*%w|--all --no-public|)
+    out, _err = capture_io do
+      @command.run(*%w(--all --no-public))
     end
     refute out.empty?, "there should be some output"
     refute_match /\bFoo#public_method\b/, out
@@ -40,8 +40,8 @@ describe ::Inch::CLI::Command do
   end
 
   it "should run with --no-public --no-protected switch" do
-    out, err = capture_io do
-      @command.run(*%w|--all --no-public --no-protected|)
+    out, _err = capture_io do
+      @command.run(*%w(--all --no-public --no-protected))
     end
     assert out.empty?, "there should be no output"
     refute_match /\bFoo#public_method\b/, out
@@ -51,8 +51,8 @@ describe ::Inch::CLI::Command do
   end
 
   it "should run with --no-public --no-protected --private switch" do
-    out, err = capture_io do
-      @command.run(*%w|--all --no-public --no-protected --private|)
+    out, _err = capture_io do
+      @command.run(*%w(--all --no-public --no-protected --private))
     end
     refute out.empty?, "there should be some output"
     refute_match /\bFoo#public_method\b/, out
@@ -62,8 +62,8 @@ describe ::Inch::CLI::Command do
   end
 
   it "should run with --no-public switch" do
-    out, err = capture_io do
-      @command.run(*%w|--all --no-public|)
+    out, _err = capture_io do
+      @command.run(*%w(--all --no-public))
     end
     refute out.empty?, "there should be some output"
     refute_match /\bFoo#public_method\b/, out
@@ -73,8 +73,8 @@ describe ::Inch::CLI::Command do
   end
 
   it "should run with --no-protected switch" do
-    out, err = capture_io do
-      @command.run(*%w|--all --no-protected|)
+    out, _err = capture_io do
+      @command.run(*%w(--all --no-protected))
     end
     refute out.empty?, "there should be some output"
     assert_match /\bFoo#public_method\b/, out

data/test/shared/base_list.rb

@@ -3,8 +3,10 @@ module Shared
     extend Minitest::Spec::DSL
 
     it "should give error when run with --unknown-switch" do
-      out, err = capture_io do
-        assert_raises(SystemExit) { @command.run("lib/foo.rb", "--unknown-switch") }
+      _out, _err = capture_io do
+        assert_raises(SystemExit) do
+          @command.run("lib/foo.rb", "--unknown-switch")
+        end
       end
     end
 
@@ -43,7 +45,6 @@ module Shared
       assert_match /\bFoo::Bar#/, out
     end
 
-
     it "should run with --only-undocumented switch" do
       skip
       out, err = capture_io do