rubocop-cask 0.1.0 → 0.2.0

data/spec/spec_helper.rb

@@ -1,10 +1,12 @@
 require 'rubocop'
 
-rubocop_path = File.join(File.dirname(__FILE__), '../vendor/rubocop')
+project_path = File.join(File.dirname(__FILE__), '..')
+rubocop_path = File.join(project_path, 'vendor/rubocop')
 unless File.directory?(rubocop_path)
   fail "Can't run specs without a local RuboCop checkout. Look in the README."
 end
 Dir["#{rubocop_path}/spec/support/**/*.rb"].each { |f| require f }
+Dir["#{project_path}/spec/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.order = :random

data/spec/support/cop_shared_examples.rb

@@ -0,0 +1,33 @@
+module CopSharedExamples
+  shared_examples 'does not report any offenses' do
+    it 'does not report any offenses' do
+      inspect_source(cop, source)
+      expect(cop.offenses).to be_empty
+    end
+  end
+
+  shared_examples 'reports offenses' do
+    it 'reports offenses' do
+      inspect_source(cop, source)
+      expect(cop.offenses.size).to eq(expected_offenses.size)
+      expected_offenses.zip(cop.offenses).each do |expected, actual|
+        expect_offense(expected, actual)
+      end
+    end
+  end
+
+  shared_examples 'autocorrects offenses' do
+    it 'autocorrects offenses' do
+      new_source = autocorrect_source(cop, source)
+      expect(new_source).to eq(Array(correct_source).join("\n"))
+    end
+  end
+
+  def expect_offense(expected, actual)
+    expect(actual.message).to eq(expected[:message])
+    expect(actual.severity).to eq(expected[:severity])
+    expect(actual.line).to eq(expected[:line])
+    expect(actual.column).to eq(expected[:column])
+    expect(actual.location.source).to eq(expected[:source])
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-cask
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Joshua Hagins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,16 +39,24 @@ files:
 - README.md
 - config/default.yml
 - lib/rubocop-cask.rb
-- lib/rubocop/cask/cask_block.rb
-- lib/rubocop/cask/cask_header.rb
+- lib/rubocop/cask/ast/cask_block.rb
+- lib/rubocop/cask/ast/cask_header.rb
+- lib/rubocop/cask/ast/stanza.rb
 - lib/rubocop/cask/cask_help.rb
+- lib/rubocop/cask/constants.rb
+- lib/rubocop/cask/extend/astrolabe/node.rb
+- lib/rubocop/cask/extend/string.rb
 - lib/rubocop/cask/inject.rb
-- lib/rubocop/cask/node_help.rb
 - lib/rubocop/cask/version.rb
 - lib/rubocop/cop/cask/no_dsl_version.rb
+- lib/rubocop/cop/cask/stanza_grouping.rb
+- lib/rubocop/cop/cask/stanza_order.rb
 - spec/project_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
 - spec/spec_helper.rb
+- spec/support/cop_shared_examples.rb
 homepage: https://github.com/caskroom/rubocop-cask
 licenses:
 - MIT
@@ -76,4 +84,7 @@ summary: Code style checking for Homebrew-Cask files
 test_files:
 - spec/project_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
 - spec/spec_helper.rb
+- spec/support/cop_shared_examples.rb

data/lib/rubocop/cask/cask_block.rb

@@ -1,20 +0,0 @@
-module RuboCop
-  module Cask
-    # This class wraps the AST block node that represents the entire cask
-    # definition. It includes various helper methods to aid cops in their
-    # analysis.
-    class CaskBlock
-      include CaskHelp
-
-      attr_reader :block_node
-
-      def initialize(block_node)
-        @block_node = block_node
-      end
-
-      def header
-        @header ||= CaskHeader.new(method_node(block_node))
-      end
-    end
-  end
-end

data/lib/rubocop/cask/cask_header.rb

@@ -1,59 +0,0 @@
-module RuboCop
-  module Cask
-    # This class wraps the AST method node that represents the cask header. It
-    # includes various helper methods to aid cops in their analysis.
-    class CaskHeader
-      include CaskHelp
-
-      attr_reader :method_node
-
-      def initialize(method_node)
-        @method_node = method_node
-      end
-
-      def dsl_version?
-        hash_node
-      end
-
-      def test_cask?
-        header_method_name == :test_cask || dsl_version.to_s.include?('test')
-      end
-
-      def header_str
-        @header_str ||= source_range.source
-      end
-
-      def source_range
-        @source_range ||= method_node.loc.expression
-      end
-
-      def preferred_header_str
-        "#{preferred_header_method_name} '#{cask_token}'"
-      end
-
-      def preferred_header_method_name
-        test_cask? ? :test_cask : :cask
-      end
-
-      def header_method_name
-        @header_method_name ||= method_name(method_node)
-      end
-
-      def dsl_version
-        @dsl_version ||= key_node(pair_node).children.first
-      end
-
-      def cask_token
-        @cask_token ||= value_node(pair_node).children.first
-      end
-
-      def hash_node
-        @hash_node ||= hash_children(method_node).first
-      end
-
-      def pair_node
-        @pair_node ||= pair_children(hash_node).first
-      end
-    end
-  end
-end

data/lib/rubocop/cask/node_help.rb

@@ -1,81 +0,0 @@
-module RuboCop
-  module Cask
-    # Helpers for traversing AST nodes
-    module NodeHelp
-      def root_node
-        processed_source.ast
-      end
-
-      def node?(node, type: nil)
-        return unless node.is_a?(Parser::AST::Node)
-        type ? node.type == type : true
-      end
-
-      def method?(node)
-        node?(node, type: :send)
-      end
-
-      def block?(node)
-        node?(node, type: :block)
-      end
-
-      def hash?(node)
-        node?(node, type: :hash)
-      end
-
-      def pair?(node)
-        node?(node, type: :pair)
-      end
-
-      def node_children(node, type: nil)
-        node.children.select { |e| node?(e, type: type) }
-      end
-
-      def method_children(node)
-        node_children(node, type: :send)
-      end
-
-      def block_children(node)
-        node_children(node, type: :block)
-      end
-
-      def hash_children(node)
-        node_children(node, type: :hash)
-      end
-
-      def pair_children(node)
-        node_children(node, type: :pair)
-      end
-
-      def method_node(block_node)
-        fail 'Not a block node' unless block?(block_node)
-        method_node, _args, _body = *block_node
-        method_node
-      end
-
-      def method_name(method_node)
-        fail 'Not a send node' unless method?(method_node)
-        _receiver, method_name, *_method_args = *method_node
-        method_name
-      end
-
-      def method_args(method_node)
-        fail 'Not a send node' unless method?(method_node)
-        _receiver, _method_name, *method_args = *method_node
-        method_args
-      end
-
-      def key_node(pair_node)
-        fail 'Not a pair node' unless pair?(pair_node)
-        key_node, _value_node = *pair_node
-        key_node
-      end
-
-      def value_node(pair_node)
-        fail 'Not a pair node' unless pair?(pair_node)
-        _key_node, value_node = *pair_node
-        value_node
-      end
-    end
-  end
-end