guard-rubocop 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df888e087c9fd9f43ae488326b28cdacc0590e04
-  data.tar.gz: 4f1e983579323bcddb9de6679c00d84a1342f345
+  metadata.gz: 00fdd1e9bc5751c2c6d979b21ef8d8ee0a1415a4
+  data.tar.gz: 52575f61a0ea2b94bf02e332d97a25cfb7f29a65
 SHA512:
-  metadata.gz: 64a073b7cb937839c493b97380185a3e286dc6cc41e741c662ae02231ec633ccf76484edc9382707eb29a0698d656405bf0b7025da87ab4f237f4a8e9d05d6ef
-  data.tar.gz: 9c8e163eb4a1e510adf4dab87b370ec9a59e4acaac16ff32e252beb450852099cf0e1cb80edf95b61e2bfe72c51fa5ef46bdfef484279bf9d58ddb2343776d7a
+  metadata.gz: 397b15f12ade915b254c5f8232fdce7e1d105c735fe156d86526511d99232fbe3264ac956883fbfab7778aed7a8aeace06bfb77d1b9b3334e94a76e1d2381534
+  data.tar.gz: a67ec286c5d22d1ffcd5c67317ac00755853d677cdf2fdb0691f36f8655f0d47cd127751bb02888db30b3a69fbd7883e947039b73cb6506fa828010efb758bfd

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-# CHANGELOG
+# Changelog
+
+## Master
+
+## v0.2.2
+
+* Fix a bug where `progress` formatter was used when `-f` and its argument were specified without separator in `:cli` option in `Guardfile` (e.g. `-fs`)
 
 ## v0.2.1
 

data/Rakefile

@@ -1,7 +1,9 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
+Rubocop::RakeTask.new(:style)
 
 namespace :ci do
   task :spec do
@@ -15,12 +17,7 @@ namespace :ci do
   end
 end
 
-desc 'Check code style with RuboCop'
-task :style do
-  sh('rubocop')
-end
-
-desc 'Run RSpec code examples and check code style with RuboCop'
+desc 'Run RSpec and RuboCop'
 task all: [:spec, :style]
 
 task default: :all

data/guard-rubocop.gemspec

@@ -7,7 +7,7 @@ require 'guard/rubocop/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'guard-rubocop'
-  spec.version       = Guard::RubocopVersion::VERSION
+  spec.version       = Guard::RubocopVersion.to_s
   spec.authors       = ['Yuji Nakayama']
   spec.email         = ['nkymyj@gmail.com']
   spec.summary       = 'Guard plugin for RuboCop'
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'guard',   '~> 1.8'
-  spec.add_runtime_dependency 'rubocop', '~> 0.9'
+  spec.add_runtime_dependency 'rubocop', '~> 0.10'
 
   spec.add_development_dependency 'bundler',     '~> 1.3'
   spec.add_development_dependency 'rake',        '~> 10.0'

data/lib/guard/rubocop/runner.rb

@@ -56,15 +56,13 @@ module Guard
       def include_formatter_for_console?(cli_args)
         index = -1
         formatter_args = cli_args.group_by do |arg|
-          if %w(-f --format).include?(arg)
-            index += 1
-          end
+          index += 1 if arg == '--format' || arg.start_with?('-f')
           index
         end
         formatter_args.delete(-1)
 
         formatter_args.each_value.any? do |args|
-          args.none? { |a| %w(-o --out).include?(a) }
+          args.none? { |a| a == '--out' || a.start_with?('-o') }
         end
       end
 

data/lib/guard/rubocop/version.rb

@@ -7,7 +7,10 @@ module Guard
     # http://semver.org/
     MAJOR = 0
     MINOR = 2
-    PATCH = 1
-    VERSION = [MAJOR, MINOR, PATCH].join('.')
+    PATCH = 2
+
+    def self.to_s
+      [MAJOR, MINOR, PATCH].join('.')
+    end
   end
 end

data/spec/guard/rubocop/runner_spec.rb

@@ -193,6 +193,24 @@ describe Guard::Rubocop::Runner do
       end
     end
 
+    context 'when the passed args include a -f with its arg without separator' do
+      context 'but does not include an -o/--output' do
+        let(:args) { %w(-fs --debug) }
+
+        it 'returns true' do
+          expect(include_formatter_for_console?).to be_true
+        end
+      end
+
+      context 'and include an -o with its arg without separator just after the -f/--format' do
+        let(:args) { %w(-fs -osimple.txt) }
+
+        it 'returns false' do
+          expect(include_formatter_for_console?).to be_false
+        end
+      end
+    end
+
     context 'when the passed args include multiple -f/--format' do
       context 'and all -f/--format have associated -o/--out' do
         let(:args) { %w(--format simple --out simple.txt --format emacs --out emacs.txt) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-rubocop
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement