rubocop-cask 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbaf42203ee69f23608c04ca5ea1716c1be38f99
-  data.tar.gz: c77fa91c8897a7ee2c25bc8183a6d16d7a65edd1
+  metadata.gz: 442d35b763d9d298b87df4a292360fe9990a018a
+  data.tar.gz: 088e6c62903ded5b57296b29cbfe63b9dfc1bfd9
 SHA512:
-  metadata.gz: d3e31e4f8ea44916bf8246715f1a0fe002a71b9c52985c181b1fea3f22c4fe5e2009080bd2bb5dda85c21f91162d8785ae74584de74d511bb3626afd1d8d5165
-  data.tar.gz: 32cdd91d9c96411537cb117e7b5dc60cfe9ce687d02f728d22909a198cf3fa9b98660d28fa4291291205902d1adde499ea8d3669a23fb5d973b46c0119bcef3c
+  metadata.gz: 50bb469d68f72ea30723f96ad495717a714a78cbc1124dd0c6e1ec3427fa484f00936eb34cddb97a0eace82b87c09c976ebcc36619533315a44a2601609b3d19
+  data.tar.gz: ce1b8254d503ddc1e5bfe5b207dc953063a86055d2bb3af76a89daaa06fa0c6d26abab44f920068b93730dd028a40c3ee7d29bec93853f0462777ac28a2a5ef8

data/config/default.yml

@@ -6,6 +6,10 @@ Cask/NoDslVersion:
   Description: 'Do not use the deprecated DSL version syntax in your cask header.'
   Enabled: true
 
+Cask/HomepageUrlTrailingSlash:
+  Description: 'Ensure that the homepage url has a slash after the domain name.'
+  Enabled: true
+
 Cask/HomepageMatchesUrl:
   Description: 'Ensure that the homepage and url match, otherwise add a comment. More info at https://github.com/caskroom/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/url.md#when-url-and-homepage-hostnames-differ-add-a-comment'
   Enabled: true

data/lib/rubocop/cask/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Cask
     # Version information for the Cask RuboCop plugin.
     module Version
-      STRING = '0.11.0'.freeze
+      STRING = '0.12.0'.freeze
 
       def self.gem_version
         Gem::Version.new(STRING)

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

@@ -0,0 +1,36 @@
+require 'forwardable'
+require 'uri'
+
+module RuboCop
+  module Cop
+    module Cask
+      # This cop checks that a cask's homepage ends with a slash
+      # if it does not have a path component.
+      class HomepageUrlTrailingSlash < Cop
+        include OnHomepageStanza
+
+        MSG_NO_SLASH = "'%s' must have a slash after the domain.".freeze
+
+        def on_homepage_stanza(stanza)
+          url_node = stanza.stanza_node.method_args.first
+          url = url_node.str_content
+
+          return if url !~ %r{^.+://[^/]+$}
+          add_offense(url_node, :expression, format(MSG_NO_SLASH, url))
+        end
+
+        def autocorrect(node)
+          domain = URI(node.str_content).host
+
+          # This also takes URLs like 'https://example.org?path'
+          # and 'https://example.org#path' into account.
+          corrected_source = node.source.sub("://#{domain}", "://#{domain}/")
+
+          lambda do |corrector|
+            corrector.replace(node.source_range, corrected_source)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/cask/mixin/on_homepage_stanza.rb

@@ -0,0 +1,25 @@
+module RuboCop
+  module Cop
+    module Cask
+      # Common functionality for checking homepage stanzas.
+      module OnHomepageStanza
+        extend Forwardable
+        include CaskHelp
+
+        def on_cask(cask_block)
+          @cask_block = cask_block
+
+          toplevel_stanzas.select(&:homepage?).each do |stanza|
+            on_homepage_stanza(stanza)
+          end
+        end
+
+        private
+
+        attr_reader :cask_block
+        def_delegators :cask_block,
+                       :toplevel_stanzas
+      end
+    end
+  end
+end

data/lib/rubocop-cask.rb

@@ -12,7 +12,9 @@ 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'
+require 'rubocop/cop/cask/homepage_url_trailing_slash'
 require 'rubocop/cop/cask/no_dsl_version'
 require 'rubocop/cop/cask/stanza_order'
 require 'rubocop/cop/cask/stanza_grouping'

data/spec/rubocop/cop/cask/homepage_url_trailing_slash_spec.rb

@@ -0,0 +1,53 @@
+describe RuboCop::Cop::Cask::HomepageUrlTrailingSlash do
+  include CopSharedExamples
+
+  subject(:cop) { described_class.new }
+
+  context 'when the homepage url ends with a slash' do
+    let(:source) do
+      <<-CASK.undent
+        cask 'foo' do
+          homepage 'https://foo.example.com/'
+        end
+      CASK
+    end
+
+    include_examples 'does not report any offenses'
+  end
+
+  context 'when the homepage url does not end with a slash' do
+    context 'but has a path' do
+      let(:source) do
+        <<-CASK.undent
+          cask 'foo' do
+            homepage 'https://foo.example.com/path'
+          end
+        CASK
+      end
+
+      include_examples 'does not report any offenses'
+    end
+
+    context 'and has no path' do
+      let(:source) do
+        <<-CASK.undent
+          cask 'foo' do
+            homepage 'https://foo.example.com'
+          end
+        CASK
+      end
+      let(:expected_offenses) do
+        [{
+          message: "'https://foo.example.com' must have a slash "\
+                   'after the domain.',
+          severity: :convention,
+          line: 2,
+          column: 11,
+          source: "'https://foo.example.com'"
+        }]
+      end
+
+      include_examples 'reports offenses'
+    end
+  end
+end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-cask
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Joshua Hagins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-12 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix
   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.47.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.47.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.14'
 description: |2
@@ -63,10 +63,7 @@ extra_rdoc_files:
 - MIT-LICENSE.md
 - README.md
 files:
-- MIT-LICENSE.md
-- README.md
 - config/default.yml
-- lib/rubocop-cask.rb
 - lib/rubocop/cask/ast/cask_block.rb
 - lib/rubocop/cask/ast/cask_header.rb
 - lib/rubocop/cask/ast/stanza.rb
@@ -76,12 +73,18 @@ files:
 - 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
 - lib/rubocop/cop/cask/mixin/cask_help.rb
+- lib/rubocop/cop/cask/mixin/on_homepage_stanza.rb
 - lib/rubocop/cop/cask/no_dsl_version.rb
 - lib/rubocop/cop/cask/stanza_grouping.rb
 - lib/rubocop/cop/cask/stanza_order.rb
+- lib/rubocop-cask.rb
+- MIT-LICENSE.md
+- README.md
 - spec/project_spec.rb
 - spec/rubocop/cop/cask/homepage_matches_url_spec.rb
+- spec/rubocop/cop/cask/homepage_url_trailing_slash_spec.rb
 - spec/rubocop/cop/cask/no_dsl_version_spec.rb
 - spec/rubocop/cop/cask/stanza_grouping_spec.rb
 - spec/rubocop/cop/cask/stanza_order_spec.rb
@@ -97,23 +100,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Code style checking for Homebrew-Cask files
 test_files:
 - spec/project_spec.rb
 - spec/rubocop/cop/cask/homepage_matches_url_spec.rb
+- spec/rubocop/cop/cask/homepage_url_trailing_slash_spec.rb
 - spec/rubocop/cop/cask/no_dsl_version_spec.rb
 - spec/rubocop/cop/cask/stanza_grouping_spec.rb
 - spec/rubocop/cop/cask/stanza_order_spec.rb