sandi_meter 1.1.8 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54a3a95954d2e42aaf57f24b88a0988b793015b2
-  data.tar.gz: 0b71ff002bb37ceee3e65b2d70ba3ebd8ff1db35
+  metadata.gz: 9a83923b441f198ed909f5cc7e0b3933b4b0b2ad
+  data.tar.gz: 5f0d9b05649988b2c7e2094ee81490212be49444
 SHA512:
-  metadata.gz: bfbf7a4c4374cdc0f78ef62faf90500fcf2e85895fb2f52d26da3ed66b6c9507b9fb8c0a72350fa1e50dfd54e3f1865a255217f4e2a99bbed43b871b45efcc7c
-  data.tar.gz: 7e7158e10271549a4c5fad4004874bacb629e6dc77efd8d9db36c8f35f42dfbe9019c63ab459d9175843cb1c7ff9f98d249d0b1b83d8ea7d01974d50afb0dc3d
+  metadata.gz: 7b35f03467396393d3ce937b5850c3cd1e6d1ac83becbc137feac43d7bb1b904e1fc21f3f195150b98dd7daa8c917406e30ad06bd7490bfc02a7fd71e51e69f5
+  data.tar.gz: 047facafdc3447ea5c37ed7e11260504fe6e7fb2e42f980b65e04f3a673d1bcaabc54328a9b33471cca1e4cabbbc14b7c5e095fccdd96da73cfcdbcfd6eced64

data/README.md

@@ -7,7 +7,7 @@ Static analysis tool for checking your Ruby code for [Sandi Metz' four rules](ht
 * 100 lines per class
 * 5 lines per method
 * 4 params per method call (and don't even try cheating with hash params)
-* 1 instance variables per controller' action
+* 1 instance variable per controller action
 
 ## CLI mode
 
@@ -19,8 +19,12 @@ sandi_meter --help
     -g, --graph                      HTML mode. Create folder, log data and output stats to HTML file.
         --json                       Output as JSON
     -l, --log                        Show syntax error and indentation log output
-    -p, --path PATH                  Path to folder or file to analyze (default is ".")
+    -o, --output-path PATH           Path for storing generated output files (default: ./sandi_meter/)
+    -p, --path PATH                  Path to folder or file to analyze
+    -q, --quiet                      Do not open HTML report for graph option in browser.
+    -t, --thresholds THRESHOLD       Thresholds for each rule (default: "90,90,90,90" or in config.yml)
     -r, --rules                      Show rules
+    -v, --version                    Gem version
     -h, --help                       Help
 
 cd ~/your/ruby/or/rails/project

data/lib/sandi_meter/cli.rb

@@ -21,6 +21,11 @@ module SandiMeter
       description: "Path to folder or file to analyze",
       default: "."
 
+    option :output_path,
+      short: "-o PATH",
+      long: "--output-path PATH",
+      description: "Path for storing generated output files (default: ./sandi_meter/)"
+
     option :log,
       short: "-l",
       long: "--log",
@@ -70,6 +75,12 @@ module SandiMeter
       long: "--json",
       description: "Output as JSON",
       boolean: false
+
+    option :rule_thresholds,
+      short: "-t THRESHOLD",
+      long: "--thresholds THRESHOLD",
+      description: "Thresholds for each rule (default: 90,90,90,90) or in config.yml",
+      default: "90,90,90,90"
   end
 
   class CLI
@@ -78,12 +89,15 @@ module SandiMeter
         cli = CommandParser.new
         cli.parse_options
 
+        cli.config[:output_path] ||= File.expand_path(File.join(cli.config[:path], 'sandi_meter'))
+
+        cli.config[:rule_thresholds] = cli.config[:rule_thresholds].split(",").map(&:to_i)
+
         if cli.config[:graph]
-          log_dir_path = File.join(cli.config[:path], 'sandi_meter')
-          FileUtils.mkdir(log_dir_path) unless Dir.exists?(log_dir_path)
+          FileUtils.mkdir_p(cli.config[:output_path]) unless Dir.exists?(cli.config[:output_path])
 
-          create_config_file(cli.config[:path], 'sandi_meter/.sandi_meter', %w(db vendor).join("\n"))
-          create_config_file(cli.config[:path], 'sandi_meter/config.yml', YAML.dump({ threshold: 90 }))
+          create_config_file(cli.config[:output_path], '.sandi_meter', %w(db vendor).join("\n"))
+          create_config_file(cli.config[:output_path], 'config.yml', YAML.dump({ thresholds: [90, 90, 90, 90] }))
         end
 
         if cli.config[:version]
@@ -108,16 +122,16 @@ module SandiMeter
         formatter.print_data(data)
 
         if cli.config[:graph]
-          if File.directory?(cli.config[:path])
+          if File.directory?(cli.config[:output_path])
             logger = SandiMeter::Logger.new(data)
-            logger.log!(cli.config[:path])
+            logger.log!(cli.config[:output_path])
 
             html_generator = SandiMeter::HtmlGenerator.new
-            html_generator.copy_assets!(cli.config[:path])
-            html_generator.generate_data!(cli.config[:path])
-            html_generator.generate_details!(cli.config[:path], data)
+            html_generator.copy_assets!(cli.config[:output_path])
+            html_generator.generate_data!(cli.config[:output_path])
+            html_generator.generate_details!(cli.config[:output_path], data)
 
-            index_html_path = File.join(cli.config[:path], 'sandi_meter/index.html')
+            index_html_path = File.join(cli.config[:output_path], 'index.html')
             unless cli.config[:quiet]
               open_in_browser(index_html_path)
             end
@@ -126,11 +140,11 @@ module SandiMeter
           end
         end
 
-        config_file_path = File.join(cli.config[:path], 'sandi_meter', 'config.yml')
+        config_file_path = File.join(cli.config[:output_path], 'config.yml')
         config =  if File.exists?(config_file_path)
                     YAML.load(File.read(config_file_path))
                   else
-                    { threshold: 90 }
+                    { thresholds: cli.config[:rule_thresholds] }
                   end
 
         if RulesChecker.new(data, config).ok?

data/lib/sandi_meter/html_generator.rb

@@ -4,19 +4,19 @@ require 'json'
 module SandiMeter
   class HtmlGenerator
     def copy_assets!(path)
-      asset_dir_path = File.join(path, 'sandi_meter/assets')
+      asset_dir_path = File.join(path, 'assets')
       FileUtils.mkdir(asset_dir_path) unless Dir.exists?(asset_dir_path)
+      html_dir = File.expand_path('../../html', File.dirname(__FILE__))
 
-
-      Dir[File.join(File.dirname(__FILE__), "../../html/*.{js,css,png}")].each do |file|
+      Dir[File.join(html_dir, "*.{js,css,png}")].each do |file|
         FileUtils.cp file, File.join(asset_dir_path, File.basename(file))
       end
 
-      FileUtils.cp File.join(File.dirname(__FILE__), "../../html", "index.html"), File.join(path, 'sandi_meter', 'index.html')
+      FileUtils.cp File.join(html_dir, 'index.html'), File.join(path, 'index.html')
     end
 
     def generate_data!(path)
-      raw_data = File.read(File.join(path, 'sandi_meter', 'sandi_meter.log')).split("\n")
+      raw_data = File.read(File.join(path, 'sandi_meter.log')).split("\n")
       raw_data.map! { |row| row.split(';').map(&:to_i) }
 
       data = []
@@ -31,7 +31,7 @@ module SandiMeter
         data << hash
       end
 
-      index_file = File.join(path, 'sandi_meter', 'index.html')
+      index_file = File.join(path, 'index.html')
       index = File.read(index_file)
       index.gsub!('<% plot_data %>', data.to_json)
 
@@ -91,7 +91,7 @@ module SandiMeter
         )
       end
 
-      index_file = File.join(path, 'sandi_meter', 'index.html')
+      index_file = File.join(path, 'index.html')
       index = File.read(index_file)
       index.gsub!('<% details %>', details)
 

data/lib/sandi_meter/logger.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 module SandiMeter
   class Logger < Struct.new(:data)
     def log!(path)
-      File.open(File.join(path, 'sandi_meter', 'sandi_meter.log'), 'a') do |file|
+      File.open(File.join(path, 'sandi_meter.log'), 'a') do |file|
         file.puts(log_line)
       end
     end

data/lib/sandi_meter/rules_checker.rb

@@ -10,12 +10,18 @@ module SandiMeter
     end
 
     def ok?
-      @rules.reduce(:+) / 4 > @config[:threshold]
+      if @config[:threshold]
+        puts "DEPRECATION WARNING: sandi_meter threshold will be deprecated. Set thresholds for each rule in sandi_meter config.yml"
+
+        @rules.reduce(:+) / 4 > @config[:threshold]
+      elsif @config[:thresholds]
+        @rules.each_with_index.map { |percentage, index| percentage >= @config[:thresholds][index].to_f }.reduce(:&)
+      end
     end
 
     private
     def percentage(amount, total)
-      total > 0 ? (amount / total.to_f)*100 : 100
+      total > 0 ? (amount / total.to_f) * 100 : 100
     end
   end
 end

data/lib/sandi_meter/version.rb

@@ -1,3 +1,3 @@
 module SandiMeter
-  VERSION = "1.1.8"
+  VERSION = "1.2.0"
 end

data/lib/sandi_meter/warning_scanner.rb

@@ -21,7 +21,7 @@ module SandiMeter
 
     private
     def validate(source)
-      Open3.capture3('ruby -wc', stdin_data: source)
+      Open3.capture3("#{RUBY_ENGINE} -wc", stdin_data: source)
     end
 
     def check_syntax(status)

data/spec/analyzer_spec.rb

@@ -14,7 +14,7 @@ describe SandiMeter::Analyzer do
     it 'finds indentation warnings for method' do
       klass = analyzer.classes.find { |c| c.name == "TestClass" }
 
-      klass.should have_attributes(
+      expect(klass).to have_attributes(
         first_line: 1,
         last_line: 5,
         path: test_file_path(3)
@@ -24,7 +24,7 @@ describe SandiMeter::Analyzer do
     it 'finds methods' do
       method = analyzer.methods["TestClass"].find { |m| m.name == "blah" }
 
-      method.should have_attributes(
+      expect(method).to have_attributes(
         first_line: 2,
         last_line: 4,
         number_of_arguments: 0,
@@ -35,7 +35,7 @@ describe SandiMeter::Analyzer do
     it 'finds method calls that brakes third rule' do
       method_call = analyzer.method_calls.first
 
-      method_call.should have_attributes(
+      expect(method_call).to have_attributes(
         first_line: 3,
         number_of_arguments: 5,
         path: test_file_path(3)
@@ -53,7 +53,7 @@ describe SandiMeter::Analyzer do
     it 'finds indentation warnings for method' do
       klass = analyzer.classes.find { |c| c.name == "MyApp::TestClass" }
 
-      klass.should have_attributes(
+      expect(klass).to have_attributes(
         first_line: 2,
         last_line: nil,
         path: test_file_path(1)
@@ -63,7 +63,7 @@ describe SandiMeter::Analyzer do
     it 'finds methods' do
       method = analyzer.methods["MyApp::TestClass"].find { |m| m.name == "blah" }
 
-      method.should have_attributes(
+      expect(method).to have_attributes(
         first_line: 3,
         last_line: nil,
         number_of_arguments: 0,
@@ -82,7 +82,7 @@ describe SandiMeter::Analyzer do
     it 'finds classes' do
       klass = analyzer.classes.find { |c| c.name == "FirstTestClass" }
 
-      klass.should have_attributes(
+      expect(klass).to have_attributes(
         first_line: 1,
         last_line: 4,
         path: test_file_path(4)
@@ -90,7 +90,7 @@ describe SandiMeter::Analyzer do
 
       klass = analyzer.classes.find { |c| c.name == "SecondTestClass" }
 
-      klass.should have_attributes(
+      expect(klass).to have_attributes(
         first_line: 6,
         last_line: 9,
         path: test_file_path(4)
@@ -100,7 +100,7 @@ describe SandiMeter::Analyzer do
     it 'finds methods' do
       method = analyzer.methods["FirstTestClass"].find { |m| m.name == "first_meth" }
 
-      method.should have_attributes(
+      expect(method).to have_attributes(
         first_line: 2,
         last_line: 3,
         number_of_arguments: 1,
@@ -109,7 +109,7 @@ describe SandiMeter::Analyzer do
 
       method = analyzer.methods["SecondTestClass"].find { |m| m.name == "second_meth" }
 
-      method.should have_attributes(
+      expect(method).to have_attributes(
         first_line: 7,
         last_line: 8,
         number_of_arguments: 1,
@@ -128,7 +128,7 @@ describe SandiMeter::Analyzer do
     it 'finds classes' do
       klass = analyzer.classes.find { |c| c.name == "OneLinerClass" }
 
-      klass.should have_attributes(
+      expect(klass).to have_attributes(
         first_line: 1,
         last_line: nil,
         path: test_file_path(5)
@@ -136,7 +136,7 @@ describe SandiMeter::Analyzer do
     end
 
     it 'finds methods' do
-      analyzer.methods.should be_empty
+      expect(analyzer.methods).to be_empty
     end
   end
 
@@ -149,14 +149,14 @@ describe SandiMeter::Analyzer do
 
     it 'finds class and subclass' do
       klass = analyzer.classes.find { |c| c.name == "MyApp::Blah::User" }
-      klass.should have_attributes(
+      expect(klass).to have_attributes(
         first_line: 5,
         last_line: 13,
         path: test_file_path(7)
       )
 
       klass = analyzer.classes.find { |c| c.name == "MyApp::Blah::User::SubUser" }
-      klass.should have_attributes(
+      expect(klass).to have_attributes(
         first_line: 9,
         last_line: 12,
         path: test_file_path(7)
@@ -165,7 +165,7 @@ describe SandiMeter::Analyzer do
 
     it 'finds methods' do
       method = analyzer.methods["MyApp::Blah"].find { |m| m.name == "module_meth" }
-      method.should have_attributes(
+      expect(method).to have_attributes(
         first_line: 2,
         last_line: 3,
         number_of_arguments: 0,
@@ -173,7 +173,7 @@ describe SandiMeter::Analyzer do
       )
 
       method = analyzer.methods["MyApp::Blah::User"].find { |m| m.name == "class_meth" }
-      method.should have_attributes(
+      expect(method).to have_attributes(
         first_line: 6,
         last_line: 7,
         number_of_arguments: 0,
@@ -181,7 +181,7 @@ describe SandiMeter::Analyzer do
       )
 
       method = analyzer.methods["MyApp::Blah::User::SubUser"].find { |m| m.name == "sub_meth" }
-      method.should have_attributes(
+      expect(method).to have_attributes(
         first_line: 10,
         last_line: 11,
         number_of_arguments: 0,
@@ -199,7 +199,7 @@ describe SandiMeter::Analyzer do
 
     it 'finds class and subclass' do
       klass = analyzer.classes.find { |c| c.name == "RailsController" }
-      klass.should have_attributes(
+      expect(klass).to have_attributes(
         first_line: 1,
         last_line: 12,
         path: test_file_path(8)
@@ -208,7 +208,7 @@ describe SandiMeter::Analyzer do
 
     it 'finds methods' do
       method = analyzer.methods["RailsController"].find { |m| m.name == "index" }
-      method.should have_attributes(
+      expect(method).to have_attributes(
         first_line: 2,
         last_line: 3,
         number_of_arguments: 0,
@@ -216,7 +216,7 @@ describe SandiMeter::Analyzer do
       )
 
       method = analyzer.methods["RailsController"].find { |m| m.name == "destroy" }
-      method.should have_attributes(
+      expect(method).to have_attributes(
         first_line: 5,
         last_line: 6,
         number_of_arguments: 0,
@@ -224,7 +224,7 @@ describe SandiMeter::Analyzer do
       )
 
       method = analyzer.methods["RailsController"].find { |m| m.name == "private_meth" }
-      method.should be_nil
+      expect(method).to be_nil
     end
   end
 
@@ -238,7 +238,7 @@ describe SandiMeter::Analyzer do
 
       it 'finds instance variable' do
         method = analyzer.methods["UsersController"].find { |m| m.name == "index" }
-        method.ivars.should eq(["@users"])
+        expect(method.ivars).to eq(["@users"])
       end
     end
 
@@ -251,7 +251,7 @@ describe SandiMeter::Analyzer do
 
       it 'does not find instance variables' do
         method = analyzer.methods["GuestController"].find { |m| m.name == "create_guest_user" }
-        method.ivars.should be_empty
+        expect(method.ivars).to be_empty
       end
     end
 
@@ -264,10 +264,10 @@ describe SandiMeter::Analyzer do
 
       it 'does not find instance variable' do
         method = analyzer.methods["User"].find { |m| m.name == "initialize" }
-        method.ivars.should be_empty
+        expect(method.ivars).to be_empty
 
         method = analyzer.methods["User"].find { |m| m.name == "hi" }
-        method.ivars.should be_empty
+        expect(method.ivars).to be_empty
       end
     end
 
@@ -280,22 +280,22 @@ describe SandiMeter::Analyzer do
 
       it 'finds method defined after public keyword' do
         method = analyzer.methods["UsersController"].find { |m| m.name == "create" }
-        method.ivars.should eq(["@user"])
+        expect(method.ivars).to eq(["@user"])
       end
 
       it 'omits actions without instance variables' do
         method = analyzer.methods["UsersController"].find { |m| m.name == "show" }
-        method.ivars.should be_empty
+        expect(method.ivars).to be_empty
       end
 
       it 'omits private methods' do
         method = analyzer.methods["UsersController"].find { |m| m.name == "find_user" }
-        method.should be_nil
+        expect(method).to be_nil
       end
 
       it 'omits protected methods' do
         method = analyzer.methods["UsersController"].find { |m| m.name == "protected_find_user" }
-        method.should be_nil
+        expect(method).to be_nil
       end
     end
   end
@@ -310,7 +310,7 @@ describe SandiMeter::Analyzer do
     it 'counts arguments' do
       method_call = analyzer.method_calls.first
 
-      method_call.should have_attributes(
+      expect(method_call).to have_attributes(
         first_line: 3,
         number_of_arguments: 5,
         path: test_file_path(11)
@@ -328,7 +328,7 @@ describe SandiMeter::Analyzer do
     it 'are count for class definition' do
       klass = analyzer.classes.find { |c| c.name == "Valera" }
 
-      klass.should have_attributes(
+      expect(klass).to have_attributes(
         first_line: 1,
         last_line: 109,
         path: test_file_path(12)
@@ -338,7 +338,7 @@ describe SandiMeter::Analyzer do
     it 'are count for method definition' do
       method = analyzer.methods["Valera"].find { |m| m.name == "doodle" }
 
-      method.should have_attributes(
+      expect(method).to have_attributes(
         first_line: 2,
         last_line: 9,
         number_of_arguments: 0,
@@ -355,7 +355,7 @@ describe SandiMeter::Analyzer do
     end
 
     it 'is not scanned' do
-      analyzer.method_calls.should be_empty
+      expect(analyzer.method_calls).to be_empty
     end
   end
 
@@ -370,7 +370,7 @@ describe SandiMeter::Analyzer do
     it 'mark 4line methods good' do
       method = analyzer.methods["TestClass"].find { |m| m.name == "render4" }
 
-      method.should have_attributes(
+      expect(method).to have_attributes(
         first_line: 2,
         last_line: 7,
         number_of_arguments: 0,
@@ -381,7 +381,7 @@ describe SandiMeter::Analyzer do
     it 'mark 5line methods good' do
       method = analyzer.methods["TestClass"].find { |m| m.name == "render5" }
 
-      method.should have_attributes(
+      expect(method).to have_attributes(
         first_line: 9,
         last_line: 15,
         number_of_arguments: 0,
@@ -392,7 +392,7 @@ describe SandiMeter::Analyzer do
     it 'mark 6line methods bad' do
       method = analyzer.methods["TestClass"].find { |m| m.name == "render6" }
 
-      method.should have_attributes(
+      expect(method).to have_attributes(
         first_line: 17,
         last_line: 24,
         number_of_arguments: 0,

data/spec/calculator_spec.rb

@@ -17,13 +17,13 @@ describe SandiMeter::Calculator do
     it 'counts class lines' do
       output = calculator.calculate!(true)
       klass = output[:first_rule][:log][:classes].find { |params| params.first == "User" }
-      klass[1].should eq(109)
+      expect(klass[1]).to eq(109)
     end
 
     it 'counts method lines' do
       output = calculator.calculate!(true)
       method_params = output[:second_rule][:log][:methods].find { |method| method[1] == "create" }
-      method_params[2].should eq(6)
+      expect(method_params[2]).to eq(6)
     end
   end
 
@@ -69,12 +69,12 @@ describe SandiMeter::Calculator do
   describe 'no matching ruby files found' do
     it 'counts class lines' do
       output = calculator.calculate!(false)
-      output[:first_rule][:total_classes_amount].should eql(0)
+      expect(output[:first_rule][:total_classes_amount]).to eql(0)
     end
 
     it 'counts method lines' do
       output = calculator.calculate!(true)
-      output[:second_rule][:total_methods_amount].should eql(0)
+      expect(output[:second_rule][:total_methods_amount]).to eq(0)
     end
   end
 end

data/spec/cli_spec.rb

@@ -2,25 +2,37 @@ require 'test_helper'
 require_relative '../lib/sandi_meter/cli'
 
 describe SandiMeter::CLI do
+  include FakeFS::SpecHelpers
+
   let(:cli) { SandiMeter::CLI }
-  
-  describe '#execute' do
-    before do 
+  let(:gem_root) { File.expand_path('../', File.dirname(__FILE__)) }
+
+  before do
+    FakeFS.activate!
+
+    FakeFS::FileSystem.clone(gem_root)
+  end
+
+  after do
+    FakeFS.deactivate!
+  end
+
+  describe '#execute', silent_cli: true do
+    before do
       @original_argv = ARGV
       ARGV.clear
     end
-    
-    after do 
+
+    after do
       ARGV.clear
       ARGV.concat(@original_argv)
     end
-    
+
     context 'with the graph flag passed in' do
       before { ARGV.push('-g') }
-      after { ARGV.pop }
-      
+
       it 'opens the graph in a web browser' do
-        cli.should_receive(:open_in_browser)
+        expect(cli).to receive(:open_in_browser)
         expect { cli.execute }.to raise_error(SystemExit)
       end
     end
@@ -30,15 +42,64 @@ describe SandiMeter::CLI do
         ARGV.push('-q')
         ARGV.push('-g')
       end
-      after do 
-        ARGV.pop 
-        ARGV.pop 
-      end
-      
+
       it 'does not open the browser' do
-        cli.should_not_receive(:open_in_browser)
+        expect(cli).to_not receive(:open_in_browser)
         expect { cli.execute }.to raise_error(SystemExit)
       end
     end
+
+    context 'output path passed in' do
+      let(:test_path) { '/test_out_dir/test2' }
+      before do
+        ARGV.push('-q')
+        ARGV.push('-g')
+        ARGV.push('-o')
+        ARGV.push(test_path)
+      end
+
+      it 'saves output files to specified output path' do
+        expect { cli.execute }.to raise_error(SystemExit)
+        expect(File.directory?(test_path)).to eq(true)
+      end
+    end
+
+    context 'output path not specified' do
+      before do
+        ARGV.push('-q')
+        ARGV.push('-g')
+        ARGV.push('-p')
+        ARGV.push('/')
+      end
+
+      it 'saves output files in sandi_meter folder relative to scanned path' do
+        expect { cli.execute }.to raise_error(SystemExit)
+        expect(File.directory?(File.expand_path('/sandi_meter'))).to eq(true)
+      end
+    end
+
+    context 'makes account for rules thresholds' do
+      context 'for low thresholds' do
+        before do
+          ARGV.push('-t')
+          ARGV.push("1,1,1,1")
+        end
+
+        it 'terminates with 0 code' do
+          expect { cli.execute }.to terminate.with_code(0)
+        end
+      end
+
+      context 'for high thresholds' do
+        before do
+          ARGV.push('-t')
+          ARGV.push("99,99,99,99")
+        end
+
+        it 'terminates with 1 code' do
+          expect { cli.execute }.to terminate.with_code(1)
+        end
+      end
+    end
   end
 end

data/spec/loc_checker_spec.rb

@@ -8,24 +8,24 @@ describe SandiMeter::LOCChecker do
     context 'for short code' do
       before do
         stub_const('SandiMeter::LOCChecker::MAX_LOC', { 'blah' => 10 })
-        checker.stub(:locs_size).and_return(rand(0..10))
+        allow(checker).to receive(:locs_size).and_return(rand(0..10))
       end
 
       # REFACTOR
       # avoid passing dumb arguments to tested methods
       it 'passes the check' do
-        checker.check([1,2,3], 'blah').should be_true
+        expect(checker.check([1,2,3], 'blah')).to eq true
       end
     end
 
     context 'for large code' do
       before do
         stub_const('SandiMeter::LOCChecker::MAX_LOC', { 'blah' => 10 })
-        checker.stub(:locs_size).and_return(rand(11..100))
+        allow(checker).to receive(:locs_size).and_return(rand(11..100))
       end
 
       it 'does not pass the check' do
-        checker.check([1,2,3], 'blah').should be_false
+        expect(checker.check([1,2,3], 'blah')).to eq false
       end
     end
   end

data/spec/method_arguments_counter_spec.rb

@@ -10,8 +10,8 @@ describe SandiMeter::MethodArgumentsCounter do
     let(:args_add_block_2) { load_args_block('blah(arg1, arg2)')}
 
     it 'counts arguments' do
-      analyzer.count(args_add_block_1).should eq([2, 1])
-      analyzer.count(args_add_block_2).should eq([2, 1])
+      expect(analyzer.count(args_add_block_1)).to eq([2, 1])
+      expect(analyzer.count(args_add_block_2)).to eq([2, 1])
     end
   end
 
@@ -23,10 +23,10 @@ describe SandiMeter::MethodArgumentsCounter do
     let(:args_add_block_4) { load_args_block('blah(k1: :v1, k2: :v2)') }
 
     it 'counts arguments' do
-      analyzer.count(args_add_block_1).should eq([1, 1])
-      analyzer.count(args_add_block_2).should eq([1, 1])
-      analyzer.count(args_add_block_3).should eq([2, 1])
-      analyzer.count(args_add_block_4).should eq([2, 1])
+      expect(analyzer.count(args_add_block_1)).to eq([1, 1])
+      expect(analyzer.count(args_add_block_2)).to eq([1, 1])
+      expect(analyzer.count(args_add_block_3)).to eq([2, 1])
+      expect(analyzer.count(args_add_block_4)).to eq([2, 1])
     end
   end
 
@@ -37,13 +37,13 @@ describe SandiMeter::MethodArgumentsCounter do
     let(:code_4) { load_args_block('blah(arg_1, arg_2, k1: :v1, k2: :v2)') }
 
     it 'counts arguments' do
-      analyzer.count(code_1).should eq([3, 1])
-      analyzer.count(code_2).should eq([3, 1])
+      expect(analyzer.count(code_1)).to eq([3, 1])
+      expect(analyzer.count(code_2)).to eq([3, 1])
     end
 
     it 'counts hash keys as argumets' do
-      analyzer.count(code_3).should eq([4, 1])
-      analyzer.count(code_4).should eq([4, 1])
+      expect(analyzer.count(code_3)).to eq([4, 1])
+      expect(analyzer.count(code_4)).to eq([4, 1])
     end
   end
 
@@ -52,8 +52,8 @@ describe SandiMeter::MethodArgumentsCounter do
     let(:code_2) { load_args_block('blah(arg_1 = "blah")') }
 
     it 'counts arguments' do
-      analyzer.count(code_1).should eq([1, 1])
-      analyzer.count(code_2).should eq([1, 1])
+      expect(analyzer.count(code_1)).to eq([1, 1])
+      expect(analyzer.count(code_2)).to eq([1, 1])
     end
   end
 end

data/spec/rules_checker_spec.rb

@@ -13,11 +13,11 @@ describe SandiMeter::RulesChecker do
 
   describe "#ok?" do
     it "returns false with 100 threshold" do
-      expect(SandiMeter::RulesChecker.new(conditions, {threshold: 100})).to_not be_ok
+      expect(SandiMeter::RulesChecker.new(conditions, {thresholds: [100, 100, 100, 100]})).to_not be_ok
     end
 
     it "returns true with threshold less than 100" do
-      expect(SandiMeter::RulesChecker.new(conditions, {threshold: 50})).to be_ok
+      expect(SandiMeter::RulesChecker.new(conditions, {thresholds: [50, 100, 100, 100]})).to be_ok
     end
   end
 end

data/spec/support/attr_matcher.rb

@@ -10,7 +10,7 @@ RSpec::Matchers.define :have_attributes do |expected|
     result
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     wrong_fields = {}
     expected.each do |key, value|
       wrong_fields[key] = {

data/spec/support/terminate_matcher.rb

@@ -0,0 +1,39 @@
+#https://gist.github.com/mmasashi/58bd7e2668836a387856
+
+RSpec::Matchers.define :terminate do |code|
+  actual = nil
+
+  def supports_block_expectations?
+    true
+  end
+
+  match do |block|
+    begin
+      block.call
+    rescue SystemExit => e
+      actual = e.status
+    end
+    actual and actual == status_code
+  end
+
+  chain :with_code do |status_code|
+    @status_code = status_code
+  end
+
+  failure_message do |block|
+    "expected block to call exit(#{status_code}) but exit" +
+      (actual.nil? ? " not called" : "(#{actual}) was called")
+  end
+
+  failure_message_when_negated do |block|
+    "expected block not to call exit(#{status_code})"
+  end
+
+  description do
+    "expect block to call exit(#{status_code})"
+  end
+
+  def status_code
+    @status_code ||= 0
+  end
+end

data/spec/test_helper.rb

@@ -1,4 +1,22 @@
-require 'rspec/autorun'
+require 'pry'
 require 'ripper'
+require 'fakefs/spec_helpers'
+
+# silence CLI output
+RSpec.configure do |config|
+  original_stderr = $stderr
+  original_stdout = $stdout
+
+  config.before silent_cli: true do
+    # Redirect stderr and stdout
+    $stderr = File.open(File::NULL, "w")
+    $stdout = File.open(File::NULL, "w")
+  end
+
+  config.after silent_cli: true do
+    $stderr = original_stderr
+    $stdout = original_stdout
+  end
+end
 
 Dir["#{Dir.pwd}/spec/support/**/*.rb"].each { |f| require f }

data/spec/warning_scanner_spec.rb

@@ -12,15 +12,15 @@ describe SandiMeter::WarningScanner do
     end
 
     it 'finds indentation warnings for method' do
-      scanner.indentation_warnings['def'].should eq([[3, 4]])
+      expect(scanner.indentation_warnings['def']).to eq([[3, 4]])
     end
 
     it 'finds indentation warnings for class' do
-      scanner.indentation_warnings['class'].should eq([[2, 5]])
+      expect(scanner.indentation_warnings['class']).to eq([[2, 5]])
     end
 
     it 'finds indentation warnings for module' do
-      scanner.indentation_warnings['module'].should eq([[1, 6]])
+      expect(scanner.indentation_warnings['module']).to eq([[1, 6]])
     end
   end
 

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: sandi_meter
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.0
 platform: ruby
 authors:
 - Anatoli Makarevich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Sandi Metz rules checker
@@ -105,7 +105,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- sandi_meter.gemspec
+- bin/sandi_meter
 - html/_detail_block.html
 - html/chart.js
 - html/forkme.png
@@ -131,7 +131,7 @@ files:
 - lib/sandi_meter/sandi_meter/method_call.rb
 - lib/sandi_meter/version.rb
 - lib/sandi_meter/warning_scanner.rb
-- bin/sandi_meter
+- sandi_meter.gemspec
 - spec/analyzer_spec.rb
 - spec/calculator_spec.rb
 - spec/cli_spec.rb
@@ -141,6 +141,7 @@ files:
 - spec/support/args_loader.rb
 - spec/support/attr_matcher.rb
 - spec/support/helper_methods.rb
+- spec/support/terminate_matcher.rb
 - spec/test_classes/1.rb
 - spec/test_classes/10.rb
 - spec/test_classes/10_controller.rb
@@ -171,17 +172,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sandi Metz rules checker