rubocop-cask 0.14.4 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e3ef8c1197234e1a0f99c84c25b9a38de7bda32
-  data.tar.gz: c4339e3e4ae6144c91a7ce11384ec97401686ea9
+  metadata.gz: 577e8c7ab24a304d8ba4ac31feb192fed42d8d62
+  data.tar.gz: 76f5df9d67eaed9fdea5789927b5d5238464af9b
 SHA512:
-  metadata.gz: eb6c7447ab7d25d715955cf82014118feb0b7f1b14b3f910786e7a618dc85af06ba212ee7ad558ede835d3d368031b1a51664b654988e276cab59f03724dd345
-  data.tar.gz: 413cb456166b64d779e9ac15dbc86bacd3efe057bb209f9df34b5e7161d0aa153fbf38d296350c56294eeca1cd15cb2161d452a04685f2539c82990501158705
+  metadata.gz: 54c659d0ba5dd259262026e611c6519928ff9896d5754ad92a63dc2562224f149e8e65b3a3e003d6220ffd7fa8bf4e713b58ad760297aae7aa1214af4cfd8462
+  data.tar.gz: 7021e9ddcea30f5c4b4c804722481f1c9fa3010d84ddb6687fc93378034429182d58a8d9f5ba5e34e2e4f3fdb373c30cfd83d92d500917130c66e2f54302f959

data/lib/rubocop/cask/version.rb

@@ -3,6 +3,6 @@ require 'rubygems'
 module RuboCop
   module Cask
     # Version information for the Cask RuboCop plugin.
-    VERSION = '0.14.4'.freeze
+    VERSION = '0.15.0'.freeze
   end
 end

data/lib/rubocop/cop/cask/homepage_matches_url.rb

@@ -55,8 +55,8 @@ module RuboCop
 
           comment = comment(stanza).loc.expression
           add_offense(comment,
-                      comment,
-                      format(MSG_UNNECESSARY, domain(stanza), homepage))
+                      location: comment,
+                      message: format(MSG_UNNECESSARY, domain(stanza), homepage))
         end
 
         def add_offense_missing_comment(stanza)
@@ -65,7 +65,7 @@ module RuboCop
 
           range = stanza.source_range
           url_domain = domain(stanza)
-          add_offense(range, range, format(MSG_MISSING, url_domain, homepage, url_domain))
+          add_offense(range, location: range, message: format(MSG_MISSING, url_domain, homepage, url_domain))
         end
 
         def add_offense_no_match(stanza)
@@ -75,8 +75,8 @@ module RuboCop
 
           comment = comment(stanza).loc.expression
           add_offense(comment,
-                      comment,
-                      format(MSG_NO_MATCH, url_from_comment(stanza), full_url(stanza)))
+                      location: comment,
+                      message: format(MSG_NO_MATCH, url_from_comment(stanza), full_url(stanza)))
         end
 
         def add_offense_wrong_format(stanza)
@@ -86,8 +86,8 @@ module RuboCop
 
           comment = comment(stanza).loc.expression
           add_offense(comment,
-                      comment,
-                      format(MSG_WRONG_FORMAT, comment(stanza).text))
+                      location: comment,
+                      message: format(MSG_WRONG_FORMAT, comment(stanza).text))
         end
 
         def comment?(stanza)

data/lib/rubocop/cop/cask/homepage_url_trailing_slash.rb

@@ -16,7 +16,8 @@ module RuboCop
           url = url_node.str_content
 
           return if url !~ %r{^.+://[^/]+$}
-          add_offense(url_node, :expression, format(MSG_NO_SLASH, url))
+          add_offense(url_node, location: :expression,
+                                message: format(MSG_NO_SLASH, url))
         end
 
         def autocorrect(node)

data/lib/rubocop/cop/cask/no_dsl_version.rb

@@ -48,7 +48,8 @@ module RuboCop
         end
 
         def offense
-          add_offense(@cask_header.method_node, header_range, error_msg)
+          add_offense(@cask_header.method_node, location: header_range,
+                                                message: error_msg)
         end
 
         def error_msg

data/lib/rubocop/cop/cask/stanza_grouping.rb

@@ -74,20 +74,20 @@ module RuboCop
         def add_offense_missing_line(stanza)
           line_index = index_of_line_after(stanza)
           line_ops[line_index] = :insert
-          add_offense(line_index, MISSING_LINE_MSG)
+          add_offense(line_index, message: MISSING_LINE_MSG)
         end
 
         def add_offense_extra_line(stanza)
           line_index = index_of_line_after(stanza)
           line_ops[line_index] = :remove
-          add_offense(line_index, EXTRA_LINE_MSG)
+          add_offense(line_index, message: EXTRA_LINE_MSG)
         end
 
-        def add_offense(line_index, msg)
+        def add_offense(line_index, message:)
           line_length = [processed_source[line_index].size, 1].max
           range = source_range(processed_source.buffer, line_index + 1, 0,
                                line_length)
-          super(range, range, msg)
+          super(range, location: range, message: message)
         end
       end
     end

data/lib/rubocop/cop/cask/stanza_order.rb

@@ -35,7 +35,8 @@ module RuboCop
         def add_offenses
           offending_stanzas.each do |stanza|
             message = format(MESSAGE, stanza.stanza_name)
-            add_offense(stanza, stanza.source_range_with_comments, message)
+            add_offense(stanza, location: stanza.source_range_with_comments,
+                                message: message)
           end
         end
 

data/lib/rubocop-cask.rb

@@ -1,5 +1,10 @@
 require 'rubocop'
 
+RuboCop::ConfigLoader.default_configuration =
+  RuboCop::ConfigLoader.configuration_from_file(
+    File.expand_path('../config/default.yml', __dir__)
+  )
+
 require 'rubocop/cask/constants'
 require 'rubocop/cask/extend/string'
 require 'rubocop/cask/extend/node'
@@ -7,10 +12,6 @@ require 'rubocop/cask/ast/cask_header'
 require 'rubocop/cask/ast/cask_block'
 require 'rubocop/cask/ast/stanza'
 require 'rubocop/cask/version'
-require 'rubocop/cask/inject'
-
-RuboCop::Cask::Inject.defaults!
-
 require 'rubocop/cop/cask/mixin/cask_help'
 require 'rubocop/cop/cask/mixin/on_homepage_stanza'
 require 'rubocop/cop/cask/homepage_matches_url'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-cask
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.0
 platform: ruby
 authors:
 - Joshua Hagins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.51.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.51.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,6 @@ files:
 - lib/rubocop/cask/constants.rb
 - lib/rubocop/cask/extend/node.rb
 - lib/rubocop/cask/extend/string.rb
-- lib/rubocop/cask/inject.rb
 - lib/rubocop/cask/version.rb
 - lib/rubocop/cop/cask/homepage_matches_url.rb
 - lib/rubocop/cop/cask/homepage_url_trailing_slash.rb

data/lib/rubocop/cask/inject.rb

@@ -1,22 +0,0 @@
-require 'yaml'
-
-module RuboCop
-  module Cask
-    # Because RuboCop doesn't yet support plugins, we have to monkey patch in a
-    # bit of our configuration.
-    module Inject
-      DEFAULT_FILE = File.expand_path(
-        '../../../../config/default.yml', __FILE__
-      )
-
-      def self.defaults!
-        hash = ConfigLoader.send(:load_yaml_configuration, DEFAULT_FILE)
-        config = Config.new(hash, DEFAULT_FILE)
-        puts "configuration from #{DEFAULT_FILE}" if ConfigLoader.debug?
-        config = ConfigLoader.merge_with_default(config, DEFAULT_FILE)
-
-        ConfigLoader.instance_variable_set(:@default_configuration, config)
-      end
-    end
-  end
-end