From 6fc06a2d3dda02ec8da929234b6698a2ae17db34 Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 21 Jul 2016 10:51:34 +0300 Subject: [PATCH] rename methods to match of it's actions --- lib/github_changelog_generator/parser.rb | 11 +++++++---- lib/github_changelog_generator/task.rb | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/github_changelog_generator/parser.rb b/lib/github_changelog_generator/parser.rb index 8dbeb4f..e0e340f 100755 --- a/lib/github_changelog_generator/parser.rb +++ b/lib/github_changelog_generator/parser.rb @@ -14,7 +14,7 @@ module GitHubChangelogGenerator parser = setup_parser(options) parser.parse! - user_and_project_from_git(options) + fetch_user_and_project(options) abort(parser.banner) unless options[:user] && options[:project] @@ -208,14 +208,17 @@ module GitHubChangelogGenerator end # If `:user` or `:project` not set in options, try setting them - def self.user_and_project_from_git(options) + # Valid unnamed parameters: + # 1) in 1 param: repo_name/project + # 2) in 2 params: repo name project + def self.fetch_user_and_project(options) if options[:user].nil? || options[:project].nil? - detect_user_and_project(options, ARGV[0], ARGV[1]) + user_and_project_from_git(options, ARGV[0], ARGV[1]) end end # Sets `:user` and `:project` in `options` from CLI arguments or `git remote` - def self.detect_user_and_project(options, arg0 = nil, arg1 = nil) + def self.user_and_project_from_git(options, arg0 = nil, arg1 = nil) options[:user], options[:project] = user_project_from_option(arg0, arg1, options[:github_site]) return if options[:user] && options[:project] diff --git a/lib/github_changelog_generator/task.rb b/lib/github_changelog_generator/task.rb index 584dd6b..4ff4bf5 100644 --- a/lib/github_changelog_generator/task.rb +++ b/lib/github_changelog_generator/task.rb @@ -46,7 +46,7 @@ module GitHubChangelogGenerator # mimick parse_options options = Parser.default_options - Parser.user_and_project_from_git(options) + Parser.fetch_user_and_project(options) OPTIONS.each do |o| v = instance_variable_get("@#{o}")