kpm 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54d00edd1b9f88c7eb6e660e218000eaa72d363a
-  data.tar.gz: a5ee8a5d0b1854fdcecbd1c08f226b80c34e2c7f
+  metadata.gz: d681ccb516730f4bf0cf48d27e479474f6fa6bec
+  data.tar.gz: d77e83aa18b676cd26f5485c640d6eacd506c86d
 SHA512:
-  metadata.gz: fd91bdd724b44246083d9e4ea3ead7baaa9af7aa84478c0566122e39fa54cc85805a9a1c986e1196050884c1ae8f05cd263e54c137256411a070a76e8132c4ba
-  data.tar.gz: b22f48d3e9d889736daf7e3ba7ea7d91bd117e597d8ea025b7c444d956a241c788c69e5002e2a1eabe58a1b44e575b83e652ffa34d2df2300f24ca4454b89c04
+  metadata.gz: 597c2535cb5b1b59d506b4696e93d6b09f29f218dafaa55a62aae61d62bd3aa4bad8346b4b1a11ba55eb19ba547bdf0f06e8a6c4311d0914980e0808ee99b610
+  data.tar.gz: 025362e93a5479ccaf715ab24e0579172ffd708dd7fd99b6477488b1833495b0b219383ba5d3bab68484d759d7559276158e0a322bb7f3d6eae7560a18e634c3

data/lib/kpm/account.rb

@@ -99,7 +99,7 @@ module KPM
       export_data = fetch_export_data(account_id)
       export_file = export(export_data)
 
-      if not File.exist?(export_file)
+      unless File.exist?(export_file)
         raise Interrupt, 'Account id not found'
       else
         @logger.info "\e[32mData exported under #{export_file}\e[0m"
@@ -108,7 +108,7 @@ module KPM
       export_file
     end
 
-    def import_data(source_file,tenant_record_id, skip_payment_methods, round_trip_export_import = false, generate_record_id = false)
+    def import_data(source_file, tenant_record_id, skip_payment_methods, round_trip_export_import = false, generate_record_id = false)
 
       @generate_record_id = generate_record_id
       @tenant_record_id = tenant_record_id
@@ -118,7 +118,7 @@ module KPM
         raise Interrupt, 'Need to specify a file'
       end
 
-      if not File.exist?(source_file)
+      unless File.exist?(source_file)
         raise Interrupt, 'Need to specify a valid file'
       end
 
@@ -219,7 +219,7 @@ module KPM
             words = line.strip.split(" ")
 
             if /--/.match(words[0])
-              if not table_name.nil?
+              unless table_name.nil?
                 if @generate_record_id
                   cols_names.shift
                 end
@@ -256,7 +256,7 @@ module KPM
           end
         end
 
-        if not error_importing_data
+        unless error_importing_data
           import(tables)
         else
           raise Interrupt, "Data on #{source_file} is invalid"
@@ -265,7 +265,8 @@ module KPM
       end
 
       def process_import_data(line, table_name, cols_names, skip_payment_methods, rows)
-        cols = line.strip.split(@delimiter)
+        # to make sure that the last column is not omitted if is empty
+        cols = line.strip.split(@delimiter,line.count(@delimiter)+1)
 
         if cols_names.size != cols.size
           @logger.warn "\e[32mWARNING!!! On #{table_name} table there is a mismatch on column count[#{cols.size}] versus header count[#{cols_names.size}]\e[0m"

data/lib/kpm/base_installer.rb

@@ -222,7 +222,7 @@ module KPM
       classifier = nil
 
       version = specified_version
-      if version.nil?
+      if version.nil? || version == LATEST_VERSION
         info = KPM::KillbillServerArtifact.info(kb_version || LATEST_VERSION, @nexus_config, @nexus_ssl_verify)
         version = info['killbill-platform']
       end

data/lib/kpm/database.rb

@@ -56,7 +56,7 @@ module KPM
 
       def execute_insert_statement(table_name, query, qty_to_insert, table_data, record_id = nil)
 
-        if not record_id.nil?
+        unless record_id.nil?
           query = "set #{record_id[:variable]}=#{record_id[:value]}; #{query}"
         end
         query = "SET autocommit=0; #{query} COMMIT;"

data/lib/kpm/installer.rb

@@ -51,13 +51,15 @@ module KPM
         latest_stable_version = version if version > latest_stable_version
       end
 
-      latest_stable_version
+      latest_stable_version.to_s
     end
 
     def initialize(raw_config, logger=nil)
       @config = raw_config['killbill']
       @kaui_config = raw_config['kaui']
 
+      @config['version'] = KPM::Installer.get_kb_latest_stable_version if !@config.nil? && (@config['version'].nil? || @config['version'] == 'LATEST')
+
       if logger.nil?
         logger = Logger.new(STDOUT)
         logger.level = Logger::INFO

data/lib/kpm/killbill_server_artifact.rb

@@ -17,6 +17,8 @@ module KPM
         logger = Logger.new(STDOUT)
         logger.level = Logger::ERROR
 
+        version = KPM::Installer.get_kb_latest_stable_version if version == 'LATEST'
+
         versions = {}
         Dir.mktmpdir do |dir|
           # Retrieve the main Kill Bill pom

data/lib/kpm/utils.rb

@@ -67,7 +67,7 @@ module KPM
           # this will remove SNAPSHOT and any dash that appear before it (ex --SNAPSHOT).
           name = name.gsub(/((-+){,1}SNAPSHOT){,1}/,'')
           last_dash = name.rindex('-')
-          name = name[0..last_dash]
+          name = name[0..last_dash] unless last_dash.nil?
         else
           name = name.gsub(ver,'')
         end

data/lib/kpm/version.rb

@@ -1,3 +1,3 @@
 module KPM
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

data/pom.xml

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

data/spec/kpm/unit_mysql/account_spec.rb

@@ -5,8 +5,6 @@ describe KPM::Account do
   shared_context 'account' do
     include_context 'connection_setup'
 
-    let(:db_host) {'localhost'}
-    let(:db_port) {'3306'}
     let(:account_class) { described_class.new(nil,[killbill_api_key,killbill_api_secrets],
                                              [killbill_user, killbill_password],url,
                                              db_name, [db_username, db_password],db_host,db_port,nil,logger)}
@@ -22,7 +20,7 @@ describe KPM::Account do
     let(:cols_data) {dummy_data.split("\n")[1]}
     let(:table_name) {dummy_data.split("\n")[0].split(" ")[1]}
     let(:obfuscating_marker) {:email}
-    let(:mysql_cli) {"mysql #{db_name} --user=#{db_username} --password=#{db_password} "}
+    let(:mysql_cli) {"mysql --user=#{db_username} --password=#{db_password} --host=#{db_host} --port=#{db_port} "}
     let(:test_ddl) {Dir["#{Dir.pwd}/**/account_test_ddl.sql"][0]}
 
   end
@@ -393,7 +391,7 @@ describe KPM::Account do
     end
     
     def delete_statement(table_name,column_name,account_id)
-      response = `#{mysql_cli} -e "DELETE FROM #{table_name} WHERE #{column_name} = '#{account_id}'; SELECT ROW_COUNT();" 2>&1`
+      response = `#{mysql_cli} #{db_name} -e "DELETE FROM #{table_name} WHERE #{column_name} = '#{account_id}'; SELECT ROW_COUNT();" 2>&1`
       response_msg = response.split("\n")
       row_count_inserted = response_msg[response_msg.size - 1]
         
@@ -401,8 +399,8 @@ describe KPM::Account do
     end
     
     def create_test_schema
-      response = `mysql --user=#{db_username} --password=#{db_password} -e "CREATE DATABASE IF NOT EXISTS #{db_name};"`
-      response = `#{mysql_cli} < "#{test_ddl}" 2>&1`
+      response = `#{mysql_cli} -e "CREATE DATABASE IF NOT EXISTS #{db_name};"`
+      response = `#{mysql_cli} #{db_name} < "#{test_ddl}" 2>&1`
       response_msg = response.split("\n")
       used_database = response_msg[response_msg.size - 1]
         
@@ -410,7 +408,7 @@ describe KPM::Account do
     end
     
     def drop_test_schema
-      response = `mysql --user=#{db_username} --password=#{db_password} -e "DROP DATABASE #{db_name};"`;
+      response = `#{mysql_cli} -e "DROP DATABASE #{db_name};"`;
       response
     end
 

data/spec/kpm/unit_mysql/account_spec.yml

@@ -2,6 +2,8 @@ database:
   name: test_kpm
   user: test_user
   password: test_password
+  host: 127.0.0.1
+  port: 3306
 
 killbill:
   user: admin
@@ -9,4 +11,4 @@ killbill:
   api_key: bob
   api_secret: lazar
   host: 127.0.0.1
-  port: 8080
+  port: 8080

data/spec/spec_helper.rb

@@ -30,4 +30,6 @@ shared_context 'connection_setup' do
   let(:db_name) {yml_file['database']['name']}
   let(:db_username) {yml_file['database']['user']}
   let(:db_password) {yml_file['database']['password']}
+  let(:db_host) {yml_file['database']['host']}
+  let(:db_port) {yml_file['database']['port']}
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kpm
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline