chef-raketasks 0.2.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de3a81f91933796f84623d88036f3a891d4f74e4194cf8f14eeac0243f382a8c
-  data.tar.gz: 56da97b647d22b54646b1f4f6710f553631fd48e56aa9acce23d7320bd9c7c34
+  metadata.gz: fd6c2fd289683cb8a5c5e68deafe185baead939f260e8b0bc7366fecc06731ee
+  data.tar.gz: 0a87509dabd7be5d9a1c286bef48f7ca0cf9b47fd638b64848d595a9714a21a1
 SHA512:
-  metadata.gz: 727860aa43b68c056ee435f00b1ad31863e00e895e8a056d5c84cc2a45515a4236d3289aacd82f345424b8f8fcccdc00c1832e2839e7d178a4e2c323cb0e5bfd
-  data.tar.gz: 6ad1066f6eccdcbf899ae73307386a087e5626f844c15a7265b6a4482b96db4f9e157688ff9c1824efdc096944a4b91f890ea6aa2789c417f038bb82f7decc63
+  metadata.gz: 90cfa6434edce820f235aeddb8fd0038bac23323f650ba990e3c1c5c4f85b2a166944a3c883b6fd35d1d4c9ce72883aae40ed689b743d7a5d524688e0d97b9f4
+  data.tar.gz: 854217379784de4611c83f0ed677e85a20b07d2ba6e1bbd2ae17d855b0ceb4c90a7e06e46b0092d708bd2dd085d2895f1265521a7743738dad6d5bc514fad09a

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## Version 0.5.0
+
+- Add gem:vendor as new raketask to vendor gems for cookbooks and others
+
+## Version 0.4.0
+
+- Extend rake release:supermarket with multiple additional options
+
+## Version 0.3.0
+
+- Enable `cookstyle` as linting option for `rake test:lint:cookbook[autocorrect]` with autocorrect options
+
 ## Version 0.2.0
 
 - Add `repin` tasks

data/README.md

@@ -26,7 +26,7 @@ Rakefile. After that, just run ```rake -T``` or ```rake --tasks``` to see all
 available tasks.
 
 If you start a Rake task with parameters, please assure to not use spaces
-between `[ ]`. This will result in `Don't know how to build task` errors. 
+between `[ ]`. This will result in `Don't know how to build task` errors.
 
 ## Cleanup Tasks
 
@@ -76,6 +76,15 @@ Installs vcenter sdk for kitchen.
 * `version`: define a specific version of the gem
 * `source`: define a different source than rubygems.org
 
+### rake gem:vendor[gemname, version, source, installdir]
+
+Vendors rubygems to a specific directory inside the cookbook
+
+* `gemname`: the name of the gem to be used
+* `version`: define a specific version of the gem
+* `source`: define a different source than rubygems.org
+* `installdir`: define the desired targetdir where the vendoring should happen
+
 ## Packaging Tasks
 
 ### rake package:cookbook
@@ -107,11 +116,20 @@ Upload to Artifactory with required settings like:
 Upload to Chef Server.
 It uses the current configured supermarket in your knife.rb or config.rb.
 
-### rake release:supermarket
+### rake release:supermarket[siteurl,user,authkeyfile,cookbookpath,cookbookname,configfile]
 
 Upload to Chef Supermarket.
 It uses the current configured supermarket in your knife.rb or config.rb.
 
+You are also allowed to use multiple additional settings:
+
+* `siteurl`: defines the url of a Chef Supermarket
+* `user`: the user to authenticate
+* `authkeyfile`: the keyfile to use (it must be a file present on your system)
+* `cookbookpath`: the path where to look up for cookbooks (default: `../`)
+* `cookbookname`: define different cookbookname instead of the current one
+* `configfile`: define a config.rb file instead of the settings above (this might look like `rake release:supermarket[,,,,,~/.chef/config.rb]`)
+
 ## Repin Tasks
 
 ### rake repin:chef-client[gem,version]
@@ -197,10 +215,12 @@ specific file for this task is `.kitchen.vcenter.yml`.
 
 Details at <https://github.com/chef/kitchen-vcenter>
 
-### rake test:lint:cookbook
+### rake test:lint:cookbook[autocorrect]
 
 Run linting tests for cookbook in current dir.
 
+You can add true as option to auto-correct found issues that can be automatically fixed.
+
 ## Contributing
 
 For information on contributing to this project see <https://github.com/chef/chef/blob/master/CONTRIBUTING.md>

data/lib/chef/raketasks/gem.rb

@@ -24,18 +24,20 @@ module ChefRake
         super
 
         namespace :gem do
-          desc 'gem:install'
-          namespace :install do
-            def install_gem(name, version, source)
-              cmd = 'chef gem install '
-              cmd << "#{name} "
-              cmd << "-v #{version} " unless version.nil?
-              cmd << "-s #{source} " unless source.nil?
-              cmd << '--no-document'
+          def install_gem(name, version, source, installdir)
+            cmd = 'chef gem install '
+            cmd << "#{name} "
+            cmd << "-v \"#{version}\" " unless version.nil?
+            cmd << "-s #{source} " unless source.nil?
+            cmd << "--install-dir #{installdir} " unless installdir.nil? # used mostly for vendoring
+            cmd << '--no-user-install ' unless installdir.nil? # used for vendoring
+            cmd << '--no-document'
 
-              sh cmd
-            end
+            sh cmd
+          end
 
+          desc 'gem:install'
+          namespace :install do
             # NAMESPACE: gem:install:static
             desc 'Installs necessary static gems for kitchen'
             task static: %i[
@@ -66,6 +68,18 @@ module ChefRake
               end
             end # namespace vcenter
           end # namespace install
+
+          # NAMESPACE: gem:vendor
+          desc 'Vendors gems into cookbook'
+          task :vendor, [:gemname, :version, :source, :installdir] do |_t, args|
+            args.with_defaults(
+              version: '>= 0', # so use latest when not set
+              source: nil,
+              installdir: 'files/default/vendor'
+            )
+
+            install_gem(args.gemname, args.version, args.source, args.installdir)
+          end
         end # namespace gem
       end # def initialize
     end # class Gem

data/lib/chef/raketasks/release.rb

@@ -70,7 +70,7 @@ module ChefRake
           end
 
           desc 'Upload to Chef Supermarket'
-          task :supermarket do
+          task :supermarket, [:siteurl, :user, :authkeyfile, :cookbookpath, :cookbookname, :configfile] do |_t, args|
             Rake::Task['clean:cookbook'].execute
 
             require 'berkshelf'
@@ -79,8 +79,20 @@ module ChefRake
             metadata = Chef::Cookbook::Metadata.new
             metadata.from_file File.join(current_dir, 'metadata.rb')
 
+            args.with_defaults(
+              cookbookpath: parent_dir
+            )
+
             cmd = "knife supermarket share #{metadata.name}"
-            cmd << " --cookbook-path #{parent_dir}"
+            if args.configfile.nil?
+              cmd << " --cookbook-path #{parent_dir}"
+              cmd << " --supermarket-site #{args.siteurl}" unless args.siteurl.nil?
+              cmd << " --user #{args.user}" unless args.user.nil?
+              cmd << " --key #{args.authkeyfile}" unless args.authkeyfile.nil?
+            elsif args.configfile
+              cmd << " --config #{args.configfile}" unless args.configfile.nil?
+            end
+
             sh cmd
 
             # require 'chef/mixin/shell_out'

data/lib/chef/raketasks/test.rb

@@ -94,9 +94,12 @@ module ChefRake
 
           namespace :lint do
             desc 'Run linting tests for cookbook'
-            task :cookbook do
-              puts 'running cookstyle for cookbook'
-              puts `cookstyle`
+            task :cookbook, [:autocorrect] do |_t, args|
+              args.with_defaults(autocorrect: false)
+
+              cmd = 'cookstyle'
+              cmd << ' --auto-correct' if args.autocorrect
+              sh cmd
             end
           end # namespace lint
         end # namespace test

data/lib/chef/raketasks/version.rb

@@ -18,6 +18,6 @@
 
 module ChefRake
   module Task
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-raketasks
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Patrick Schaumburg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mdl
@@ -145,7 +145,8 @@ files:
 homepage: https://www.tecracer.de
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: Add `require 'chef-raketasks'` to your `Rakefile`.
 rdoc_options: []
 require_paths:
@@ -161,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Collection of reusable Rake tasks for Chef