skippy 0.4.1.a → 0.4.2.a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: ce2b2452959a54d094d90bac57789f3738137f7d94ce844db4a6a2b08788925d
-  data.tar.gz: f3984931967ac74cfb3d5c8c233855385e0bee8c046d4d8156c0fec1d503d320
+SHA1:
+  metadata.gz: 7fb507a519db6a67ab099f00097e2d631a7d1adf
+  data.tar.gz: b8a6cea5346d7ed5bc3d699ecd9cedd98563e355
 SHA512:
-  metadata.gz: b18020a84524b9d4842e22939ada7fdf9f1edec500a4dce6d9ff6642ef47d335c46debb5c7933a4e504c191eb953af5a4654977787b9ce6e1734e408c1019f7f
-  data.tar.gz: 1836e67a3a1a547b3f7f9caa96d729157246621df36045171920e234eeccc9224419730a53dddf6d17a603b6d1871135d2ad1dcd99472fd34dbc833c4d3f19a3
+  metadata.gz: 2ae139c5630b471b4be7366321d8615fea6b367dd5e1f1133f0ec914b25f0d97b8138318e3fb11189263668a8d75f6b92467b8336e42328b7f477ab67a1e90db
+  data.tar.gz: ce10a2212bb23fea1eccf02bf18ecd6fbe35619f49ac630d1afe47fdd21dafdf1ca0dd1004c1c71b0b4d73031701b63c9223f1952c1ea4a86beff2bcb28b14d4

data/.rubocop.yml

@@ -9,6 +9,7 @@ AllCops:
     - 'vendor/**/*'
   DisplayCopNames: true
 
+
 Layout/AlignParameters:
   EnforcedStyle: with_fixed_indentation
 
@@ -36,6 +37,11 @@ Layout/EndOfLine:
 Layout/EmptyLinesAroundBlockBody:
   Enabled: false
 
+
+Naming/RescuedExceptionsVariableName:
+  PreferredName: error
+
+
 Metrics/AbcSize:
   Enabled: false
   Exclude:
@@ -61,6 +67,7 @@ Metrics/MethodLength:
 Metrics/PerceivedComplexity:
   Enabled: false
 
+
 # Prefer { ... } over do ... end except for control flow and
 # method defintions. Unfortunatly, no cop configuration for this.
 # https://github.com/chneukirchen/styleguide/blob/e60de37b478d3f892f6985a58d573016f33f0269/RUBY-STYLE#L63-L67
@@ -109,5 +116,8 @@ Style/SymbolArray:
   Enabled: False
 
 # Add trailing comma so it's easy to duplicate/add lines.
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
+Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: consistent_comma

data/.vscode/tasks.json

@@ -1,18 +1,18 @@
-{
-  // See https://go.microsoft.com/fwlink/?LinkId=733558
-  // for the documentation about the tasks.json format
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "rake test FILE",
-      "type": "shell",
-      "command": "bundle",
-      "args": [
-        "exec",
-        "rake",
-        "TEST=${relativeFile}"
-      ],
-      "group": "test"
-    }
-  ]
-}
+{
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "rake test FILE",
+      "type": "shell",
+      "command": "bundle",
+      "args": [
+        "exec",
+        "rake",
+        "TEST=${relativeFile}"
+      ],
+      "group": "test"
+    }
+  ]
+}

data/Gemfile

@@ -13,6 +13,7 @@ group :development do
   # gem 'aruba', git: 'https://github.com/rbld/aruba.git',
   #              branch: 'aruba-win-fix'
   gem 'pry'
-  gem 'rubocop', '~> 0.51.0', require: false
+  gem 'rubocop', '~> 0.67.2', require: false
+  gem 'rubocop-performance', '~> 1.1.0', require: false
   gem 'webmock', '~> 3.1'
 end

data/Rakefile

@@ -5,6 +5,9 @@ Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.libs << 'lib'
   t.test_files = FileList['test/**/*_test.rb']
+  # Turning off because Rake 11 >= turns warning on by default.
+  # TODO: Clean up the warnings coming from this project and enable.
+  t.warning = false
 end
 
 task default: :test

data/app/commands/new.rb

@@ -38,6 +38,7 @@ class New < Skippy::Command::Group
     if project.exist?
       raise Skippy::Error, "A project already exist: #{project.filename}"
     end
+
     project.namespace = namespace
     project.name = project.namespace.to_name
     project.basename = options[:basename] || project.namespace.short_name

data/app/commands/sketchup.rb

@@ -15,6 +15,7 @@ class Sketchup < Skippy::Command
     unless app.can_debug
       raise Skippy::Error, "Debug library not installed for Sketchup #{version}"
     end
+
     arguments = ['-rdebug', %("ide port=#{options.port}")]
     Skippy.os.launch_app(app.executable, *arguments)
   end
@@ -51,10 +52,14 @@ class Sketchup < Skippy::Command
   # @param [Integer] version
   # @return [Skippy::SketchUpApp, nil]
   def find_sketchup(version)
+    # Allow shortcuts such as 18 to mean 2018.
+    full_version = version.to_i
+    full_version += 2000 if (13..99).cover?(full_version)
     app = Skippy.os.sketchup_apps.find { |sketchup|
-      sketchup.version == version.to_i
+      sketchup.version == full_version
     }
     raise Skippy::Error, "SketchUp #{version} not found." if app.nil?
+
     app
   end
 

data/lib/skippy/app.rb

@@ -43,6 +43,7 @@ class Skippy::App
       template_path = templates_source_path.join(entry)
       next unless template_path.directory?
       next if %w(. ..).include?(entry.basename.to_s)
+
       result << entry.expand_path(templates_source_path)
     }
     result

data/lib/skippy/cli.rb

@@ -57,11 +57,12 @@ class Skippy::CLI < Skippy::Command
     end
   end
 
+  # rubocop:disable Style/MethodMissingSuper,Style/MissingRespondToMissing
   # Verbatim copy from Thor::Runner:
   # If a command is not found on Thor::Runner, method missing is invoked and
   # Thor::Runner is then responsible for finding the command in all classes.
   #
-  def method_missing(meth, *args) # rubocop:disable Style/MethodMissing
+  def method_missing(meth, *args)
     meth = meth.to_s
     initialize_thorfiles(meth)
     klass, command = Thor::Util.find_class_and_command_by_namespace(meth)
@@ -69,14 +70,15 @@ class Skippy::CLI < Skippy::Command
     args.unshift(command) if command
     klass.start(args, shell: shell)
   end
+  # rubocop:enable Style/MethodMissingSuper,Style/MissingRespondToMissing
 
   # Verbatim copy from Thor::Runner:
   desc 'list [SEARCH]',
     "List the available #{$PROGRAM_NAME} commands (--substring means .*SEARCH)"
   method_options substring: :boolean,
-                 group:     :string,
-                 all:       :boolean,
-                 debug:     :boolean
+                 group: :string,
+                 all: :boolean,
+                 debug: :boolean
   def list(search = '')
     initialize_thorfiles
 
@@ -112,8 +114,9 @@ class Skippy::CLI < Skippy::Command
   def initialize_thorfiles(_relevant_to = nil, _skip_lookup = false)
     project = Skippy::Project.new(Dir.pwd)
     return unless project.exist?
+
     project.command_files { |filename|
-      unless Thor::Base.subclass_files.keys.include?(File.expand_path(filename))
+      unless Thor::Base.subclass_files.key?(File.expand_path(filename))
         begin
           Thor::Util.load_thorfile(filename, nil, options[:debug])
         rescue ScriptError, StandardError => error

data/lib/skippy/config.rb

@@ -35,6 +35,7 @@ class Skippy::Config < Hash
     item = get_item(key_path)
     item = set_item(key_path, []) if item.nil?
     raise ArgumentError, 'key path is not an Array' unless item.is_a?(Array)
+
     item << value
   end
 
@@ -52,6 +53,7 @@ class Skippy::Config < Hash
 
   def save
     raise MissingPathError if path.nil?
+
     export(path)
   end
 
@@ -117,9 +119,11 @@ class Skippy::Config < Hash
   def get_item(key_path)
     parts = key_parts(key_path)
     return nil if parts.empty?
+
     item = self
     parts.each { |key|
       return nil if item.nil?
+
       item = item[key]
     }
     item

data/lib/skippy/config_accessors.rb

@@ -15,6 +15,7 @@ module Skippy::ConfigAccessors
     class_eval do
       symbols.each { |symbol|
         raise TypeError unless symbol.is_a?(Symbol)
+
         define_method(symbol) do
           value = @config.get(key || symbol, default)
           value = type.new(value) if type && !value.is_a?(type)
@@ -29,6 +30,7 @@ module Skippy::ConfigAccessors
     class_eval do
       symbols.each { |symbol|
         raise TypeError unless symbol.is_a?(Symbol)
+
         symbol_set = "#{symbol}=".intern
         define_method(symbol_set) do |value|
           value = type.new(value) if type && !value.is_a?(type)

data/lib/skippy/helpers/file.rb

@@ -7,6 +7,7 @@ module Skippy::Helpers
     # @return [Array<Pathname>]
     def directories(pathname)
       return [] unless pathname.exist?
+
       pathname.children.select(&:directory?)
     end
 

data/lib/skippy/installer/git.rb

@@ -27,7 +27,7 @@ class Skippy::GitLibraryInstaller < Skippy::LibraryInstaller
     end
     begin
       checkout_branch(git, source.branch) if source.branch
-      checkout_tag(git, source.requirement) unless edge_version?(source.requirement)
+      checkout_tag(git, source.requirement) unless edge_version?(source.requirement) # rubocop:disable Metrics/LineLength
     rescue Skippy::Error
       git.checkout(previous_commit) if previous_commit
       raise
@@ -67,6 +67,7 @@ class Skippy::GitLibraryInstaller < Skippy::LibraryInstaller
     unless branches.include?(branch)
       raise Skippy::BranchNotFound, "Found no branch named: '#{branch}'"
     end
+
     git.checkout(branch)
     nil
   end
@@ -77,6 +78,7 @@ class Skippy::GitLibraryInstaller < Skippy::LibraryInstaller
     tags = Naturally.sort_by(git.tags, :name)
     tag = latest_version?(version) ? tags.last : resolve_tag(tags, version)
     raise Skippy::TagNotFound, "Found no version: '#{version}'" if tag.nil?
+
     git.checkout(tag)
     # Verify the library version with the tagged version.
     target = path.join(source.lib_path)
@@ -97,6 +99,7 @@ class Skippy::GitLibraryInstaller < Skippy::LibraryInstaller
     requirement = Gem::Requirement.new(version)
     tags.reverse.find { |tag|
       next false unless Gem::Version.correct?(tag.name)
+
       tag_version = Gem::Version.new(tag.name)
       requirement.satisfied_by?(tag_version)
     }

data/lib/skippy/lib_module.rb

@@ -13,6 +13,7 @@ class Skippy::LibModule
   def initialize(library, path)
     @path = Pathname.new(path)
     raise ModuleNotFoundError, @path.to_s unless @path.file?
+
     @library = library
   end
 

data/lib/skippy/lib_source.rb

@@ -40,6 +40,7 @@ class Skippy::LibrarySource
   # @return [String, nil]
   def requirement
     return nil if @options[:requirement].nil?
+
     # Normalize the version requirement pattern.
     parts = Gem::Requirement.parse(@options[:requirement])
     # .parse will from '1.2.3' return ['=', '1.2.3']. Don't need that.

data/lib/skippy/library.rb

@@ -28,8 +28,10 @@ class Skippy::Library
     @path = Pathname.new(path)
     raise LibraryNotFoundError, @path.to_s unless @path.directory?
     raise LibraryNotFoundError, config_file.to_s unless config_file.exist?
+
     @config = Skippy::Config.load(config_file)
     raise LibraryNotFoundError, 'Not a Skippy Library' unless @config[:library]
+
     @source = source
   end
 

data/lib/skippy/library_manager.rb

@@ -29,6 +29,7 @@ class Skippy::LibraryManager
   # @param [Skippy::Project] project
   def initialize(project)
     raise TypeError, 'expected a Project' unless project.is_a?(Skippy::Project)
+
     @project = project
     @libraries = SortedSet.new(discover_libraries)
   end
@@ -56,8 +57,10 @@ class Skippy::LibraryManager
     if library_name.nil? || module_name.nil?
       raise ArgumentError, 'expected a module path'
     end
+
     library = find_library(library_name)
     return nil if library.nil?
+
     library.modules.find { |mod| mod.basename.casecmp(module_name).zero? }
   end
 
@@ -77,6 +80,7 @@ class Skippy::LibraryManager
   # @return [Skippy::Library]
   def install(source, options = {})
     raise Skippy::Project::ProjectNotSavedError unless project.exist?
+
     lib_source = Skippy::LibrarySource.new(project, source, options)
 
     installer = get_installer(lib_source)
@@ -99,8 +103,10 @@ class Skippy::LibraryManager
   # @return [Skippy::Library]
   def uninstall(lib)
     raise Skippy::Project::ProjectNotSavedError unless project.exist?
+
     library = lib.is_a?(Skippy::Library) ? lib : find_library(lib)
     raise Skippy::LibraryNotFound, 'Library not found' if library.nil?
+
     # Uninstall modules first - using the module manager.
     vendor_path = project.modules.vendor_path
     vendor_module_path = vendor_path.join(library.name)
@@ -113,9 +119,11 @@ class Skippy::LibraryManager
       vendor_path.rmdir
     end
     raise 'Unable to remove vendor modules' if vendor_module_path.exist?
+
     # Now the library itself is safe to remove.
     library.path.rmtree if library.path.exist?
     raise 'Unable to remove library' if library.path.exist?
+
     @libraries.delete(library)
     library
   end

data/lib/skippy/module_manager.rb

@@ -17,6 +17,7 @@ class Skippy::ModuleManager
   # @param [Skippy::Project] project
   def initialize(project)
     raise TypeError, 'expected a Project' unless project.is_a?(Skippy::Project)
+
     @project = project
     @modules = SortedSet.new(discover_modules)
   end
@@ -48,6 +49,7 @@ class Skippy::ModuleManager
   # @return [Skippy::LibModule]
   def use(module_name)
     raise Skippy::Project::ProjectNotSavedError unless project.exist?
+
     lib_module = project.libraries.find_module_or_fail(module_name)
 
     source = lib_module.path
@@ -63,6 +65,7 @@ class Skippy::ModuleManager
   # @return [Array<Skippy::LibModule>]
   def update(library)
     raise Skippy::Project::ProjectNotSavedError unless project.exist?
+
     installed = select { |mod| mod.library.name.casecmp(library.name).zero? }
     installed.each { |mod| use(mod.name) }
     installed
@@ -72,6 +75,7 @@ class Skippy::ModuleManager
   # @return [Skippy::LibModule]
   def remove(module_name)
     raise Skippy::Project::ProjectNotSavedError unless project.exist?
+
     lib_module = project.libraries.find_module_or_fail(module_name)
 
     target = vendor_path.join(lib_module.library.name, lib_module.path.basename)
@@ -103,9 +107,11 @@ class Skippy::ModuleManager
     project.libraries.each { |library|
       library_vendor_path = vendor_path.join(library.name)
       next unless library_vendor_path.directory?
+
       library_vendor_path.each_child { |module_file|
         next unless module_file.file?
         next unless module_file.extname.casecmp('.rb').zero?
+
         modules << Skippy::LibModule.new(library, module_file)
       }
     }
@@ -122,6 +128,7 @@ class Skippy::ModuleManager
     basename = source.basename('.*')
     source_support_folder = source.parent.join(basename)
     return unless source_support_folder.directory?
+
     target_support_folder = target.parent.join(basename)
     copy_directory(lib_module, source_support_folder, target_support_folder)
   end
@@ -133,6 +140,7 @@ class Skippy::ModuleManager
     Dir.glob("#{source_path}/**/*") { |filename|
       source = Pathname.new(filename)
       next unless source.file?
+
       relative_path = source.relative_path_from(source_path)
       target = target_path.join(relative_path)
       copy_file(lib_module, source, target)
@@ -164,7 +172,7 @@ class Skippy::ModuleManager
     content
   end
 
-  LIB_REQUIRE_PATTERN = %r{(\brequire ["'])(modules)(/[^"']*["'])}
+  LIB_REQUIRE_PATTERN = %r{(\brequire ["'])(modules)(/[^"']*["'])}.freeze
 
   # Transform the require statements to the target destination.
   #

data/lib/skippy/namespace.rb

@@ -6,6 +6,7 @@ class Skippy::Namespace
     unless valid?(namespace)
       raise Skippy::Error, "'#{namespace}' is not a valid Ruby namespace"
     end
+
     @namespace = namespace
   end
 
@@ -24,6 +25,7 @@ class Skippy::Namespace
   def short_name
     items = to_a
     return to_s unless items.size > 1
+
     initials = items.first.scan(/[[:upper:]]/)
     prefix = initials.size > 1 ? initials.join : items.first[0, 2]
     "#{prefix}_#{items.last}"

data/lib/skippy/project.rb

@@ -36,6 +36,7 @@ class Skippy::Project
   def self.current_or_fail
     project = current
     raise ProjectNotFoundError, project.filename unless project.exist?
+
     project
   end
 
@@ -108,8 +109,8 @@ class Skippy::Project
   end
 
   # @return [String]
-  def to_json
-    JSON.pretty_generate(@config)
+  def to_json(*args)
+    JSON.pretty_generate(@config, *args)
   end
 
   private
@@ -141,6 +142,7 @@ class Skippy::Project
       project_file = pathname.join(PROJECT_FILENAME)
       return pathname if project_file.exist?
       break if pathname.root?
+
       pathname = pathname.parent
     end
     nil

data/lib/skippy/version.rb

@@ -1,5 +1,5 @@
 module Skippy
 
-  VERSION = '0.4.1.a'.freeze
+  VERSION = '0.4.2.a'.freeze
 
 end

data/skippy.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'naturally', '~> 2.1'
   spec.add_dependency 'thor', '~> 0.19'
 
-  spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '>= 1.15.0', '< 3.0'
+  spec.add_development_dependency 'rake', '~> 12.3.3'
   spec.add_development_dependency 'minitest', '~> 5.0'
   # TODO(thomthom): Need to lock to 2.3 because 2.4 fails with the custom
   # aruba build.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skippy
 version: !ruby/object:Gem::Version
-  version: 0.4.1.a
+  version: 0.4.2.a
 platform: ruby
 authors:
 - Thomas Thomassen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -56,30 +56,36 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.15.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.15.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -255,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: CLI development tool for SketchUp extensions.