kpm 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e69269a01b07d01247f91c4928f795a6082798e29b7dc80e0f9dcff7bbf052ff
-  data.tar.gz: 474ccaea9db693606babde9a94ba21d3f53c087bd0735c6c93c36e38451ad264
+  metadata.gz: 9494301ca44d5d736b5451e958d0e6f16abc4c5aa9c0965b82aa2827f869ce84
+  data.tar.gz: bd60d65f4870ef85cf896d532d0b81e97985f38611c2472a51dd509cf7eed49d
 SHA512:
-  metadata.gz: a4b59ab0cfc80647365f04679782e4dbe089948d54b900e7a677989f4b36fc021a5c02210985f7773d139ca4644f1c2c572e6eb39c28d754eb6986856af6f4ef
-  data.tar.gz: 66a4b7a14509ae8ef03d05636bf37312e11363b9e6da5de743d46bd78c7fd096dff2d81ef9466ba13c2661b4dc166d51d502d540f38c1532872a1816708a0648
+  metadata.gz: 38bd4cc2f8f9b546b3fe733723cd54049b5c0c5547b2861247a8b8ee6e023753f1ef650bf4e7d8b80a36d2f7b387e0c337a25188978ca5b73714760ce5a3dddc
+  data.tar.gz: ca87e6f189fa9f7ea5a171fcd7ed75f0dc9ed6bbd52ab0c646bff97b65f2fd180f864561180129ab796922429aa94c5cdbccf7021a7ac14482b030ff4df44d26

data/.gitignore

@@ -2,10 +2,12 @@ Gemfile.lock
 pkg
 packaging/tmp
 packaging/vendor
-kpm-*-linux-x86.tar.gz
 kpm-*-linux-x86_64.tar.gz
+kpm-*-osx-arm64.tar.gz
 kpm-*-osx.tar.gz
-traveling-ruby-*.tar.gz
+kpm-*-noarch.tar.gz
+portable-ruby-*.tar.gz
+jruby-dist-*-bin.tar.gz
 *.asc
 .rakeTasks
 pom.xml.versionsBackup

data/lib/kpm/plugins_directory.yml

@@ -13,7 +13,7 @@
   :versions:
     :0.18: 4.2.5
     :0.20: 6.0.1
-    :0.22: 7.2.3
+    :0.22: 7.2.7
 :avatax:
   :type: :java
   :versions:

data/lib/kpm/version.rb

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

data/packaging/Gemfile

@@ -3,7 +3,4 @@
 source 'https://rubygems.org'
 
 gem 'kpm', '~> VERSION'
-
-group :development do
-  gem 'rake'
-end
+gem 'rake'

data/packaging/kpm.sh

@@ -11,4 +11,4 @@ unset BUNDLE_IGNORE_CONFIG
 
 # Run the actual app using the bundled Ruby interpreter, with Bundler activated.
 # See https://github.com/phusion/traveling-ruby/issues/58
-exec "$SELFDIR/lib/ruby/bin/ruby" -rbundler/setup -rreadline $SELFDIR/lib/vendor/ruby/2.*/bin/kpm $@
+exec "$SELFDIR/lib/ruby/bin/ruby" -rbundler/setup -rreadline $SELFDIR/lib/vendor/*ruby/2.*/bin/kpm $@

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.4</version>
+    <version>0.10.5</version>
     <packaging>pom</packaging>
     <name>KPM</name>
     <description>KPM: the Kill Bill Package Manager</description>
@@ -147,11 +147,6 @@
                         </goals>
                         <configuration>
                             <artifacts>
-                                <artifact>
-                                    <file>kpm-${project.version}-linux-x86.tar.gz</file>
-                                    <type>tar.gz</type>
-                                    <classifier>linux-x86</classifier>
-                                </artifact>
                                 <artifact>
                                     <file>kpm-${project.version}-linux-x86_64.tar.gz</file>
                                     <type>tar.gz</type>
@@ -162,6 +157,16 @@
                                     <type>tar.gz</type>
                                     <classifier>osx</classifier>
                                 </artifact>
+                                <artifact>
+                                    <file>kpm-${project.version}-osx-arm64.tar.gz</file>
+                                    <type>tar.gz</type>
+                                    <classifier>osx-arm64</classifier>
+                                </artifact>
+                                <artifact>
+                                    <file>kpm-${project.version}-noarch.tar.gz</file>
+                                    <type>tar.gz</type>
+                                    <classifier>noarch</classifier>
+                                </artifact>
                             </artifacts>
                         </configuration>
                     </execution>

data/tasks/package.rake

@@ -9,33 +9,50 @@ PACKAGE_NAME = 'kpm'
 require './lib/kpm/version'
 VERSION = KPM::VERSION
 
-# See https://traveling-ruby.s3-us-west-2.amazonaws.com/list.html
-TRAVELING_RUBY_VERSION = '20150715-2.2.2'
+# See https://www.jruby.org/download
+JRUBY_VERSION = '9.3.4.0'
+# See https://github.com/Homebrew/homebrew-portable-ruby/releases
+HOMEBREW_PORTABLE_RUBY_VERSION = '2.6.8_1'
 
 # Remove unused files to reduce package size
 GEMS_PATH = 'packaging/vendor/ruby/*/gems/*/'
 REMOVE_FILES = %w[test tests spec README* CHANGE* Change* COPYING* LICENSE* MIT-LICENSE* doc docs examples ext/*/Makefile .gitignore .travis.yml].freeze
 REMOVE_EXTENSIONS = %w[*.md *.c *.h *.rl extconf.rb *.java *.class *.so *.o].freeze
 
+NOARCH_TARGET = 'noarch'
+LINUX_X86_TARGET = 'x86_64_linux'
+OSX_X86_TARGET = 'el_capitan'
+OSX_ARM_TARGET = 'arm64_big_sur'
+
 desc 'Package your app'
-task package: %w[package:linux:x86 package:linux:x86_64 package:osx]
+task package: %w[package:noarch package:linux:x86_64 package:osx:x86_64 package:osx:arm64]
 
 namespace :package do
-  namespace :linux do
-    desc 'Package KPM for Linux x86'
-    task x86: [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz"] do
-      create_package('linux-x86')
-    end
+  desc 'Package KPM (noarch)'
+  task noarch: [:bundle_install, "packaging/jruby-dist-#{JRUBY_VERSION}-bin.tar.gz"] do
+    create_package(NOARCH_TARGET, 'noarch')
+  end
 
+  namespace :linux do
     desc 'Package KPM for Linux x86_64'
-    task x86_64: [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz"] do
-      create_package('linux-x86_64')
+    task x86_64: [:bundle_install, "packaging/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{LINUX_X86_TARGET}.bottle.tar.gz"] do
+      ensure_ruby_version
+      create_package(LINUX_X86_TARGET, 'linux-x86_64')
     end
   end
 
-  desc 'Package KPM for OS X'
-  task osx: [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz"] do
-    create_package('osx')
+  namespace :osx do
+    desc 'Package KPM for OSX x86_64'
+    task x86_64: [:bundle_install, "packaging/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{OSX_X86_TARGET}.bottle.tar.gz"] do
+      ensure_ruby_version
+      create_package(OSX_X86_TARGET, 'osx')
+    end
+
+    desc 'Package KPM for OSX arm64'
+    task arm64: [:bundle_install, "packaging/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{OSX_ARM_TARGET}.bottle.tar.gz"] do
+      ensure_ruby_version
+      create_package(OSX_ARM_TARGET, 'osx-arm64')
+    end
   end
 
   desc 'Install gems to local directory'
@@ -43,15 +60,12 @@ namespace :package do
     # abort if version packaging does not exist on repository
     abort "KPM #{VERSION} does not exists in the repository." unless gem_exists?
 
-    # Note! Must match TRAVELING_RUBY_VERSION above
-    expected_ruby_version = TRAVELING_RUBY_VERSION.split('-')[-1]
-    abort "You can only 'bundle install' using Ruby #{expected_ruby_version}, because that's what Traveling Ruby uses." if RUBY_VERSION !~ /#{Regexp.quote(expected_ruby_version)}/
     sh 'rm -rf packaging/tmp'
     sh 'mkdir -p packaging/tmp'
     sh 'cp packaging/Gemfile packaging/tmp/'
     sh "sed -i 's/VERSION/#{VERSION}/g' packaging/tmp/Gemfile"
 
-    sh "rm -rf packaging/vendor/ruby/#{expected_ruby_version}/bundler" # if multiple clones of same repo, may load in wrong one
+    sh 'rm -rf packaging/vendor/ruby/2.*/bundler' # if multiple clones of same repo, may load in wrong one
 
     Bundler.with_clean_env do
       sh 'cd packaging/tmp && env BUNDLE_IGNORE_CONFIG=1 bundle install --path ../vendor --without development'
@@ -80,28 +94,42 @@ namespace :package do
   end
 end
 
-file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz" do
-  download_runtime('linux-x86')
+file "packaging/jruby-dist-#{JRUBY_VERSION}-bin.tar.gz" do
+  download_noarch_runtime
 end
 
-file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz" do
-  download_runtime('linux-x86_64')
+file "packaging/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{LINUX_X86_TARGET}.bottle.tar.gz" do
+  download_portable_runtime(LINUX_X86_TARGET)
 end
 
-file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz" do
-  download_runtime('osx')
+file "packaging/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{OSX_X86_TARGET}.bottle.tar.gz" do
+  download_portable_runtime(OSX_X86_TARGET)
 end
 
-def create_package(target)
-  package_dir = "#{PACKAGE_NAME}-#{VERSION}-#{target}"
+file "packaging/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{OSX_ARM_TARGET}.bottle.tar.gz" do
+  download_portable_runtime(OSX_ARM_TARGET)
+end
+
+def create_package(target, package_dir_suffix)
+  pom_version = %r{<version>(.*)</version>}.match(File.read("#{__dir__}/../pom.xml"))[1]
+  package_dir = "#{PACKAGE_NAME}-#{pom_version}-#{package_dir_suffix}"
   sh "rm -rf #{package_dir}"
   sh "mkdir -p #{package_dir}/lib/ruby"
-  sh "tar -xzf packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz -C #{package_dir}/lib/ruby"
+  if target == NOARCH_TARGET
+    sh "tar -xzf packaging/jruby-dist-#{JRUBY_VERSION}-bin.tar.gz -C #{package_dir}/lib/ruby --strip-components 1"
+  else
+    sh "tar -xzf packaging/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{target}.bottle.tar.gz -C #{package_dir}/lib/ruby --strip-components 2"
+  end
 
   sh "cp packaging/kpm.sh #{package_dir}/kpm"
   sh "chmod +x packaging/kpm.sh #{package_dir}/kpm"
 
   sh "cp -pR packaging/vendor #{package_dir}/lib/"
+  if target == NOARCH_TARGET
+    # Need to tweak a few things to make it work with JRuby
+    sh "cp #{package_dir}/lib/ruby/bin/jruby #{package_dir}/lib/ruby/bin/ruby"
+    sh "mv #{package_dir}/lib/vendor/ruby #{package_dir}/lib/vendor/jruby"
+  end
 
   sh "cp packaging/Gemfile* #{package_dir}/lib/vendor/"
   sh "sed -i 's/VERSION/#{VERSION}/g' #{package_dir}/lib/vendor/Gemfile"
@@ -114,9 +142,14 @@ def create_package(target)
   sh "rm -rf #{package_dir}"
 end
 
-def download_runtime(target)
+def download_noarch_runtime
+  sh 'mkdir -p packaging && cd packaging && curl -L -O --fail ' \
+     "https://repo1.maven.org/maven2/org/jruby/jruby-dist/#{JRUBY_VERSION}/jruby-dist-#{JRUBY_VERSION}-bin.tar.gz"
+end
+
+def download_portable_runtime(target)
   sh 'mkdir -p packaging && cd packaging && curl -L -O --fail ' \
-     "https://d6r77u77i8pq3.cloudfront.net/releases/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz"
+     "https://github.com/Homebrew/homebrew-portable-ruby/releases/download/#{HOMEBREW_PORTABLE_RUBY_VERSION}/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{target}.bottle.tar.gz"
 end
 
 def gem_exists?
@@ -126,3 +159,9 @@ def gem_exists?
   specification = YAML.load(response)
   specification.instance_of?(Gem::Specification)
 end
+
+def ensure_ruby_version
+  # Note! Must match HOMEBREW_PORTABLE_RUBY_VERSION above
+  expected_ruby_version = HOMEBREW_PORTABLE_RUBY_VERSION.split('_')[0]
+  abort "You can only 'bundle install' using Ruby #{expected_ruby_version}, because that's what homebrew-portable-ruby uses." if RUBY_VERSION !~ /#{Regexp.quote(expected_ruby_version)}/
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kpm
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-18 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.88.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.88.0
 description: A package manager for Kill Bill.
 email: killbilling-users@googlegroups.com
 executables:
@@ -168,7 +182,6 @@ files:
 - packaging/bundler-config
 - packaging/kpm.sh
 - pom.xml
-- release.sh
 - spec/kpm/remote/base_artifact_spec.rb
 - spec/kpm/remote/base_installer_spec.rb
 - spec/kpm/remote/cloudsmith_api_calls_spec.rb
@@ -223,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Kill Bill package manager.

data/release.sh

@@ -1,60 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-BUNDLE=${BUNDLE-"bundle exec"}
-MVN=${MVN-"mvn"}
-
-if [ 'GNU' != "$(tar --help | grep GNU | head -1 | awk '{print $1}')" ]; then
-  echo 'Unable to release: make sure to use GNU tar'
-  exit 1
-fi
-
-# See TRAVELING_RUBY_VERSION in tasks/package.rake
-if [[ "$(ruby --version 2>&1 | tail -1 | awk '{print $2}')" != 2.2.2* ]]; then
-  echo 'Ruby version 2.2.2 is required'
-  exit 1
-fi
-
-VERSION=`grep -E '<version>([0-9]+\.[0-9]+\.[0-9]+)</version>' pom.xml | sed 's/[\t \n]*<version>\(.*\)<\/version>[\t \n]*/\1/'`
-if [[ -z "$NO_RELEASE" && "$VERSION" != "$(ruby -r./lib/kpm/version.rb -e "print KPM::VERSION")" ]]; then
-  echo 'Unable to release: make sure the versions in pom.xml and VERSION match'
-  exit 1
-fi
-
-if [[ -z "$NO_RELEASE" ]]; then
-  echo 'Pushing the gem to Rubygems'
-  $BUNDLE rake release
-fi
-
-# Wait for the gem to be propagated
-sleep 15
-
-$BUNDLE rake package
-
-if [[ -z "$NO_RELEASE" ]]; then
-  GOAL=gpg:sign-and-deploy-file
-  REPOSITORY_ID=ossrh-releases
-  URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
-  REPO_VERSION=$VERSION
-else
-  GOAL=deploy:deploy-file
-  REPOSITORY_ID=sonatype-nexus-snapshots
-  URL=https://oss.sonatype.org/content/repositories/snapshots/
-  REPO_VERSION="$VERSION-SNAPSHOT"
-fi
-
-echo "Pushing artifacts to Maven Central"
-$MVN $GOAL \
-     -DgroupId=org.kill-bill.billing.installer \
-     -DartifactId=kpm \
-     -Dversion=$REPO_VERSION \
-     -Dpackaging=tar.gz \
-     -DrepositoryId=$REPOSITORY_ID \
-     -Durl=$URL \
-     -Dfile=kpm-$VERSION-linux-x86_64.tar.gz \
-     -Dclassifier=linux-x86_64 \
-     -Dfiles=kpm-$VERSION-linux-x86.tar.gz,kpm-$VERSION-osx.tar.gz \
-     -Dclassifiers=linux-x86,osx \
-     -Dtypes=tar.gz,tar.gz \
-     -DpomFile=pom.xml