kpm 0.5.3 → 0.6.0

data/lib/kpm/trace_logger.rb

@@ -0,0 +1,70 @@
+require 'json'
+
+module KPM
+  class TraceLogger
+    def initialize
+      @trace = Hash.new
+    end
+
+    # Return JSON representation of the logs
+    def to_json
+      @trace.to_json
+    end
+
+    # Return String representation of the logs
+    def to_s
+      @trace.to_s
+    end
+
+    # Return HASH representation of the logs
+    def to_hash
+      @trace
+    end
+
+    def add(group=nil, key, message)
+      add_to_hash(group,key,message);
+    end
+
+    private
+    # This procedures will store the logs into a hash to be later returned
+    def add_to_hash(group=nil, key, message)
+
+      if group.nil? || key.nil?
+        add_with_key(group || key, message)
+      else
+        container_key = group.to_sym
+
+        @trace[container_key] ||= Hash.new
+        child_key = key.to_sym
+
+        unless @trace[container_key][child_key].nil?
+          child_is_an_array = @trace[container_key][child_key].kind_of?(Array)
+
+          old_message = nil
+          old_message = @trace[container_key][child_key] unless child_is_an_array
+          @trace[container_key][child_key] = [] unless child_is_an_array
+          @trace[container_key][child_key].push(old_message) unless old_message.nil?
+          @trace[container_key][child_key].push(message)
+        else
+          @trace[container_key][child_key] = message
+        end
+      end
+    end
+
+    def add_with_key(key, message)
+      child_key = key.to_sym
+
+      unless @trace[child_key].nil?
+        child_is_an_array = @trace[child_key].kind_of?(Array)
+
+        old_message = nil
+        old_message = @trace[child_key] unless child_is_an_array
+        @trace[child_key] = [] unless child_is_an_array
+        @trace[child_key].push(old_message) unless old_message.nil?
+        @trace[child_key].push(message)
+      else
+        @trace[child_key] = message
+      end
+    end
+  end
+end

data/lib/kpm/utils.rb

@@ -43,6 +43,48 @@ module KPM
       def path_with_skipped_top_level_dir(path)
         Pathname(path).each_filename.to_a[1..-1].join(File::SEPARATOR)
       end
+
+      def peek_tgz_file_names(tar_gz_archive)
+        file_names = []
+        Gem::Package::TarReader.new(Zlib::GzipReader.open(tar_gz_archive)) do |tar|
+          tar.each do |entry|
+            if entry.file?
+              file_names.push entry.full_name
+            end
+          end
+        end
+
+        file_names
+      end
+
+      def get_plugin_name_from_file_path(file_path)
+        base = File.basename(file_path).to_s
+        ver = get_version_from_file_path(file_path)
+        ext = File.extname(base)
+
+        name = base.gsub(ext,'')
+        if ver.nil?
+          # this will remove SNAPSHOT and any dash that appear before it (ex --SNAPSHOT).
+          name = name.gsub(/((-+){,1}SNAPSHOT){,1}/,'')
+          last_dash = name.rindex('-')
+          name = name[0..last_dash]
+        else
+          name = name.gsub(ver,'')
+        end
+
+        name = name[0..name.length-2] if name[-1].match(/[a-zA-z]/).nil?
+        name
+      end
+
+      def get_version_from_file_path(file_path)
+        base = File.basename(file_path).to_s
+        ver = base.match(/(\d+)(\.(\d+)){,6}((-+){,1}SNAPSHOT){,1}/)
+
+        return ver if ver.nil?
+
+        ver[0]
+      end
+
     end
   end
 end

data/lib/kpm/version.rb

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

data/pom.xml

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

@@ -46,6 +46,26 @@ describe KPM::BaseArtifact do
     end
   end
 
+  it 'should be able to download and remove previous version artifacts' do
+    group_id    = 'org.kill-bill.billing'
+    artifact_id = 'killbill-platform-osgi-bundles-defaultbundles'
+    packaging   = 'tar.gz'
+    classifier  = nil
+    version     = '0.36.2'
+
+    second_bundle_version = '0.36.10'
+
+    Dir.mktmpdir do |dir|
+      first_take = KPM::BaseArtifact.pull(@logger, group_id, artifact_id, packaging, classifier, version, dir)
+      File.file?(first_take[:file_path] + '/killbill-platform-osgi-bundles-jruby-0.36.2.jar').should be_true
+
+      second_take = KPM::BaseArtifact.pull(@logger, group_id, artifact_id, packaging, classifier, second_bundle_version, dir)
+      File.file?(first_take[:file_path] + '/killbill-platform-osgi-bundles-jruby-0.36.2.jar').should be_false
+      File.file?(second_take[:file_path] + '/killbill-platform-osgi-bundles-jruby-0.36.10.jar').should be_true
+
+    end
+  end
+
 
   def test_download(dir, filename=nil, verify_is_skipped=false, force_download=false)
     path = filename.nil? ? dir : dir + '/' + filename

data/spec/kpm/remote/base_installer_spec.rb

@@ -52,6 +52,21 @@ describe KPM::BaseInstaller do
     end
   end
 
+  it 'should extract plugin name from file path' do
+
+    [
+      {:file_path => '/Somewhere/xxx-foo/target/xxx-1.0.0.jar', :expected => 'xxx'},
+      {:file_path => '/Somewhere/xxx-foo/target/xxx-foo-bar-1.0.0.jar', :expected => 'xxx-foo-bar'},
+      {:file_path => '/Somewhere/xxx-foo/target/xxx-foo-1.0.0.jar', :expected => 'xxx-foo'},
+      {:file_path => '/Somewhere/xxx-foo/target/xxx-foo-1.0.0-SNAPSHOT.jar', :expected => 'xxx-foo'},
+      {:file_path => '/Somewhere/xxx-foo/target/xxx-foo-1.0.jar', :expected => 'xxx-foo'},
+      {:file_path => '/Somewhere/xxx-foo/target/xxx-foo-1.jar', :expected => 'xxx-foo'},
+      {:file_path => '/Somewhere/xxx-foo/target/xxx-foo-abc-SNAPSHOT.jar', :expected => 'xxx-foo'},
+      {:file_path => '/Somewhere/xxx-foo/target/xxx-foo-abc.jar', :expected => 'xxx-foo'}
+    ].each do |test|
+      KPM::Utils.get_plugin_name_from_file_path(test[:file_path]).should eq test[:expected]
+    end
+  end
 
   private
 

data/spec/kpm/remote/installer_spec.rb

@@ -19,7 +19,11 @@ describe KPM::Installer do
                                             @logger)
 
       # No exception
-      installer.install.should be_nil
+      response = nil
+      expect{ response = installer.install }.to_not raise_exception
+      response = JSON[response]
+      response['help'].should be_nil
+      response['killbill']['status'].should eq 'INSTALLED'
     end
   end
 
@@ -34,7 +38,11 @@ describe KPM::Installer do
                                             @logger)
 
       # No exception
-      installer.install.should be_nil
+      response = nil
+      expect{ response = installer.install }.to_not raise_exception
+      response = JSON[response]
+      response['help'].should be_nil
+      response['kaui']['status'].should eq 'INSTALLED'
     end
   end
 

data/spec/kpm/remote/migrations_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe KPM::Migrations do
+describe KPM::Migrations, :skip_me_if_nil => ENV['TOKEN'].nil? do
 
   context 'plugins' do
     it 'should be able to find migrations for a java plugin' do

data/spec/kpm/remote/nexus_facade_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+require 'rexml/document'
+
+describe KPM::NexusFacade do
+
+  let(:coordinates_map){ {:version  => '0.1.4',
+                      :group_id => 'org.kill-bill.billing',
+                      :artifact_id => 'killbill-platform-osgi-api',
+                      :packaging => 'jar',
+                      :classifier => nil} }
+  let(:coordinates_with_classifier_map){ {:version  => '0.1.1',
+                      :group_id => 'org.kill-bill.billing',
+                      :artifact_id => 'killbill-platform-osgi-bundles-jruby',
+                      :packaging => 'jar',
+                      :classifier => 'javadoc'} }
+  let(:coordinates) { KPM::Coordinates.build_coordinates(coordinates_map)}
+  let(:coordinates_with_classifier) { KPM::Coordinates.build_coordinates(coordinates_with_classifier_map)}
+  let(:nexus_remote) { described_class::RemoteFactory.create(nil, true)}
+
+  it 'when searching for artifacts' do
+    response = nil
+    expect{  response = nexus_remote.search_for_artifacts(coordinates) }.not_to raise_exception
+    expect(REXML::Document.new(response).elements["//artifactId"].text).to eq(coordinates_map[:artifact_id])
+  end
+
+  it 'when searching for artifact with classifier' do
+    response = nil
+    expect{  response = nexus_remote.search_for_artifacts(coordinates_with_classifier) }.not_to raise_exception
+    expect(REXML::Document.new(response).elements["//artifactId"].text).to eq(coordinates_with_classifier_map[:artifact_id])
+  end
+
+  it 'when getting artifact info' do
+    response = nil
+    expect{  response = nexus_remote.get_artifact_info(coordinates) }.not_to raise_exception
+    expect(REXML::Document.new(response).elements["//version"].text).to eq(coordinates_map[:version])
+  end
+
+  it 'when getting artifact info with classifier' do
+    response = nil
+    expect{  response = nexus_remote.get_artifact_info(coordinates_with_classifier) }.not_to raise_exception
+    expect(REXML::Document.new(response).elements["//version"].text).to eq(coordinates_with_classifier_map[:version])
+  end
+
+  it 'when pull artifact' do
+    response = nil
+    destination = Dir.mktmpdir('artifact')
+    expect{  response = nexus_remote.pull_artifact(coordinates,destination) }.not_to raise_exception
+    destination = File.join(File.expand_path(destination), response[:file_name])
+    expect(File.exist?(destination)).to be_true
+  end
+
+  it 'when pull artifact with classifier' do
+    response = nil
+    destination = Dir.mktmpdir('artifact')
+    expect{  response = nexus_remote.pull_artifact(coordinates_with_classifier,destination) }.not_to raise_exception
+    destination = File.join(File.expand_path(destination), response[:file_name])
+    expect(File.exist?(destination)).to be_true
+  end
+
+end

data/spec/spec_helper.rb

@@ -11,6 +11,7 @@ RSpec.configure do |config|
   config.color_enabled = true
   config.tty           = true
   config.formatter     = 'documentation'
+  config.filter_run_excluding :skip_me_if_nil => true
 end
 
 shared_context 'connection_setup' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kpm
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.21
-- !ruby/object:Gem::Dependency
-  name: nexus_cli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +122,7 @@ files:
 - lib/kpm/cli.rb
 - lib/kpm/coordinates.rb
 - lib/kpm/database.rb
+- lib/kpm/diagnostic_file.rb
 - lib/kpm/formatter.rb
 - lib/kpm/inspector.rb
 - lib/kpm/installer.rb
@@ -143,14 +130,24 @@ files:
 - lib/kpm/killbill_plugin_artifact.rb
 - lib/kpm/killbill_server_artifact.rb
 - lib/kpm/migrations.rb
+- lib/kpm/nexus_helper/actions.rb
+- lib/kpm/nexus_helper/nexus_api_calls_v2.rb
+- lib/kpm/nexus_helper/nexus_facade.rb
 - lib/kpm/plugins_directory.rb
 - lib/kpm/plugins_directory.yml
 - lib/kpm/plugins_manager.rb
 - lib/kpm/sha1_checker.rb
 - lib/kpm/system.rb
+- lib/kpm/system_helpers/cpu_information.rb
+- lib/kpm/system_helpers/disk_space_information.rb
+- lib/kpm/system_helpers/entropy_available.rb
+- lib/kpm/system_helpers/memory_information.rb
+- lib/kpm/system_helpers/os_information.rb
+- lib/kpm/system_helpers/system_proxy.rb
 - lib/kpm/tasks.rb
 - lib/kpm/tenant_config.rb
 - lib/kpm/tomcat_manager.rb
+- lib/kpm/trace_logger.rb
 - lib/kpm/uninstaller.rb
 - lib/kpm/utils.rb
 - lib/kpm/version.rb
@@ -166,6 +163,7 @@ files:
 - spec/kpm/remote/killbill_plugin_artifact_spec.rb
 - spec/kpm/remote/killbill_server_artifact_spec.rb
 - spec/kpm/remote/migrations_spec.rb
+- spec/kpm/remote/nexus_facade_spec.rb
 - spec/kpm/remote/tenant_config_spec.rb
 - spec/kpm/remote/tenant_config_spec.yml
 - spec/kpm/remote/tomcat_manager_spec.rb