kpm 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a84528c544264bdd6db6123135d22b4af0ecb4d
-  data.tar.gz: 764686330376b941d7179507bc020133f551e97e
+  metadata.gz: 605f1ea236b696acb2b7a87a52bcc76e52f3449c
+  data.tar.gz: f3f2b76cc6016ac8197efef1dda03d406dcacee1
 SHA512:
-  metadata.gz: da1d775e80d6c2e2a3e7b30ec155320521f1897cd410ff2ed460b1fb802526959caabd7736728ea77fd5ff9aa1efb34930abb95295dfeb9c03541e3a0acfe5b9
-  data.tar.gz: 2b52b1b175a2d73e061fad4ca6b02bbdc4175abdbc15995c4578f62b8b2d7dec784c1dbbeb63c88a4dbccab16fb729d30391b3aec615c64b25533c9f0ae8b7e4
+  metadata.gz: 48f57b6887bc2d1d4386082c5150781461714b7118cac886a4aeea659bacff10ec2d8df300d2139f2d9af5eeca68f9ea89a787a718e2e25ebd5b69a693db8917
+  data.tar.gz: d6b335c3d5d4bca030505d5f738c5e9dc310c667263fb9e2362ef6fbc19d1c16a572db5f7f45cb84b95ef001cfc18194813f95402d2ccb66413ca32e884c6304

data/lib/kpm/system.rb

@@ -221,6 +221,7 @@ module KPM
 
     def get_kaui_standalone_version(kaui_web_path = nil)
       kaui_search_default_dir = kaui_web_path.nil? ? DEFAULT_KAUI_SEARCH_BASE_DIR : Dir[kaui_web_path][0]
+      return nil if kaui_search_default_dir.nil?
       kaui_search_default_dir.gsub!('.war','')
       version = nil
 
@@ -236,22 +237,21 @@ module KPM
 
     def get_kaui_version(kaui_web_path = nil)
       kaui_search_default_dir = kaui_web_path.nil? ? DEFAULT_KAUI_SEARCH_BASE_DIR : Dir[kaui_web_path][0]
+      return nil if kaui_search_default_dir.nil?
       kaui_search_default_dir.gsub!('.war','')
       version = nil
 
       gemfile = Dir[kaui_search_default_dir + File::SEPARATOR + 'WEB-INF' + File::SEPARATOR + 'Gemfile']
 
-      if not gemfile[0].nil?
+      unless 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)
+              version = /(\d+)\.(\d+)\.(\d+)/.match(line)
 
-                if not version.nil?
-                  break;
-                end
+              break unless version.nil?
              end
           end
           version
@@ -264,21 +264,20 @@ module KPM
 
     def get_killbill_version(killbill_web_path = nil)
       killbill_search_default_dir = killbill_web_path.nil? ? DEFAULT_KILLBILL_SEARCH_BASE_DIR : Dir[killbill_web_path][0]
+      return nil if killbill_search_default_dir.nil?
       killbill_search_default_dir.gsub!('.war','')
       killbill_search_default_dir.gsub!('webapps','**')
 
       file =  Dir[killbill_search_default_dir + File::SEPARATOR + 'META-INF' +  File::SEPARATOR + '**' + File::SEPARATOR + 'pom.properties']
       version = nil
-      if not file[0].nil?
+      unless 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)
+            version = /(\d+)\.(\d+)\.(\d+)/.match(line)
 
-              if not version.nil?
-                break;
-              end
+            break unless version.nil?
           end
           version
         end

data/lib/kpm/version.rb

@@ -1,3 +1,3 @@
 module KPM
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/pom.xml

@@ -26,7 +26,7 @@
   <groupId>org.kill-bill.billing.installer</groupId>
   <artifactId>kpm</artifactId>
   <packaging>pom</packaging>
-  <version>0.6.1</version>
+  <version>0.6.2</version>
   <name>KPM</name>
   <url>http://github.com/killbill/killbill-cloud</url>
   <description>KPM: the Kill Bill Package Manager</description>

data/release.sh

@@ -27,6 +27,9 @@ if [[ -z "$NO_RELEASE" ]]; then
   $BUNDLE rake release
 fi
 
+# Wait for the gem to be propagated
+sleep 5
+
 $BUNDLE rake package
 
 if [[ -z "$NO_RELEASE" ]]; then

data/tasks/package.rake

@@ -104,6 +104,7 @@ def create_package(target)
   sh "cp -pR packaging/vendor #{package_dir}/lib/"
 
   sh "cp packaging/Gemfile* #{package_dir}/lib/vendor/"
+  sh "sed -i 's/VERSION/#{VERSION}/g' #{package_dir}/lib/vendor/Gemfile"
   sh "mkdir #{package_dir}/lib/vendor/.bundle"
   sh "cp packaging/bundler-config #{package_dir}/lib/vendor/.bundle/config"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kpm
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Kill Bill package manager.