chake 0.90.2 → 0.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c094249a63d6302e4b53969fcb103595aca7da88a1a1c3c6355d0facc9a55061
-  data.tar.gz: 8ebdd02f879e7f5dfdf083e985a81745e62df3102c5c3c972c89a96e2058873c
+  metadata.gz: 6fe9cf47e4e7590cb5a32366622afc40947318a280a958615c927b5f50bd82a6
+  data.tar.gz: 415f634b59bdb86ad59e582e8685ddd85891d4df66a54d81f9cc0c8bfa7e6e26
 SHA512:
-  metadata.gz: 19730aecf31f2f6f2d2564d247e17f7e26cce70673a37430793628e31a20a038e1f1f25bf9a290c5540798143390ae8100a8dcb186eac1355aef02f460735b82
-  data.tar.gz: f595aa58c562160b6944927f9c2ede9a58ee32a9cedcd436895140fe011316d2bcb7755d2449b0a49f78eff2ce4e9f3a0752b6611b9cacd0ffe760fdc4e58c77
+  metadata.gz: 9840c830bdbb3469a7458ac19eeeb4518a75a07ae35937326a02c437be8a6b809adb5bb89d45ac3bad86703f3c2068139378b300e057bb119d3b4249d7b38285
+  data.tar.gz: 2d85e0d8e47a6ce2a5b189bbe9cc81b0b58913c7089fa60f7b61697787e37b58dc7356c7626c64c37915f0ba72e104c38d5f67da5d134a925f13f98315470963

data/.manifest

@@ -13,6 +13,7 @@ README.itamae.md
 README.md
 README.shell.md
 Rakefile
+activate.sh
 bin/chake
 chake.gemspec
 chake.spec.erb

data/ChangeLog.md

@@ -1,3 +1,18 @@
+# 0.91
+
+- itamae: handle empty recipe list
+- Add support for configuring encrypted files explicitly
+- itamae-remote: handle empty recipe list
+- Rakefile: deb:install: install dependencies as well
+- activate.sh: add script to use this source dir in a shell
+- Make rsync invocations quiet by default
+
+# 0.90.3
+
+- `itamae_spec`: fix rspec warning about syntax for `expect { }.to raise`
+- bootstrap: `00_set_hostname.sh`: don't set hostname if not needed
+- Chake::Connection: add missing require for `$CHILD_STATUS`
+
 # 0.90.2
 
 - upload: make sure to reupload on config manager changes

data/README.md

@@ -265,9 +265,28 @@ end
 
 ### Encrypted files
 
-Any files ending matching `*.gpg` and `*.asc` will be decrypted with GnuPG
-before being sent to the node (for the configuration management tools that
-required files to be sent). You can use them to store passwords and other
+`chake` supports encrypted files matching either `\*.gpg` or `\*.asc`. There are
+two ways of specicying per-host encrypted files:
+
+1. listing them in the `encrypted` attribute in the node configuration file.
+   Example:
+
+   ```yaml
+   host1.mycompany.com:
+     itamae:
+       - roles/basic.rb
+     encrypted:
+       - foo.txt.asc
+   ```
+2. (deprecated) any files matching
+   `\*\*/files/{default,host-#{node}}/\*.{asc,gpg}` and
+   `\*\*/files/\*.{asc,gpg}`, **if** `encrypted` is not defined in the node
+   configuration.
+
+
+They will be decrypted with GnuPG before being sent to the node (for the
+configuration management tools that required files to be sent), without the
+`\*.asc` or `\*.gpg` extension. You can use them to store passwords and other
 sensitive information (SSL keys, etc) in the repository together with the rest
 of the configuration.
 

data/Rakefile

@@ -36,7 +36,7 @@ desc 'Builds and installs Debian package'
 task 'deb:install' => 'build:debsrc' do
   chdir "pkg/#{pkg.name}-#{pkg.version}" do
     sh 'dpkg-buildpackage --diff-ignore=version.rb -us -uc'
-    sh 'debi'
+    sh 'sudo apt-get install -qy --reinstall $(debc --list-debs)'
   end
 end
 

data/activate.sh

@@ -0,0 +1,3 @@
+base=$(dirname $BASH_SOURCE)
+export RUBYLIB=${base}/lib:${RUBYLIB}
+export PATH=${base}/bin:${PATH}

data/bin/chake

@@ -16,7 +16,7 @@ if rakefiles.none? { |f| File.exist?(f) } && !ARGV.include?('-f') && !ARGV.inclu
   end
   ARGV.unshift << '--rakefile' << rakefile
 
-  # clenup after finishing
+  # cleanup after finishing
   at_exit do
     FileUtils.rm_rf tmpdir
   end

data/lib/chake/bootstrap/00_set_hostname.sh

@@ -1,7 +1,9 @@
 hostname="$1"
 
-echo "$hostname" > /etc/hostname
-hostname --file /etc/hostname
+if [ "$(hostname)" != "${hostname}" ]; then
+  echo "$hostname" > /etc/hostname
+  hostname --file /etc/hostname
+fi
 
 fqdn=$(hostname --fqdn || true)
 if [ "$fqdn" != "$hostname" ]; then

data/lib/chake/config_manager/itamae.rb

@@ -6,7 +6,10 @@ module Chake
   class ConfigManager
     class Itamae < ConfigManager
       def converge
-        run_itamae(*node.data['itamae'])
+        recipes = node.data['itamae']
+        return if recipes.empty?
+
+        run_itamae(*recipes)
       end
 
       def apply(config)

data/lib/chake/config_manager/itamae_remote.rb

@@ -6,7 +6,10 @@ module Chake
   class ConfigManager
     class ItamaeRemote < ConfigManager
       def converge
-        run_itamae(*node.data['itamae-remote'])
+        recipes = node.data['itamae-remote']
+        return if recipes.empty?
+
+        run_itamae(*recipes)
       end
 
       def apply(config)

data/lib/chake/connection.rb

@@ -1,3 +1,5 @@
+require 'English'
+
 module Chake
   Connection = Struct.new(:node)
   class Connection

data/lib/chake/version.rb

@@ -1,3 +1,3 @@
 module Chake
-  VERSION = '0.90.2'.freeze
+  VERSION = '0.91'.freeze
 end

data/lib/chake.rb

@@ -31,18 +31,28 @@ task :nodes do
 end
 
 def encrypted_for(node)
-  encrypted_files = Dir.glob("**/files/{default,host-#{node}}/*.{asc,gpg}") + Dir.glob('**/files/*.{asc,gpg}')
+  encrypted_files = Array(node.data['encrypted'])
+  if encrypted_files.empty?
+    encrypted_files = Dir.glob("**/files/{default,host-#{node.hostname}}/*.{asc,gpg}") + Dir.glob('**/files/*.{asc,gpg}')
+  end
   encrypted_files.each_with_object({}) do |key, hash|
     hash[key] = key.sub(/\.(asc|gpg)$/, '')
   end
 end
 
+desc 'list encrypted files per node'
+task :encrypted do
+  Chake.nodes.each do |node|
+    puts "#{node.hostname}: #{Array(encrypted_for(node).keys).join(', ')}"
+  end
+end
+
 def maybe_decrypt(node)
   if node.needs_upload?
     return yield
   end
 
-  files = encrypted_for(node.hostname)
+  files = encrypted_for(node)
   files.each do |encrypted, target|
     sh "gpg --use-agent --quiet --decrypt --output #{target} #{encrypted}"
   end
@@ -131,15 +141,15 @@ Chake.nodes.each do |node|
   task "upload:#{hostname}" => ["bootstrap:#{hostname}", :upload_common] do
     next unless node.needs_upload?
 
-    encrypted = encrypted_for(hostname)
+    encrypted = encrypted_for(node)
     rsync_excludes = (encrypted.values + encrypted.keys).map { |f| ['--exclude', f] }.flatten
     rsync_excludes << '--exclude' << '.git/'
     rsync_excludes << '--exclude' << 'cache/'
     rsync_excludes << '--exclude' << 'nodes/'
     rsync_excludes << '--exclude' << 'local-mode-cache/'
 
-    rsync = node.rsync + ['-avp'] + ENV.fetch('CHAKE_RSYNC_OPTIONS', '').split
-    rsync_logging = (Rake.application.options.silent && '--quiet') || '--verbose'
+    rsync = node.rsync + ['-ap'] + ENV.fetch('CHAKE_RSYNC_OPTIONS', '').split
+    rsync_logging = (Rake.application.options.trace && '--verbose') || '--quiet'
 
     hash_files = Dir.glob(File.join(Chake.tmpdir, '*.sha1sum'))
     files = Dir.glob('**/*').reject { |f| File.directory?(f) } - encrypted.keys - encrypted.values - hash_files

data/spec/chake/config_manager/itamae_spec.rb

@@ -61,7 +61,7 @@ describe Chake::ConfigManager::Itamae do
 
   it 'throws an error for unsupported connection' do
     allow(node).to receive(:connection).and_return(Object.new)
-    expect(-> { cfg.converge }).to raise_error(NotImplementedError)
+    expect { cfg.converge }.to raise_error(NotImplementedError)
   end
 
   it 'handles silent mode' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chake
 version: !ruby/object:Gem::Version
-  version: 0.90.2
+  version: '0.91'
 platform: ruby
 authors:
 - Antonio Terceiro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-05 00:00:00.000000000 Z
+date: 2023-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,6 +121,7 @@ files:
 - README.md
 - README.shell.md
 - Rakefile
+- activate.sh
 - bin/chake
 - chake.gemspec
 - chake.spec.erb
@@ -199,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: serverless configuration management tool for chef