kpm 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a487717568c5814d90fd062a8b006b66ec550dbb
-  data.tar.gz: 3c533f57e8f2bf257bd36f66553cdd49d43be34e
+  metadata.gz: 9d42c3f647760630bf77cd1b747651801726d523
+  data.tar.gz: b8bb3427daf343b4b58da5381241bfddda7c038f
 SHA512:
-  metadata.gz: 0802e436f2889109ce4a05ad99e220a4e051ff5e34c96589611ea77a479aebf6ee8727ef5afe1e5ad0fa32e24ccecebd27629d9a02a6295b2ebef393be1e582a
-  data.tar.gz: 122a71247e5a187d3b440d1cc600215920c80d98599258a36986a19a04f1d2ea5fb9b3d660a0e699f8cd27514cdfddd566431e59a55ef9cf731dced9f84b605d
+  metadata.gz: 321702e297c7ef18cb523e474e59ba12780d289b336cc541f58964e95fd72b5cb841b66826528b4cbac424cb7c858f307377e4c71fd7ac3d663b4947b7d71417
+  data.tar.gz: 6c60dceeba121d962c8d71e953ece53f427638be7531f9351174cba8e3824008cf7aedae34eacf0c044c49f1e118ce33071f6696c1151c8382564b69e2c2ddbb

data/.gitignore

@@ -6,3 +6,4 @@ kpm-*-linux-x86.tar.gz
 kpm-*-linux-x86_64.tar.gz
 kpm-*-osx.tar.gz
 traveling-ruby-*.tar.gz
+*.asc

data/lib/kpm/account.rb

@@ -72,7 +72,7 @@ module KPM
     DEFAULT_DELIMITER = "|"
 
     def initialize(config_file = nil, killbill_api_credentials = nil, killbill_credentials = nil, killbill_url = nil,
-                   database_name = nil, database_credentials = nil, data_delimiter = nil, logger = nil)
+                   database_name = nil, database_credentials = nil, database_host = nil, data_delimiter = nil, logger = nil)
       @killbill_api_key = KILLBILL_API_KEY
       @killbill_api_secrets = KILLBILL_API_SECRET
       @killbill_url = KILLBILL_URL
@@ -84,7 +84,7 @@ module KPM
 
 
       set_killbill_options(killbill_api_credentials,killbill_credentials,killbill_url)
-      set_database_options(database_name,database_credentials,logger)
+      set_database_options(database_host,database_name,database_credentials,logger)
 
       load_config_from_file(config_file)
 
@@ -460,7 +460,7 @@ module KPM
           config_db = @config['database']
 
           if not config_db.nil?
-            set_database_options(config_db['database'],
+            set_database_options(config_db['host'],config_db['name'],
                                  [config_db['username'],config_db['password']],
                                  @logger)
 
@@ -479,17 +479,13 @@ module KPM
 
       end
 
-      def set_database_options(database_name = nil, database_credentials = nil, logger)
+      def set_database_options(database_host = nil, database_name = nil, database_credentials = nil, logger)
 
         Database.set_logger(logger)
 
-        if not database_credentials.nil?
-          Database.set_credentials(database_credentials[0],database_credentials[1])
-        end
-
-        if not database_name.nil?
-          Database.set_database_name(database_name)
-        end
+        Database.set_credentials(database_credentials[0],database_credentials[1]) unless database_credentials.nil?
+        Database.set_database_name(database_name) unless database_name.nil?
+        Database.set_host(database_host) unless database_host.nil?
 
         Database.set_mysql_command_line
       end

data/lib/kpm/database.rb

@@ -13,6 +13,8 @@ module KPM
       DATABASE = ENV['DATABASE'] || 'killbill'
       USERNAME = ENV['USERNAME'] || 'root'
       PASSWORD = ENV['PASSWORD'] || 'root'
+      HOST = ENV['HOST'] || 'localhost'
+
       COLUMN_NAME_POS = 3
       
       STATEMENT_TMP_FILE = Dir.mktmpdir('statement') + File::SEPARATOR + 'statement.sql'
@@ -23,6 +25,7 @@ module KPM
       @@username = USERNAME
       @@password = PASSWORD
       @@database = DATABASE
+      @@host = HOST
 
       def set_logger(logger)
         @@logger = logger
@@ -33,12 +36,16 @@ module KPM
         @@password = password
       end
 
+      def set_host(host)
+        @@host = host
+      end
+
       def set_database_name(database_name = nil)
         @@database = database_name
       end
 
       def set_mysql_command_line
-        @@mysql_command_line = "mysql #{@@database} --user=#{@@username} --password=#{@@password} "
+        @@mysql_command_line = "mysql #{@@database} --host=#{@@host} --user=#{@@username} --password=#{@@password} "
       end
 
       def execute_insert_statement(table_name, query, qty_to_insert, table_data, record_id = nil)

data/lib/kpm/tasks.rb

@@ -479,7 +479,11 @@ module KPM
         method_option :data_delimiter,
                       :type    => :string,
                       :default => "|",
-                      :desc    => 'Data delimiter' 
+                      :desc    => 'Data delimiter'
+        method_option :database_host,
+                      :type    => :string,
+                      :default => nil,
+                      :desc    => 'Database Host name'
         desc 'account', 'export/import accounts'
         def account
           logger.info 'Please wait processing the request!!!'
@@ -515,7 +519,7 @@ module KPM
 
 
             account = KPM::Account.new(config_file || options[:config_file],options[:killbill_api_credentials],options[:killbill_credentials],
-                                       options[:killbill_url],options[:database_name],options[:database_credentials],options[:data_delimiter], logger)
+                                       options[:killbill_url],options[:database_name],options[:database_credentials],options[:database_host],options[:data_delimiter], logger)
             export_file = nil
             round_trip_export_import = false
 

data/lib/kpm/version.rb

@@ -1,3 +1,3 @@
 module KPM
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/pom.xml

@@ -26,7 +26,7 @@
   <groupId>org.kill-bill.billing.installer</groupId>
   <artifactId>kpm</artifactId>
   <packaging>pom</packaging>
-  <version>0.5.2</version>
+  <version>0.5.3</version>
   <name>KPM</name>
   <url>http://github.com/killbill/killbill-cloud</url>
   <description>KPM: the Kill Bill Package Manager</description>

data/release.sh

@@ -27,6 +27,8 @@ if [[ -z "$NO_RELEASE" ]]; then
   $BUNDLE rake release
 fi
 
+$BUNDLE rake package
+
 if [[ -z "$NO_RELEASE" ]]; then
   GOAL=gpg:sign-and-deploy-file
   REPOSITORY_ID=ossrh-releases

data/spec/kpm/unit_mysql/account_spec.rb

@@ -5,9 +5,10 @@ describe KPM::Account do
   shared_context 'account' do
     include_context 'connection_setup'
 
+    let(:db_host) {'localhost'}
     let(:account_class) { described_class.new(nil,[killbill_api_key,killbill_api_secrets],
                                              [killbill_user, killbill_password],url,
-                                             db_name, [db_username, db_password],nil,logger)}
+                                             db_name, [db_username, db_password],db_host,nil,logger)}
     let(:dummy_account_id) {SecureRandom.uuid}
     let(:account_id_invalid) {SecureRandom.uuid}
     let(:dummy_data) {
@@ -22,6 +23,7 @@ describe KPM::Account do
     let(:obfuscating_marker) {:email}
     let(:mysql_cli) {"mysql #{db_name} --user=#{db_username} --password=#{db_password} "}
     let(:test_ddl) {Dir["#{Dir.pwd}/**/account_test_ddl.sql"][0]}
+
   end
 
   describe '#initialize' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kpm
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline