Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-23 05:03:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Permit plugin to be in path with git ref (#4251)

Browse source 
Permit plugin to be in path with git ref
This commit is contained in:
Clinton Wolfe 2019-07-30 13:58:37 -04:00 committed by GitHub
commit b8c9043a3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/plugins/inspec-plugin-manager-cli/lib/inspec-plugin-manager-cli/cli_command.rb
View file

@ -229,6 +229,7 @@ module InspecPlugins
given = given.expand_path # Resolve any relative paths given = given.expand_path # Resolve any relative paths
name_regex = /^(inspec|train)-/ name_regex = /^(inspec|train)-/
versioned_regex = /^(inspec|train)-[a-z0-9\-\_]+-\d+\.\d+\.\d+$/ versioned_regex = /^(inspec|train)-[a-z0-9\-\_]+-\d+\.\d+\.\d+$/
sha_ref_regex = /^(inspec|train)-[a-z0-9\-\_]+-[0-9a-f]{5,40}$/
# What are the last four things like? # What are the last four things like?
parts = [ parts = [
@ -257,14 +258,14 @@ module InspecPlugins
# In that case, we'll have a version on the plugin name in part 0 # In that case, we'll have a version on the plugin name in part 0
# /home/you/.gems/2.4.0/gems/inspec-something-3.45.1/lib/inspec-something.rb # /home/you/.gems/2.4.0/gems/inspec-something-3.45.1/lib/inspec-something.rb
# parts index: ^0^ ^1^ ^2^ ^3^ # parts index: ^0^ ^1^ ^2^ ^3^
if parts[0] =~ versioned_regex && parts[1] == "lib" && parts[0].start_with?(parts[2]) && parts[3] == ".rb" if (parts[0] =~ versioned_regex || parts[0] =~ sha_ref_regex) && parts[1] == "lib" && parts[0].start_with?(parts[2]) && parts[3] == ".rb"
return given.to_s return given.to_s
end end
# Case 4: Like case 3, but missing the .rb # Case 4: Like case 3, but missing the .rb
# /home/you/.gems/2.4.0/gems/inspec-something-3.45.1/lib/inspec-something # /home/you/.gems/2.4.0/gems/inspec-something-3.45.1/lib/inspec-something
# parts index: ^0^ ^1^ ^2^ ^3^ (empty) # parts index: ^0^ ^1^ ^2^ ^3^ (empty)
if parts[0] =~ versioned_regex && parts[1] == "lib" && parts[0].start_with?(parts[2]) && parts[3].empty? if (parts[0] =~ versioned_regex || parts[0] =~ sha_ref_regex) && parts[1] == "lib" && parts[0].start_with?(parts[2]) && parts[3].empty?
return given.to_s + ".rb" return given.to_s + ".rb"
end end