inch 0.4.6 → 0.4.7

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

@@ -1,5 +1,5 @@
-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
@@ -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,4 +1,4 @@
-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
@@ -8,7 +8,7 @@ describe ::Inch::CLI::Command::Show do
 
   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,4 +1,4 @@
-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
@@ -8,7 +8,7 @@ describe ::Inch::CLI::Command::Stats 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"

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

@@ -1,4 +1,4 @@
-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
@@ -8,7 +8,7 @@ describe ::Inch::CLI::Command::Suggest 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"
@@ -37,13 +37,13 @@ describe ::Inch::CLI::Command::Suggest do
   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
@@ -58,7 +58,7 @@ describe ::Inch::CLI::Command::Suggest do
   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
@@ -86,7 +86,7 @@ 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()
+      @command.run
     end
     refute out.empty?, "there should be some output"
     assert err.empty?, "there should be no errors"

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.
@@ -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,4 +1,4 @@
-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
@@ -7,7 +7,7 @@ describe ::Inch::CLI::Command do
   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

data/test/test_helper.rb

@@ -1,11 +1,12 @@
-require 'simplecov'
+require "simplecov"
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
-require 'minitest/autorun'
-require 'bundler'
+require "minitest/autorun"
+require "bundler"
 Bundler.require
-require 'inch'
+require "inch"
+require "inch/cli"
 
 def assert_roles(object, expected, unexpected)
   roles = object.roles.map(&:class)
@@ -17,6 +18,16 @@ def assert_roles(object, expected, unexpected)
   end
 end
 
+def count_roles(object, role_class, object_name = nil)
+  find_roles(object, role_class, object_name).size
+end
+
+def find_roles(object, role_class, object_name = nil)
+  object.roles.select do |r|
+    r.class == role_class && (object_name.nil? || r.object.name == object_name)
+  end
+end
+
 def fixture_path(name)
   File.join(File.dirname(__FILE__), "fixtures", name.to_s)
 end

data/test/unit/api/filter_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../../test_helper")
 
 describe ::Inch::API::Filter do
   before do
@@ -13,37 +13,37 @@ describe ::Inch::API::Filter do
   end
 
   it "should work with option: visibility == :public" do
-    @options = {:visibility => [:public]}
+    @options = { visibility: [:public] }
     @context = ::Inch::API::Filter.new @codebase, @options
     assert @context.objects.all? { |o| o.public? }
   end
 
   it "should work with option: visibility == :protected" do
-    @options = {:visibility => [:protected]}
+    @options = { visibility: [:protected] }
     @context = ::Inch::API::Filter.new @codebase, @options
     assert @context.objects.all? { |o| o.protected? }
   end
 
   it "should work with option: visibility == :private" do
-    @options = {:visibility => [:private]}
+    @options = { visibility: [:private] }
     @context = ::Inch::API::Filter.new @codebase, @options
     assert @context.objects.all? { |o| o.private? || o.tagged_as_private? }
   end
 
   it "should work with option: namespaces == :only" do
-    @options = {:namespaces => :only}
+    @options = { namespaces: :only }
     @context = ::Inch::API::Filter.new @codebase, @options
     assert @context.objects.all? { |o| o.namespace? }
   end
 
   it "should work with option: undocumented == :only" do
-    @options = {:undocumented => :only}
+    @options = { undocumented: :only }
     @context = ::Inch::API::Filter.new @codebase, @options
     assert @context.objects.all? { |o| o.undocumented? }
   end
 
   it "should work with option: depth == 2" do
-    @options = {:depth => 2}
+    @options = { depth: 2 }
     @context = ::Inch::API::Filter.new @codebase, @options
     refute @context.objects.any? { |o| o.depth > 2 }
   end

data/test/unit/api/get_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../../test_helper")
 
 describe ::Inch::API::Get do
   before do

data/test/unit/api/list_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../../test_helper")
 
 describe ::Inch::API::List do
   before do

data/test/unit/api/options/base_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../../../test_helper")
 
 describe ::Inch::API::Options::Base do
   class APIOptionsTest < ::Inch::API::Options::Base
@@ -8,7 +8,7 @@ describe ::Inch::API::Options::Base do
   end
 
   it "should work with a Hash or Struct" do
-    @options_hash = {:foo => "foo", :baz => 42}
+    @options_hash = { foo: "foo", baz: 42 }
     @options_struct = OpenStruct.new(@options_hash)
 
     @options1 = APIOptionsTest.new @options_hash
@@ -21,7 +21,7 @@ describe ::Inch::API::Options::Base do
   end
 
   it "should return default values" do
-    @options_hash = {:baz => 42}
+    @options_hash = { baz: 42 }
     @options = APIOptionsTest.new @options_hash
 
     assert_equal :bar, @options.foo

data/test/unit/api/stats_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../../test_helper")
 
 describe ::Inch::API::Stats do
   before do

data/test/unit/api/suggest_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../../test_helper")
 
 describe ::Inch::API::Suggest do
   before do
@@ -13,10 +13,10 @@ describe ::Inch::API::Suggest do
   end
 
   it "should work with option: object_count" do
-    @options = {:object_count => 10}
+    @options = { object_count: 10 }
     @context = ::Inch::API::Suggest.new @codebase, @options
 
-    @options2 = {:object_count => 20}
+    @options2 = { object_count: 20 }
     @context2 = ::Inch::API::Suggest.new @codebase, @options2
 
     assert_equal 10, @context.objects.size

data/test/unit/cli/arguments_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../../test_helper")
 
 describe ::Inch::CLI::Arguments do
   before do

data/test/unit/cli/command/base_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../../../test_helper")
 
 describe ::Inch::CLI::Command::Console do
   before do

data/test/unit/cli/command/options/base_list_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../../../../test_helper")
 
 describe ::Inch::CLI::Command::Options::BaseList do
   it "should run parse without errors" do
@@ -10,7 +10,7 @@ describe ::Inch::CLI::Command::Options::BaseList do
     assert @options.undocumented.nil?
     assert @options.depth.nil?
   end
-  
+
   it "should run parse twice without affecting the second run" do
     @options = ::Inch::CLI::Command::Options::BaseList.new
     @options.parse(["--no-public", "--no-protected", "--private"])

data/test/unit/cli/command/options/base_object_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../../../../test_helper")
 
 describe ::Inch::CLI::Command::Options::BaseObject do
   it "should run parse without errors" do

data/test/unit/cli/command/options/base_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../../../../test_helper")
 
 describe ::Inch::CLI::Command::Options::Base do
   it "should run parse without errors" do

data/test/unit/cli/command_parser_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + "/../../test_helper")
 
 describe ::Inch::CLI::CommandParser do
   before do
@@ -8,7 +8,7 @@ describe ::Inch::CLI::CommandParser do
 
   it "should run without args" do
     out, err = capture_io do
-      @command = @command_parser.run()
+      @command = @command_parser.run
     end
     refute out.empty?, "there should be some output"
     assert err.empty?, "there should be no errors"

data/test/unit/cli/trace_helper_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 Tracer
   include ::Inch::CLI::TraceHelper