aptible-tasks 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dca1da20e3741895059fa585d643c18c2e723dea
-  data.tar.gz: a50de5358eca74d0d22f2faf1354f9df98f02ffa
+  metadata.gz: 782b492bc0392d17b93b628c4595ec9a13abaea7
+  data.tar.gz: bb8fb404236f673d30739285f30e3636060233c6
 SHA512:
-  metadata.gz: c4d295a429baa117226a3a76b95e06d2540353b156438a16037dd5b62dd9bfe3577493524c4276c3e9358b250c64a14cb87491a343422683fddc0668918eaf98
-  data.tar.gz: 3d95cc6e3dd85b67872ba62781a59b3269244ed61fc47c9a2194073cdd70ed315df3e24102031e80c792126dea6a8f340ca38fbd87919e277e1c0b4a30e72d5b
+  metadata.gz: 4afa304ff676316ca4f94d07daa2905578503e5b656b56b10662a07f6bf8f37df4851d5beddfcc4429b3e14d02b23ec1b3c9d448b3ba3aa0ffdaeaa38a3aceb7
+  data.tar.gz: 546c7f578b0a8366bdb75e88525609dd645e1c92ed4619275b7e61657a76397c1d3bc9ccfec4b64347bc28e16082ad6042ae551602fa60754377485a75e26e27

data/lib/aptible/tasks/rubocop.rb

@@ -4,9 +4,22 @@ module Aptible
   module Tasks
     class Rubocop
       def config_file
+        project_config_file ||
         File.join(File.dirname(__FILE__), '..', '..', '..', '.rubocop.yml')
       end
 
+      def project_config_file(dir = Dir.pwd)
+        previous = File.expand_path('..', dir)
+        local_rubocop_yml = File.join(dir, '.rubocop.yml')
+        if File.exist?(local_rubocop_yml)
+          local_rubocop_yml
+        elsif previous == dir
+          nil
+        else
+          project_config_file(previous)
+        end
+      end
+
       def config
         ::Rubocop::ConfigLoader.load_file(config_file)
       end

data/lib/aptible/tasks/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Tasks
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

data/spec/aptible/tasks/rubocop_spec.rb

@@ -7,10 +7,28 @@ describe Aptible::Tasks::Rubocop do
 
   its(:config) { should be_a ::Rubocop::Config }
 
+  describe :project_config_file do
+    let!(:rubocop_yml) { File.join(Dir.pwd, '.rubocop.yml') }
+
+    it 'should return a local .rubocop.yml if present' do
+      expect(subject.project_config_file).to eq rubocop_yml
+    end
+
+    it 'should return a .rubocop.yml in a parent directory' do
+      FileUtils.cd 'spec'
+      expect(subject.project_config_file).to eq rubocop_yml
+    end
+
+    it 'should return nil if no file exists' do
+      File.stub(:exist?) { false }
+      expect(subject.project_config_file).to be_nil
+    end
+  end
+
   describe :config do
     it 'contains sane values' do
-      subject.config['Documentation']['Enabled'].should be_false
-      subject.config['AllCops']['Exclude'].should_not be_empty
+      expect(subject.config['Documentation']['Enabled']).to be_false
+      expect(subject.config['AllCops']['Exclude']).not_to be_empty
     end
   end
 end

data/spec/tasks/rubocob_spec.rb

@@ -12,7 +12,7 @@ describe 'rake rubocop' do
   its(:prerequisites) { should be_empty }
 
   it 'delegates to ::Rubocop.new.run' do
-    rubocop.should_receive(:run)
+    expect(rubocop).to receive(:run)
     subject.invoke
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-tasks
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Shared Rake tasks for Aptible projects.