Skip to content

Provide ordering within a given option weight #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kpaulisse merged 3 commits into from
Nov 16, 2017
Merged

Provide ordering within a given option weight #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f40a5ca
Provide for ordering within the same weight
kpaulisse Nov 16, 2017
3221bde
Ordering within weights for puppetdb and puppet SSL info
kpaulisse Nov 16, 2017
a2d0505
Regenerate options document with new weights
kpaulisse Nov 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions doc/optionsref.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,16 @@ Usage: octocatalog-diff [command line options]
--to-puppet-binary STRING Full path to puppet binary for the to branch
--from-puppet-binary STRING Full path to puppet binary for the from branch
--facts-terminus STRING Facts terminus: one of yaml, facter
--puppetdb-url URL PuppetDB base URL
--puppetdb-ssl-ca FILENAME CA certificate that signed the PuppetDB certificate
--puppetdb-ssl-client-cert FILENAME
SSL client certificate to connect to PuppetDB
--puppetdb-ssl-client-password PASSWORD
Password for SSL client key to connect to PuppetDB
--puppetdb-ssl-client-key FILENAME
SSL client key to connect to PuppetDB
--puppetdb-ssl-client-password PASSWORD
Password for SSL client key to connect to PuppetDB
--puppetdb-ssl-client-password-file FILENAME
Read password for SSL client key from a file
--puppetdb-url URL PuppetDB base URL
--puppetdb-api-version N Version of PuppetDB API (3 or 4)
--fact-override STRING1[,STRING2[,...]]
Override fact globally
Expand Down
12 changes: 11 additions & 1 deletion lib/octocatalog-diff/cli/options.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,18 @@ def self.has_weight(w) # rubocop:disable Style/PredicateName
@weight = w
end

def self.order_within_weight(w) # rubocop:disable Style/TrivialAccessors
@order_within_weight = w
end

def self.weight
@weight || DEFAULT_WEIGHT
if @weight && @order_within_weight
@weight + (@order_within_weight / 100.0)
elsif @weight
@weight
else
DEFAULT_WEIGHT
end
end

def self.name
Expand Down
1 change: 1 addition & 0 deletions lib/octocatalog-diff/cli/options/puppet_master_ssl_ca.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# @param options [Hash] Options hash being constructed; this is modified in this method.
OctocatalogDiff::Cli::Options::Option.newoption(:puppet_master_ssl_ca) do
has_weight 320
order_within_weight 30

def parse(parser, options)
OctocatalogDiff::Cli::Options.option_globally_or_per_branch(
Expand Down
1 change: 1 addition & 0 deletions lib/octocatalog-diff/cli/options/puppet_master_ssl_client_cert.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# @param options [Hash] Options hash being constructed; this is modified in this method.
OctocatalogDiff::Cli::Options::Option.newoption(:puppet_master_ssl_client_cert) do
has_weight 320
order_within_weight 40

def parse(parser, options)
OctocatalogDiff::Cli::Options.option_globally_or_per_branch(
Expand Down
1 change: 1 addition & 0 deletions lib/octocatalog-diff/cli/options/puppet_master_ssl_client_key.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# @param options [Hash] Options hash being constructed; this is modified in this method.
OctocatalogDiff::Cli::Options::Option.newoption(:puppet_master_ssl_client_key) do
has_weight 320
order_within_weight 50

def parse(parser, options)
OctocatalogDiff::Cli::Options.option_globally_or_per_branch(
Expand Down
1 change: 1 addition & 0 deletions lib/octocatalog-diff/cli/options/puppetdb_ssl_ca.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# @param options [Hash] Options hash being constructed; this is modified in this method.
OctocatalogDiff::Cli::Options::Option.newoption(:puppetdb_ssl_ca) do
has_weight 310
order_within_weight 10

def parse(parser, options)
parser.on('--puppetdb-ssl-ca FILENAME', 'CA certificate that signed the PuppetDB certificate') do |x|
Expand Down
1 change: 1 addition & 0 deletions lib/octocatalog-diff/cli/options/puppetdb_ssl_client_cert.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# @param options [Hash] Options hash being constructed; this is modified in this method.
OctocatalogDiff::Cli::Options::Option.newoption(:puppetdb_ssl_client_cert) do
has_weight 310
order_within_weight 20

def parse(parser, options)
parser.on('--puppetdb-ssl-client-cert FILENAME', 'SSL client certificate to connect to PuppetDB') do |x|
Expand Down
1 change: 1 addition & 0 deletions lib/octocatalog-diff/cli/options/puppetdb_ssl_client_key.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# @param options [Hash] Options hash being constructed; this is modified in this method.
OctocatalogDiff::Cli::Options::Option.newoption(:puppetdb_ssl_client_key) do
has_weight 310
order_within_weight 30

def parse(parser, options)
parser.on('--puppetdb-ssl-client-key FILENAME', 'SSL client key to connect to PuppetDB') do |x|
Expand Down
1 change: 1 addition & 0 deletions lib/octocatalog-diff/cli/options/puppetdb_ssl_client_password.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# @param options [Hash] Options hash being constructed; this is modified in this method.
OctocatalogDiff::Cli::Options::Option.newoption(:puppetdb_ssl_client_cert) do
has_weight 310
order_within_weight 35

def parse(parser, options)
parser.on('--puppetdb-ssl-client-password PASSWORD', 'Password for SSL client key to connect to PuppetDB') do |x|
Expand Down
1 change: 1 addition & 0 deletions lib/octocatalog-diff/cli/options/puppetdb_ssl_client_password_file.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# @param options [Hash] Options hash being constructed; this is modified in this method.
OctocatalogDiff::Cli::Options::Option.newoption(:puppetdb_ssl_client_password_file) do
has_weight 310
order_within_weight 37

def parse(parser, options)
parser.on('--puppetdb-ssl-client-password-file FILENAME', 'Read password for SSL client key from a file') do |x|
Expand Down
1 change: 1 addition & 0 deletions lib/octocatalog-diff/cli/options/puppetdb_url.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# @param options [Hash] Options hash being constructed; this is modified in this method.
OctocatalogDiff::Cli::Options::Option.newoption(:puppetdb_url) do
has_weight 310
order_within_weight 1

def parse(parser, options)
parser.on('--puppetdb-url URL', 'PuppetDB base URL') do |url|
Expand Down