preek 1.2.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a2898d250cb8cea642a90c538ce337b21b582fb
-  data.tar.gz: 963cbb7dcebd619e3da7a47fd2fdce46d767a406
+  metadata.gz: 0cb49e8b58f821000455e1d1941e25e9af1d7e3b
+  data.tar.gz: c253a2d0358384d2f0de5681abafa92d78d22755
 SHA512:
-  metadata.gz: 0f33bf0471e6fde2f572c62bd546da8611ef8be0f54ce4e81bcfaac2da2335c9e55ae2f4b4cfea0300a503c89272ec1444ea8c95bb7cad4cedfb610e465bd8c6
-  data.tar.gz: 3a51ab71c58530be58fd33affcf172ac7b4f8abc781050d73f02da3fb103d04a71a8bf49c9bbae1d20af7faacfd4575d8769ee2e8b42c6f3753fb205c82f0ed4
+  metadata.gz: 86e4cda27dac0f8728976b0fedccef6924c68fb15886c8f0f123665e0e76524996a928d363a2655ef8207cd15d1a4d1f65e6ab75df78e43b05302f3470692c16
+  data.tar.gz: 8cfa8c70876c56740a529a3abfc778b0c4dc4424c0d5c91133bb1beedd1e97842998f6e6bf8aba82ede6f0e4f0579672237dacb4dec5b17fb1dd477d5db86856

data/README.md

@@ -28,7 +28,7 @@ From source
 ### CLI
 ```bash
 Usage:
-  preek smell FILE(S)|DIR
+  preek FILE(S)|DIR
 
 Options:
   -i, [--irresponsible]  # Include IrresponsibleModule smell in output.

data/lib/preek/cli.rb

@@ -1,19 +1,21 @@
 require 'thor'
 require 'preek/version'
+require 'preek/default_command'
 
 module Preek
 
   # whoop whoop
   class CLI < Thor
     include Thor::Actions
+    extend DefaultCommand
 
     desc 'version', 'Shows version'
     def version(*)
       say VERSION
     end
 
-    desc 'smell FILE(S)|DIR', 'Pretty format Reek output'
-
+    default_command :smell
+    desc 'smell FILE(S)|DIR', 'Shorthand: preek [FILES]'
     method_option :irresponsible,
                   type: :boolean,
                   aliases: '-i',
@@ -30,12 +32,11 @@ module Preek
                   desc: 'Report files with no smells.'
 
 
-    def smell(*args)
-      Examiner.new(args, excludes, reporter: reporter, output: output).perform
+    def smell(*files)
+      Examiner.new(files, excludes, reporter: reporter, output: output).perform
     end
 
   private
-
     def reporter
       options[:verbose] ? VerboseReport : QuietReport
     end

data/lib/preek/default_command.rb

@@ -0,0 +1,18 @@
+module Preek
+  #Lets monkey patch to have a default action with arguments!
+  module DefaultCommand
+    def dispatch(meth, given_args, given_opts, config)
+      meth = retrieve_command_name(given_args)
+      command = all_commands[normalize_command_name(meth)]
+      unless command
+        given_args.unshift meth
+        meth = default_command
+        command = all_commands[meth]
+      end
+      if given_args.empty? && command.name == default_command
+        handle_argument_error(command, nil, given_args, nil)
+      end
+      super
+    end
+  end
+end

data/lib/preek/version.rb

@@ -1,3 +1,3 @@
 module Preek
-  VERSION = "1.2.1"
+  VERSION = "1.3.1"
 end

data/preek.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.name          = "preek"
   gem.require_paths = ["lib"]
   gem.version       = Preek::VERSION
-  gem.add_runtime_dependency "thor", ">=0.16"
-  gem.add_runtime_dependency "reek", ">=1.3"
+  gem.add_runtime_dependency "thor", "~> 0.18"
+  gem.add_runtime_dependency "reek", "~> 1.3.3"
   gem.add_development_dependency "rspec", ">=2.13"
   gem.add_development_dependency "rspec-given"
   gem.add_development_dependency "guard", ">=1.6"

data/spec/cli_spec.rb

@@ -9,22 +9,57 @@ describe Preek::CLI do
     File.expand_path(File.join(File.dirname(__FILE__),'test_files/',"#{file_name}.rb"))
   end
 
-  describe "#version" do
-    When(:output) { capture(:stdout) { subject.version} }
-    Then {output.should =~ /(\d\.?){3}/}
-  end
+  When(:output) { capture(:stdout) { Preek::CLI.start args } }
+
+  describe 'Commands' do
 
-  describe "#smell" do
+    context 'errors' do
+      When(:output) { capture(:stderr) { Preek::CLI.start args } }
 
-    When(:output) { capture(:stdout) { subject.smell(*args) } }
+      context 'with no argument' do
+        Given(:args){ [] }
+        Then{ output.should include("was called with no arguments")}
+      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])}
+      context 'with "smell" and no argument' do
+        Given(:args){ ['smell'] }
+        Then{ output.should include("was called with no arguments")}
+      end
     end
 
+    context 'no errors' do
+
+      context 'with "smell" and a file as argument' do
+        Given(:args){ ['smell', test_file('non_smelly')] }
+        Then{output.should include("No smells")}
+      end
+
+      context 'with a file as argument' do
+        Given(:args){ [test_file('non_smelly')] }
+        Then{output.should include("No smells")}
+      end
+
+      context 'with "help" as argument' do
+        Given(:args){ ['help'] }
+        Then{output.should =~ /Commands:/}
+      end
+
+      context 'with "version"' do
+        Given(:args){ ['version'] }
+        Then {output.should =~ /(\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])}
+      end
+    end
+  end
+
+  describe "Reports" do
+
     context 'default quiet report' do
 
       context "when given file has no smells" do
@@ -77,7 +112,7 @@ describe Preek::CLI do
     end
 
     context 'with --irresponsible option' do
-      Given{subject.options =  {irresponsible: true} }
+      When(:output) { capture(:stdout) { Preek::CLI.start ['-i'].concat(args) } }
 
       context "when given file has Irresponsible smell" do
         Given(:args){ [test_file('irresponsible')] }
@@ -104,7 +139,7 @@ describe Preek::CLI do
     end
 
     context 'with --verbose option' do
-      Given{subject.options =  {verbose: true}}
+      When(:output) { capture(:stdout) { Preek::CLI.start ['--verbose'].concat(args) } }
 
       context "when given file has no smells" do
         Given(:args){ [test_file('non_smelly')] }

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: preek
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.1
 platform: ruby
 authors:
 - Jon Neverland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +127,7 @@ files:
 - bin/preek
 - lib/preek.rb
 - lib/preek/cli.rb
+- lib/preek/default_command.rb
 - lib/preek/examiner.rb
 - lib/preek/ext/smell_warning.rb
 - lib/preek/output.rb
@@ -164,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: It might reek but its pretty