cookbook-release 1.6.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4b745baf2a010f96d7bd64dea31e9275f5d070cf871d738f0f1e9a6271a7554
-  data.tar.gz: 84360fb9192231adc36ef0e1031b7a4ca2cac799848a08efb6c270b7daa7943a
+  metadata.gz: 7538788e3e44d58e55dfe48772447e2a3bb907ae4b2d4cff09fcafc54c824335
+  data.tar.gz: 43b8f4c6cc08721f3afc8cbf1c49252480d23ce504d2ab3694c158af2a7f9600
 SHA512:
-  metadata.gz: 9278ffaf0ed6073d59b733e1c79c39a80b199874ba3f94318801805ba1f70508b019ae359926272183f862e0702c4d8596f98a095f10624592c0c2eb28ffd972
-  data.tar.gz: d08177747f17e1fb1c5a9527bd75b55be0bf9f9446e9e18529bf3d2121ed77427dbedd22d49d0b074f8d0e2d56a12dbff8d365ffcda4c5dbea7109fb43eab9ff
+  metadata.gz: ab64808c6d9ea7a0355e03e3caf20597786f61c29f3606ca57bbf2228c9aa4b674b02a7b133bb094b0c1cf493ad63083cbb42384ae180f88216b7e6d527a1614
+  data.tar.gz: 47de72ef77bdc293efffea2617868e40379ac24cd5b160d283730427ff71ba54560fd72f636f9b31b81e896f1b3d762170a9957c40923485e5ad00035cc061b2

data/.github/workflows/ci.yml

@@ -0,0 +1,15 @@
+name: Tests
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.5', '2.7']
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - run: bundle exec rake

data/.github/workflows/release.yml

@@ -0,0 +1,18 @@
+name: Release
+on:
+  push:
+    tags: [ '*' ]
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - run: |
+        install -D -m 600 <(echo -e "---\n:rubygems_api_key: ${RUBYGEMS_API_KEY}") $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}

data/README.md

@@ -63,6 +63,7 @@ Optional environment variables:
 
 ```
 export COOKBOOK_CATEGORY="Other" # defaults to Other
+export SKIP_COOKOOK_UPLOAD=true #Just prepare release and push tag to git, but don't upload
 ```
 
 Note: this setup is intended to be used in a CI system such as jenkins or travis.

data/Rakefile

@@ -0,0 +1,6 @@
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/cookbook-release.gemspec

@@ -6,7 +6,7 @@ require 'English'
 
 Gem::Specification.new do |spec|
   spec.name          = 'cookbook-release'
-  spec.version       = '1.6.0'
+  spec.version       = '1.8.0'
   spec.authors       = ['Grégoire Seux']
   spec.email         = 'g.seux@criteo.com'
   spec.summary       = 'Provide primitives (and rake tasks) to release a cookbook'

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

@@ -8,6 +8,7 @@ module CookbookRelease
   class GitUtilities
 
     attr_accessor :no_prompt
+    attr_reader :sub_dir
 
     def initialize(options={})
       @tag_prefix = options[:tag_prefix] || ''

data/lib/cookbook-release/release.rb

@@ -34,6 +34,7 @@ module CookbookRelease
     def initialize(git, opts={})
       @git         = git
       @no_prompt   = opts[:no_prompt]
+      @skip_upload   = opts[:skip_upload]
       @git.no_prompt = @no_prompt
       @category    = opts[:category] || 'Other'
     end
@@ -108,7 +109,7 @@ module CookbookRelease
         exit 1 unless agreed
         git.push_tag(new_version)
         supermarket = Supermarket.new
-        supermarket.publish_ck(@category)
+        supermarket.publish_ck(@category, git.sub_dir) unless @skip_upload
       rescue
         puts HighLine.color("Release aborted, you have to reset to previous state manually", :red)
         puts ":use with care: #{git.reset_command(new_version)}"

data/lib/cookbook-release/supermarket.rb

@@ -8,7 +8,7 @@ require 'json'
 module CookbookRelease
   class Supermarket
 
-    # This code is adapted from "knife cookbook share" and travis dpl provider 
+    # This code is adapted from "knife cookbook share" and travis dpl provider
     # for supermarket.
 
     def initialize(opts={})
@@ -20,11 +20,11 @@ module CookbookRelease
 
     include ::Chef::Mixin::ShellOut
 
-    def publish_ck(category)
-      ck = ::Chef::Cookbook::CookbookVersionLoader.new('.')
+    def publish_ck(category, path = nil)
+      ck = ::Chef::Cookbook::CookbookVersionLoader.new(path || '.')
       ck.load!
       cookbook = ck.cookbook_version
-      # we have to provide a rest option otherwise it will try to load a 
+      # we have to provide a rest option otherwise it will try to load a
       # client.pem key
       ::Chef::CookbookUploader.new(cookbook, rest: 'fake_rest').validate_cookbooks
 

data/lib/cookbook-release.rb

@@ -78,6 +78,7 @@ module CookbookRelease
           opts = {
             no_prompt: ENV['NO_PROMPT'],
             category: ENV['COOKBOOK_CATEGORY'],
+            skip_upload: ENV['SKIP_COOKOOK_UPLOAD']
           }
           git = GitUtilities.new
           Release.new(git, opts).release!

data/spec/release_spec.rb

@@ -36,12 +36,13 @@ describe Release do
                    :push_tag => true,
                   )
       allow(git).to receive(:no_prompt=)
+      allow(git).to receive(:sub_dir).and_return(nil)
       release = Release.new(git, no_prompt: true)
 
       supermarket = double('supermarket')
       expect(CookbookRelease::Supermarket).to receive(:new).and_return(supermarket)
 
-      expect(supermarket).to receive(:publish_ck).with('Other')
+      expect(supermarket).to receive(:publish_ck).with('Other', nil)
       release.release!
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cookbook-release
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -162,12 +162,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile.rb
+- Rakefile
 - cookbook-release.gemspec
 - lib/cookbook-release.rb
 - lib/cookbook-release/changelog.rb
@@ -200,8 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Provide primitives (and rake tasks) to release a cookbook

data/.travis.yml

@@ -1,12 +0,0 @@
-language: ruby
-rvm:
-- 2.4.0
-deploy:
-  provider: rubygems
-  api_key:
-    secure: ylfB0GIaZxPfZ6/dSJIPujfSt3vxqVFg16lqTBq/2AAZ0qwKTZi9qeM/QZDLMX28vCXmTsYxHGepmyvv0PvJaKvy7E6YBzIKz1Y1vsEZFeAFrgIQq9cDvc4wIX2eFjI7N1ChyaRgi+YYK4BSVfKjYqGBfXk5Wyh7uqNEuWE7FzABV+RxXoHcNi+AhYkCX3NF80qNukXRtiB7XTQj6CP4Wd+Dm25iOUwx8/zNMce8Z8V3j2ysvR4Vtm/soDsr/+Z+27wIdP0VqwElV1FxtR9km8MIJhmzSsnzcvgqJpRmMvO6HLZFzwqnLBzCoPYJqm3K+uQSSfll5LbaNtixlBzIusgtGgm1UjQy1YDGkPexJd5K5CuC/LW78Y7Zrl3CeT34RDlICoztEjhJxFry3EvFxPT03lVQx5z5Fc55/u0hy3mBCiHbxHxAPJLMOtehfv35bzOS7Jv3+otBm/8jn9dXO2pJJdwxL9W2wrzljWkly4yemwceMvtMYf+xnf1zdTnMYoqkYGGl0KutbFL69w78w7BwTFQIhcJOO+g27C6V8vHtqU0U5JOgE/QNg3yWhzhQjgCpzQhmuO+Bcs3Jq2T/OcqTfwM6gufNe+Gq2TdEfeH5Y0WcRtTKJBVVQ4XWFtgONE1C1hNBFLyh7GNZDQQVYBT3c/MXeV5Q++rVJYOdSrw=
-  gem: cookbook-release
-  on:
-    tags: true
-    repo: criteo/cookbook-release
-  skip_cleanup: 'true'

data/Rakefile.rb

@@ -1,7 +0,0 @@
-begin
-  require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new(:spec)
-rescue LoadError
-end
-
-task :default => :spec