kpm 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e260780bc136822cf4dca4670b5779054c84d9c3
-  data.tar.gz: 4ebf213ba82c10eba1177c8afc740dd190fcedde
+  metadata.gz: c651b2089fe9f33b3484e82dcdb4471980b6f4ad
+  data.tar.gz: 8c746fc62e9332919f0082ffd25b96d450a91d64
 SHA512:
-  metadata.gz: 5947555e983f49c7a212ca22c46fc6bed955b3ec23ad995265c081172c1fd68549dcf546c8f52705998f04ff7393d8dbda83539b6e939fff41e8aa7ac8596a00
-  data.tar.gz: ef3751e24e2e736e549d311ccb129d9c998ae2f7882bf86e3a5ddf77b7ded72ed63383a9544b97fb0bf59a2b68549ade52f119cba3ee47637660f31bae49f996
+  metadata.gz: c0da2ef993caf070b2aaa3840e75220c1c9f26f4490bd3a2f5a3c4ca309de9a431e7198600733c2db317e2e2bff557438c447a753ddabc6f08f0c98f21ca4a09
+  data.tar.gz: 859900d8b192dd29cdd7f0ecd925b527654e397baac2c0771e7c145876da58ef03ea0508cc4ac5b3fb3595e1017d7820e0203487e28dfbb13aaf1b17c7de05ad

data/lib/kpm/account.rb

@@ -39,7 +39,7 @@ module KPM
 
     DATE_COLUMNS_TO_FIX = ['created_date','updated_date','processing_available_date','effective_date',
                            'boot_date','start_timestamp','last_access_time','payment_date','original_created_date',
-                           'last_sys_update_date','charged_through_date','bundle_start_date','start_date']
+                           'last_sys_update_date','charged_through_date','bundle_start_date','start_date', 'reference_time']
 
     # round trip constants duplicate record
     ROUND_TRIP_EXPORT_IMPORT_MAP = {:accounts => {:id => :accounts_id, :external_key => :accounts_id}, :all => {:account_id => :accounts_id},
@@ -109,6 +109,7 @@ module KPM
     end
 
     def import_data(source_file, tenant_record_id, skip_payment_methods, round_trip_export_import = false, generate_record_id = false)
+      source_file = File.expand_path(source_file)
 
       @generate_record_id = generate_record_id
       @tenant_record_id = tenant_record_id
@@ -119,7 +120,7 @@ module KPM
       end
 
       unless File.exist?(source_file)
-        raise Interrupt, 'Need to specify a valid file'
+        raise Interrupt, "File #{source_file} does not exist"
       end
 
       @delimiter = sniff_delimiter(source_file) || @delimiter
@@ -275,6 +276,7 @@ module KPM
 
         row = []
 
+        @logger.debug "Processing table_name=#{table_name}, line=#{line}"
         cols_names.each_with_index do |col_name, index|
           sanitized_value = sanitize(table_name,col_name,cols[index], skip_payment_methods)
 

data/lib/kpm/base_artifact.rb

@@ -61,7 +61,7 @@ module KPM
 
       def pull_and_put_in_place(logger, coordinate_map, plugin_name, destination_path=nil, skip_top_dir=true, sha1_file=nil, force_download=false, verify_sha1=true, overrides={}, ssl_verify=true)
         # Build artifact info
-        artifact_info = artifact_info(logger, coordinate_map, overrides, ssl_verify)
+        artifact_info = artifact_info(logger, coordinate_map, sha1_file, force_download, overrides, ssl_verify)
         artifact_info[:plugin_name] = plugin_name
         populate_fs_info(artifact_info, destination_path)
 
@@ -168,19 +168,27 @@ module KPM
         end
       end
 
-      def artifact_info(logger, coordinate_map, overrides={}, ssl_verify=true)
+      def artifact_info(logger, coordinate_map, sha1_file=nil, force_download=false, overrides={}, ssl_verify=true)
         info = {
             :skipped => false
         }
 
+        sha1_checker = sha1_file ? Sha1Checker.from_file(sha1_file) : nil
+
         coordinates = KPM::Coordinates.build_coordinates(coordinate_map)
         begin
           nexus_info = nexus_remote(overrides, ssl_verify, logger).get_artifact_info(coordinates)
         rescue KPM::NexusFacade::ArtifactMalformedException => e
-          raise StandardError.new("Invalid coordinates #{coordinate_map}")
+          raise StandardError.new("Invalid coordinates #{coordinate_map}: #{e}")
         rescue StandardError => e
-          logger.warn("Unable to retrieve coordinates #{coordinate_map}")
-          raise e
+          logger.warn("Unable to retrieve coordinates #{coordinate_map}: #{e}")
+          cached_coordinates = sha1_checker ? sha1_checker.artifact_info(coordinates) : nil
+          if force_download || !cached_coordinates
+            raise e
+          else
+            # Use the cache
+            return cached_coordinates
+          end
         end
 
         xml = REXML::Document.new(nexus_info)
@@ -189,6 +197,8 @@ module KPM
         info[:repository_path] = xml.elements['//repositoryPath'].text unless xml.elements['//repositoryPath'].nil?
         info[:is_tgz] = info[:repository_path].end_with?('.tar.gz') || info[:repository_path].end_with?('.tgz')
 
+        sha1_checker.cache_artifact_info(coordinates, info) if sha1_checker
+
         info
       end
 

data/lib/kpm/base_installer.rb

@@ -223,7 +223,8 @@ module KPM
 
       version = specified_version
       if version.nil? || version == LATEST_VERSION
-        info = KPM::KillbillServerArtifact.info(kb_version || LATEST_VERSION, @nexus_config, @nexus_ssl_verify)
+        sha1_file = "#{bundles_dir}/#{SHA1_FILENAME}"
+        info = KPM::KillbillServerArtifact.info(kb_version || LATEST_VERSION, sha1_file, force_download, verify_sha1, @nexus_config, @nexus_ssl_verify)
         version = info['killbill-platform']
       end
       version ||= LATEST_VERSION

data/lib/kpm/database.rb

@@ -102,7 +102,16 @@ module KPM
 
             rows = []
             table[:rows].each do |row|
-              rows << row.map{|value| value.is_a?(Symbol) ? value.to_s : "'#{value.to_s.gsub(/['"]/, "'" => "\\'", '"' => '\\"')}'" }.join(",")
+              rows << row.map do |value|
+                if value.is_a?(Symbol)
+                  value.to_s
+                else
+                  escaped_value = value.to_s.gsub(/['"]/, "'" => "\\'", '"' => '\\"')
+                                            .gsub('\N{LINE FEED}', "\n")
+                                            .gsub('\N{VERTICAL LINE}', "|")
+                  "'#{escaped_value}'"
+                end
+              end.join(",")
             end
 
             value_data = rows.map{|row| "(#{row})" }.join(",")

data/lib/kpm/diagnostic_file.rb

@@ -66,6 +66,7 @@ module KPM
 
           @logger.info "\e[32mDiagnostic data exported under #{zip_file_name} \e[0m"
 
+          return zip_file_name
         else
           raise Interrupt, 'Account id or configuration file not found'
         end

data/lib/kpm/killbill_server_artifact.rb

@@ -13,12 +13,14 @@ module KPM
         versions
       end
 
-      def info(version='LATEST', overrides={}, ssl_verify=true)
+      def info(version='LATEST', sha1_file=nil, force_download=false, verify_sha1=true, overrides={}, ssl_verify=true)
         logger = Logger.new(STDOUT)
         logger.level = Logger::ERROR
 
         version = KPM::Installer.get_kb_latest_stable_version if version == 'LATEST'
 
+        sha1_checker = sha1_file ? Sha1Checker.from_file(sha1_file) : nil
+
         versions = {}
         Dir.mktmpdir do |dir|
           # Retrieve the main Kill Bill pom
@@ -29,9 +31,9 @@ module KPM
                              nil,
                              version,
                              dir,
-                             nil,
-                             false,
-                             true,
+                             sha1_file,
+                             force_download,
+                             verify_sha1,
                              overrides,
                              ssl_verify)
 
@@ -51,9 +53,9 @@ module KPM
                               nil,
                               oss_parent_version,
                               dir,
-                              nil,
-                              false,
-                              true,
+                              sha1_file,
+                              force_download,
+                              verify_sha1,
                               overrides,
                               ssl_verify)
 
@@ -62,8 +64,19 @@ module KPM
           %w(killbill-api killbill-plugin-api killbill-commons killbill-platform).each do |property|
             versions[property] = properties_element.elements["#{property}.version"].text
           end
+
+          sha1_checker.cache_killbill_info(version, versions) if sha1_checker
         end
         versions
+      rescue StandardError => e
+        # Network down? Hopefully, we have something in the cache
+        cached_version = sha1_checker ? sha1_checker.killbill_info(version) : nil
+        if force_download || !cached_version
+          raise e
+        else
+          # Use the cache
+          return cached_version
+        end
       end
     end
   end

data/lib/kpm/plugins_directory.rb

@@ -6,7 +6,12 @@ module KPM
     def self.all(latest=false)
       if latest
         # Look at GitHub (source of truth)
-        source = URI.parse('https://raw.githubusercontent.com/killbill/killbill-cloud/master/kpm/lib/kpm/plugins_directory.yml').read
+        begin
+          source = URI.parse('https://raw.githubusercontent.com/killbill/killbill-cloud/master/kpm/lib/kpm/plugins_directory.yml').read
+        rescue StandardError
+          # Default to built-in version if GitHub isn't accessible
+          return self.all(false)
+        end
         YAML.load(source)
       else
         source = File.join(File.expand_path(File.dirname(__FILE__)), 'plugins_directory.yml')
@@ -19,7 +24,6 @@ module KPM
       all(latest).inject({}) { |out, (key, val)| out[key]=val[:versions][kb_version.to_sym] if val[:versions].key?(kb_version.to_sym) ; out}
     end
 
-    # Note: this API is used in Docker images (see kpm_generator.rb, careful when changing it!)
     def self.lookup(raw_plugin_key, latest=false, raw_kb_version=nil)
       plugin_key = raw_plugin_key.to_s.downcase
       plugin = all(latest)[plugin_key.to_sym]

data/lib/kpm/plugins_directory.yml

@@ -16,8 +16,9 @@
     :0.15: 0.2.1
     :0.16: 0.3.2
     :0.17: 0.4.10
-    :0.18: 0.5.10
+    :0.18: 0.5.18
     :0.19: 0.6.0
+    :0.20: 0.7.0
   :require:
     - :org.killbill.billing.plugin.adyen.merchantAccount
     - :org.killbill.billing.plugin.adyen.username
@@ -32,7 +33,8 @@
     :0.17: 4.0.5
     :0.18: 4.2.5
     :0.19: 5.1.4
-    :0.20: 6.0.0
+    :0.20: 6.0.1
+    :0.21: 7.0.1
 :avatax:
   :type: :java
   :versions:
@@ -41,7 +43,8 @@
     :0.16: 0.3.0
     :0.18: 0.4.1
     :0.19: 0.5.1
-    :0.20: 0.6.0
+    :0.20: 0.6.1
+    :0.21: 0.7.0
   :require:
     - :org.killbill.billing.plugin.avatax.url
     - :org.killbill.billing.plugin.avatax.accountNumber
@@ -91,7 +94,7 @@
     :0.16: 0.2.0
     :0.18: 0.3.1
     :0.19: 0.4.0
-    :0.20: 0.5.0
+    :0.20: 0.5.1
 :firstdata_e4:
   :type: :ruby
   :artifact_id: firstdata-e4-plugin
@@ -148,7 +151,7 @@
   :type: :ruby
   :versions:
     :0.16: 0.0.2
-    :0.18: 0.1.10
+    :0.18: 0.1.15
   :require:
     - :login
     - :password
@@ -158,7 +161,8 @@
   :artifact_id: bridge-plugin
   :versions:
     :0.19: 0.0.12
-    :0.20: 0.1.0
+    :0.20: 0.1.2
+    :0.21: 0.2.0
 :payeezy:
   :type: :java
   :versions:
@@ -223,7 +227,7 @@
     :0.17: 4.0.0
     :0.18: 4.1.1
     :0.19: 5.0.0
-    :0.20: 6.0.0
+    :0.20: 6.0.1
   :require:
   - :api_secret_key
 :zendesk:

data/lib/kpm/sha1_checker.rb

@@ -39,8 +39,36 @@ module KPM
       save!
     end
 
+    def artifact_info(coordinates)
+      nexus_cache[coordinates]
+    end
+
+    def cache_artifact_info(coordinates, artifact_info)
+      # See BaseArtifact#artifact_info
+      nexus_keys = [:sha1, :version, :repository_path, :is_tgz]
+      nexus_cache[coordinates] = artifact_info ? artifact_info.select { |key,_| nexus_keys.include? key } : nil
+      save!
+    end
+
+    def killbill_info(version)
+      killbill_cache[version]
+    end
+
+    def cache_killbill_info(version, dependencies)
+      killbill_cache[version] = dependencies
+      save!
+    end
+
     private
 
+    def nexus_cache
+      @sha1_config['nexus'] ||= {}
+    end
+
+    def killbill_cache
+      @sha1_config['killbill'] ||= {}
+    end
+
     def save!
       Dir.mktmpdir do |tmp_destination_dir|
         tmp_file = File.join(tmp_destination_dir, File.basename(@sha1_file))

data/lib/kpm/tasks.rb

@@ -365,8 +365,11 @@ module KPM
           say "Fetching info for version #{options[:version]}...\n"
 
           versions_info = KillbillServerArtifact.info(options[:version],
-                                             options[:overrides],
-                                             options[:ssl_verify])
+                                                      options[:sha1_file],
+                                                      options[:force_download],
+                                                      options[:verify_sha1],
+                                                      options[:overrides],
+                                                      options[:ssl_verify])
           say "Dependencies for version #{options[:version]}\n  " + (versions_info.map {|k,v| "#{k} #{v}"}).join("\n  "), :green
           say "\n\n"
 
@@ -496,7 +499,6 @@ module KPM
                       :desc    => 'Database port'
         desc 'account', 'export/import accounts'
         def account
-          logger.info 'Please wait processing the request!!!'
           begin
             config_file = nil
             if options[:killbill_url] && /https?:\/\/[\S]+/.match(options[:killbill_url]).nil?
@@ -570,7 +572,6 @@ module KPM
                       :desc    => 'Killbill URL ex. http://127.0.0.1:8080'
         desc 'tenant_config', 'export all tenant-level configs.'
         def tenant_config
-          logger.info 'Please wait processing the request!!!'
           begin
 
             if options[:killbill_url] && /https?:\/\/[\S]+/.match(options[:killbill_url]).nil?
@@ -657,7 +658,6 @@ module KPM
                       :desc    => 'A different folder other than the default bundles directory.'
         desc 'diagnostic', 'exports and \'zips\' the account data, system, logs and tenant configurations'
         def diagnostic
-          logger.info 'Please wait processing the request!!!'
           begin
             if options[:account_export] && options[:account_export] == 'account_export'
               raise Interrupt,'--account_export,  please provide a valid account id'
@@ -711,7 +711,7 @@ module KPM
 
         def logger
           logger       = ::Logger.new(STDOUT)
-          logger.level = Logger::INFO
+          logger.level = ENV['KPM_DEBUG'] ? Logger::DEBUG : Logger::INFO
           logger
         end
       end

data/lib/kpm/version.rb

@@ -1,3 +1,3 @@
 module KPM
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/pom.xml

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

data/spec/kpm/remote/base_artifact_spec.rb

@@ -25,6 +25,23 @@ describe KPM::BaseArtifact do
     end
   end
 
+  it 'should be able to handle download errors' do
+    nexus_down = {:url => 'https://does.not.exist'}
+    Dir.mktmpdir do |dir|
+      sha1_file = "#{dir}/sha1.yml"
+      test_download dir, 'foo-oss.pom.xml', false, false, sha1_file
+      # Verify we skip the second time
+      test_download dir, 'foo-oss.pom.xml', true, false, sha1_file
+      # Verify the download is skipped gracefully when Nexus isn't reachable
+      test_download dir, 'foo-oss.pom.xml', true, false, sha1_file, nexus_down
+      # Verify the download fails when Nexus isn't reachable and force_download is set
+      expect { test_download dir, 'foo-oss.pom.xml', nil, true, sha1_file, nexus_down }.to raise_error(SocketError)
+      # Verify the download fails when Nexus isn't reachable and the Nexus cache is empty
+      KPM::Sha1Checker.from_file(sha1_file).cache_artifact_info('org.kill-bill.billing:killbill-oss-parent:pom:LATEST', nil)
+      expect { test_download dir, 'foo-oss.pom.xml', nil, false, sha1_file, nexus_down }.to raise_error(SocketError)
+    end
+  end
+
   it 'should be able to download and verify generic .tar.gz artifacts' do
     # The artifact is not small unfortunately (23.7M)
     group_id    = 'org.kill-bill.billing'
@@ -66,11 +83,10 @@ describe KPM::BaseArtifact do
     end
   end
 
-
-  def test_download(dir, filename=nil, verify_is_skipped=false, force_download=false)
+  def test_download(dir, filename=nil, verify_is_skipped=false, force_download=false, sha1_file=nil, overrides={})
     path = filename.nil? ? dir : dir + '/' + filename
 
-    info = KPM::BaseArtifact.pull(@logger, 'org.kill-bill.billing', 'killbill-oss-parent', 'pom', nil, 'LATEST', path, nil, force_download, true, {}, true)
+    info = KPM::BaseArtifact.pull(@logger, 'org.kill-bill.billing', 'killbill-oss-parent', 'pom', nil, 'LATEST', path, sha1_file, force_download, true, overrides, true)
     info[:file_name].should == (filename.nil? ? "killbill-oss-parent-#{info[:version]}.pom" : filename)
     info[:skipped].should == verify_is_skipped
     if !info[:skipped]

data/spec/kpm/remote/installer_spec.rb

@@ -67,7 +67,8 @@ describe KPM::Installer do
                                                                        'version' => '1.8.7'
                                                                    },
                                                                    {
-                                                                       'name' => 'stripe'
+                                                                       'name' => 'stripe',
+                                                                       'version' => '3.0.3'
                                                                    }]
                                                     }
                                                 },
@@ -147,7 +148,7 @@ describe KPM::Installer do
     plugin_identifiers['stripe']['group_id'].should == 'org.kill-bill.billing.plugin.ruby'
     plugin_identifiers['stripe']['artifact_id'].should == 'stripe-plugin'
     plugin_identifiers['stripe']['packaging'].should == 'tar.gz'
-    plugin_identifiers['stripe']['version'].should >= '4.0.0'
+    plugin_identifiers['stripe']['version'].should == '3.0.3'
     plugin_identifiers['stripe']['language'].should == 'ruby'
   end
 end

data/spec/kpm/remote/killbill_server_artifact_spec.rb

@@ -30,12 +30,28 @@ describe KPM::KillbillServerArtifact do
   end
 
   it 'should get dependencies information' do
-    info = KPM::KillbillServerArtifact.info('0.15.9')
-    info['killbill'].should == '0.15.9'
-    info['killbill-oss-parent'].should == '0.62'
-    info['killbill-api'].should == '0.27'
-    info['killbill-plugin-api'].should == '0.16'
-    info['killbill-commons'].should == '0.10'
-    info['killbill-platform'].should == '0.13'
+    nexus_down = {:url => 'https://does.not.exist'}
+
+    Dir.mktmpdir do |dir|
+      sha1_file = "#{dir}/sha1.yml"
+      info = KPM::KillbillServerArtifact.info('0.15.9', sha1_file)
+      info['killbill'].should == '0.15.9'
+      info['killbill-oss-parent'].should == '0.62'
+      info['killbill-api'].should == '0.27'
+      info['killbill-plugin-api'].should == '0.16'
+      info['killbill-commons'].should == '0.10'
+      info['killbill-platform'].should == '0.13'
+      KPM::Sha1Checker.from_file(sha1_file).killbill_info('0.15.9').should == info
+
+      # Verify the download is skipped gracefully when Nexus isn't reachable
+      KPM::KillbillServerArtifact.info('0.15.9', sha1_file, false, nil, nexus_down)
+
+      # Verify the download fails when Nexus isn't reachable and force_download is set
+      expect { KPM::KillbillServerArtifact.info('0.15.9', sha1_file, true, nil, nexus_down) }.to raise_error(SocketError)
+
+      # Verify the download fails when Nexus isn't reachable and the Nexus cache is empty
+      KPM::Sha1Checker.from_file(sha1_file).cache_killbill_info('0.15.9', nil)
+      expect { KPM::KillbillServerArtifact.info('0.15.9', sha1_file, false, nil, nexus_down) }.to raise_error(SocketError)
+    end
   end
 end

data/spec/kpm/unit_mysql/account_spec.rb

@@ -12,9 +12,9 @@ describe KPM::Account do
     let(:account_id_invalid) {SecureRandom.uuid}
     let(:dummy_data) {
       "-- accounts record_id|id|external_key|email|name|first_name_length|currency|billing_cycle_day_local|parent_account_id|is_payment_delegated_to_parent|payment_method_id|time_zone|locale|address1|address2|company_name|city|state_or_province|country|postal_code|phone|notes|migrated|is_notified_for_invoices|created_date|created_by|updated_date|updated_by|tenant_record_id\n"\
-      "5|#{dummy_account_id}|#{dummy_account_id}|willharnet@example.com|Will Harnet||USD|0||||UTC||||||||||||false|2017-04-03T15:50:14.000+0000|demo|2017-04-05T15:01:39.000+0000|Killbill::Stripe::PaymentPlugin|2\n"\
+      "5|#{dummy_account_id}|#{dummy_account_id}|willharnet@example.com|Will Harnet||USD|0||||UTC||||Company\\N{VERTICAL LINE}\\N{LINE FEED}Name||||||||false|2017-04-03T15:50:14.000+0000|demo|2017-04-05T15:01:39.000+0000|Killbill::Stripe::PaymentPlugin|2\n"\
       "-- account_history record_id|id|target_record_id|external_key|email|name|first_name_length|currency|billing_cycle_day_local|parent_account_id|payment_method_id|is_payment_delegated_to_parent|time_zone|locale|address1|address2|company_name|city|state_or_province|country|postal_code|phone|notes|migrated|is_notified_for_invoices|change_type|created_by|created_date|updated_by|updated_date|tenant_record_id\n"\
-      "3|#{SecureRandom.uuid}|5|#{dummy_account_id}|willharnet@example.com|Will Harnet||USD|0||||UTC||||||||||||false|INSERT|demo|2017-04-03T15:50:14.000+0000|demo|2017-04-03T15:50:14.000+0000|2\n"
+      "3|#{SecureRandom.uuid}|5|#{dummy_account_id}|willharnet@example.com|Will Harnet||USD|0||||UTC||||Company\\N{VERTICAL LINE}\\N{LINE FEED}Name||||||||false|INSERT|demo|2017-04-03T15:50:14.000+0000|demo|2017-04-03T15:50:14.000+0000|2\n"
     }
     let(:cols_names) {dummy_data.split("\n")[0].split(" ")[2]}
     let(:cols_data) {dummy_data.split("\n")[1]}
@@ -303,7 +303,7 @@ describe KPM::Account do
       end
       
       it 'when importing data with no file' do
-        expect{account_class.import_data(dummy_data_file,nil,true,false,true) }.to raise_error(Interrupt,'Need to specify a valid file')
+        expect{account_class.import_data(dummy_data_file,nil,true,false,true) }.to raise_error(Interrupt, "File #{dummy_data_file} does not exist")
       end
       
       it 'when importing data with new record_id' do
@@ -312,6 +312,8 @@ describe KPM::Account do
         end
         expect{account_class.import_data(dummy_data_file,nil,true,false,true) }.not_to raise_error(Interrupt)
 
+        verify_data(dummy_account_id)
+
         row_count_inserted = delete_statement('accounts','id',dummy_account_id)
         expect(row_count_inserted).to eq('1')
         row_count_inserted = delete_statement('account_history','external_key',dummy_account_id)
@@ -324,6 +326,8 @@ describe KPM::Account do
         end
         expect{account_class.import_data(dummy_data_file,nil,true,false,false) }.not_to raise_error(Interrupt)
 
+        verify_data(dummy_account_id)
+
         row_count_inserted = delete_statement('accounts','id',dummy_account_id)
         expect(row_count_inserted).to eq('1')
         row_count_inserted = delete_statement('account_history','external_key',dummy_account_id)
@@ -336,6 +340,8 @@ describe KPM::Account do
         end
         expect{account_class.import_data(dummy_data_file,10,true,false,true) }.not_to raise_error(Interrupt)
 
+        verify_data(dummy_account_id)
+
         row_count_inserted = delete_statement('accounts','id',dummy_account_id)
         expect(row_count_inserted).to eq('1')
         row_count_inserted = delete_statement('account_history','external_key',dummy_account_id)
@@ -349,6 +355,8 @@ describe KPM::Account do
         expect{account_class.import_data(dummy_data_file,10,true,true,true) }.not_to raise_error(Interrupt)
         new_account_id = account_class.instance_variable_get(:@tables_id)
 
+        verify_data(new_account_id['accounts_id'])
+
         row_count_inserted = delete_statement('accounts','id',new_account_id['accounts_id'])
         expect(row_count_inserted).to eq('1')
         row_count_inserted = delete_statement('account_history','external_key',new_account_id['accounts_id'])
@@ -389,8 +397,16 @@ describe KPM::Account do
       
       $account_id
     end
-    
-    def delete_statement(table_name,column_name,account_id)
+
+  def verify_data(account_id)
+    response = `#{mysql_cli} #{db_name} -e "select company_name FROM accounts WHERE id = '#{account_id}';" 2>&1`
+    response_msg = response.split("\n")
+    company_name = response_msg[response_msg.size - 1]
+
+    expect(company_name).to eq("Company|\\nName")
+   end
+
+   def delete_statement(table_name,column_name,account_id)
       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]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kpm
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-19 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline