kpm 0.7.1 → 0.9.0

data/lib/kpm/nexus_helper/nexus_facade.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'actions'
 module KPM
   module NexusFacade
@@ -11,10 +13,10 @@ module KPM
 
     class RemoteFactory
       class << self
-        def create(overrides, ssl_verify=true, logger=nil)
-          Actions.new(overrides, ssl_verify,logger || NexusFacade.logger)
+        def create(overrides, ssl_verify = true, logger = nil)
+          Actions.new(overrides, ssl_verify, logger || NexusFacade.logger)
         end
       end
     end
   end
-end
+end

data/lib/kpm/plugins_directory.rb

@@ -1,26 +1,31 @@
+# frozen_string_literal: true
+
 require 'open-uri'
 require 'yaml'
 
 module KPM
   class PluginsDirectory
-    def self.all(latest=false)
+    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 all(false)
+        end
         YAML.load(source)
       else
-        source = File.join(File.expand_path(File.dirname(__FILE__)), 'plugins_directory.yml')
+        source = File.join(__dir__, 'plugins_directory.yml')
         YAML.load_file(source)
       end
     end
 
-
-    def self.list_plugins(latest=false, kb_version)
-      all(latest).inject({}) { |out, (key, val)| out[key]=val[:versions][kb_version.to_sym] if val[:versions].key?(kb_version.to_sym) ; out}
+    def self.list_plugins(latest = false, kb_version)
+      all(latest).each_with_object({}) { |(key, val), out| out[key] = val[:versions][kb_version.to_sym] if val[:versions].key?(kb_version.to_sym); }
     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)
+    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]
       return nil if plugin.nil?
@@ -36,7 +41,7 @@ module KPM
       if raw_kb_version == 'LATEST'
         version = 'LATEST'
       else
-        captures = raw_kb_version.nil? ? [] : raw_kb_version.scan(/(\d+\.\d+)(\.\d)?/)
+        captures = raw_kb_version.nil? ? [] : raw_kb_version.scan(/(\d+\.\d+)(\.\d+)?/)
         if captures.empty? || captures.first.nil? || captures.first.first.nil?
           version = 'LATEST'
         else

data/lib/kpm/plugins_directory.yml

@@ -2,237 +2,78 @@
 :accertify:
   :type: :java
   :versions:
-    :0.14: 0.1.0
-    :0.16: 0.2.0
     :0.18: 0.3.0
-  :require:
-    - :org.killbill.billing.plugin.accertify.url
-    - :org.killbill.billing.plugin.accertify.username
-    - :org.killbill.billing.plugin.accertify.password
 :adyen:
   :type: :java
   :versions:
-    :0.14: 0.1.0
-    :0.15: 0.2.1
-    :0.16: 0.3.2
-    :0.17: 0.4.10
-    :0.18: 0.5.10
-    :0.19: 0.6.0
-  :require:
-    - :org.killbill.billing.plugin.adyen.merchantAccount
-    - :org.killbill.billing.plugin.adyen.username
-    - :org.killbill.billing.plugin.adyen.password
-    - :org.killbill.billing.plugin.adyen.paymentUrl
+    :0.18: 0.5.26
+    :0.20: 0.7.0
 :analytics:
   :type: :java
   :versions:
-    :0.14: 1.0.3
-    :0.15: 2.0.1
-    :0.16: 3.0.2
-    :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.22: 7.0.8
 :avatax:
   :type: :java
   :versions:
-    :0.14: 0.1.0
-    :0.15: 0.2.0
-    :0.16: 0.3.0
     :0.18: 0.4.1
-    :0.19: 0.5.1
-    :0.20: 0.6.0
-  :require:
-    - :org.killbill.billing.plugin.avatax.url
-    - :org.killbill.billing.plugin.avatax.accountNumber
-    - :org.killbill.billing.plugin.avatax.licenseKey
-:braintree_blue:
-  :type: :ruby
-  :versions:
-    :0.14: 0.0.1
-    :0.16: 0.2.1
-    :0.18: 0.3.1
-  :require:
-    - :merchant_id
-    - :public_key
-    - :private_key
-:currency:
-  :type: :ruby
-  :artifact_id: killbill-currency-plugin
-  :versions:
-    :0.16: 2.0.0
-    :0.18: 3.0.0
+    :0.20: 0.6.1
+    :0.22: 0.7.0
 :cybersource:
   :type: :ruby
   :versions:
-    :0.14: 1.0.0
-    :0.15: 3.3.0
-    :0.16: 4.0.12
     :0.18: 5.2.7
-  :require:
-    - :login
-    - :password
 :dwolla:
   :type: :java
   :versions:
     :0.18: 0.1.0
-  :require:
-    - :org.killbill.billing.plugin.dwolla.baseUrl
-    - :org.killbill.billing.plugin.dwolla.baseOAuthUrl
-    - :org.killbill.billing.plugin.dwolla.scopes
-    - :org.killbill.billing.plugin.dwolla.clientId
-    - :org.killbill.billing.plugin.dwolla.clientSecret
-    - :org.killbill.billing.plugin.dwolla.accountId
 :email-notifications:
   :type: :java
   :artifact_id: killbill-email-notifications-plugin
   :versions:
-    :0.14: 0.1.0
-    :0.16: 0.2.0
     :0.18: 0.3.1
-    :0.19: 0.4.0
-    :0.20: 0.5.0
-:firstdata_e4:
-  :type: :ruby
-  :artifact_id: firstdata-e4-plugin
-  :versions:
-    :0.16: 0.1.0
-    :0.18: 0.2.0
-  :require:
-  - :login
-  - :password
+    :0.20: 0.5.1
+    :0.22: 0.6.1
 :forte:
   :type: :java
   :versions:
-    :0.14: 0.1.0
-    :0.16: 0.2.0
     :0.18: 0.3.0
-  :require:
-    - :org.killbill.billing.plugin.forte.merchantId
-    - :org.killbill.billing.plugin.forte.password
-    - :org.killbill.billing.plugin.forte.host
-    - :org.killbill.billing.plugin.forte.port
-    - :org.killbill.billing.plugin.forte.apiLoginId
-    - :org.killbill.billing.plugin.forte.secureTransactionKey
 :kpm:
   :type: :ruby
   :versions:
-    :0.15: 0.0.2
-    :0.16: 0.0.5
-    :0.17: 1.0.0
     :0.18: 1.1.2
-    :0.19: 1.2.4
     :0.20: 1.3.0
-:litle:
-  :type: :ruby
-  :versions:
-    :0.14: 2.0.0
-    :0.16: 3.0.0
-    :0.18: 4.0.0
-    :0.20: 5.0.0
-  :require:
-    - :account_id
-    - :merchant_id
-    - :username
-    - :password
-    - :secure_page_url
-    - :paypage_id
-:logging:
-  :type: :ruby
-  :versions:
-    :0.14: 1.7.0
-    :0.15: 2.0.0
-    :0.16: 3.0.0
-    :0.18: 4.0.0
 :orbital:
   :type: :ruby
   :versions:
-    :0.16: 0.0.2
-    :0.18: 0.1.10
-  :require:
-    - :login
-    - :password
-    - :merchant_id
+    :0.18: 0.1.15
 :payment_bridge:
   :type: :java
   :artifact_id: bridge-plugin
   :versions:
-    :0.19: 0.0.12
-    :0.20: 0.1.0
-:payeezy:
-  :type: :java
-  :versions:
-    :0.17: 0.1.0
-  :require:
-    - :org.killbill.billing.plugin.payeezy.apiKey
-    - :org.killbill.billing.plugin.payeezy.token
-    - :org.killbill.billing.plugin.payeezy.secret
-    - :org.killbill.billing.plugin.payeezy.paymentUrl
+    :0.20: 0.1.2
+    :0.21: 0.2.1
 :payment-retries:
   :type: :java
   :versions:
-    :0.16: 0.0.1
-    :0.17: 0.1.0
     :0.18: 0.2.4
 :paypal:
   :type: :ruby
   :artifact_id: paypal-express-plugin
   :versions:
-    :0.14: 2.0.0
-    :0.15: 3.0.0
-    :0.16: 4.1.7
-    :0.18: 5.0.9
+    :0.18: 5.0.15
     :0.20: 6.0.0
-  :require:
-  - :signature
-  - :login
-  - :password
-:payu_latam:
-  :type: :ruby
-  :artifact_id: payu-latam-plugin
-  :versions:
-    :0.14: 0.1.0
-    :0.16: 0.2.0
-    :0.18: 0.3.0
-  :require:
-  - :api_login
-  - :api_key
-  - :country_account_id
-  - :merchant_id
 :payment-test:  
-  :type: :ruby
+  :type: :java
   :artifact_id: payment-test-plugin
   :versions:
-    :0.18: 4.2.0
-    :0.19: 5.0.0
-    :0.20: 6.0.0
+    :0.22: 7.0.4
 :securenet:
   :type: :ruby
   :versions:
-    :0.16: 0.1.0
     :0.18: 0.2.0
-  :require:
-  - :login
-  - :password
 :stripe:
-  :type: :ruby
-  :versions:
-    :0.14: 1.0.0
-    :0.15: 2.0.0
-    :0.16: 3.0.3
-    :0.17: 4.0.0
-    :0.18: 4.1.1
-    :0.19: 5.0.0
-    :0.20: 6.0.0
-  :require:
-  - :api_secret_key
-:zendesk:
-  :type: :ruby
+  :type: :java
   :versions:
-    :0.14: 1.3.0
-    :0.16: 2.0.0
-    :0.18: 3.0.1
-  :require:
-  - :subdomain
-  - :username
-  - :password
+    :0.22: 7.0.4

data/lib/kpm/plugins_manager.rb

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'json'
 
 module KPM
   class PluginsManager
-
     def initialize(plugins_dir, logger)
       @plugins_dir = Pathname.new(plugins_dir)
       @logger = logger
     end
 
-    def set_active(plugin_name_or_path, plugin_version=nil)
+    def set_active(plugin_name_or_path, plugin_version = nil)
       if plugin_name_or_path.nil?
         @logger.warn('Unable to mark a plugin as active: no name or path specified')
         return
@@ -19,7 +20,7 @@ module KPM
         # Full path specified, with version
         link = Pathname.new(plugin_name_or_path).join('../SET_DEFAULT')
         FileUtils.rm_f(link)
-        FileUtils.ln_s(plugin_name_or_path, link, :force => true)
+        FileUtils.ln_s(plugin_name_or_path, link, force: true)
       else
         # Plugin name (fs directory) specified
         plugin_dir_glob = @plugins_dir.join('*').join(plugin_name_or_path)
@@ -28,7 +29,7 @@ module KPM
           plugin_dir = Pathname.new(plugin_dir_path)
           link = plugin_dir.join('SET_DEFAULT')
           FileUtils.rm_f(link)
-          FileUtils.ln_s(plugin_dir.join(plugin_version), link, :force => true)
+          FileUtils.ln_s(plugin_dir.join(plugin_version), link, force: true)
         end
       end
 
@@ -38,7 +39,7 @@ module KPM
       end
     end
 
-    def uninstall(plugin_name_or_path, plugin_version=nil)
+    def uninstall(plugin_name_or_path, plugin_version = nil)
       update_fs(plugin_name_or_path, plugin_version) do |tmp_dir|
         FileUtils.rm_f(tmp_dir.join('restart.txt'))
         # Be safe, keep the code, just never start it
@@ -46,7 +47,7 @@ module KPM
       end
     end
 
-    def restart(plugin_name_or_path, plugin_version=nil)
+    def restart(plugin_name_or_path, plugin_version = nil)
       update_fs(plugin_name_or_path, plugin_version) do |tmp_dir|
         # Remove disabled.txt so that the plugin is started if it was stopped
         FileUtils.rm_f(tmp_dir.join('disabled.txt'))
@@ -59,20 +60,19 @@ module KPM
       entry = identifiers[plugin_key]
       if entry
         coordinate_map.each_pair do |key, value|
-          return false if !validate_plugin_identifier_key_value(plugin_key, key, entry[key.to_s], value)
+          return false unless validate_plugin_identifier_key_value(plugin_key, key, entry[key.to_s], value)
         end
       end
       true
     end
 
     def add_plugin_identifier_key(plugin_key, plugin_name, language, coordinate_map)
-
       identifiers = read_plugin_identifiers
       # If key does not already exists or if the version in the json is not the one we are currently installing we update the entry, if not nothing to do
-      if !identifiers.has_key?(plugin_key) ||
+      if !identifiers.key?(plugin_key) ||
          (coordinate_map && identifiers[plugin_key]['version'] != coordinate_map[:version])
 
-        entry = {'plugin_name' => plugin_name}
+        entry = { 'plugin_name' => plugin_name }
         entry['language'] = language
         if coordinate_map
           entry['group_id'] = coordinate_map[:group_id]
@@ -91,7 +91,7 @@ module KPM
     def remove_plugin_identifier_key(plugin_key)
       identifiers = read_plugin_identifiers
       # If key does not already exists we update it, if not nothing to do.
-      if identifiers.has_key?(plugin_key)
+      if identifiers.key?(plugin_key)
         identifiers.delete(plugin_key)
         write_plugin_identifiers(identifiers)
       end
@@ -101,7 +101,7 @@ module KPM
 
     def get_plugin_key_and_name(plugin_name_or_key)
       identifiers = read_plugin_identifiers
-      if identifiers.has_key?(plugin_name_or_key)
+      if identifiers.key?(plugin_name_or_key)
         # It's a plugin key
         [plugin_name_or_key, identifiers[plugin_name_or_key]['plugin_name']]
       else
@@ -121,19 +121,20 @@ module KPM
 
     def guess_plugin_name(artifact_id)
       return nil if artifact_id.nil?
+
       captures = artifact_id.scan(/(.*)-plugin/)
-      if captures.empty? || captures.first.nil? || captures.first.first.nil?
-        short_name = artifact_id
-      else
-        # 'analytics-plugin' or 'stripe-plugin' passed
-        short_name = captures.first.first
-      end
+      short_name = if captures.empty? || captures.first.nil? || captures.first.first.nil?
+                     artifact_id
+                   else
+                     # 'analytics-plugin' or 'stripe-plugin' passed
+                     captures.first.first
+                   end
       Dir.glob(@plugins_dir.join('*').join('*')).each do |plugin_path|
         plugin_name = File.basename(plugin_path)
         if plugin_name == short_name ||
-            plugin_name == artifact_id ||
-            !plugin_name.scan(/-#{short_name}/).empty? ||
-            !plugin_name.scan(/#{short_name}-/).empty?
+           plugin_name == artifact_id ||
+           !plugin_name.scan(/-#{short_name}/).empty? ||
+           !plugin_name.scan(/#{short_name}-/).empty?
           return plugin_name
         end
       end
@@ -148,6 +149,7 @@ module KPM
           JSON.parse(f.read)
         end
       rescue Errno::ENOENT
+        # Ignore
       end
       identifiers
     end
@@ -166,7 +168,6 @@ module KPM
     end
 
     def write_plugin_identifiers(identifiers)
-
       path = Pathname.new(@plugins_dir).join('plugin_identifiers.json')
       Dir.mktmpdir do |tmp_dir|
         tmp_path = Pathname.new(tmp_dir).join('plugin_identifiers.json')
@@ -179,13 +180,17 @@ module KPM
     end
 
     # Note: the plugin name here is the directory name on the filesystem
-    def update_fs(plugin_name_or_path, plugin_version=nil, &block)
+    def update_fs(plugin_name_or_path, plugin_version = nil)
       if plugin_name_or_path.nil?
         @logger.warn('Unable to update the filesystem: no name or path specified')
         return
       end
 
-      p = plugin_version.nil? ? plugin_name_or_path : @plugins_dir.join('*').join(plugin_name_or_path).join(plugin_version == :all ? '*' : plugin_version)
+      p = if plugin_version.nil?
+            plugin_name_or_path
+          else
+            @plugins_dir.join('*').join(plugin_name_or_path).join(plugin_version == :all ? '*' : plugin_version)
+          end
 
       modified = []
       Dir.glob(p).each do |plugin_dir_path|