skippy 0.4.1.a → 0.5.1.a

data/lib/skippy/installer/git.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git'
 require 'naturally'
 require 'pathname'
@@ -32,8 +34,7 @@ class Skippy::GitLibraryInstaller < Skippy::LibraryInstaller
       git.checkout(previous_commit) if previous_commit
       raise
     end
-    library = Skippy::Library.new(target, source: source)
-    library
+    Skippy::Library.new(target, source: source)
   end
 
   private
@@ -55,7 +56,7 @@ class Skippy::GitLibraryInstaller < Skippy::LibraryInstaller
     git = Git.open(target)
     previous_commit = git.object('HEAD^').class
     git.reset_hard
-    git.pull
+    git.fetch
     [git, previous_commit]
   end
 
@@ -67,6 +68,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 +79,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 +100,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)
     }
@@ -104,7 +108,7 @@ class Skippy::GitLibraryInstaller < Skippy::LibraryInstaller
 
   # @param [String] version
   def edge_version?(version)
-    version && version.casecmp('edge').zero?
+    version&.casecmp('edge')&.zero?
   end
 
   # @param [String] version

data/lib/skippy/installer/local.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 require 'skippy/installer'

data/lib/skippy/installer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'skippy/lib_source'
 require 'skippy/library'
 require 'skippy/project'
@@ -28,7 +30,7 @@ class Skippy::LibraryInstaller
   # @param [Symbol] type
   # @param [String] message
   def status(type, message)
-    @messager.call(type, message) if @messager
+    @messager&.call(type, message)
   end
 
   # @param [String] message

data/lib/skippy/lib_module.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 require 'skippy/library'
@@ -13,6 +15,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'digest'
 require 'net/http'
 require 'pathname'
@@ -40,6 +42,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'pathname'
 
@@ -12,7 +14,7 @@ class Skippy::Library
 
   include Skippy::Helpers::File
 
-  CONFIG_FILENAME = 'skippy.json'.freeze
+  CONFIG_FILENAME = 'skippy.json'
 
   attr_reader :path, :source, :requirement
 
@@ -28,8 +30,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git'
 require 'json'
 require 'naturally'
@@ -29,13 +31,14 @@ 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
 
   # @yield [Skippy::Library]
-  def each
-    @libraries.each { |library| yield library }
+  def each(&block)
+    @libraries.each(&block)
     self
   end
 
@@ -56,8 +59,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,11 +82,12 @@ 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)
     if block_given?
-      installer.on_status { |type, message|
+      installer.on_status { |type, message| # rubocop:disable Style/ExplicitBlockArgument
         yield type, message
       }
     end
@@ -99,8 +105,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 +121,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'json'
 require 'pathname'
@@ -17,13 +19,14 @@ 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
 
   # @yield [Skippy::LibModule]
-  def each
-    @modules.each { |lib_module| yield lib_module }
+  def each(&block)
+    @modules.each(&block)
     self
   end
 
@@ -40,7 +43,7 @@ class Skippy::ModuleManager
   # @param [Skippy::LibModule, String] lib_module
   def installed?(lib_module)
     module_name = lib_module.name
-    modules = project && project.config.get(:modules, [])
+    modules = project&.config&.get(:modules, [])
     modules.any? { |mod| mod.casecmp(module_name).zero? }
   end
 
@@ -48,6 +51,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 +67,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 +77,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 +109,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 +130,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 +142,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 +174,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'skippy/error'
 
 class Skippy::Namespace
@@ -6,6 +8,7 @@ class Skippy::Namespace
     unless valid?(namespace)
       raise Skippy::Error, "'#{namespace}' is not a valid Ruby namespace"
     end
+
     @namespace = namespace
   end
 
@@ -24,6 +27,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/os/common.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Skippy::OSCommon
 
   # @param [String] command
@@ -15,7 +17,7 @@ class Skippy::OSCommon
   end
 
   # @param [String] path
-  def launch_app(path, *args) # rubocop:disable Lint/UnusedMethodArgument
+  def launch_app(path, *args)
     raise NotImplementedError
   end
 
@@ -23,4 +25,11 @@ class Skippy::OSCommon
     raise NotImplementedError
   end
 
+  # @param [String] path
+  # @return [Integer, nil]
+  def sketchup_version_from_path(path)
+    match = File.basename(path).match(/[0-9.]+/)
+    match ? match[0].to_i : nil
+  end
+
 end

data/lib/skippy/os/mac.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'skippy/os/common'
 require 'skippy/sketchup/app'
 
@@ -5,7 +7,7 @@ class Skippy::OSMac < Skippy::OSCommon
 
   # @param [String] executable_path
   def launch_app(executable_path, *args)
-    command = %(open -a "#{executable_path}")
+    command = +%(open -a "#{executable_path}")
     unless args.empty?
       command << " --args #{args.join(' ')}"
     end
@@ -18,7 +20,9 @@ class Skippy::OSMac < Skippy::OSCommon
     Dir.glob(pattern) { |path|
       app = File.join(path, 'SketchUp.app')
       debug_lib = File.join(app, 'Contents/Frameworks/SURubyDebugger.dylib')
-      version = File.basename(path).match(/[0-9.]+$/)[0].to_i
+      version = sketchup_version_from_path(path)
+      next unless version
+
       apps << Skippy::SketchUpApp.from_hash(
         executable: app,
         version: version,

data/lib/skippy/os/win.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'skippy/os/common'
 require 'skippy/sketchup/app'
 
 class Skippy::OSWin < Skippy::OSCommon
 
-  # Note: This is not a good indication to 32bit bs 64bit. It's a naive
+  # NOTE: This is not a good indication to 32bit bs 64bit. It's a naive
   #       assumption that will fail when SketchUp is installed to a
   #       non-standard location.
   SYSTEM_32BIT = ENV['ProgramFiles(x86)'].nil? && ENV['ProgramW6432'].nil?
@@ -13,7 +15,7 @@ class Skippy::OSWin < Skippy::OSCommon
 
   # @param [String] executable_path
   def launch_app(executable_path, *args)
-    command = %("#{executable_path}")
+    command = +%("#{executable_path}")
     unless args.empty?
       command << " #{args.join(' ')}"
     end
@@ -28,7 +30,9 @@ class Skippy::OSWin < Skippy::OSCommon
       Dir.glob(pattern) { |path|
         exe = File.join(path, 'SketchUp.exe')
         debug_dll = File.join(path, 'SURubyDebugger.dll')
-        version = File.basename(path).match(/[0-9.]+$/)[0].to_i
+        version = sketchup_version_from_path(path)
+        next unless version
+
         apps << Skippy::SketchUpApp.from_hash(
           executable: exe,
           version: version,

data/lib/skippy/os.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Skippy
 
   if RUBY_PLATFORM =~ /darwin/

data/lib/skippy/project.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'pathname'
 
@@ -15,7 +17,7 @@ class Skippy::Project
 
   include Skippy::Helpers::File
 
-  PROJECT_FILENAME = 'skippy.json'.freeze
+  PROJECT_FILENAME = 'skippy.json'
 
   attr_reader :config
   attr_reader :libraries
@@ -36,6 +38,7 @@ class Skippy::Project
   def self.current_or_fail
     project = current
     raise ProjectNotFoundError, project.filename unless project.exist?
+
     project
   end
 
@@ -66,11 +69,9 @@ class Skippy::Project
 
   # @yield [filename]
   # @yieldparam [String] filename the path to custom Skippy command
-  def command_files
+  def command_files(&block)
     files_pattern = File.join(path, 'skippy', '**', '*.rb')
-    Dir.glob(files_pattern) { |filename|
-      yield filename
-    }
+    Dir.glob(files_pattern, &block)
   end
 
   # Checks if a project exist on disk. If not it's just transient.
@@ -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/sketchup/app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Skippy
 
   SketchUpApp = Struct.new(:executable, :version, :can_debug, :is64bit) do

data/lib/skippy/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Skippy
 
-  VERSION = '0.4.1.a'.freeze
+  VERSION = '0.5.1.a'
 
 end

data/lib/skippy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'skippy/version'
 
 module Skippy

data/skippy.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/thomthom/skippy'
   spec.license       = 'MIT'
 
-  spec.required_ruby_version = '>= 2.0'
+  spec.required_ruby_version = '>= 2.3'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -26,13 +26,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'git', '~> 1.3'
   spec.add_dependency 'naturally', '~> 2.1'
-  spec.add_dependency 'thor', '~> 0.19'
+  spec.add_dependency 'thor', '>= 0.19', '< 2.0'
 
-  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.
-  spec.add_development_dependency 'cucumber', '~> 2.3.0'
-  spec.add_development_dependency 'aruba', '~> 0.14.1'
+  spec.add_development_dependency 'aruba', '~> 1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skippy
 version: !ruby/object:Gem::Version
-  version: 0.4.1.a
+  version: 0.5.1.a
 platform: ruby
 authors:
 - Thomas Thomassen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2021-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -42,44 +42,56 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.19'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.19'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.15.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        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
@@ -94,34 +106,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '1.0'
 description: Automate common tasks for SketchUp extension development, including managing
   library dependencies.
 email:
@@ -131,6 +129,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".appveyor.yml"
 - ".editorconfig"
 - ".gitignore"
 - ".gitmodules"
@@ -146,6 +145,7 @@ files:
 - ".idea/vcs.xml"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".vscode/extensions.json"
 - ".vscode/launch.json"
 - ".vscode/settings.json"
 - ".vscode/tasks.json"
@@ -180,6 +180,7 @@ files:
 - bin/setup
 - bin/skippy
 - bin/thor
+- cucumber.yml
 - debug/skippy.bat
 - exe/skippy
 - fixtures/my_lib/modules/command.rb
@@ -247,15 +248,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: CLI development tool for SketchUp extensions.