govuk-lint 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ee1df307755ee3675eefdc79578e639c6ea3bfc
-  data.tar.gz: f79724e020c356c65315d5f20e2414df53108668
+  metadata.gz: ae1e00c5da9d6ad92606caf1ccdd797cd250143f
+  data.tar.gz: 27bdddd3c14c5c098ca9db575e86e43e5ecb0823
 SHA512:
-  metadata.gz: a86bbb94484e724960c9cfefd418347d78cdb39c01e83f63259bdf1e07f38549cc01008916c866e3ca0ba5f285ce3ffa7aae3483ce29dd63964d5283b094d37e
-  data.tar.gz: 652c224478445f4cb192ea1d0e7b841fdc7dfd09805e12072d9871b3d481d3f4fccecafaa6919b0c58fde0556396bf6db9fb70c1ab2a207dd8940c9414a7d941
+  metadata.gz: d27a39775793be1afb49d3a1d4cd342131c25b1052b8649085efd35c7db2ca55347b3698185df3e53a26d2630a046a1f1e52031bec9d3d53cfc4cbb7c52d59e0
+  data.tar.gz: e65e4e43db09fd02afa686f885f59aa57c65e77d2cc77cbeb43482f2719c03373d1b42716b830e1ce450618df344aac0c6a4edd9da7851d94c4ddc60db9589f9

data/lib/govuk/lint/cli.rb

@@ -1,5 +1,6 @@
 require "govuk/lint"
 require "govuk/lint/diff"
+require "govuk/lint/config_file"
 
 require "rubocop"
 
@@ -8,7 +9,7 @@ module Govuk
     class CLI < RuboCop::CLI
       def run(args = ARGV)
         args += ["--config",
-                 File.join(Govuk::Lint::CONFIG_PATH, "rubocop/all.yml")]
+                 ConfigFile.new.config_file_path]
 
         Diff.enable!(args) if args.include? "--diff"
 

data/lib/govuk/lint/config_file.rb

@@ -0,0 +1,49 @@
+require 'tempfile'
+require 'yaml'
+
+module Govuk
+  module Lint
+    class ConfigFile
+      CONFIG_PATH = File.expand_path("../../../../configs", __FILE__)
+      BASE_CONFIG_FILE = File.join(CONFIG_PATH, "rubocop/all.yml")
+
+      def config_file_path
+        return BASE_CONFIG_FILE unless File.exist?(local_config_file_path)
+
+        config = merged_global_and_local_configs
+        file = create_tempfile_for_configs(config)
+        file.path
+      end
+
+    private
+
+      def merged_global_and_local_configs
+        config = load_global_config
+        config['inherit_from'] = absolutize_paths(config)
+        config['inherit_from'] << local_config_file_path
+        config
+      end
+
+      def load_global_config
+        YAML.load_file(BASE_CONFIG_FILE)
+      end
+
+      def absolutize_paths(config)
+        config['inherit_from'].map do |filename|
+          File.join(CONFIG_PATH, "rubocop/#{filename}")
+        end
+      end
+
+      def local_config_file_path
+        @local_config_file_path ||= File.join(Dir.pwd, ".rubocop.yml")
+      end
+
+      def create_tempfile_for_configs(config)
+        file = Tempfile.new('tmp-rubocop-all.yml')
+        file.write(config.to_yaml)
+        file.close
+        file
+      end
+    end
+  end
+end

data/lib/govuk/lint/diff.rb

@@ -42,7 +42,6 @@ module Govuk
       def self.changed_files
         `git diff #{commit_options} --name-only`.
           split.
-          select { |f| f =~ %r{.rb$} }.
           map { |f| File.expand_path(f.chomp, "./") }
       end
 

data/lib/govuk/lint/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Lint
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/lib/govuk/lint.rb

@@ -2,6 +2,5 @@ require "govuk/lint/version"
 
 module Govuk
   module Lint
-    CONFIG_PATH = File.expand_path("../../../configs", __FILE__)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-lint
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Government Digital Service
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +98,7 @@ files:
 - configs/rubocop/other-style.yml
 - lib/govuk/lint.rb
 - lib/govuk/lint/cli.rb
+- lib/govuk/lint/config_file.rb
 - lib/govuk/lint/diff.rb
 - lib/govuk/lint/version.rb
 homepage: https://github.com/alphagov/govuk-lint
@@ -105,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A wrapper around rubocop, configured with the GDS style guides