rubocop-sketchup 1.3.0 → 1.4.0

data/lib/rubocop/sketchup/sketchup_version.rb

@@ -1,128 +1,129 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module SketchUp
-    class SketchUpVersion
-
-      include Comparable
-
-      attr_reader :version, :maintenance
-
-      class InvalidVersion < StandardError; end
-
-      # @overload initialize(version_string)
-      #   @param [String] version_string
-      #
-      # @overload initialize(version, maintenance)
-      #   @param [Integer, Float] version
-      #   @param [Integer] maintenance
-      def initialize(*args)
-        case args.size
-        when 1
-          @version, @maintenance = parse_version(args.first)
-        when 2
-          validate(args)
-          @version, @maintenance = args
-        else
-          raise ArgumentError, "expected 1..2 arguments, got #{args.size}"
-        end
-      end
-
-      # @return [SketchUpVersion, nil]
-      def succ
-        version_parts = [@version, @maintenance]
-        index = VALID_VERSIONS.index(version_parts)
-        next_version_parts = VALID_VERSIONS[index + 1]
-        return nil if next_version_parts.nil?
-
-        self.class.new(*next_version_parts)
-      end
-
-      def <=>(other)
-        if version == other.version
-          maintenance <=> other.maintenance
-        else
-          version <=> other.version
-        end
-      end
-
-      # @return [String]
-      def to_s
-        string_version = version < 2013 ? version.to_f : version.to_i
-        if maintenance > 0
-          "SketchUp #{string_version} M#{maintenance}"
-        else
-          "SketchUp #{string_version}"
-        end
-      end
-
-      private
-
-      VERSION_NUMBER_REGEX = /^(?:SketchUp )?([0-9.]+)(?: M(\d+))?$/.freeze
-
-      # This list is compiled from the list of versions reported by YARD when
-      # running the `versions` template on the API stubs repository;
-      #
-      #   yardoc -t versions -f text
-      #
-      # The second item in the array is maintenance annotation
-      VALID_VERSIONS = [
-        [2022.0, 0],
-        [2021.1, 0],
-        [2021.0, 0],
-        [2020.1, 0],
-        [2020.0, 0],
-        [2019.2, 0],
-        [2019.0, 0], # SketchUp dropped M notation as of SU2019.
-        [2019, 0], # Documentation still refer to SU2019 instead of SU2019.0
-        [2018, 0],
-        [2017, 0],
-        [2016, 1],
-        [2016, 0],
-        [2015, 0],
-        [2014, 0],
-        [2013, 0],
-        [8.0, 2],
-        [8.0, 1],
-        [8.0, 0],
-        [7.1, 1],
-        [7.1, 0],
-        [7.0, 1],
-        [7.0, 0],
-        [6.0, 0],
-      ].reverse.freeze
-
-      # @param [String] version
-      # @return [Array(Float, Integer)]
-      def parse_version(version)
-        v = 0
-        m = 0
-        case version
-        when String
-          # Treat all LayOut versions as SketchUp versions for now.
-          normalized_version = version.gsub('LayOut', 'SketchUp')
-          result = normalized_version.match(VERSION_NUMBER_REGEX)
-          if result
-            v = result.captures[0].to_f
-            m = (result.captures[1] || '0').to_i
-          end
-        when Numeric
-          v = version
-          m = 0
-        end
-        validate([v, m])
-      end
-
-      # @param [Array(Float, Integer)] version_parts
-      def validate(version_parts)
-        unless VALID_VERSIONS.include?(version_parts)
-          version = version_parts.join('.')
-          raise InvalidVersion, "#{version} is not a valid SketchUp version"
-        end
-
-        version_parts
-      end
-
-    end
-  end
-end
+# frozen_string_literal: true
+
+module RuboCop
+  module SketchUp
+    class SketchUpVersion
+
+      include Comparable
+
+      attr_reader :version, :maintenance
+
+      class InvalidVersion < StandardError; end
+
+      # @overload initialize(version_string)
+      #   @param [String] version_string
+      #
+      # @overload initialize(version, maintenance)
+      #   @param [Integer, Float] version
+      #   @param [Integer] maintenance
+      def initialize(*args)
+        case args.size
+        when 1
+          @version, @maintenance = parse_version(args.first)
+        when 2
+          validate(args)
+          @version, @maintenance = args
+        else
+          raise ArgumentError, "expected 1..2 arguments, got #{args.size}"
+        end
+      end
+
+      # @return [SketchUpVersion, nil]
+      def succ
+        version_parts = [@version, @maintenance]
+        index = VALID_VERSIONS.index(version_parts)
+        next_version_parts = VALID_VERSIONS[index + 1]
+        return nil if next_version_parts.nil?
+
+        self.class.new(*next_version_parts)
+      end
+
+      def <=>(other)
+        if version == other.version
+          maintenance <=> other.maintenance
+        else
+          version <=> other.version
+        end
+      end
+
+      # @return [String]
+      def to_s
+        string_version = version < 2013 ? version.to_f : version.to_i
+        if maintenance > 0
+          "SketchUp #{string_version} M#{maintenance}"
+        else
+          "SketchUp #{string_version}"
+        end
+      end
+
+      private
+
+      VERSION_NUMBER_REGEX = /^(?:SketchUp )?([0-9.]+)(?: M(\d+))?$/.freeze
+
+      # This list is compiled from the list of versions reported by YARD when
+      # running the `versions` template on the API stubs repository;
+      #
+      #   yardoc -t versions -f text
+      #
+      # The second item in the array is maintenance annotation
+      VALID_VERSIONS = [
+        [2023.0, 0],
+        [2022.0, 0],
+        [2021.1, 0],
+        [2021.0, 0],
+        [2020.1, 0],
+        [2020.0, 0],
+        [2019.2, 0],
+        [2019.0, 0], # SketchUp dropped M notation as of SU2019.
+        [2019, 0], # Documentation still refer to SU2019 instead of SU2019.0
+        [2018, 0],
+        [2017, 0],
+        [2016, 1],
+        [2016, 0],
+        [2015, 0],
+        [2014, 0],
+        [2013, 0],
+        [8.0, 2],
+        [8.0, 1],
+        [8.0, 0],
+        [7.1, 1],
+        [7.1, 0],
+        [7.0, 1],
+        [7.0, 0],
+        [6.0, 0],
+      ].reverse.freeze
+
+      # @param [String] version
+      # @return [Array(Float, Integer)]
+      def parse_version(version)
+        v = 0
+        m = 0
+        case version
+        when String
+          # Treat all LayOut versions as SketchUp versions for now.
+          normalized_version = version.gsub('LayOut', 'SketchUp')
+          result = normalized_version.match(VERSION_NUMBER_REGEX)
+          if result
+            v = result.captures[0].to_f
+            m = (result.captures[1] || '0').to_i
+          end
+        when Numeric
+          v = version
+          m = 0
+        end
+        validate([v, m])
+      end
+
+      # @param [Array(Float, Integer)] version_parts
+      def validate(version_parts)
+        unless VALID_VERSIONS.include?(version_parts)
+          version = version_parts.join('.')
+          raise InvalidVersion, "#{version} is not a valid SketchUp version"
+        end
+
+        version_parts
+      end
+
+    end
+  end
+end

data/lib/rubocop/sketchup/tool_checker.rb

@@ -1,43 +1,41 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module SketchUp
-    module ToolChecker
-
-      def on_class(node)
-        name, _base_class, body = *node
-        return unless name.const_name.end_with?('Tool')
-
-        check_body(body, node)
-      end
-
-      private
-
-      # rubocop:disable Lint/UnusedMethodArgument
-      def on_tool_class(class_node, body, body_methods)
-        raise NotImplementedError, 'Implement this method'
-      end
-      # rubocop:enable Lint/UnusedMethodArgument
-
-      def body_methods(body)
-        return [body] if body.def_type?
-        return unless body.begin_type?
-
-        body.each_child_node(:def)
-      end
-
-      def check_body(body, class_node)
-        return if body.nil? # Empty class etc.
-
-        body_methods = body_methods(body)
-
-        on_tool_class(class_node, body_methods)
-      end
-
-      def find_method(defs, method_name)
-        defs.find { |def_node| def_node.method?(method_name) }
-      end
-
-    end
-  end
-end
+# frozen_string_literal: true
+
+module RuboCop
+  module SketchUp
+    module ToolChecker
+
+      def on_class(node)
+        name, _base_class, body = *node
+        return unless name.const_name.end_with?('Tool')
+
+        check_body(body, node)
+      end
+
+      private
+
+      def on_tool_class(class_node, body, body_methods)
+        raise NotImplementedError, 'Implement this method'
+      end
+
+      def body_methods(body)
+        return [body] if body.def_type?
+        return unless body.begin_type?
+
+        body.each_child_node(:def)
+      end
+
+      def check_body(body, class_node)
+        return if body.nil? # Empty class etc.
+
+        body_methods = body_methods(body)
+
+        on_tool_class(class_node, body_methods)
+      end
+
+      def find_method(defs, method_name)
+        defs.find { |def_node| def_node.method?(method_name) }
+      end
+
+    end
+  end
+end

data/lib/rubocop/sketchup/version.rb

@@ -1,7 +1,7 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module SketchUp
-    VERSION = '1.3.0'
-  end
-end
+# frozen_string_literal: true
+
+module RuboCop
+  module SketchUp
+    VERSION = '1.4.0'
+  end
+end

data/lib/rubocop/sketchup.rb

@@ -1,14 +1,14 @@
-# frozen_string_literal: true
-
-require 'pathname'
-
-module RuboCop
-  # RuboCop SketchUp project namespace
-  module SketchUp
-    PROJECT_ROOT   = Pathname.new(__dir__).parent.parent.expand_path.freeze
-    CONFIG_DEFAULT = PROJECT_ROOT.join('config', 'default.yml').freeze
-    CONFIG         = YAML.safe_load(CONFIG_DEFAULT.read).freeze
-
-    private_constant(:CONFIG_DEFAULT, :PROJECT_ROOT)
-  end
-end
+# frozen_string_literal: true
+
+require 'pathname'
+
+module RuboCop
+  # RuboCop SketchUp project namespace
+  module SketchUp
+    PROJECT_ROOT   = Pathname.new(__dir__).parent.parent.expand_path.freeze
+    CONFIG_DEFAULT = PROJECT_ROOT.join('config', 'default.yml').freeze
+    CONFIG         = YAML.safe_load(CONFIG_DEFAULT.read).freeze
+
+    private_constant(:CONFIG_DEFAULT, :PROJECT_ROOT)
+  end
+end

data/lib/rubocop-sketchup.rb

@@ -1,53 +1,53 @@
-# frozen_string_literal: true
-
-require 'rubocop'
-require 'rubocop/sketchup'
-require 'rubocop/sketchup/version'
-require 'rubocop/sketchup/inject'
-
-require 'rubocop/sketchup/formatter/extension_review'
-require 'rubocop/sketchup/config'
-require 'rubocop/sketchup/cop'
-require 'rubocop/sketchup/dc_globals'
-require 'rubocop/sketchup/dc_methods'
-require 'rubocop/sketchup/extension_project'
-require 'rubocop/sketchup/features'
-require 'rubocop/sketchup/namespace'
-require 'rubocop/sketchup/namespace_checker'
-require 'rubocop/sketchup/no_comment_disable'
-require 'rubocop/sketchup/range_help'
-require 'rubocop/sketchup/sketchup_target_range'
-require 'rubocop/sketchup/sketchup_version'
-require 'rubocop/sketchup/tool_checker'
-
-RuboCop::SketchUp::Inject.defaults!
-
-# Monkey patching the built in formatter list to add a short alias for custom
-# formatters. Naughty! Naughty!
-class RuboCop::Formatter::FormatterSet
-  formatters = BUILTIN_FORMATTERS_FOR_KEYS.dup
-  formatters['extension_review'] =
-      RuboCop::Formatter::ExtensionReviewFormatter
-  verbose = $VERBOSE
-  begin
-    $VERBOSE = nil
-    BUILTIN_FORMATTERS_FOR_KEYS = formatters.freeze
-  ensure
-    $VERBOSE = verbose
-  end
-end
-
-# Make it easier to explore available methods on a method.
-class Object
-  def methods!(queries = true) # rubocop:disable Style/OptionalBooleanParameter
-    sorted = methods.sort - Object.class.instance_methods
-    sorted.reject! { |m| m.to_s.end_with?('?') } unless queries
-    sorted
-  end
-end
-
-# Load all custom cops.
-pattern = File.join(__dir__, 'rubocop', 'sketchup', 'cop', '**/*rb')
-Dir.glob(pattern).sort.each { |file|
-  require file
-}
+# frozen_string_literal: true
+
+require 'rubocop'
+require 'rubocop/sketchup'
+require 'rubocop/sketchup/version'
+require 'rubocop/sketchup/inject'
+
+require 'rubocop/sketchup/formatter/extension_review'
+require 'rubocop/sketchup/config'
+require 'rubocop/sketchup/cop'
+require 'rubocop/sketchup/dc_globals'
+require 'rubocop/sketchup/dc_methods'
+require 'rubocop/sketchup/extension_project'
+require 'rubocop/sketchup/features'
+require 'rubocop/sketchup/namespace'
+require 'rubocop/sketchup/namespace_checker'
+require 'rubocop/sketchup/no_comment_disable'
+require 'rubocop/sketchup/range_help'
+require 'rubocop/sketchup/sketchup_target_range'
+require 'rubocop/sketchup/sketchup_version'
+require 'rubocop/sketchup/tool_checker'
+
+RuboCop::SketchUp::Inject.defaults!
+
+# Monkey patching the built in formatter list to add a short alias for custom
+# formatters. Naughty! Naughty!
+class RuboCop::Formatter::FormatterSet
+  formatters = BUILTIN_FORMATTERS_FOR_KEYS.dup
+  formatters['extension_review'] =
+      RuboCop::Formatter::ExtensionReviewFormatter
+  verbose = $VERBOSE
+  begin
+    $VERBOSE = nil
+    BUILTIN_FORMATTERS_FOR_KEYS = formatters.freeze
+  ensure
+    $VERBOSE = verbose
+  end
+end
+
+# Make it easier to explore available methods on a method.
+class Object
+  def methods!(queries = true) # rubocop:disable Style/OptionalBooleanParameter
+    sorted = methods.sort - Object.class.instance_methods
+    sorted.reject! { |m| m.to_s.end_with?('?') } unless queries
+    sorted
+  end
+end
+
+# Load all custom cops.
+pattern = File.join(__dir__, 'rubocop', 'sketchup', 'cop', '**/*rb')
+Dir.glob(pattern).sort.each { |file|
+  require file
+}

data/rubocop-sketchup.gemspec

@@ -1,29 +1,29 @@
-# frozen_string_literal: true
-
-$LOAD_PATH.unshift File.expand_path('lib', __dir__)
-require 'rubocop/sketchup/version'
-
-Gem::Specification.new do |spec|
-  spec.name = 'rubocop-sketchup'
-  spec.summary = 'RuboCop rules for SketchUp extensions.'
-  spec.description = 'RuboCop rules for SketchUp extensions.'
-  spec.homepage = 'https://github.com/sketchup/rubocop-sketchup'
-  spec.authors = ['Trimble Inc, SketchUp Team']
-  spec.licenses = ['MIT']
-
-  spec.version = RuboCop::SketchUp::VERSION
-  spec.platform = Gem::Platform::RUBY
-  spec.required_ruby_version = '>= 2.5.0'
-
-  spec.require_paths = ['lib']
-  spec.files = Dir[
-      'assets/**/*',
-      'config/**/*',
-      'lib/**/*',
-      '*.gemspec',
-      'Gemfile'
-  ]
-
-  spec.add_dependency 'rubocop', '>= 0.82', '< 2.0'
-  spec.add_development_dependency 'bundler', '>= 1.13', '< 3.0'
-end
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
+require 'rubocop/sketchup/version'
+
+Gem::Specification.new do |spec|
+  spec.name = 'rubocop-sketchup'
+  spec.summary = 'RuboCop rules for SketchUp extensions.'
+  spec.description = 'RuboCop rules for SketchUp extensions.'
+  spec.homepage = 'https://github.com/sketchup/rubocop-sketchup'
+  spec.authors = ['Trimble Inc, SketchUp Team']
+  spec.licenses = ['MIT']
+
+  spec.version = RuboCop::SketchUp::VERSION
+  spec.platform = Gem::Platform::RUBY
+  spec.required_ruby_version = '>= 2.6.0'
+
+  spec.require_paths = ['lib']
+  spec.files = Dir[
+      'assets/**/*',
+      'config/**/*',
+      'lib/**/*',
+      '*.gemspec',
+      'Gemfile'
+  ]
+
+  spec.add_dependency 'rubocop', '>= 0.82', '< 2.0'
+  spec.add_development_dependency 'bundler', '>= 1.13', '< 3.0'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-sketchup
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Trimble Inc, SketchUp Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2023-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -51,7 +51,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 description: RuboCop rules for SketchUp extensions.
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -129,7 +129,7 @@ homepage: https://github.com/sketchup/rubocop-sketchup
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,15 +137,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: RuboCop rules for SketchUp extensions.
 test_files: []