preek 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c585c8febf862238a426fd347775911454140bbb
-  data.tar.gz: e1ec29fbab5d972d84a4abf5731cd815cd1d2e83
+  metadata.gz: 3de170e7e48fb838dc8486e5e454193df7ada8a5
+  data.tar.gz: f03da30344efc94f3348a0832c8c3cb436c806c3
 SHA512:
-  metadata.gz: fa32eff70b87f0f4ebfa3ff282ed72399d15192fb537b403163c75f284f3486f4001a82d5631f40f33c8581068a6a91823bf8723ec101742fe928170007a4ed2
-  data.tar.gz: 52f8ef1a293c65142a1d834e499a581d91f505f1dc9d81c56c5895f33b5183c93a431ed51ae807b49014b21c2e842164935c1cb8ff523b5499e695b590768883
+  metadata.gz: 13658f79c1f9748410bde706afa47a2ae53a09abe776a1cf8129f9a117e6c2e374aabbca76a489ba2d26457fd6ff65d4dd26480ca81f21cc021cf59430cb0377
+  data.tar.gz: 452cda3f91a5d0e2c3ee7e2d3c1eb1fbdcaa513c46273c2d9e1845870385f6c89be9ee1643b38ac7cdab229e3292642887f33cde1fc44c9fd672291c93457dc3

data/.rspec

@@ -1,2 +1 @@
 --color
---format documentation

data/README.md

@@ -63,6 +63,16 @@ Preek::Smell(filenames, excludes)
 
 ```
 
+### Git
+To run preek on your code before commit, place this in `.git/hooks/pre-commit`
+
+```bash
+#!/bin/sh
+exec bundle exec preek git
+0
+```
+
+
 ## Contributing
 
 1. Fork it

data/lib/preek/cli.rb

@@ -38,11 +38,11 @@ module Preek
 
     desc 'git', 'Run Preek on git changes'
     def git
-      args = git_status.scan(/[ M?]+(.*\.rb)/).flatten
+      args = git_status.scan(/[ M?]{2} (.*\.rb)/).flatten
       smell *args unless args.empty?
     end
 
-  private
+    private
 
     def git_status
       `git status -s`

data/lib/preek/version.rb

@@ -1,3 +1,3 @@
 module Preek
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/spec/cli_spec.rb

@@ -16,12 +16,12 @@ describe Preek::CLI do
 
       context 'with no argument' do
         Given(:args){ [] }
-        Then{ output.should include("was called with no arguments")}
+        Then{ expect(output).to include("was called with no arguments")}
       end
 
       context 'with "smell" and no argument' do
         Given(:args){ ['smell'] }
-        Then{ output.should include("was called with no arguments")}
+        Then{ expect(output).to include("was called with no arguments")}
       end
     end
 
@@ -30,29 +30,29 @@ describe Preek::CLI do
 
       context 'with "smell" and a file as argument' do
         Given(:args){ ['smell', test_file('non_smelly')] }
-        Then{output.should include("No smells")}
+        Then{expect(output).to include("No smells")}
       end
 
       context 'with a file as argument' do
         Given(:args){ [test_file('non_smelly')] }
-        Then{output.should include("No smells")}
+        Then{expect(output).to include("No smells")}
       end
 
       context 'with "help" as argument' do
         Given(:args){ ['help'] }
-        Then{output.should =~ /Commands:/}
+        Then{expect(output).to match /Commands:/}
       end
 
       context 'with "version"' do
         Given(:args){ ['version'] }
-        Then {output.should =~ /(\d\.?){3}/}
+        Then {expect(output).to match /(\d\.?){3}/}
       end
 
       context "with non-existing file in ARGS" do
         Given(:args) { ['i/am/not/a_file'] }
-        Then{output.should_not include("success")}
-        Then{output.should include("No such file")}
-        Then{output.should include(args[0])}
+        Then{expect(output).to_not include("success")}
+        Then{expect(output).to include("No such file")}
+        Then{expect(output).to include(args[0])}
       end
     end
   end
@@ -64,58 +64,58 @@ describe Preek::CLI do
 
       context "when given file has no smells" do
         Given(:args){ [test_file('non_smelly')] }
-        Then{output.should include("No smells")}
-        Then{output.should_not include(args[0])}
+        Then{expect(output).to include("No smells")}
+        Then{expect(output).to_not include(args[0])}
       end
 
       context "when given file has no smells and the other does not exist" do
         Given(:args){ [test_file('non_smelly'), 'i/am/not/a_file'] }
-        Then{output.should include("No smells")}
-        Then{output.should_not include(args[0])}
-        Then{output.should include("No such file")}
-        Then{output.should include(args[1])}
+        Then{expect(output).to include("No smells")}
+        Then{expect(output).to_not include(args[0])}
+        Then{expect(output).to include("No such file")}
+        Then{expect(output).to include(args[1])}
       end
 
       context "when given file has Irresponsible smell" do
         Given(:args){ [test_file('irresponsible')] }
-        Then{output.should include("No smells")}
-        Then{output.should_not include(args[0])}
+        Then{expect(output).to include("No smells")}
+        Then{expect(output).to_not include(args[0])}
       end
 
       context "when given a file with two smelly classes" do
         Given(:args){ [test_file('two_smelly_classes')] }
-        Then{output.should include('SecondSmelly')}
-        Then{output.should include('UncommunicativeMethodName')}
+        Then{expect(output).to include('SecondSmelly')}
+        Then{expect(output).to include('UncommunicativeMethodName')}
 
         describe 'total count' do
-          Then{output.should match(/total.*1/)}
+          Then{expect(output).to match(/total.*1/)}
         end
       end
 
       context "when given two smelly files" do
         Given(:args){ [test_file('too_many_statements'), test_file('two_smelly_classes')] }
-        Then{output.should include('UncommunicativeMethodName', 'TooManyStatements')}
-        Then{output.should include(args[0], args[1])}
-        Then{output.should include("#loong_method", "#x")}
+        Then{expect(output).to include('UncommunicativeMethodName', 'TooManyStatements')}
+        Then{expect(output).to include(args[0], args[1])}
+        Then{expect(output).to include("#loong_method", "#x")}
 
         describe 'total count' do
-          Then{output.should match(/total.*2/)}
+          Then{expect(output).to match(/total.*2/)}
         end
       end
 
       context "when given one file without smells and another with smells" do
         Given(:args){ [test_file('non_smelly'), test_file('too_many_statements')] }
 
-        Then{output.should include('TooManyStatements')}
-        Then{output.should include(args[1])}
-        Then{output.should include("#loong_method")}
-        Then{output.should_not include(args[0])}
+        Then{expect(output).to include('TooManyStatements')}
+        Then{expect(output).to include(args[1])}
+        Then{expect(output).to include("#loong_method")}
+        Then{expect(output).to_not include(args[0])}
       end
 
       context "when given file has NilCheck smell" do
         Given(:args){ [test_file('nil_check')] }
-        Then{output.should include("NilCheck")}
-        Then{output.should include(args[0])}
+        Then{expect(output).to include("NilCheck")}
+        Then{expect(output).to include(args[0])}
       end
     end
 
@@ -124,25 +124,25 @@ describe Preek::CLI do
 
       context "when given file has Irresponsible smell" do
         Given(:args){ [test_file('irresponsible')] }
-        Then{output.should include("Irresponsible")}
+        Then{expect(output).to include("Irresponsible")}
       end
 
       context "when given a file with two smelly classes" do
         Given(:args){ [test_file('two_smelly_classes')] }
-        Then{output.should include('FirstSmelly', 'SecondSmelly')}
-        Then{output.should include('IrresponsibleModule', 'UncommunicativeMethodName')}
+        Then{expect(output).to include('FirstSmelly', 'SecondSmelly')}
+        Then{expect(output).to include('IrresponsibleModule', 'UncommunicativeMethodName')}
       end
 
       context "when given two smelly files" do
         Given(:args){ [test_file('too_many_statements'), test_file('two_smelly_classes')] }
-        Then{output.should include('IrresponsibleModule', 'UncommunicativeMethodName', 'TooManyStatements')}
-        Then{output.should include(args[0], args[1])}
-        Then{output.should include("#loong_method", "#x")}
+        Then{expect(output).to include('IrresponsibleModule', 'UncommunicativeMethodName', 'TooManyStatements')}
+        Then{expect(output).to include(args[0], args[1])}
+        Then{expect(output).to include("#loong_method", "#x")}
       end
 
       context "when given a file with two different smells" do
         Given(:args){ [test_file('irresponsible_and_lazy')] }
-        Then{output.should include('IrresponsibleModule', 'UncommunicativeMethodName')}
+        Then{expect(output).to include('IrresponsibleModule', 'UncommunicativeMethodName')}
       end
     end
 
@@ -151,18 +151,18 @@ describe Preek::CLI do
 
       context "when given file has no smells" do
         Given(:args){ [test_file('non_smelly')] }
-        Then{output.should include("No smells")}
-        Then{output.should include(args[0])}
+        Then{expect(output).to include("No smells")}
+        Then{expect(output).to include(args[0])}
       end
 
       context "when given two smelly files" do
         Given(:args){ [test_file('too_many_statements'), test_file('two_smelly_classes')] }
-        Then{output.should include(args[0], args[1])}
+        Then{expect(output).to include(args[0], args[1])}
       end
 
       context "when given one file without smells and another with smells" do
         Given(:args){ [test_file('non_smelly'), test_file('too_many_statements')] }
-        Then{output.should include(args[1], args[0])}
+        Then{expect(output).to include(args[1], args[0])}
       end
     end
   end
@@ -178,9 +178,15 @@ describe Preek::CLI do
       Then{}
     end
 
+    context 'with deleted file' do
+      Given(:git_output){" M .travis.yml\n M Gemfile\n M lib/random/file.rb\n D ruby.rb\n"}
+      Given{cli.should_receive(:smell).with('lib/random/file.rb')}
+      Then{}
+    end
+
     context 'without ruby file' do
       Given(:git_output){" M .travis.yml\n M Gemfile\n M preek.gemspec\n"}
-      Given{cli.should_not receive(:smell)}
+      Given{cli.should_not_receive(:smell)}
       Then{}
     end
   end

data/spec/spec_helper.rb

@@ -7,9 +7,12 @@ require File.expand_path('../../lib/preek', __FILE__)
 require 'rspec/given'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.order = 'random'
   config.fail_fast = true
+
+ config.mock_with :rspec do |mocks|
+    mocks.syntax = :should
+  end
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: preek
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Jon Neverland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: rspec-given
   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: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: coveralls
   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'
 description: 'Preek prints Ruby code smells in color, using Reek. '
@@ -116,9 +116,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE
@@ -155,17 +155,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Code smells in color