kpm 0.6.2 → 0.6.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/kpm/diagnostic_file.rb +3 -2
- data/lib/kpm/plugins_directory.yml +2 -1
- data/lib/kpm/tasks.rb +10 -6
- data/lib/kpm/version.rb +1 -1
- data/pom.xml +1 -1
- data/release.sh +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 54d00edd1b9f88c7eb6e660e218000eaa72d363a
|
|
4
|
+
data.tar.gz: a5ee8a5d0b1854fdcecbd1c08f226b80c34e2c7f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: fd91bdd724b44246083d9e4ea3ead7baaa9af7aa84478c0566122e39fa54cc85805a9a1c986e1196050884c1ae8f05cd263e54c137256411a070a76e8132c4ba
|
|
7
|
+
data.tar.gz: b22f48d3e9d889736daf7e3ba7ea7d91bd117e597d8ea025b7c444d956a241c788c69e5002e2a1eabe58a1b44e575b83e652ffa34d2df2300f24ca4454b89c04
|
data/lib/kpm/diagnostic_file.rb
CHANGED
|
@@ -24,7 +24,7 @@ module KPM
|
|
|
24
24
|
ZIP_LOG_FILE = 'logs.zip'
|
|
25
25
|
|
|
26
26
|
def initialize(config_file = nil, killbill_api_credentials = nil, killbill_credentials = nil, killbill_url = nil,
|
|
27
|
-
database_name = nil, database_credentials = nil, database_host = nil, kaui_web_path = nil,
|
|
27
|
+
database_name = nil, database_credentials = nil, database_host = nil, database_port = nil, kaui_web_path = nil,
|
|
28
28
|
killbill_web_path = nil, bundles_dir = nil, logger = nil)
|
|
29
29
|
@killbill_api_credentials = killbill_api_credentials
|
|
30
30
|
@killbill_credentials = killbill_credentials
|
|
@@ -32,6 +32,7 @@ module KPM
|
|
|
32
32
|
@database_name = database_name
|
|
33
33
|
@database_credentials = database_credentials
|
|
34
34
|
@database_host = database_host
|
|
35
|
+
@database_port = database_port
|
|
35
36
|
@config_file = config_file
|
|
36
37
|
@kaui_web_path = kaui_web_path;
|
|
37
38
|
@killbill_web_path = killbill_web_path;
|
|
@@ -118,7 +119,7 @@ module KPM
|
|
|
118
119
|
|
|
119
120
|
account = KPM::Account.new(@config_file, @killbill_api_credentials, @killbill_credentials,
|
|
120
121
|
@killbill_url, @database_name,
|
|
121
|
-
@database_credentials,@database_host,nil, @logger)
|
|
122
|
+
@database_credentials,@database_host, @database_port, nil, @logger)
|
|
122
123
|
export_file = account.export_data(account_id)
|
|
123
124
|
|
|
124
125
|
final = TMP_DIR + File::Separator + ACCOUNT_FILE
|
data/lib/kpm/tasks.rb
CHANGED
|
@@ -493,7 +493,7 @@ module KPM
|
|
|
493
493
|
method_option :database_port,
|
|
494
494
|
:type => :string,
|
|
495
495
|
:default => nil,
|
|
496
|
-
:desc => 'Database
|
|
496
|
+
:desc => 'Database port'
|
|
497
497
|
desc 'account', 'export/import accounts'
|
|
498
498
|
def account
|
|
499
499
|
logger.info 'Please wait processing the request!!!'
|
|
@@ -550,7 +550,7 @@ module KPM
|
|
|
550
550
|
end
|
|
551
551
|
end
|
|
552
552
|
end
|
|
553
|
-
|
|
553
|
+
|
|
554
554
|
method_option :key_prefix,
|
|
555
555
|
:type => :string,
|
|
556
556
|
:default => nil,
|
|
@@ -572,7 +572,7 @@ module KPM
|
|
|
572
572
|
def tenant_config
|
|
573
573
|
logger.info 'Please wait processing the request!!!'
|
|
574
574
|
begin
|
|
575
|
-
|
|
575
|
+
|
|
576
576
|
if options[:killbill_url] && /https?:\/\/[\S]+/.match(options[:killbill_url]).nil?
|
|
577
577
|
raise Interrupt,'--killbill_url, required format -> http(s)://something'
|
|
578
578
|
end
|
|
@@ -584,14 +584,14 @@ module KPM
|
|
|
584
584
|
if options[:killbill_credentials] && options[:killbill_credentials].size != 2
|
|
585
585
|
raise Interrupt,'--killbill_credentials, required format -> <user> <password>'
|
|
586
586
|
end
|
|
587
|
-
|
|
587
|
+
|
|
588
588
|
if options[:key_prefix] === :key_prefix.to_s
|
|
589
589
|
raise Interrupt, "--key_prefix, posible values #{KPM::TenantConfig::KEY_PREFIXES.join(', ')}"
|
|
590
590
|
end
|
|
591
591
|
|
|
592
592
|
tenantConfig = KPM::TenantConfig.new(options[:killbill_api_credentials],options[:killbill_credentials],
|
|
593
593
|
options[:killbill_url], logger)
|
|
594
|
-
|
|
594
|
+
|
|
595
595
|
tenantConfig.export(options[:key_prefix])
|
|
596
596
|
|
|
597
597
|
rescue Exception => e
|
|
@@ -639,6 +639,10 @@ module KPM
|
|
|
639
639
|
:type => :string,
|
|
640
640
|
:default => nil,
|
|
641
641
|
:desc => 'Database Host name'
|
|
642
|
+
method_option :database_port,
|
|
643
|
+
:type => :string,
|
|
644
|
+
:default => nil,
|
|
645
|
+
:desc => 'Database port'
|
|
642
646
|
method_option :kaui_web_path,
|
|
643
647
|
:type => :string,
|
|
644
648
|
:default => nil,
|
|
@@ -689,7 +693,7 @@ module KPM
|
|
|
689
693
|
|
|
690
694
|
diagnostic = KPM::DiagnosticFile.new(options[:config_file],options[:killbill_api_credentials],options[:killbill_credentials],
|
|
691
695
|
options[:killbill_url],options[:database_name],options[:database_credentials],
|
|
692
|
-
options[:database_host], options[:kaui_web_path], options[:killbill_web_path], options[:bundles_dir],logger)
|
|
696
|
+
options[:database_host], options[:database_port], options[:kaui_web_path], options[:killbill_web_path], options[:bundles_dir],logger)
|
|
693
697
|
diagnostic.export_data(options[:account_export], options[:log_dir])
|
|
694
698
|
|
|
695
699
|
rescue Exception => e
|
data/lib/kpm/version.rb
CHANGED
data/pom.xml
CHANGED
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
<groupId>org.kill-bill.billing.installer</groupId>
|
|
27
27
|
<artifactId>kpm</artifactId>
|
|
28
28
|
<packaging>pom</packaging>
|
|
29
|
-
<version>0.6.
|
|
29
|
+
<version>0.6.3</version>
|
|
30
30
|
<name>KPM</name>
|
|
31
31
|
<url>http://github.com/killbill/killbill-cloud</url>
|
|
32
32
|
<description>KPM: the Kill Bill Package Manager</description>
|
data/release.sh
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: kpm
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.6.
|
|
4
|
+
version: 0.6.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Kill Bill core team
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-01-
|
|
11
|
+
date: 2018-01-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: highline
|