cookbook-release 1.9.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a2b23c7c9af0dd7ecb83cd1a4f89601951cacd6b8bf2577984559f2fc02cf81
-  data.tar.gz: 5940dfa4456a6003415dfdbdd22b558c912c59edbeecf587e2c0121e4bc492b5
+  metadata.gz: 4c8a060e05eec00dfef6b93987646c9eba3f77e004a9f904a363d782e43a11b3
+  data.tar.gz: 97ee8c774a28ffdcde358f70fd66bb2060a2d3c78e5b50ec92d9fd744c862c6b
 SHA512:
-  metadata.gz: 4ed18ffa88071327c4ba652561e0b3d7bc2beabe18f472d2f75fe9865801743d81b3d78bf4343989e2e04504093b62b15b1c6266b22e3084dbfc1e1460844b8c
-  data.tar.gz: 2abe84b04bb5a9a5879f850dd4296cc0bff59d14a3de12e3ddafa886aaf0cfa88df0556d0ce631ad171221c58a31ed94d74a602c71945040979abbbf1194f551
+  metadata.gz: 01ae1172d137d0f215b360eb4211e4c75f8600549d5df07b9af75f16406d8d35c45adf42af8e49d61250a9dc47dd24ea684bc9f94f55a7db5a40b654bf5c7d3a
+  data.tar.gz: 8854f4668b0d050a286edc5a443eb35c1c810d19778badfaed9be25a280f8d8c91468f0757f317bee582ace21614b9ea3b2ce682de0dd9c8f8da449fe4600438

data/.github/workflows/ci.yml

@@ -1,11 +1,15 @@
 name: Tests
-on: [push, pull_request]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.5', '2.7']
+        ruby-version: ['3.3']
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1

data/cookbook-release.gemspec

@@ -6,7 +6,7 @@ require 'English'
 
 Gem::Specification.new do |spec|
   spec.name          = 'cookbook-release'
-  spec.version       = '1.9.0'
+  spec.version       = '2.0.1'
   spec.authors       = ['Grégoire Seux']
   spec.email         = 'g.seux@criteo.com'
   spec.summary       = 'Provide primitives (and rake tasks) to release a cookbook'
@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'semantic'
   spec.add_dependency 'highline'
   spec.add_dependency 'mixlib-shellout'
-  # TODO: support Chef 17 and leverage knife gem at some point
-  spec.add_dependency 'chef', '>= 12.18.31', '< 17.0' # knife code has been moved to dedicated gem starting with Chef 17
-  spec.add_dependency 'git'
+  spec.add_dependency 'chef', '>= 17'
+  spec.add_dependency 'knife', '>= 17'
+  spec.add_dependency 'git', '~> 4.0'
   spec.add_dependency 'unicode-emoji'
 
 

data/lib/cookbook-release/git-utilities.rb

@@ -77,7 +77,7 @@ module CookbookRelease
 
     def compute_changelog(since, short_sha = true)
       ref = "#{@tag_prefix}#{since}"
-      @g.log(500).object(@sub_dir).between(ref, 'HEAD').map do |commit|
+      @g.log(500).object(@sub_dir).between(ref, 'HEAD').execute.map do |commit|
         message = commit.message.lines.map(&:chomp).compact.delete_if(&:empty?)
         Commit.new(
           author: commit.author.name,

data/lib/cookbook-release/supermarket.rb

@@ -1,7 +1,7 @@
 require 'chef/cookbook_loader'
 require 'chef/cookbook/cookbook_version_loader'
 require 'chef/cookbook_uploader'
-require 'chef/cookbook_site_streaming_uploader'
+require 'chef/knife/core/cookbook_site_streaming_uploader'
 require 'chef/mixin/shell_out'
 require 'json'
 
@@ -28,7 +28,7 @@ module CookbookRelease
       # client.pem key
       ::Chef::CookbookUploader.new(cookbook, rest: 'fake_rest').validate_cookbooks
 
-      tmp_cookbook_dir = Chef::CookbookSiteStreamingUploader.create_build_dir(cookbook)
+      tmp_cookbook_dir = ::Chef::Knife::Core::CookbookSiteStreamingUploader.create_build_dir(cookbook)
       begin
         shell_out!("tar -czf #{cookbook.name}.tgz #{cookbook.name}", :cwd => tmp_cookbook_dir)
       rescue StandardError => e
@@ -46,7 +46,7 @@ module CookbookRelease
     end
 
     def upload(filename, category)
-      http_resp = ::Chef::CookbookSiteStreamingUploader.post(
+      http_resp = ::Chef::Knife::Core::CookbookSiteStreamingUploader.post(
         @url,
         @user_id,
         @client_key,

data/spec/supermarket_spec.rb

@@ -39,7 +39,7 @@ version          '2.0.0'
         body: "{}",
         code: "201"
       )
-      expect(::Chef::CookbookSiteStreamingUploader).
+      expect(::Chef::Knife::Core::CookbookSiteStreamingUploader).
         to receive(:post).
         with('http://a_url', 'a_name', 'a_file', anything()).
         and_return(response)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cookbook-release
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Grégoire Seux
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-28 00:00:00.000000000 Z
+date: 2026-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -58,34 +58,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.18.31
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '17.0'
+        version: '17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.18.31
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '17.0'
+        version: '17'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: knife
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '17'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: unicode-emoji
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +194,7 @@ homepage: https://github.com/criteo/cookbook-release.git
 licenses:
 - Apache License v2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -202,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Provide primitives (and rake tasks) to release a cookbook
 test_files: