kpm 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee0a0c6bd9401fa083710541772db690618749d31ea65a6531aee02bfcbc075b
-  data.tar.gz: b46b7a3777be07cd3b6ca5be05ef5c76504e4c8ca7e54938487c42b017b251c7
+  metadata.gz: d052b9c73fbb831cf7469a3f57ae21dfe733ededd65541f7b693117b857d4f7c
+  data.tar.gz: a76a44cac1de427a83183be0d1d271f8f79e35f0945d9722576363a5644be690
 SHA512:
-  metadata.gz: f1d274c79ad9762432a649c144d32f4365cc93ab57f841a58293c666d432895056872882b1edee2b1e6493e83a5f27d719825f490f8ca594188c906665253cf4
-  data.tar.gz: 9fbe10b774582a2bf60f534b134d1180109efcd18ff8dc6cc901de74a4e9ee1ee8e11416c5848cee4a7658b3703c67d2c93c590804ec9a25500e9902a7f6189d
+  metadata.gz: f8c51c778cd35a93b2416c8eed3ba9e43d9307ab1df9b6d066ca67384b17c17b32f612445ce102433b261057a137fe5b95b13be5366ec73a79eeb40cedd588ba
+  data.tar.gz: b634baf2edc85f1f0f0880dc4d1c81deb434affe7ee4065825f31fcffa53fe9f6a62fc5849e93b00d44cf9da64952a3e9c0431d89e73e6edd58541bd47175619

data/docker/docker-compose.ci.mysql.yml

@@ -0,0 +1,21 @@
+version: '3.8'
+
+services:
+  killbill:
+    network_mode: host
+    image: killbill/killbill:0.22.1
+    environment:
+      - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml
+      - KILLBILL_DAO_URL=jdbc:mysql://0.0.0.0:3306/killbill
+      - KILLBILL_DAO_USER=root
+      - KILLBILL_DAO_PASSWORD=root
+      - KILLBILL_SERVER_TEST_MODE=true
+      - KILLBILL_INVOICE_SANITY_SAFETY_BOUND_ENABLED=false
+      - KILLBILL_INVOICE_MAX_DAILY_NUMBER_OF_ITEMS_SAFETY_BOUND=-1
+    depends_on:
+      - db
+  db:
+    network_mode: host
+    image: killbill/mariadb:0.22
+    environment:
+      - MYSQL_ROOT_PASSWORD=root

data/lib/kpm/nexus_helper/cloudsmith_api_calls.rb

@@ -9,7 +9,11 @@ module KPM
   module NexusFacade
     class CloudsmithApiCalls < NexusApiCallsV2
       def pull_artifact_endpoint(coordinates)
-        version_artifact_details = parent_get_artifact_info(coordinates)
+        version_artifact_details = begin
+                                     parent_get_artifact_info(coordinates)
+                                   rescue StandardError
+                                     ''
+                                   end
 
         # For SNAPSHOTs, we need to figure out the version used as part of the filename
         filename_version = begin
@@ -27,8 +31,6 @@ module KPM
 
       alias parent_get_artifact_info get_artifact_info
       def get_artifact_info(coordinates)
-        super
-
         _, versioned_artifact, coords = build_base_path_and_coords(coordinates)
         sha1 = get_sha1(coordinates)
         "<artifact-resolution>

data/lib/kpm/plugins_directory.yml

@@ -13,7 +13,7 @@
   :versions:
     :0.18: 4.2.5
     :0.20: 6.0.1
-    :0.22: 7.0.8
+    :0.22: 7.1.1
 :avatax:
   :type: :java
   :versions:
@@ -80,4 +80,4 @@
 :stripe:
   :type: :java
   :versions:
-    :0.22: 7.2.0
+    :0.22: 7.3.0

data/lib/kpm/version.rb

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

data/pom.xml

@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.kill-bill.billing.installer</groupId>
     <artifactId>kpm</artifactId>
-    <version>0.10.0</version>
+    <version>0.10.1</version>
     <packaging>pom</packaging>
     <name>KPM</name>
     <description>KPM: the Kill Bill Package Manager</description>

data/spec/kpm/remote/cloudsmith_api_calls_spec.rb

@@ -24,17 +24,86 @@ describe KPM::NexusFacade, skip_me_if_nil: ENV['CLOUDSMITH_TOKEN'].nil? do
     expect { nexus_remote.search_for_artifacts(coordinates) }.to raise_exception(NoMethodError, 'Cloudsmith has no search support')
   }
 
-  it {
-    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])
-  }
+  # Upload as: cloudsmith push maven -v --group-id com.mycompany.app --artifact-id my-app --packaging pom --version 1.2.3 org/repo my-app-1.2.3.pom
+  # <project>
+  #   <modelVersion>4.0.0</modelVersion>
+  #   <groupId>com.mycompany.app</groupId>
+  #   <artifactId>my-app</artifactId>
+  #   <version>1.2.3</version>
+  #   <packaging>pom</packaging>
+  # </project>
+  context 'when pulling release artifact' do
+    let(:coordinates_map) do
+      { version: '1.2.3',
+        group_id: 'com.mycompany.app',
+        artifact_id: 'my-app',
+        packaging: 'pom',
+        classifier: nil }
+    end
+    let(:coordinates) { KPM::Coordinates.build_coordinates(coordinates_map) }
 
-  it {
-    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.read(destination)).to match(/org.kill-bill.billing/)
-  }
+    it {
+      response = nil
+      expect { response = nexus_remote.get_artifact_info(coordinates) }.not_to raise_exception
+      parsed_doc = REXML::Document.new(response)
+      expect(parsed_doc.elements['//version'].text).to eq('1.2.3')
+      expect(parsed_doc.elements['//repositoryPath'].text).to eq('/com/mycompany/app/1.2.3/my-app-1.2.3.pom')
+      expect(parsed_doc.elements['//snapshot'].text).to eq('false')
+    }
+
+    it {
+      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])
+      parsed_pom = REXML::Document.new(File.read(destination))
+      expect(parsed_pom.elements['//groupId'].text).to eq('com.mycompany.app')
+      expect(parsed_pom.elements['//artifactId'].text).to eq('my-app')
+      expect(parsed_pom.elements['//version'].text).to eq('1.2.3')
+    }
+  end
+
+  # File uploaded twice (the first doesn't have any <properties>)
+  # <project>
+  #   <modelVersion>4.0.0</modelVersion>
+  #   <groupId>com.mycompany.app</groupId>
+  #   <artifactId>my-app</artifactId>
+  #   <version>1.2.4-SNAPSHOT</version>
+  #   <packaging>pom</packaging>
+  #   <properties>
+  #     <for-kpm>true</for-kpm>
+  #   </properties>
+  # </project>
+  context 'when pulling SNAPSHOT artifact' do
+    let(:coordinates_map) do
+      { version: '1.2.4-SNAPSHOT',
+        group_id: 'com.mycompany.app',
+        artifact_id: 'my-app',
+        packaging: 'pom',
+        classifier: nil }
+    end
+    let(:coordinates) { KPM::Coordinates.build_coordinates(coordinates_map) }
+
+    it {
+      response = nil
+      expect { response = nexus_remote.get_artifact_info(coordinates) }.not_to raise_exception
+      parsed_doc = REXML::Document.new(response)
+      expect(parsed_doc.elements['//version'].text).to eq('1.2.4-SNAPSHOT')
+      expect(parsed_doc.elements['//repositoryPath'].text).to eq('/com/mycompany/app/1.2.4-SNAPSHOT/my-app-1.2.4-SNAPSHOT.pom')
+      expect(parsed_doc.elements['//snapshot'].text).to eq('true')
+    }
+
+    it {
+      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])
+      parsed_pom = REXML::Document.new(File.read(destination))
+      expect(parsed_pom.elements['//groupId'].text).to eq('com.mycompany.app')
+      expect(parsed_pom.elements['//artifactId'].text).to eq('my-app')
+      expect(parsed_pom.elements['//version'].text).to eq('1.2.4-SNAPSHOT')
+      # Verify that if multiple SNAPSHOTs are uploaded, the last one is downloaded (the first one doesn't have <properties>)
+      expect(parsed_pom.elements['//properties/for-kpm'].text).to eq('true')
+    }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kpm
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -122,6 +122,7 @@ files:
 - README.adoc
 - Rakefile
 - bin/kpm
+- docker/docker-compose.ci.mysql.yml
 - install_example.yml
 - kpm.gemspec
 - lib/kpm.rb