killbill-kpm-ui 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 2b7025eef9ab8cebe65d63c33833a9f515885c35fd1f67b4aaf43afae3c24d0a
-  data.tar.gz: d006e0105f7df31d7bb86264d1889e5dd7f0a8307db3a1194272e413da43159d
+SHA1:
+  metadata.gz: 525be1974e3fff33c6523e2042ee3c6510e40c7c
+  data.tar.gz: 0c8ca1aac74c3d99e1908a1b829561d96dfbf8a2
 SHA512:
-  metadata.gz: ffd25cd903eda24b3a05cd6a4feb46ff9183f8ccf394828a50e258290344a58b555c1bdce2f19bec268d70a4c081569872904b27d34abd7a5c5f8c8036332633
-  data.tar.gz: 32d3dcc22b3f37fe13a365fdb295817a6193c821d2586f36af156cb02b5e2495f85f131353f9192cb9b9a1d17b82b2ebc6ab47144eb14b2ea6a48b655ec9bf66
+  metadata.gz: ec09d119fb4f1a3355530918236e83c32c4ed12775dc705e23888100cde1bedfeb8ac3f9ea5a64f56dd007e9bc652838fb4ea91e26d7845a2d9f62f3ee3e3d3c
+  data.tar.gz: 873f1e309fff26406e1022c85c23a1cf97f80e3f8dc2bf9bebfa1fabdf90645a25aa906e90c0876c812b5f20a2b02d491fcf7fa2cd3ca20337564584e91d5c35

data/app/controllers/kpm/nodes_info_controller.rb

@@ -39,7 +39,7 @@ module KPM
       sse_client = nil
       begin
         # Kaui -> Browser
-        sse = ActionController::Live::SSE.new(response.stream, :retry => 300, :event => 'refresh')
+        sse = ActionController::Live::SSE.new(response.stream, retry: 300, event: 'refresh')
 
         # Kill Bill -> Kaui
         sse_client = ::Killbill::KPM::KPMClient.stream_osgi_logs(sse, params[:kb_host], last_event_id_ref)
@@ -50,7 +50,7 @@ module KPM
           i += 1
           # Keep the thread alive (Kill Bill should send us a heartbeat as well though)
           # Note that we set the id as the last log id, so that we can easily resume
-          sse.write('heartbeat', :id => last_event_id_ref.get)
+          sse.write('heartbeat', id: last_event_id_ref.get)
           sleep 5
         end
       rescue ActionController::Live::ClientDisconnected
@@ -58,11 +58,11 @@ module KPM
       ensure
         begin
           begin
-            sse_client.close unless sse_client.nil?
+            sse_client&.close
           rescue StandardError
             # ignored
           end
-          sse.close unless sse.nil?
+          sse&.close
         ensure
           # Clear dead DB connections
           # Very lame, but I couldn't do better... Rails will checkout a DB connection
@@ -78,7 +78,7 @@ module KPM
 
     def install_plugin
       trigger_node_plugin_command('INSTALL_PLUGIN')
-      redirect_to nodes_info_index_path(:i => 1)
+      redirect_to nodes_info_index_path(i: 1)
     end
 
     def uninstall_plugin

data/config/routes.rb

@@ -3,8 +3,8 @@
 KPM::Engine.routes.draw do
   root to: 'nodes_info#index'
 
-  resources :nodes_info, :only => [:index]
-  resources :plugins, :only => [:index]
+  resources :nodes_info, only: [:index]
+  resources :plugins, only: [:index]
 
   scope '/nodes_info' do
     match '/refresh' => 'nodes_info#refresh', :via => :get, :as => 'nodes_info_refresh'

data/lib/kpm.rb

@@ -8,17 +8,17 @@ module KPM
 
   self.current_tenant_user = lambda { |_session, _user|
     {
-      :username => 'admin',
-      :password => 'password',
-      :session_id => nil,
-      :api_key => KillBillClient.api_key,
-      :api_secret => KillBillClient.api_secret
+      username: 'admin',
+      password: 'password',
+      session_id: nil,
+      api_key: KillBillClient.api_key,
+      api_secret: KillBillClient.api_secret
     }
   }
 
   def self.config
     {
-      :layout => layout || 'kpm/layouts/kpm_application'
+      layout: layout || 'kpm/layouts/kpm_application'
     }
   end
 end

data/lib/kpm/client.rb

@@ -14,27 +14,27 @@ module Killbill
           # (we rarely deploy SNAPSHOT jars)
           captures = kb_version_maybe_snapshot.scan(/0.(\d+)(\.)?(\d+)?(-SNAPSHOT)?/)
           # [["20", ".", "1", "-SNAPSHOT"]]
-          if !captures.nil? && !captures.first.nil? && !captures.first[3].nil?
-            if captures.first[2].to_i > 0
-              kb_version = '0.' + captures.first[0] + '.' + (captures.first[2].to_i - 1).to_s
-            else
-              kb_version = '0.' + (captures.first[0].to_i - 1).to_s + '.0'
-            end
-          else
-            kb_version = kb_version_maybe_snapshot
-          end
+          kb_version = if !captures.nil? && !captures.first.nil? && !captures.first[3].nil?
+                         if captures.first[2].to_i.positive?
+                           '0.' + captures.first[0] + '.' + (captures.first[2].to_i - 1).to_s
+                         else
+                           '0.' + (captures.first[0].to_i - 1).to_s + '.0'
+                         end
+                       else
+                         kb_version_maybe_snapshot
+                       end
 
           path = "#{KILLBILL_KPM_PREFIX}/plugins"
-          response = KillBillClient::API.get path, { :kbVersion => kb_version, :latest => latest }, options
+          response = KillBillClient::API.get path, { kbVersion: kb_version, latest: latest }, options
           JSON.parse(response.body)
         end
 
         def stream_osgi_logs(writer, host, last_event_id_ref)
           url = host
           url = "http://#{url}" unless url.starts_with?('http:')
-          SSE::Client.new(url + KILLBILL_OSGI_LOGGER_PREFIX, :last_event_id => last_event_id_ref.get, :logger => Rails.logger) do |client|
+          SSE::Client.new(url + KILLBILL_OSGI_LOGGER_PREFIX, last_event_id: last_event_id_ref.get, logger: Rails.logger) do |client|
             client.on_event do |event|
-              writer.write(event.data, :id => event.id)
+              writer.write(event.data, id: event.id)
               last_event_id_ref.set(event.id)
             end
           end

data/lib/kpm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KPM
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/test/test_helper.rb

@@ -11,7 +11,7 @@ require 'rails/test_help'
 Minitest.backtrace_filter = Minitest::BacktraceFilter.new
 
 # Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }
 
 # Load fixtures from the engine
 if ActiveSupport::TestCase.respond_to?(:fixture_path=)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-kpm-ui
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-datatables-rails
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 0.88.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 0.88.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -242,7 +270,6 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
-- test/dummy/log/test.log
 - test/integration/navigation_test.rb
 - test/kpm_test.rb
 - test/test_helper.rb
@@ -265,43 +292,43 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Kill Bill KPM UI mountable engine
 test_files:
+- test/kpm_test.rb
 - test/test_helper.rb
 - test/integration/navigation_test.rb
-- test/dummy/log/test.log
-- test/dummy/config/secrets.yml
-- test/dummy/config/locales/en.yml
-- test/dummy/config/environment.rb
+- test/dummy/config.ru
+- test/dummy/bin/yarn
+- test/dummy/bin/update
+- test/dummy/bin/rake
+- test/dummy/bin/setup
+- test/dummy/bin/bundle
+- test/dummy/bin/rails
 - test/dummy/config/routes.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/initializers/new_framework_defaults_5_1.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/killbill_client.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/boot.rb
 - test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/application_controller_renderer.rb
-- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/killbill_client.rb
+- test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/boot.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/new_framework_defaults_5_1.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/secrets.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/test.rb
 - test/dummy/config/application.rb
-- test/dummy/Rakefile
 - test/dummy/README.rdoc
+- test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/config.ru
-- test/dummy/bin/rake
-- test/dummy/bin/bundle
-- test/dummy/bin/update
-- test/dummy/bin/setup
-- test/dummy/bin/yarn
-- test/dummy/bin/rails
-- test/kpm_test.rb

data/test/dummy/log/test.log

@@ -1,21 +0,0 @@
----------------------------------
-KPMTest: test_can_load_KPM_module
----------------------------------
-------------------------------------------------
-NavigationTest: test_can_see_the_nodes_info_page
-------------------------------------------------
-Started GET "/kpm" for 127.0.0.1 at 2018-05-18 09:08:53 +0000
-Processing by KPM::NodesInfoController#index as HTML
-Request method='GET', uri='http://127.0.0.1:8080/1.0/kb/nodesInfo'
-accept='application/json', user-agent='killbill/2.2.3; ruby 2.4.2p198 (2017-09-14 revision 59899) [x86_64-linux]', accept-encoding='gzip;q=1.0,deflate;q=0.6,identity;q=0.3', x-killbill-apikey='bob', x-killbill-apisecret='lazar', authorization='Basic [FILTERED]'
-Completed 500 Internal Server Error in 1ms
----------------------------------------
-NavigationTest: test_can_restart_bundle
----------------------------------------
-Started POST "/kpm/nodes_info/plugin/restart?plugin_name=org.apache.felix.shell" for 127.0.0.1 at 2018-05-18 09:08:53 +0000
-Processing by KPM::NodesInfoController#restart_plugin as HTML
-  Parameters: {"plugin_name"=>"org.apache.felix.shell"}
-Request method='POST', uri='http://127.0.0.1:8080/1.0/kb/nodesInfo?localNodeOnly=false'
-accept='application/json', user-agent='killbill/2.2.3; ruby 2.4.2p198 (2017-09-14 revision 59899) [x86_64-linux]', accept-encoding='gzip;q=1.0,deflate;q=0.6,identity;q=0.3', x-killbill-apikey='bob', x-killbill-apisecret='lazar', authorization='Basic [FILTERED]', content-type='application/json', x-killbill-createdby='admin'
-requestBody='{"systemCommandType":true,"nodeCommandType":"RESTART_PLUGIN","nodeCommandProperties":[{"key":"pluginKey"},{"key":"pluginName","value":"org.apache.felix.shell"},{"key":"pluginVersion"}]}'
-Completed 500 Internal Server Error in 1ms