guard-rubocop 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee67224feb5ed77ab48db7a593b0d9dc97047014
-  data.tar.gz: 2b2c4fc6e147d90bf97922dbd4c870e4aa389e1d
+  metadata.gz: ec82afdd85de6be92deca90949f571a84eae25cf
+  data.tar.gz: 68d6f82e862a90d3625e4fcf0b1c06d36a67221c
 SHA512:
-  metadata.gz: bfd262dbc1a81cfe4cb9ef6f1cec3fea7d3e0f2092b9afdd8e7c88dc2809bde6b0d46f925b715321d1d4ec9512c49fc644ec1e0b5cb1940ba20490f7b301e838
-  data.tar.gz: 18ebd330633b8a5e3bd023aa94d9b2ab6608d9a30674893c4768d79770d220e8a786f82a5c61a8ded02598b028879028c7b0b0c588bebc041085b934c31378a5
+  metadata.gz: d40d80a751bc72240d3c0d5b1c1ace21c12e1792a66ee481511733c91ff1f360c478eda6ccf31bf80cf2475ab1c4464176ebf979f61514a668998339687328ea
+  data.tar.gz: 5a2c18d2e662dc0744463c374bd94cf55979b816538726dd89f81bac3dce0d14850ced6d4dbd35a72caf3c72372cf96cb433651a775ccfdb4eef8ac1cd6127cd

data/.gitignore

@@ -0,0 +1,18 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+vendor/bundle

data/.rubocop.yml

@@ -0,0 +1,7 @@
+# The default 79 character limit is sometimes unproductive.
+LineLength:
+  Max: 100
+
+# The default 10 lines limit is unrealistic.
+MethodLength:
+  Max: 15

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - jruby-19mode
+script:
+  - bundle exec rspec
+  - bundle exec rubocop

data/.yardopts

@@ -0,0 +1 @@
+--markup markdown

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## Master
+## Development
+
+## v1.0.1
+
+* Fix inappripriate multiple run on a save with Vim ([#6](https://github.com/yujinakayama/guard-rubocop/pull/6))
 
 ## v1.0.0
 

data/README.md

@@ -74,3 +74,9 @@ notification: :failed  # Display Growl notification after each run.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## License
+
+Copyright (c) 2013 Yuji Nakayama
+
+See the [LICENSE.txt](LICENSE.txt) for details.

data/guard-rubocop.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/yujinakayama/guard-rubocop'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/).reject { |f| File.basename(f).start_with?('.') }
+  spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake',        '~> 10.0'
   spec.add_development_dependency 'rspec',       '~> 2.14'
   spec.add_development_dependency 'simplecov',   '~> 0.7'
-  spec.add_development_dependency 'guard-rspec', '~> 3.0'
+  spec.add_development_dependency 'guard-rspec', '~> 4.0'
   spec.add_development_dependency 'ruby_gntp',   '~> 0.3'
 end

data/lib/guard/rubocop.rb

@@ -30,10 +30,24 @@ module Guard
 
     def run_all
       UI.info 'Inspecting Ruby code style of all files'
-      run
+      inspect_with_rubocop
     end
 
-    def run_on_changes(paths)
+    def run_on_additions(paths)
+      run_partially(paths)
+    end
+
+    def run_on_modifications(paths)
+      run_partially(paths)
+    end
+
+    def reload
+      @failed_paths = []
+    end
+
+    private
+
+    def run_partially(paths)
       paths += @failed_paths if @options[:keep_failed]
       paths = clean_paths(paths)
 
@@ -42,11 +56,17 @@ module Guard
       displayed_paths = paths.map { |path| smart_path(path) }
       UI.info "Inspecting Ruby code style: #{displayed_paths.join(' ')}"
 
-      run(paths)
+      inspect_with_rubocop(paths)
     end
 
-    def reload
-      @failed_paths = []
+    def inspect_with_rubocop(paths = [])
+      runner = Runner.new(@options)
+      passed = runner.run(paths)
+      @failed_paths = runner.failed_paths
+      throw :task_has_failed unless passed
+    rescue => error
+      UI.error 'The following exception occurred while running guard-rubocop: ' +
+               "#{error.backtrace.first} #{error.message} (#{error.class.name})"
     end
 
     def clean_paths(paths)
@@ -60,18 +80,6 @@ module Guard
       paths
     end
 
-    private
-
-    def run(paths = [])
-      runner = Runner.new(@options)
-      passed = runner.run(paths)
-      @failed_paths = runner.failed_paths
-      throw :task_has_failed unless passed
-    rescue => error
-      UI.error 'The following exception occurred while running guard-rubocop: ' +
-               "#{error.backtrace.first} #{error.message} (#{error.class.name})"
-    end
-
     def included_in_other_path?(target_path, other_paths)
       dir_paths = other_paths.select { |path| File.directory?(path) }
       dir_paths.delete(target_path)

data/lib/guard/rubocop/runner.rb

@@ -2,15 +2,11 @@
 
 require 'json'
 
-# rubocop:disable Documentation
 module Guard
   class Rubocop
     # This class runs `rubocop` command, retrieves result and notifies.
     # An instance of this class is intended to invoke `rubocop` only once in its lifetime.
     class Runner
-      # rubocop:enable Documentation
-
-      #
       def initialize(options)
         @options = options
       end

data/lib/guard/rubocop/version.rb

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

data/spec/.rubocop.yml

@@ -0,0 +1,5 @@
+inherit_from: ../.rubocop.yml
+
+# Sometimes I want to indicate that “This is a hash” explicitly with #and_return.
+BracesAroundHashParameters:
+  Enabled: false

data/spec/guard/rubocop_spec.rb

@@ -11,10 +11,26 @@ describe Guard::Rubocop, :silence_output do
 
     context 'by default' do
       let(:options) { {} }
-      its([:all_on_start]) { should be_true }
-      its([:keep_failed])  { should be_true }
-      its([:notification]) { should == :failed }
-      its([:cli])          { should be_nil }
+
+      describe '[:all_on_start]' do
+        subject { super()[:all_on_start] }
+        it { should be_true }
+      end
+
+      describe '[:keep_failed]' do
+        subject { super()[:keep_failed] }
+        it { should be_true }
+      end
+
+      describe '[:notification]' do
+        subject { super()[:notification] }
+        it { should == :failed }
+      end
+
+      describe '[:cli]' do
+        subject { super()[:cli] }
+        it { should be_nil }
+      end
     end
   end
 
@@ -95,69 +111,71 @@ describe Guard::Rubocop, :silence_output do
     end
   end
 
-  describe '#run_on_changes', :processes_after_running do
-    subject { super().run_on_changes(changed_paths) }
-    let(:changed_paths) do
-      [
-        'lib/guard/rubocop.rb',
-        'spec/spec_helper.rb'
-      ]
-    end
-
-    before do
-      allow_any_instance_of(Guard::Rubocop::Runner).to receive(:run).and_return(true)
-      allow_any_instance_of(Guard::Rubocop::Runner).to receive(:failed_paths).and_return([])
-    end
+  [:run_on_additions, :run_on_modifications].each do |method|
+    describe "##{method}", :processes_after_running do
+      subject { super().send(method, changed_paths) }
+      let(:changed_paths) do
+        [
+          'lib/guard/rubocop.rb',
+          'spec/spec_helper.rb'
+        ]
+      end
 
-    it 'inspects changed files with rubocop' do
-      expect_any_instance_of(Guard::Rubocop::Runner).to receive(:run)
-      guard.run_on_changes(changed_paths)
-    end
+      before do
+        allow_any_instance_of(Guard::Rubocop::Runner).to receive(:run).and_return(true)
+        allow_any_instance_of(Guard::Rubocop::Runner).to receive(:failed_paths).and_return([])
+      end
 
-    it 'passes cleaned paths to rubocop' do
-      expect_any_instance_of(Guard::Rubocop::Runner).to receive(:run) do |paths|
-        expect(paths).to eq([
-          File.expand_path('some.rb'),
-          File.expand_path('dir/another.rb')
-        ])
+      it 'inspects changed files with rubocop' do
+        expect_any_instance_of(Guard::Rubocop::Runner).to receive(:run)
+        subject
       end
-      guard.run_on_changes(changed_paths)
-    end
 
-    context 'when cleaned paths are empty' do
-      before do
-        allow(guard).to receive(:clean_paths).and_return([])
+      it 'passes cleaned paths to rubocop' do
+        expect_any_instance_of(Guard::Rubocop::Runner).to receive(:run) do |paths|
+          expect(paths).to eq([
+            File.expand_path('some.rb'),
+            File.expand_path('dir/another.rb')
+          ])
+        end
+        subject
       end
 
-      it 'does nothing' do
-        expect_any_instance_of(Guard::Rubocop::Runner).not_to receive(:run)
-        guard.run_on_changes(changed_paths)
+      context 'when cleaned paths are empty' do
+        before do
+          allow(guard).to receive(:clean_paths).and_return([])
+        end
+
+        it 'does nothing' do
+          expect_any_instance_of(Guard::Rubocop::Runner).not_to receive(:run)
+          subject
+        end
       end
-    end
 
-    let(:failed_path) { File.expand_path('Rakefile') }
+      let(:failed_path) { File.expand_path('Rakefile') }
 
-    context 'when :keep_failed option is enabled' do
-      let(:options) { { keep_failed: true } }
+      context 'when :keep_failed option is enabled' do
+        let(:options) { { keep_failed: true } }
 
-      it 'also inspects paths which are failed last time' do
-        guard.failed_paths << failed_path
-        expect_any_instance_of(Guard::Rubocop::Runner).to receive(:run) do |paths|
-          expect(paths).to include failed_path
+        it 'also inspects paths which are failed last time' do
+          guard.failed_paths << failed_path
+          expect_any_instance_of(Guard::Rubocop::Runner).to receive(:run) do |paths|
+            expect(paths).to include failed_path
+          end
+          subject
         end
-        guard.run_on_changes(changed_paths)
       end
-    end
 
-    context 'when :keep_failed option is disabled' do
-      let(:options) { { keep_failed: false } }
+      context 'when :keep_failed option is disabled' do
+        let(:options) { { keep_failed: false } }
 
-      it 'inspects just changed paths' do
-        guard.failed_paths << failed_path
-        expect_any_instance_of(Guard::Rubocop::Runner).to receive(:run) do |paths|
-          expect(paths).to eq(changed_paths)
+        it 'inspects just changed paths' do
+          guard.failed_paths << failed_path
+          expect_any_instance_of(Guard::Rubocop::Runner).to receive(:run) do |paths|
+            expect(paths).to eq(changed_paths)
+          end
+          subject
         end
-        guard.run_on_changes(changed_paths)
       end
     end
   end
@@ -171,12 +189,16 @@ describe Guard::Rubocop, :silence_output do
   end
 
   describe '#clean_paths' do
+    def clean_paths(path)
+      guard.send(:clean_paths, path)
+    end
+
     it 'converts to absolute paths' do
       paths = [
         'lib/guard/rubocop.rb',
         'spec/spec_helper.rb'
       ]
-      expect(guard.clean_paths(paths)).to eq([
+      expect(clean_paths(paths)).to eq([
         File.expand_path('lib/guard/rubocop.rb'),
         File.expand_path('spec/spec_helper.rb')
       ])
@@ -188,7 +210,7 @@ describe Guard::Rubocop, :silence_output do
         'spec/spec_helper.rb',
         'lib/guard/../guard/rubocop.rb'
       ]
-      expect(guard.clean_paths(paths)).to eq([
+      expect(clean_paths(paths)).to eq([
         File.expand_path('lib/guard/rubocop.rb'),
         File.expand_path('spec/spec_helper.rb')
       ])
@@ -200,7 +222,7 @@ describe Guard::Rubocop, :silence_output do
         'path/to/non_existent_file.rb',
         'spec/spec_helper.rb'
       ]
-      expect(guard.clean_paths(paths)).to eq([
+      expect(clean_paths(paths)).to eq([
         File.expand_path('lib/guard/rubocop.rb'),
         File.expand_path('spec/spec_helper.rb')
       ])
@@ -212,7 +234,7 @@ describe Guard::Rubocop, :silence_output do
         'spec/spec_helper.rb',
         'spec'
       ]
-      expect(guard.clean_paths(paths)).to eq([
+      expect(clean_paths(paths)).to eq([
         File.expand_path('lib/guard/rubocop.rb'),
         File.expand_path('spec')
       ])

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: guard-rubocop
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-06 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !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: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
 description: Guard::Rubocop automatically checks Ruby code style with RuboCop when
@@ -130,6 +130,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -141,6 +145,7 @@ files:
 - lib/guard/rubocop/runner.rb
 - lib/guard/rubocop/templates/Guardfile
 - lib/guard/rubocop/version.rb
+- spec/.rubocop.yml
 - spec/guard/rubocop/runner_spec.rb
 - spec/guard/rubocop_spec.rb
 - spec/spec_helper.rb
@@ -155,21 +160,22 @@ 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.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Guard plugin for RuboCop
 test_files:
+- spec/.rubocop.yml
 - spec/guard/rubocop/runner_spec.rb
 - spec/guard/rubocop_spec.rb
 - spec/spec_helper.rb