kpm 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 472c2af6b9f4d6d74d5d82c9b8247ba5b8679b87
-  data.tar.gz: c12d9370dc6a0929d2f74e9a9af3f4391e560694
+  metadata.gz: d38b77f40a5cdb50c139255664892b3f463a44bf
+  data.tar.gz: 41019b6c0119626701a6a89823237585d7588bf6
 SHA512:
-  metadata.gz: 8fad17400301e6923130654b8aae6384c6e99ca197a3290a4de62e9970f1298d6fc8e4cd17da3adf8dcb94003b0e0c15e4ea85cd6b3e59fff4a090c0d97b4d4f
-  data.tar.gz: ed8e4ecb4c036aa9cef65cd37ffb87b18f483632d7161340bb35d2c2aa3b1804b3003dbfc471c04075b8d88341defbc45859aa31ba2cfeb593e3abf48fca0066
+  metadata.gz: b0457be8ee32667355291e3b936ec9aeeaba943480a6006a5fe12f7cf7175d6445ca3663b8a4435b8cbabf0b9205f8ce8949f4dd5d535f8b64254e5cae04b4f4
+  data.tar.gz: 0a14351c90df0618a2013a1a12b43001b4e483228a5af3e7f8fb098028b30914081e13077c9db4c5e497ca0bd4d6e7b3a83b04759fd2b140d23882c188ea93b1

data/lib/kpm.rb

@@ -17,6 +17,7 @@ module KPM
   autoload :Cli, 'kpm/cli'
   autoload :PluginsDirectory, 'kpm/plugins_directory'
   autoload :Migrations, 'kpm/migrations'
+  autoload :System, 'kpm/system'
 
   class << self
     def root

data/lib/kpm/formatter.rb

@@ -62,24 +62,27 @@ module KPM
     end
 
 
-    def format(all_plugins)
-      if all_plugins.size == 0
+    def format(data, labels = nil)
+      if data.nil? || data.size == 0
         return
       end
 
-      # What we want to output
-      labels = [{:label => :plugin_name},
-                {:label => :plugin_key},
-                {:label => :type},
-                {:label => :group_id},
-                {:label => :artifact_id},
-                {:label => :packaging},
-                {:label => :versions, :formatter => VersionFormatter.name}]
+      if labels.nil?
+
+        # What we want to output
+        labels = [{:label => :plugin_name},
+                  {:label => :plugin_key},
+                  {:label => :type},
+                  {:label => :group_id},
+                  {:label => :artifact_id},
+                  {:label => :packaging},
+                  {:label => :versions, :formatter => VersionFormatter.name}]
+      end
 
       # Compute label to print along with max size for each label
       labels_format_argument = []
-      all_plugins.keys.each do |key|
-        v = all_plugins[key]
+      data.keys.each do |key|
+        v = data[key]
         labels.each do |e|
           # sanitize entry at the same time
           v[e[:label]] = v[e[:label]] || "???"
@@ -106,8 +109,8 @@ module KPM
       puts "#{format}\n" % labels_format_argument
       puts "#{border}\n"
 
-      all_plugins.keys.each do |key|
-        v = all_plugins[key]
+      data.keys.each do |key|
+        v = data[key]
 
         arguments = []
         labels.inject(arguments) do |res, e|

data/lib/kpm/plugins_directory.yml

@@ -157,7 +157,7 @@
   :versions:
     :0.16: 0.0.1
     :0.17: 0.1.0
-    :0.18: 0.2.0
+    :0.18: 0.2.1
 :paypal:
   :type: :ruby
   :artifact_id: paypal-express-plugin
@@ -165,7 +165,7 @@
     :0.14: 2.0.0
     :0.15: 3.0.0
     :0.16: 4.1.7
-    :0.18: 5.0.1
+    :0.18: 5.0.3
   :require:
   - :signature
   - :login

data/lib/kpm/system.rb

@@ -0,0 +1,344 @@
+require 'yaml'
+
+module KPM
+
+  module OS
+    def OS.windows?
+      (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RbConfig::CONFIG["host_os"]) != nil
+    end
+
+    def OS.mac?
+      (/darwin/ =~ RbConfig::CONFIG["host_os"]) != nil
+    end
+
+    def OS.unix?
+      !OS.windows?
+    end
+
+    def OS.linux?
+      OS.unix? and not OS.mac?
+    end
+  end
+
+  class System
+
+    MAX_VALUE_COLUMN_WIDTH = 60
+    DEFAULT_BUNDLE_DIR = Dir['/var' + File::SEPARATOR + 'lib' + File::SEPARATOR + 'killbill' + File::SEPARATOR + 'bundles'][0] || Dir['/var' + File::SEPARATOR + 'tmp' + File::SEPARATOR + 'bundles'][0]
+    DEFAULT_KAUI_SEARCH_BASE_DIR = '**' + File::SEPARATOR + 'kaui'
+    DEFAULT_KILLBILL_SEARCH_BASE_DIR = '**' + File::SEPARATOR + 'ROOT'
+
+    def initialize
+      @formatter = KPM::Formatter.new
+    end
+
+    def information(bundles_dir = nil, output_as_json = false, config_file = nil, kaui_web_path = nil, killbill_web_path = nil)
+      puts 'Retrieving system information'
+      set_config(config_file)
+      killbill_information = show_killbill_information(kaui_web_path,killbill_web_path,output_as_json)
+
+      java_version = `java -version 2>&1`.split("\n")[0].split('"')[1]
+
+      environment_information = show_environment_information(java_version, output_as_json)
+      os_information = show_os_information(output_as_json)
+
+      if not java_version.nil?
+        command = get_command
+        java_system_information = show_java_system_information(command,output_as_json)
+      end
+
+      plugin_information = show_plugin_information(get_plugin_path || bundles_dir || DEFAULT_BUNDLE_DIR, output_as_json)
+
+      if output_as_json
+        json_data = Hash.new
+        json_data[:killbill_information] = killbill_information
+        json_data[:environment_information] = environment_information
+        json_data[:os_information] = os_information
+        json_data[:java_system_information] = java_system_information
+        json_data[:plugin_information] = plugin_information
+
+        puts json_data.to_json
+      end
+    end
+
+    def show_killbill_information(kaui_web_path, killbill_web_path, output_as_json)
+
+      kpm_version = KPM::VERSION
+      kaui_version = get_kaui_version(get_kaui_web_path || kaui_web_path)
+      killbill_version = get_killbill_version(get_killbill_web_path || killbill_web_path)
+
+      environment = Hash[:kpm => {:system=>'KPM',:version => kpm_version},
+                         :kaui => {:system=>'Kaui',:version => kaui_version.nil? ? 'not found' : kaui_version},
+                         :killbill => {:system=>'Killbill',:version => killbill_version.nil? ? 'not found' : killbill_version}]
+
+      labels = [{:label => :system},
+                {:label => :version}]
+
+      if not output_as_json
+        @formatter.format(environment,labels)
+      end
+
+      environment
+    end
+
+    def show_environment_information(java_version, output_as_json)
+
+      environment = Hash[:ruby => {:environment=>'Ruby',:version => RUBY_VERSION},
+                         :java => {:environment=>'Java',:version => java_version.nil? ? 'no version found' : java_version}]
+
+      labels = [{:label => :environment},
+                {:label => :version}]
+
+      if not output_as_json
+        @formatter.format(environment,labels)
+      end
+
+      environment
+    end
+
+    def show_os_information(output_as_json)
+      os = Hash.new
+      os_data = nil
+
+      if OS.windows?
+        os_data = `systeminfo | findstr /C:"OS"`
+
+      elsif OS.linux?
+        os_data = `lsb_release -a 2>&1`
+
+      elsif OS.mac?
+        os_data = `sw_vers`
+
+      end
+
+      if os_data != nil
+        os_data.split("\n").each do |info|
+
+          infos = info.split(':')
+          os[infos[0]] = {:os_detail => infos[0], :value => infos[1].to_s.strip}
+
+        end
+      end
+
+      labels = [{:label => :os_detail},
+                {:label => :value}]
+
+      if not output_as_json
+        @formatter.format(os,labels)
+      end
+
+      os
+    end
+
+    def show_java_system_information(command, output_as_json)
+      java_system = Hash.new
+      property_count = 0;
+      last_key = ''
+
+      `#{command}`.split("\n").each do |prop|
+
+        if prop.to_s.strip.empty?
+          break;
+        end
+
+        if property_count > 0
+          props = prop.split('=')
+
+          if (not props[1].nil? && props[1].to_s.strip.size > MAX_VALUE_COLUMN_WIDTH) && output_as_json == false
+
+            chunks = ".{1,#{MAX_VALUE_COLUMN_WIDTH}}"
+            props[1].to_s.scan(/#{chunks}/).each_with_index do |p, index|
+
+              java_system[property_count] = {:java_property => index.equal?(0) ? props[0] : '', :value => p}
+              property_count += 1
+
+            end
+          elsif output_as_json
+            key = (props[1].nil? ? last_key : props[0]).to_s.strip
+            value = props[1].nil? ? props[0] : props[1]
+
+            if java_system.has_key?(key)
+              java_system[key][:value] = java_system[key][:value].to_s.concat(' ').concat(value)
+            else
+              java_system[key] = {:java_property => key, :value => value}
+            end
+
+          else
+
+            java_system[property_count] = {:java_property => props[1].nil? ? '' : props[0], :value => props[1].nil? ? props[0] : props[1]}
+
+          end
+
+          last_key = props[1].nil? ? last_key : props[0]
+        end
+
+        property_count += 1
+
+      end
+      labels = [{:label => :java_property},
+                  {:label => :value}]
+
+
+      if not output_as_json
+        @formatter.format(java_system,labels)
+      end
+
+      java_system
+
+    end
+
+    def show_plugin_information(bundles_dir, output_as_json)
+
+      if bundles_dir.nil?
+        all_plugins = nil
+      else
+        inspector = KPM::Inspector.new
+        all_plugins = inspector.inspect(bundles_dir)
+      end
+
+      if not output_as_json
+        if all_plugins.nil? || all_plugins.size == 0
+          puts "\e[91;1mNo KB plugin information available\e[0m\n\n"
+        else
+          @formatter.format(all_plugins)
+        end
+      end
+
+      if output_as_json && (all_plugins.nil? || all_plugins.size == 0)
+        all_plugins = 'No KB plugin information available'
+      end
+      all_plugins
+    end
+
+    def get_kaui_version(kaui_web_path = nil)
+      puts kaui_web_path
+      kaui_search_default_dir = Dir[kaui_web_path.nil? ? '' : kaui_web_path][0] || DEFAULT_KAUI_SEARCH_BASE_DIR
+      version = nil
+
+      gemfile = Dir[kaui_search_default_dir + File::SEPARATOR + 'WEB-INF' + File::SEPARATOR + 'Gemfile']
+
+      if not gemfile[0].nil?
+        absolute_gemfile_path = File.absolute_path(gemfile[0])
+
+        version = open(absolute_gemfile_path) do |f|
+          f.each_line.detect do |line|
+             if /kaui/.match(line)
+                version = /(\d+)\.(\d+)\.(\d+)/.match(line)
+
+                if not version.nil?
+                  break;
+                end
+             end
+          end
+          version
+        end
+
+      end
+
+      version
+    end
+
+    def get_killbill_version(killbill_web_path = nil)
+      killbill_search_default_dir = Dir[killbill_web_path.nil? ? '' : killbill_web_path][0] || DEFAULT_KILLBILL_SEARCH_BASE_DIR
+
+      file =  Dir[killbill_search_default_dir + File::SEPARATOR + 'META-INF' +  File::SEPARATOR + '**' + File::SEPARATOR + 'pom.properties']
+      version = nil
+      if not file[0].nil?
+        absolute_file_path = File.absolute_path(file[0])
+
+        version = open(absolute_file_path) do |f|
+          f.each_line.detect do |line|
+              version = /(\d+)\.(\d+)\.(\d+)/.match(line)
+
+              if not version.nil?
+                break;
+              end
+          end
+          version
+        end
+
+      end
+
+      version
+    end
+
+    def get_command
+      command = 'java -XshowSettings:properties -version 2>&1'
+      apache_tomcat_pid = get_apache_tomcat_pid
+
+      if not apache_tomcat_pid.nil?
+        command = "jcmd #{apache_tomcat_pid} VM.system_properties"
+      end
+
+      command
+    end
+
+    def get_apache_tomcat_pid
+      apache_tomcat_pid = nil;
+      `jcmd -l 2>&1`.split("\n").each do |line|
+
+        if /org.apache.catalina/.match(line)
+          words = line.split(' ')
+          apache_tomcat_pid = words[0]
+        end
+
+      end
+
+      apache_tomcat_pid
+    end
+
+    def set_config(config_file = nil)
+      @config = nil
+
+      if not config_file.nil?
+        if not Dir[config_file][0].nil?
+          @config = YAML::load_file(config_file)
+        end
+      end
+
+    end
+
+    def get_kaui_web_path
+      kaui_web_path = nil;
+
+      if not @config.nil?
+        config_kaui = @config['kaui']
+
+        if not config_kaui.nil?
+          kaui_web_path = Dir[config_kaui['webapp_path']][0]
+        end
+      end
+
+      kaui_web_path
+    end
+
+    def get_killbill_web_path
+      killbill_web_path = nil;
+
+      if not @config.nil?
+        config_killbill = @config['killbill']
+
+        if not config_killbill.nil?
+          killbill_web_path = Dir[config_killbill['webapp_path']][0]
+        end
+      end
+
+      killbill_web_path
+    end
+
+    def get_plugin_path
+      plugin_path = nil;
+
+      if not @config.nil?
+        config_killbill = @config['killbill']
+
+        if not config_killbill.nil?
+          plugin_path = Dir[config_killbill['plugins_dir']][0]
+        end
+      end
+
+      plugin_path
+    end
+
+  end
+
+end

data/lib/kpm/tasks.rb

@@ -399,11 +399,39 @@ module KPM
         desc 'inspect', 'Inspect current deployment'
         def inspect
           inspector = KPM::Inspector.new
+          puts options[:destination]
           all_plugins = inspector.inspect(options[:destination])
           #puts all_plugins.to_json
           inspector.format(all_plugins)
         end
 
+        method_option :bundles_dir,
+                      :type    => :string,
+                      :default => nil,
+                      :desc    => 'A different folder other than the default bundles directory.'
+        method_option :config_file,
+                      :type    => :string,
+                      :default => nil,
+                      :desc    => 'KPM configuration file (yml file)'
+        method_option :as_json,
+                      :type    => :boolean,
+                      :default => false,
+                      :desc    => 'Set the output format as JSON when true'
+        method_option :kaui_web_path,
+                      :type    => :string,
+                      :default => nil,
+                      :desc    => 'Path for the KAUI web app'
+        method_option :killbill_web_path,
+                      :type    => :string,
+                      :default => nil,
+                      :desc    => 'Path for the killbill web app'
+        desc 'system', 'Gather information about the system'
+        def system
+          system = KPM::System.new
+          system.information(options[:bundles_dir], options[:as_json], options[:config_file], options[:kaui_web_path],
+                             options[:killbill_web_path])
+        end
+
         map :pull_ruby_plugin => :install_ruby_plugin,
             :pull_java_plugin => :install_java_plugin
 

data/lib/kpm/version.rb

@@ -1,3 +1,3 @@
 module KPM
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kpm
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-04 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +131,7 @@ files:
 - lib/kpm/plugins_directory.yml
 - lib/kpm/plugins_manager.rb
 - lib/kpm/sha1_checker.rb
+- lib/kpm/system.rb
 - lib/kpm/tasks.rb
 - lib/kpm/tomcat_manager.rb
 - lib/kpm/uninstaller.rb