Parser: YARD docstrings and a rename
This commit is contained in:
parent
8bd4578e44
commit
d9e2cdeeac
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -5,3 +5,5 @@ pkg/
|
|||
coverage/
|
||||
.bundle
|
||||
spec/*.lock
|
||||
doc
|
||||
.yardoc
|
||||
|
|
70
lib/github_changelog_generator/parser.rb
Normal file → Executable file
70
lib/github_changelog_generator/parser.rb
Normal file → Executable file
|
@ -23,7 +23,12 @@ module GitHubChangelogGenerator
|
|||
options
|
||||
end
|
||||
|
||||
# @param [Hash] options to display
|
||||
# If options set to verbose, print the parsed options.
|
||||
#
|
||||
# The GitHub `:token` key is censored in the output.
|
||||
#
|
||||
# @param options [Hash] The options to display
|
||||
# @option options [Boolean] :verbose If false this method does nothing
|
||||
def self.print_options(options)
|
||||
if options[:verbose]
|
||||
Helper.log.info "Performing task with options:"
|
||||
|
@ -167,7 +172,7 @@ module GitHubChangelogGenerator
|
|||
parser
|
||||
end
|
||||
|
||||
# just get default options
|
||||
# @return [Hash] Default options
|
||||
def self.default_options
|
||||
{
|
||||
tag1: nil,
|
||||
|
@ -199,13 +204,14 @@ module GitHubChangelogGenerator
|
|||
}
|
||||
end
|
||||
|
||||
# If `:user` or `:project` not set in options, try setting them
|
||||
def self.user_and_project_from_git(options)
|
||||
if options[:user].nil? || options[:project].nil?
|
||||
detect_user_and_project(options, ARGV[0], ARGV[1])
|
||||
end
|
||||
end
|
||||
|
||||
# Detects user and project from git
|
||||
# Sets `:user` and `:project` in `options` from CLI arguments or `git remote`
|
||||
def self.detect_user_and_project(options, arg0 = nil, arg1 = nil)
|
||||
options[:user], options[:project] = user_project_from_option(arg0, arg1, options[:github_site])
|
||||
return if options[:user] && options[:project]
|
||||
|
@ -219,16 +225,23 @@ module GitHubChangelogGenerator
|
|||
end
|
||||
end
|
||||
|
||||
# Try to find user and project name from git remote output
|
||||
# Returns GitHub username and project from CLI arguments
|
||||
#
|
||||
# @param [String] output of git remote command
|
||||
# @return [Array] user and project
|
||||
# @param arg0 [String] This parameter takes two forms: Either a full
|
||||
# GitHub URL, or a 'username/projectname', or
|
||||
# simply a GitHub username
|
||||
# @param arg1 [String] If arg0 is given as a username,
|
||||
# then arg1 can given as a projectname
|
||||
# @param github_site [String] Domain name of GitHub site
|
||||
#
|
||||
# @return [Array, nil] user and project, or nil if unsuccessful
|
||||
def self.user_project_from_option(arg0, arg1, github_site)
|
||||
user = nil
|
||||
project = nil
|
||||
github_site ||= "github.com"
|
||||
if arg0 && !arg1
|
||||
# this match should parse strings such "https://github.com/skywinder/Github-Changelog-Generator" or "skywinder/Github-Changelog-Generator" to user and name
|
||||
# this match should parse strings such "https://github.com/skywinder/Github-Changelog-Generator" or
|
||||
# "skywinder/Github-Changelog-Generator" to user and name
|
||||
puts arg0
|
||||
match = /(?:.+#{Regexp.escape(github_site)}\/)?(.+)\/(.+)/.match(arg0)
|
||||
|
||||
|
@ -248,27 +261,34 @@ module GitHubChangelogGenerator
|
|||
[user, project]
|
||||
end
|
||||
|
||||
# Try to find user and project name from git remote output
|
||||
# These patterns match these formats:
|
||||
#
|
||||
# ```
|
||||
# origin git@github.com:skywinder/Github-Changelog-Generator.git (fetch)
|
||||
# git@github.com:skywinder/Github-Changelog-Generator.git
|
||||
# ```
|
||||
#
|
||||
# and
|
||||
#
|
||||
# ```
|
||||
# origin https://github.com/skywinder/ChangelogMerger (fetch)
|
||||
# https://github.com/skywinder/ChangelogMerger
|
||||
# ```
|
||||
GIT_REMOTE_PATTERNS = [
|
||||
/.*(?:[:\/])((?:-|\w|\.)*)\/((?:-|\w|\.)*)(?:\.git).*/,
|
||||
/.*\/((?:-|\w|\.)*)\/((?:-|\w|\.)*).*/
|
||||
]
|
||||
|
||||
# Returns GitHub username and project from git remote output
|
||||
#
|
||||
# @param git_remote_output [String] Output of git remote command
|
||||
#
|
||||
# @param [String] output of git remote command
|
||||
# @return [Array] user and project
|
||||
def self.user_project_from_remote(remote)
|
||||
# try to find repo in format:
|
||||
# origin git@github.com:skywinder/Github-Changelog-Generator.git (fetch)
|
||||
# git@github.com:skywinder/Github-Changelog-Generator.git
|
||||
regex1 = /.*(?:[:\/])((?:-|\w|\.)*)\/((?:-|\w|\.)*)(?:\.git).*/
|
||||
|
||||
# try to find repo in format:
|
||||
# origin https://github.com/skywinder/ChangelogMerger (fetch)
|
||||
# https://github.com/skywinder/ChangelogMerger
|
||||
regex2 = /.*\/((?:-|\w|\.)*)\/((?:-|\w|\.)*).*/
|
||||
|
||||
remote_structures = [regex1, regex2]
|
||||
|
||||
def self.user_project_from_remote(git_remote_output)
|
||||
user = nil
|
||||
project = nil
|
||||
remote_structures.each do |regex|
|
||||
matches = Regexp.new(regex).match(remote)
|
||||
GIT_REMOTE_PATTERNS.each do |git_remote_pattern|
|
||||
matches = Regexp.new(git_remote_pattern).match(git_remote_output)
|
||||
|
||||
if matches && matches[1] && matches[2]
|
||||
puts "Detected user:#{matches[1]}, project:#{matches[2]}"
|
||||
|
@ -276,7 +296,7 @@ module GitHubChangelogGenerator
|
|||
project = matches[2]
|
||||
end
|
||||
|
||||
break unless matches.nil?
|
||||
break if matches
|
||||
end
|
||||
|
||||
[user, project]
|
||||
|
|
Loading…
Reference in New Issue
Block a user