chake 0.90 → 0.90.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73bba733109589908cc9fe35b4f009f105cdac398b8e2eeb4a6ca3638f328276
-  data.tar.gz: 715c2eb00007ced85da48fd4c5c4d4ec6c508627494a87aaeb0e25e1dea3968e
+  metadata.gz: aea493f81d004a6dbcc2ccb1657dd6705d538512e0d7522d9db7e4a7483846fb
+  data.tar.gz: e8a6f9c7e034e95f536361b58ce5083d9f3f3d3037d90e82f7d79ff4c8b389e5
 SHA512:
-  metadata.gz: d04fcefd02e1fe73eba0941f2d1dda595f28e1c40067daf74defac1020039812c58740769bebbdcc92f6414c9d49da3b0753f4e088bb4cefaed295432910f1d2
-  data.tar.gz: 717537aa7effd7371cc23ba4e1fcaa80fb1a0a47fe97d5123abe69488b4b193b61afb34be806a8314234e2257b60081a4c2229a8c93880977609f1fdea69bea5
+  metadata.gz: e93294e8a34232bd6e709440f3384223e2171a93a280708568e019dbbcaeeeac75de1d0d933e1ccbfd720a34e835a211bf6f51cd707fe241f0a04e2e44f8700f
+  data.tar.gz: 04e65daf9f089b5b9a63e2d097c6a178b0362cf433698310cf9858085967ef026ab2c5775f8eb4eb9339298e1c6281062c05b9a59413b59075fdfb378eec286d

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/ChangeLog.md

@@ -1,3 +1,7 @@
+# 0.90.1
+
+* Fix loading node data under ruby < 3.1
+
 # 0.90
 
 * itamae: use --sudo when root for local backend

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

@@ -1,3 +1,3 @@
 module Chake
-  VERSION = '0.90'.freeze
+  VERSION = '0.90.1'.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/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['RUBYLIB']].compact.join(':')
+    path = [Pathname.new(__FILE__).parent.parent / 'bin', ENV['PATH']].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.1
 platform: ruby
 authors:
 - Antonio Terceiro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-09 00:00:00.000000000 Z
+date: 2022-12-18 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,6 +177,7 @@ 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:
@@ -210,4 +212,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