chake 0.90 → 0.90.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73bba733109589908cc9fe35b4f009f105cdac398b8e2eeb4a6ca3638f328276
-  data.tar.gz: 715c2eb00007ced85da48fd4c5c4d4ec6c508627494a87aaeb0e25e1dea3968e
+  metadata.gz: c094249a63d6302e4b53969fcb103595aca7da88a1a1c3c6355d0facc9a55061
+  data.tar.gz: 8ebdd02f879e7f5dfdf083e985a81745e62df3102c5c3c972c89a96e2058873c
 SHA512:
-  metadata.gz: d04fcefd02e1fe73eba0941f2d1dda595f28e1c40067daf74defac1020039812c58740769bebbdcc92f6414c9d49da3b0753f4e088bb4cefaed295432910f1d2
-  data.tar.gz: 717537aa7effd7371cc23ba4e1fcaa80fb1a0a47fe97d5123abe69488b4b193b61afb34be806a8314234e2257b60081a4c2229a8c93880977609f1fdea69bea5
+  metadata.gz: 19730aecf31f2f6f2d2564d247e17f7e26cce70673a37430793628e31a20a038e1f1f25bf9a290c5540798143390ae8100a8dcb186eac1355aef02f460735b82
+  data.tar.gz: f595aa58c562160b6944927f9c2ede9a58ee32a9cedcd436895140fe011316d2bcb7755d2449b0a49f78eff2ce4e9f3a0752b6611b9cacd0ffe760fdc4e58c77

data/.manifest

@@ -56,6 +56,7 @@ lib/chake/readline.rb
 lib/chake/tmpdir.rb
 lib/chake/version.rb
 lib/chake/wipe.rb
+lib/chake/yaml.rb
 man/.gitignore
 man/Rakefile
 man/readme2man.sed
@@ -68,4 +69,5 @@ spec/chake/config_manager/itamae_spec.rb
 spec/chake/config_manager/shell_spec.rb
 spec/chake/config_manager_spec.rb
 spec/chake/node_spec.rb
+spec/integration_tests_spec.rb
 spec/spec_helper.rb

data/.rubocop.yml

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

data/ChangeLog.md

@@ -1,3 +1,15 @@
+# 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
+
 # 0.90
 
 * itamae: use --sudo when root for local backend

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/config.rb

@@ -1,4 +1,5 @@
 require 'chake/node'
+require 'chake/yaml'
 
 module Chake
   class << self
@@ -8,12 +9,12 @@ end
 
 nodes_file = ENV['CHAKE_NODES'] || 'nodes.yaml'
 nodes_directory = ENV['CHAKE_NODES_D'] || 'nodes.d'
-nodes = File.exist?(nodes_file) && YAML.load_file(nodes_file, aliases: true) || {}
+nodes = (File.exist?(nodes_file) && Chake::YAML.load_file(nodes_file)) || {}
 nodes.values.each do |node|
   node['chake_metadata'] = { 'definition_file' => nodes_file }
 end
 Dir.glob(File.join(nodes_directory, '*.yaml')).sort.each do |f|
-  file_nodes = YAML.load_file(f, aliases: true)
+  file_nodes = Chake::YAML.load_file(f)
   file_nodes.values.each do |node|
     node['chake_metadata'] = { 'definition_file' => f }
   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,6 @@
 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'.freeze
+  VERSION = '0.90.2'.freeze
 end

data/lib/chake/yaml.rb

@@ -0,0 +1,13 @@
+require 'yaml'
+
+module Chake
+  module YAML
+    def self.load_file(filename)
+      if RUBY_VERSION >= '3.1'
+        ::YAML.load_file(filename, aliases: true)
+      else
+        ::YAML.load_file(filename)
+      end
+    end
+  end
+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/integration_tests_spec.rb

@@ -0,0 +1,48 @@
+require 'fileutils'
+require 'pathname'
+require 'tmpdir'
+
+describe 'Chake' do
+  include FileUtils
+
+  def sh(*args)
+    cmd = Shellwords.join(args)
+    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
+    }
+    unless system(env, *args, out: ['.out', 'w'], err: ['.err', 'w'])
+      out = File.read('.out')
+      err = File.read('.err')
+      raise "Command [#{cmd}] failed with exit status #{$CHILD_STATUS} (PATH = #{path}, RUBYLIB = #{lib}).\nstdout:\n#{out}\nstderr:\n#{err}"
+    end
+    rm_f '.log'
+  end
+
+  def chake(*args)
+    cmd = [Gem.ruby, '-S', 'chake'] + args
+    sh(*cmd)
+  end
+
+  def rake(*args)
+    cmd = [Gem.ruby, '-S', 'rake'] + args
+    sh(*cmd)
+  end
+
+  def project
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        yield dir
+      end
+    end
+  end
+
+  it 'loads node information' do
+    project do
+      chake 'init'
+      rake 'nodes'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chake
 version: !ruby/object:Gem::Version
-  version: '0.90'
+  version: 0.90.2
 platform: ruby
 authors:
 - Antonio Terceiro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-09 00:00:00.000000000 Z
+date: 2023-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,7 @@ files:
 - lib/chake/tmpdir.rb
 - lib/chake/version.rb
 - lib/chake/wipe.rb
+- lib/chake/yaml.rb
 - man/.gitignore
 - man/Rakefile
 - man/readme2man.sed
@@ -176,11 +177,13 @@ files:
 - spec/chake/config_manager/shell_spec.rb
 - spec/chake/config_manager_spec.rb
 - spec/chake/node_spec.rb
+- spec/integration_tests_spec.rb
 - spec/spec_helper.rb
 homepage: https://gitlab.com/terceiro/chake
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -210,4 +213,5 @@ test_files:
 - spec/chake/config_manager/shell_spec.rb
 - spec/chake/config_manager_spec.rb
 - spec/chake/node_spec.rb
+- spec/integration_tests_spec.rb
 - spec/spec_helper.rb