kpm 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a60374d9426b71862a9dc7deba1f6b196af27ea
-  data.tar.gz: 3e72b27242ce530e18eea45961f361ec70e73b0f
+  metadata.gz: 7a84528c544264bdd6db6123135d22b4af0ecb4d
+  data.tar.gz: 764686330376b941d7179507bc020133f551e97e
 SHA512:
-  metadata.gz: 07dd7d2ad53197d3cca095c6c7a4cdc92e14bd7182d0da960611f43b229539b06723a46534b14fd660d8ef1cb9a476a9c4f24c4f54c1a9241bfca29d64d43e9b
-  data.tar.gz: 9223ffad42ddadc56feb517b085ff9f1454bf57c12e56e2dd2bc4f43cb64ebc9ebb835f30f37f2ca5c9f950e961c09d0fc0cb199970b5ecd245517ec86083097
+  metadata.gz: da1d775e80d6c2e2a3e7b30ec155320521f1897cd410ff2ed460b1fb802526959caabd7736728ea77fd5ff9aa1efb34930abb95295dfeb9c03541e3a0acfe5b9
+  data.tar.gz: 2b52b1b175a2d73e061fad4ca6b02bbdc4175abdbc15995c4578f62b8b2d7dec784c1dbbeb63c88a4dbccab16fb729d30391b3aec615c64b25533c9f0ae8b7e4

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, database_host = nil, data_delimiter = nil, logger = nil)
+                   database_name = nil, database_credentials = nil, database_host = nil, database_port = 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_host,database_name,database_credentials,logger)
+      set_database_options(database_host,database_port,database_name,database_credentials,logger)
 
       load_config_from_file(config_file)
 
@@ -268,6 +268,7 @@ module KPM
         cols = line.strip.split(@delimiter)
 
         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"
           return nil
         end
 
@@ -276,7 +277,7 @@ module KPM
         cols_names.each_with_index do |col_name, index|
           sanitized_value = sanitize(table_name,col_name,cols[index], skip_payment_methods)
 
-          if not sanitized_value.nil?
+          unless sanitized_value.nil?
             row << sanitized_value
           end
         end
@@ -479,13 +480,14 @@ module KPM
 
       end
 
-      def set_database_options(database_host = nil, database_name = nil, database_credentials = nil, logger)
+      def set_database_options(database_host = nil, database_port = nil, database_name = nil, database_credentials = nil, logger)
 
         Database.set_logger(logger)
 
         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_port(database_port) unless database_port.nil?
 
         Database.set_mysql_command_line
       end

data/lib/kpm/database.rb

@@ -14,6 +14,7 @@ module KPM
       USERNAME = ENV['USERNAME'] || 'root'
       PASSWORD = ENV['PASSWORD'] || 'root'
       HOST = ENV['HOST'] || 'localhost'
+      PORT = ENV['PORT'] || '3306'
 
       COLUMN_NAME_POS = 3
       
@@ -26,6 +27,7 @@ module KPM
       @@password = PASSWORD
       @@database = DATABASE
       @@host = HOST
+      @@port = PORT
 
       def set_logger(logger)
         @@logger = logger
@@ -40,12 +42,16 @@ module KPM
         @@host = host
       end
 
+      def set_port(port)
+        @@port = port
+      end
+
       def set_database_name(database_name = nil)
         @@database = database_name
       end
 
       def set_mysql_command_line
-        @@mysql_command_line = "mysql #{@@database} --host=#{@@host} --user=#{@@username} --password=#{@@password} "
+        @@mysql_command_line = "mysql #{@@database} --host=#{@@host} --port=#{@@port} --user=#{@@username} --password=#{@@password} "
       end
 
       def execute_insert_statement(table_name, query, qty_to_insert, table_data, record_id = nil)
@@ -58,10 +64,12 @@ module KPM
         File.open(STATEMENT_TMP_FILE,'w') do |s|
           s.puts query
         end
-          
+
         response = `#{@@mysql_command_line} < "#{STATEMENT_TMP_FILE}" 2>&1`
 
         if response.include? 'ERROR'
+          @@logger.error "\e[91;1mTransaction that fails to be executed\e[0m"
+          @@logger.error "\e[91m#{query}\e[0m"
           raise Interrupt, "Importing table #{table_name}...... \e[91;1m#{response}\e[0m"
         end
 
@@ -89,17 +97,20 @@ module KPM
 
         tables.each_key do |table_name|
           table = tables[table_name]
-          columns_names = table[:col_names].join(",").gsub(/'/,'')
+          if !table[:rows].nil? && table[:rows].size > 0
+            columns_names = table[:col_names].join(",").gsub(/'/,'')
 
-          rows = []
-          table[:rows].each do |row|
-            rows << row.map{|value| value.is_a?(Symbol) ? value.to_s : "'#{value.to_s.gsub(/['"]/, "'" => "\\'", '"' => '\\"')}'" }.join(",")
-          end
+            rows = []
+            table[:rows].each do |row|
+              rows << row.map{|value| value.is_a?(Symbol) ? value.to_s : "'#{value.to_s.gsub(/['"]/, "'" => "\\'", '"' => '\\"')}'" }.join(",")
+            end
+
+            value_data = rows.map{|row| "(#{row})" }.join(",")
 
-          value_data = rows.map{|row| "(#{row})" }.join(",")
+            statements << {:query => get_insert_statement(table_name,columns_names,value_data, rows.size),
+                                      :qty_to_insert => rows.size, :table_name => table_name, :table_data => table}
 
-          statements << {:query => get_insert_statement(table_name,columns_names,value_data, rows.size),
-                                    :qty_to_insert => rows.size, :table_name => table_name, :table_data => table}
+          end
 
         end
 

data/lib/kpm/diagnostic_file.rb

@@ -25,7 +25,7 @@ module KPM
 
       def initialize(config_file = nil, killbill_api_credentials = nil, killbill_credentials = nil, killbill_url = nil,
                      database_name = nil, database_credentials = nil, database_host = nil, kaui_web_path = nil,
-                     killbill_web_path = nil, logger = nil)
+                     killbill_web_path = nil, bundles_dir = nil, logger = nil)
         @killbill_api_credentials = killbill_api_credentials
         @killbill_credentials = killbill_credentials
         @killbill_url = killbill_url
@@ -38,6 +38,7 @@ module KPM
         @logger = logger
         @original_logger_level = logger.level;
         @catalina_base = nil
+        @bundles_dir = bundles_dir
       end
 
       def export_data(account_id = nil, log_dir = nil)
@@ -58,7 +59,7 @@ module KPM
             zipFile.add(TENANT_FILE,  tenant_export_file)
             zipFile.add(SYSTEM_FILE,  system_export_file)
             zipFile.add(ACCOUNT_FILE, account_export_file) unless account_id.nil?
-            zipFile.add(ZIP_LOG_FILE, log_files)
+            zipFile.add(ZIP_LOG_FILE, log_files) unless log_files.nil?
 
           end
 
@@ -99,7 +100,7 @@ module KPM
 
         @logger.info 'Retrieving system configuration'
         system = KPM::System.new
-        export_data = system.information(nil, true, @config_file, @kaui_web_path, @killbill_web_path)
+        export_data = system.information(@bundles_dir, true, @config_file, @kaui_web_path, @killbill_web_path)
 
         get_system_catalina_base(export_data)
 
@@ -129,6 +130,12 @@ module KPM
       def get_log_files(log_dir)
 
         @logger.info 'Collecting log files'
+
+        if @catalina_base.nil? && log_dir.nil?
+          @logger.warn 'Unable to find Tomcat process, make sure to run kpm using the same user as the Tomcat process.'
+          return nil
+        end
+
         log_base = log_dir || (@catalina_base + File::Separator + 'logs')
         log_items = Dir.glob(log_base + File::Separator + '*')
 
@@ -149,7 +156,11 @@ module KPM
       # Helpers
 
       def get_system_catalina_base(export_data)
+        @catalina_base = nil
         system_json = JSON.parse(export_data)
+
+        return if system_json['java_system_information']['catalina.base'].nil?
+
         @catalina_base = system_json['java_system_information']['catalina.base']['value']
 
       end

data/lib/kpm/installer.rb

@@ -18,8 +18,20 @@ module KPM
     def self.build_default_config(all_kb_versions=nil)
       latest_stable_version = get_kb_latest_stable_version(all_kb_versions)
 
-      # Note: we assume no unstable version of Kaui is published today
-      {'killbill' => {'version' => latest_stable_version.to_s, 'plugins' => {'ruby' => [{'name' => 'kpm'}]}}, 'kaui' => {'version' => 'LATEST'}}
+      {
+          'killbill' => {
+              'version' => latest_stable_version.to_s,
+              'plugins' => {
+                  'ruby' => [
+                      {'name' => 'kpm'}
+                  ]
+              }
+          },
+          'kaui' => {
+              # Note: we assume no unstable version of Kaui is published today
+              'version' => 'LATEST'
+          }
+      }
     end
 
     def self.get_kb_latest_stable_version(all_kb_versions=nil)

data/lib/kpm/plugins_directory.yml

@@ -16,7 +16,7 @@
     :0.15: 0.2.1
     :0.16: 0.3.2
     :0.17: 0.4.10
-    :0.18: 0.5.5
+    :0.18: 0.5.7
   :require:
     - :org.killbill.billing.plugin.adyen.merchantAccount
     - :org.killbill.billing.plugin.adyen.username
@@ -30,6 +30,7 @@
     :0.16: 3.0.2
     :0.17: 4.0.5
     :0.18: 4.2.3
+    :0.19: 5.0.0
 :avatax:
   :type: :java
   :versions:
@@ -63,7 +64,7 @@
     :0.14: 1.0.0
     :0.15: 3.3.0
     :0.16: 4.0.12
-    :0.18: 5.2.2
+    :0.18: 5.2.4
   :require:
     - :login
     - :password
@@ -138,7 +139,7 @@
   :type: :ruby
   :versions:
     :0.16: 0.0.2
-    :0.18: 0.1.5
+    :0.18: 0.1.8
   :require:
     - :login
     - :password
@@ -157,7 +158,7 @@
   :versions:
     :0.16: 0.0.1
     :0.17: 0.1.0
-    :0.18: 0.2.2
+    :0.18: 0.2.4
 :paypal:
   :type: :ruby
   :artifact_id: paypal-express-plugin
@@ -165,7 +166,7 @@
     :0.14: 2.0.0
     :0.15: 3.0.0
     :0.16: 4.1.7
-    :0.18: 5.0.5
+    :0.18: 5.0.6
   :require:
   - :signature
   - :login

data/lib/kpm/system.rb

@@ -226,7 +226,7 @@ module KPM
 
       yaml_file = kaui_search_default_dir + File::SEPARATOR + 'WEB-INF' + File::SEPARATOR + 'version.yml'
       unless Dir[yaml_file][0].nil?
-        yml_data = YAML::load_file(yaml_file)
+        yml_data = YAML::load_file(Dir[yaml_file][0])
 
         version = yml_data['version']
       end
@@ -310,6 +310,15 @@ module KPM
 
       end
 
+      return apache_tomcat_pid unless apache_tomcat_pid.nil?
+
+      jcmd = ( ENV['JAVA_HOME'] || '/**' ) + File::Separator + 'bin' + File::Separator + 'jcmd'
+      jcmd = Dir[jcmd][0]
+      return nil if jcmd.nil?
+
+      apache_tomcat_pid = `#{jcmd} | awk '/org.apache.catalina/' | cut -d ' ' -f 1`.gsub("\n",'')
+      return nil if apache_tomcat_pid.nil? || apache_tomcat_pid.empty?
+
       apache_tomcat_pid
     end
 

data/lib/kpm/tasks.rb

@@ -490,6 +490,10 @@ module KPM
                       :type    => :string,
                       :default => nil,
                       :desc    => 'Database Host name'
+        method_option :database_port,
+                      :type    => :string,
+                      :default => nil,
+                      :desc    => 'Database Host name'
         desc 'account', 'export/import accounts'
         def account
           logger.info 'Please wait processing the request!!!'
@@ -525,7 +529,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[:database_host],options[:data_delimiter], logger)
+                                       options[:killbill_url],options[:database_name],options[:database_credentials],options[:database_host], options[:database_port],options[:data_delimiter], logger)
             export_file = nil
             round_trip_export_import = false
 
@@ -643,6 +647,10 @@ module KPM
                       :type    => :string,
                       :default => nil,
                       :desc    => 'Path for the killbill web app'
+        method_option :bundles_dir,
+                      :type    => :string,
+                      :default => nil,
+                      :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!!!'
@@ -681,7 +689,7 @@ module KPM
 
             diagnostic = KPM::DiagnosticFile.new(options[:config_file],options[:killbill_api_credentials],options[:killbill_credentials],
                                        options[:killbill_url],options[:database_name],options[:database_credentials],
-                                      options[:database_host], options[:kaui_web_path], options[:killbill_web_path],logger)
+                                      options[:database_host], options[:kaui_web_path], options[:killbill_web_path], options[:bundles_dir],logger)
             diagnostic.export_data(options[:account_export],  options[:log_dir])
 
           rescue Exception => e

data/lib/kpm/tomcat_manager.rb

@@ -47,7 +47,8 @@ module KPM
 
       # Setup default properties
       setenv_sh_path = @tomcat_dir.join('bin').join('setenv.sh')
-      File.write(setenv_sh_path, 'export CATALINA_OPTS="$CATALINA_OPTS -XX:PermSize=512m -XX:MaxPermSize=1G -Xms1G -Xmx2G"')
+
+      File.write(setenv_sh_path, "export CATALINA_OPTS=\"$CATALINA_OPTS #{default_java_properties}\"")
 
       @tomcat_dir.join('webapps').join('ROOT.war').to_s
     end
@@ -58,5 +59,35 @@ Start script: #{@tomcat_dir.join('bin').join('startup.sh').to_s}
 Stop script: #{@tomcat_dir.join('bin').join('shutdown.sh').to_s}
 Logs: #{@tomcat_dir.join('logs').to_s}"
     end
+
+    private
+
+    def default_java_properties
+      <<HEREDOC.gsub(/\s+/, ' ').strip
+      -server
+      -showversion
+      -XX:+PrintCommandLineFlags
+      -XX:+UseCodeCacheFlushing
+      -XX:PermSize=512m
+      -XX:MaxPermSize=1G
+      -Xms1G
+      -Xmx2G
+      -XX:+CMSClassUnloadingEnabled
+      -XX:-OmitStackTraceInFastThrow
+      -XX:+UseParNewGC
+      -XX:+UseConcMarkSweepGC
+      -XX:+CMSConcurrentMTEnabled
+      -XX:+CMSParallelRemarkEnabled
+      -XX:+UseCMSInitiatingOccupancyOnly
+      -XX:CMSInitiatingOccupancyFraction=70
+      -XX:+ScavengeBeforeFullGC
+      -XX:+CMSScavengeBeforeRemark
+      -XX:NewSize=600m
+      -XX:MaxNewSize=900m
+      -XX:SurvivorRatio=10
+      -XX:+DisableExplicitGC
+      -Djava.security.egd=file:/dev/./urandom
+HEREDOC
+    end
   end
 end

data/lib/kpm/version.rb

@@ -1,3 +1,3 @@
 module KPM
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/packaging/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'kpm'
+gem 'kpm', '~> VERSION'
 
 group :development do
   gem 'rake'

data/pom.xml

@@ -26,7 +26,7 @@
   <groupId>org.kill-bill.billing.installer</groupId>
   <artifactId>kpm</artifactId>
   <packaging>pom</packaging>
-  <version>0.6.0</version>
+  <version>0.6.1</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

@@ -6,9 +6,10 @@ describe KPM::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,nil,logger)}
+                                             db_name, [db_username, db_password],db_host,db_port,nil,logger)}
     let(:dummy_account_id) {SecureRandom.uuid}
     let(:account_id_invalid) {SecureRandom.uuid}
     let(:dummy_data) {

data/tasks/package.rake

@@ -1,5 +1,6 @@
 # For Bundler.with_clean_env
 require 'bundler/setup'
+require 'yaml'
 
 PACKAGE_NAME = 'kpm'
 
@@ -36,7 +37,10 @@ namespace :package do
   end
 
   desc 'Install gems to local directory'
-  task :bundle_install do
+  task :bundle_install => [:clean] do
+    # abort if version packaging does not exist on repository
+    abort "KPM #{VERSION} does not exists in the repository." unless gem_exists?
+
     # Note! Must match TRAVELING_RUBY_VERSION above
     expected_ruby_version = TRAVELING_RUBY_VERSION.split('-')[-1]
     if RUBY_VERSION !~ /#{Regexp.quote(expected_ruby_version)}/
@@ -45,6 +49,7 @@ namespace :package do
     sh 'rm -rf packaging/tmp'
     sh 'mkdir -p packaging/tmp'
     sh 'cp packaging/Gemfile packaging/tmp/'
+    sh "sed -i 's/VERSION/#{VERSION}/g' packaging/tmp/Gemfile"
 
     sh "rm -rf packaging/vendor/ruby/#{expected_ruby_version}/bundler" # if multiple clones of same repo, may load in wrong one
 
@@ -112,3 +117,11 @@ def download_runtime(target)
   sh 'mkdir -p packaging && cd packaging && curl -L -O --fail ' +
          "https://d6r77u77i8pq3.cloudfront.net/releases/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz"
 end
+
+def gem_exists?
+  response = `gem specification 'kpm' -r -v #{VERSION} 2>&1`
+  return false if response.nil?
+
+  specification = YAML::load(response)
+  specification.instance_of?(Gem::Specification)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kpm
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline