chake 0.90.1 → 0.90.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aea493f81d004a6dbcc2ccb1657dd6705d538512e0d7522d9db7e4a7483846fb
-  data.tar.gz: e8a6f9c7e034e95f536361b58ce5083d9f3f3d3037d90e82f7d79ff4c8b389e5
+  metadata.gz: 693b8b54a375b45d4adcd8ba3bc9b4d67c4a54746767e3dcf4a3df14750a18b9
+  data.tar.gz: 6ddd35528575a2b413d3c8e1ebd445bfb9a742c4410eb76062a2848a8b5b06d1
 SHA512:
-  metadata.gz: e93294e8a34232bd6e709440f3384223e2171a93a280708568e019dbbcaeeeac75de1d0d933e1ccbfd720a34e835a211bf6f51cd707fe241f0a04e2e44f8700f
-  data.tar.gz: 04e65daf9f089b5b9a63e2d097c6a178b0362cf433698310cf9858085967ef026ab2c5775f8eb4eb9339298e1c6281062c05b9a59413b59075fdfb378eec286d
+  metadata.gz: 254cdfa1778b624204769f8f6ab96dc367d1200a3814809597df64b102d91c47d91659a2854620963702b5251ec1730476da5e40dd7db5e7e0c66a1ec55136ad
+  data.tar.gz: 607a924a23f89120fbf7fb97e0f27a80ed3a5b20f001620776498e9a3d7646f4ad01cdb94d159fd405cf22ba1e6f8d810718f69cc20399bf54bf5eedfacbae33

data/.rubocop.yml

@@ -53,3 +53,6 @@ Style/SymbolArray:
 
 Gemspec/RequiredRubyVersion:
   Enabled: false
+
+Gemspec/DeprecatedAttributeAssignment:
+  Enabled: false

data/ChangeLog.md

@@ -1,3 +1,17 @@
+# 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
+- Apply suggestions by rubocop 1.39.0
+- Chake::Connection: avoid setting constant inside of block
+- rubocop: keep assignment to `test_files` in the gemspec
+- gemspec: set `spec.metadata['rubygems_mfa_required']`
+
 # 0.90.1
 
 * Fix loading node data under ruby < 3.1

data/Rakefile

@@ -74,12 +74,10 @@ end
 
 desc 'checks if the latest release is properly documented in ChangeLog.md'
 task :check_changelog do
-  begin
-    sh 'grep', "^#\\s*#{pkg.version}", 'ChangeLog.md'
-  rescue StandardError
-    puts "Version #{pkg.version} not documented in ChangeLog.md!"
-    raise
-  end
+  sh 'grep', "^#\\s*#{pkg.version}", 'ChangeLog.md'
+rescue StandardError
+  puts "Version #{pkg.version} not documented in ChangeLog.md!"
+  raise
 end
 
 desc 'Updates manifest file'
@@ -87,7 +85,7 @@ task :manifest do
   manifest = File.read('.manifest')
   git = `git ls-files`
   if manifest != git
-    File.open('.manifest', 'w') { |f| f.write(git) }
+    File.write('.manifest', git)
     sh 'git commit .manifest -m "Update manifest"'
   end
 end

data/chake.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov'
 
   spec.add_dependency 'rake'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 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.rb

@@ -9,7 +9,7 @@ end
 
 nodes_file = ENV['CHAKE_NODES'] || 'nodes.yaml'
 nodes_directory = ENV['CHAKE_NODES_D'] || 'nodes.d'
-nodes = File.exist?(nodes_file) && Chake::YAML.load_file(nodes_file) || {}
+nodes = (File.exist?(nodes_file) && Chake::YAML.load_file(nodes_file)) || {}
 nodes.values.each do |node|
   node['chake_metadata'] = { 'definition_file' => nodes_file }
 end

data/lib/chake/config_manager/chef.rb

@@ -28,7 +28,7 @@ module Chake
       end
 
       def logging
-        node.silent && '-l fatal' || ''
+        (node.silent && '-l fatal') || ''
       end
     end
   end

data/lib/chake/connection/ssh.rb

@@ -44,7 +44,7 @@ module Chake
       end
 
       def ssh_config
-        File.exist?(ssh_config_file) && ['-F', ssh_config_file] || []
+        (File.exist?(ssh_config_file) && ['-F', ssh_config_file]) || []
       end
 
       def ssh_config_file
@@ -60,11 +60,11 @@ module Chake
       end
 
       def ssh_options
-        node.port && ['-p', node.port.to_s] || []
+        (node.port && ['-p', node.port.to_s]) || []
       end
 
       def scp_options
-        node.port && ['-P', node.port.to_s] || []
+        (node.port && ['-P', node.port.to_s]) || []
       end
     end
   end

data/lib/chake/connection.rb

@@ -1,5 +1,8 @@
+require 'English'
+
 module Chake
-  Connection = Struct.new(:node) do
+  Connection = Struct.new(:node)
+  class Connection
     class CommandFailed < RuntimeError
     end
 

data/lib/chake/version.rb

@@ -1,3 +1,3 @@
 module Chake
-  VERSION = '0.90.1'.freeze
+  VERSION = '0.90.3'.freeze
 end

data/lib/chake.rb

@@ -59,6 +59,7 @@ def if_files_changed(node, group_name, files)
   return if files.empty?
 
   hash_io = IO.popen(%w[xargs sha1sum], 'w+')
+  hash_io.puts(File.join(Chake.tmpdir, "#{node}.bootstrap"))
   files.sort.each { |f| hash_io.puts(f) }
   hash_io.close_write
   current_hash = hash_io.read
@@ -69,9 +70,7 @@ def if_files_changed(node, group_name, files)
 
   yield if current_hash != hash_on_disk
   FileUtils.mkdir_p(File.dirname(hash_file))
-  File.open(hash_file, 'w') do |f|
-    f.write(current_hash)
-  end
+  File.write(hash_file, current_hash)
 end
 
 def write_json_file(file, data)
@@ -111,9 +110,7 @@ Chake.nodes.each do |node|
     if !File.exist?(bootstrap_script) || File.read(bootstrap_script) != bootstrap_code
 
       # create bootstrap script
-      File.open(bootstrap_script, 'w') do |f|
-        f.write(bootstrap_code)
-      end
+      File.write(bootstrap_script, bootstrap_code)
       chmod 0o755, bootstrap_script
 
       # copy bootstrap script over
@@ -131,7 +128,7 @@ Chake.nodes.each do |node|
   end
 
   desc "upload data to #{hostname}"
-  task "upload:#{hostname}" => :upload_common do
+  task "upload:#{hostname}" => ["bootstrap:#{hostname}", :upload_common] do
     next unless node.needs_upload?
 
     encrypted = encrypted_for(hostname)
@@ -142,7 +139,7 @@ Chake.nodes.each do |node|
     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_logging = (Rake.application.options.silent && '--quiet') || '--verbose'
 
     hash_files = Dir.glob(File.join(Chake.tmpdir, '*.sha1sum'))
     files = Dir.glob('**/*').reject { |f| File.directory?(f) } - encrypted.keys - encrypted.values - hash_files

data/man/Rakefile

@@ -21,9 +21,9 @@ MANPAGES.each do |man|
 end
 
 task install: MANPAGES do
-  prefix = ENV['PREFIX'] || File.exist?('debian/rules') && '/usr' || '/usr/local'
-  man1 = File.join(*[ENV['DESTDIR'], prefix, 'share/man/man1'].compact)
-  man7 = File.join(*[ENV['DESTDIR'], prefix, 'share/man/man7'].compact)
+  prefix = ENV['PREFIX'] || (File.exist?('debian/rules') && '/usr') || '/usr/local'
+  man1 = File.join(*[ENV.fetch('DESTDIR', nil), prefix, 'share/man/man1'].compact)
+  man7 = File.join(*[ENV.fetch('DESTDIR', nil), prefix, 'share/man/man7'].compact)
   target = { '.1' => man1, '.7' => man7 }
   sh 'install', '-d', '-m', '0755', man1
   sh 'install', '-d', '-m', '0755', man7

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

data/spec/integration_tests_spec.rb

@@ -7,8 +7,8 @@ describe 'Chake' do
 
   def sh(*args)
     cmd = Shellwords.join(args)
-    lib = [Pathname.new(__FILE__).parent.parent / 'lib', ENV['RUBYLIB']].compact.join(':')
-    path = [Pathname.new(__FILE__).parent.parent / 'bin', ENV['PATH']].join(':')
+    lib = [Pathname.new(__FILE__).parent.parent / 'lib', ENV.fetch('RUBYLIB', nil)].compact.join(':')
+    path = [Pathname.new(__FILE__).parent.parent / 'bin', ENV.fetch('PATH', nil)].join(':')
     env = {
       'RUBYLIB' => lib,
       'PATH' => path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chake
 version: !ruby/object:Gem::Version
-  version: 0.90.1
+  version: 0.90.3
 platform: ruby
 authors:
 - Antonio Terceiro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-18 00:00:00.000000000 Z
+date: 2023-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -182,7 +182,8 @@ files:
 homepage: https://gitlab.com/terceiro/chake
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths: