rubocop-sketchup 1.0.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f127a24e47b19d2fdfcc67dbd345a4c2a7ad60425ec65b6d966f28244fcb081
-  data.tar.gz: cd916a3de6ebb7e3b51d0a57c3176be7898bd2b4cea2cf3cbfecf508fe1d94aa
+  metadata.gz: e9935671119993e41eef012a5f69fca2709a59d7db06d28c2e89ff9ea5721aa7
+  data.tar.gz: 05cba02d5fa27e8eab8b32cae46d586c68d5fec8922b959febf89ebd36660ced
 SHA512:
-  metadata.gz: f805d4810dd4711b760763ed4d83b9185a13b7c8c9e14cf89472fff1acbb9c1246defcdbdfc593350b5b3e4213b4523decc060639b46b12c6a73eee26d4a3d68
-  data.tar.gz: e5d41dd9aa462d62be7804076803f9969e7dbc5b100169c339654e88d9b518e4a06d72859450ea645aba2ea8b7b981a9c76a17ee2eb449b220b8e627b1778194
+  metadata.gz: 06e197b228db557e7d1b0ab9eeec6550e9a70a8e64fa4079f6f4e093249f0057390f9ce6f4270d15e1be956e36b684ff66f5e926a55d0a2b862e33d113a8a3c2
+  data.tar.gz: 54242ae1e4bb983394e9976f02893d98794ae46971755751bdbcea1b4ecdfd9e1c6e3c9e4dde6cd995e7977b788d8ec5fa3dab693723bdd84f30dd3717b8a590

data/Gemfile

@@ -9,6 +9,8 @@ group :test do
   gem 'rake', '~> 12.0', require: false
   gem 'rspec', '~> 3.7', require: false
   gem 'rubocop-performance', '~> 1.11.0', require: false
+  gem 'rubocop-rake', '~> 0.6.0', require: false
+  gem 'rubocop-rspec', require: false
   gem 'simplecov', '~> 0.10', require: false
 end
 

data/lib/rubocop/sketchup/cop/requirements/exit.rb

@@ -13,18 +13,19 @@ module RuboCop
 
         include SketchUp::NoCommentDisable
 
-        MSG = '`exit` attempts to kill the Ruby interpreter. Use `return`, '\
+        MSG = '`%s` attempts to kill the Ruby interpreter. Use `return`, '\
               '`next`, `break` or `raise` instead.'
 
         # Reference: http://rubocop.readthedocs.io/en/latest/development/
         def_node_matcher :exit?, <<-PATTERN
-          (send {(const nil? :Kernel) nil?} {:exit :exit!} ...)
+          (send {(const nil? :Kernel) nil?} {:abort :exit :exit!} ...)
         PATTERN
 
         def on_send(node)
           return unless exit?(node)
 
-          add_offense(node, location: :selector)
+          message = format(MSG, node.method_name)
+          add_offense(node, location: :selector, message: message)
         end
       end
     end

data/lib/rubocop/sketchup/features.rb

@@ -41,6 +41,51 @@ module RuboCop
 
       FEATURES = [
 
+        {
+          version: 'LayOut 2022.0',
+          types: {
+            method: [
+              'Layout::AutoTextDefinition#end_page',
+              'Layout::AutoTextDefinition#end_page=',
+              'Layout::AutoTextDefinition#increment',
+              'Layout::AutoTextDefinition#increment=',
+              'Layout::AutoTextDefinition#number_style',
+              'Layout::AutoTextDefinition#number_style=',
+              'Layout::AutoTextDefinition#renumber',
+              'Layout::AutoTextDefinition#sequence_format',
+              'Layout::AutoTextDefinition#sequence_format=',
+              'Layout::AutoTextDefinition#start_page',
+              'Layout::AutoTextDefinition#start_page=',
+            ],
+          },
+        },
+
+        {
+          version: 'SketchUp 2022.0',
+          types: {
+            class: [
+              'Sketchup::EntitiesBuilder',
+            ],
+            method: [
+              'Sketchup::AppObserver#onExtensionsLoaded',
+              'Sketchup::ComponentDefinition#save_copy',
+              'Sketchup::Entities#build',
+              'Sketchup::EntitiesBuilder#add_edge',
+              'Sketchup::EntitiesBuilder#add_edges',
+              'Sketchup::EntitiesBuilder#add_face',
+              'Sketchup::EntitiesBuilder#add_line',
+              'Sketchup::EntitiesBuilder#entities',
+              'Sketchup::EntitiesBuilder#valid?',
+              'Sketchup::EntitiesBuilder#vertex_at',
+              'Sketchup::Face#clear_texture_position',
+              'UI::Command#extension',
+              'UI::Command#extension=',
+              'UI::Command#get_validation_proc',
+              'UI::Command#proc',
+            ],
+          },
+        },
+
         {
           version: 'SketchUp 2021.1',
           types: {
@@ -1231,6 +1276,7 @@ module RuboCop
         camera_modified?
         center_2d
         classifications
+        clear_texture_position
         clip_to_margins?
         clip_to_margins=
         colorize_deltas
@@ -1259,6 +1305,7 @@ module RuboCop
         get_drawingelement_visibility
         get_glued_instances
         get_texture_projection
+        get_validation_proc
         has_aligned_text?
         has_aligned_text=
         icon_name
@@ -1340,6 +1387,7 @@ module RuboCop
         unload_schema
         upper_left
         upper_right
+        vertex_at
         visible_on_new_pages?
         visible_on_new_pages=
         winding
@@ -1352,6 +1400,7 @@ module RuboCop
         onAfterComponentSaveAs
         onBeforeComponentSaveAs
         onElementModified
+        onExtensionsLoaded
         onExplode
         onLayerChanged
         onLayerFolderAdded

data/lib/rubocop/sketchup/namespace_checker.rb

@@ -4,6 +4,35 @@ module RuboCop
   module SketchUp
     module NamespaceChecker
 
+      extend NodePattern::Macros
+
+      # Example:
+      #   Array.include(Example)
+      def_node_matcher :klass_include, <<-PATTERN
+        (send
+          (const nil? $_) { :include | :extend } _)
+      PATTERN
+
+      # Example:
+      #   class Array
+      #     include Example
+      #   end
+      def_node_matcher :klass_scope_include, <<-PATTERN
+        (
+          {
+            class (const nil? $_) nil? |
+            module (const nil? $_)
+          }
+          (send nil? { :include | :extend } _))
+      PATTERN
+
+      # Example:
+      #   include Example
+      def_node_matcher :include_call?, <<-PATTERN
+        (send nil? { :include | :extend } _)
+      PATTERN
+
+
       def on_class(node)
         check_namespace(node)
       end
@@ -22,12 +51,40 @@ module RuboCop
         check_namespace(node)
       end
 
+      def on_send(node)
+        klass = klass_include(node) || klass_scope_include(node.parent)
+
+        if klass
+          namespace = SketchUp::Namespace.new(klass.to_s)
+          return unless namespaces.include?(namespace.first)
+        else
+          # If klass is `nil` we either don't have a `include` call or we're in
+          # global namespace.
+          return unless top_level_include?(node)
+        end
+
+        add_offense(node, location: :selector, severity: :error)
+      end
+
       def check_namespace(node)
         return unless in_namespace?(node)
 
         add_offense(node, location: :name, severity: :error)
       end
 
+      def top_level?(node)
+        # parent_module_name might return nil if for instance a method is
+        # defined within a block. (Apparently that is possible...)
+        return false if node.parent_module_name.nil?
+
+        namespace = SketchUp::Namespace.new(node.parent_module_name)
+        namespace.top_level?
+      end
+
+      def top_level_include?(node)
+        include_call?(node) && top_level?(node)
+      end
+
       def in_namespace?(node)
         # parent_module_name might return nil if for instance a method is
         # defined within a block. (Apparently that is possible...)

data/lib/rubocop/sketchup/sketchup_version.rb

@@ -67,6 +67,7 @@ module RuboCop
       #
       # The second item in the array is maintenance annotation
       VALID_VERSIONS = [
+        [2022.0, 0],
         [2021.1, 0],
         [2021.0, 0],
         [2020.1, 0],

data/lib/rubocop/sketchup/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module SketchUp
-    VERSION = '1.0.0'
+    VERSION = '1.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-sketchup
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Trimble Inc, SketchUp Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: RuboCop rules for SketchUp extensions.