chake 0.19 → 0.20

data/lib/chake.rb

@@ -4,20 +4,11 @@ require 'yaml'
 require 'json'
 require 'tmpdir'
 
+require 'chake/config'
 require 'chake/version'
-require 'chake/node'
 require 'chake/readline'
 require 'chake/tmpdir'
 
-chef_config = ENV['CHAKE_CHEF_CONFIG'] || 'config.rb'
-nodes_file = ENV['CHAKE_NODES'] || 'nodes.yaml'
-nodes_directory = ENV['CHAKE_NODES_D'] || 'nodes.d'
-node_data = File.exists?(nodes_file) && YAML.load_file(nodes_file) || {}
-Dir.glob(File.join(nodes_directory, '*.yaml')).sort.each do |f|
-  node_data.merge!(YAML.load_file(f))
-end
-$nodes = node_data.map { |node,data| Chake::Node.new(node, data) }.reject(&:skip?).uniq(&:hostname)
-$chake_tmpdir = Chake.tmpdir
 
 desc "Initializes current directory with sample structure"
 task :init do
@@ -84,7 +75,7 @@ end
 
 desc 'list nodes'
 task :nodes do
-  $nodes.each do |node|
+  Chake.nodes.each do |node|
     puts "%-40s %-5s\n" % [node.hostname, node.backend]
   end
 end
@@ -106,7 +97,7 @@ def if_files_changed(node, group_name, files)
   hash_io.close_write
   current_hash = hash_io.read
 
-  hash_file = File.join($chake_tmpdir, node + '.' + group_name + '.sha1sum')
+  hash_file = File.join(Chake.tmpdir, node + '.' + group_name + '.sha1sum')
   hash_on_disk = nil
   if File.exists?(hash_file)
     hash_on_disk = File.read(hash_file)
@@ -144,10 +135,10 @@ task :converge_common => :connect_common
 desc 'Executed before connecting to any host'
 task :connect_common
 
-$nodes.each do |node|
+Chake.nodes.each do |node|
 
   hostname = node.hostname
-  bootstrap_script = File.join($chake_tmpdir, 'bootstrap-' + hostname)
+  bootstrap_script = File.join(Chake.tmpdir, 'bootstrap-' + hostname)
 
   file bootstrap_script => bootstrap_steps do |t|
     mkdir_p(File.dirname(bootstrap_script))
@@ -163,7 +154,7 @@ $nodes.each do |node|
 
   desc "bootstrap #{hostname}"
   task "bootstrap:#{hostname}" => [:bootstrap_common, bootstrap_script] do
-    config = File.join($chake_tmpdir, hostname + '.json')
+    config = File.join(Chake.tmpdir, hostname + '.json')
 
     if File.exists?(config)
       # already bootstrapped, just overwrite
@@ -196,7 +187,7 @@ $nodes.each do |node|
     rsync = node.rsync + ["-avp"] + ENV.fetch('CHAKE_RSYNC_OPTIONS', '').split
     rsync_logging = Rake.application.options.silent && '--quiet' || '--verbose'
 
-    hash_files = Dir.glob(File.join($chake_tmpdir, '*.sha1sum'))
+    hash_files = Dir.glob(File.join(Chake.tmpdir, '*.sha1sum'))
     files = Dir.glob("**/*").select { |f| !File.directory?(f) } - encrypted.keys - encrypted.values - hash_files
     if_files_changed(hostname, 'plain', files) do
       sh *rsync, '--delete', rsync_logging, *rsync_excludes, './', node.rsync_dest
@@ -225,13 +216,13 @@ $nodes.each do |node|
   desc "converge #{hostname}"
   task "converge:#{hostname}" => converge_dependencies do
     chef_logging = Rake.application.options.silent && '-l fatal' || ''
-    node.run_as_root "chef-solo -c #{node.path}/#{chef_config} #{chef_logging} -j #{node.path}/#{$chake_tmpdir}/#{hostname}.json"
+    node.run_as_root "chef-solo -c #{node.path}/#{Chake.chef_config} #{chef_logging} -j #{node.path}/#{Chake.tmpdir}/#{hostname}.json"
   end
 
   desc 'apply <recipe> on #{hostname}'
   task "apply:#{hostname}", [:recipe] => [:recipe_input, :connect_common] do |task, args|
     chef_logging = Rake.application.options.silent && '-l fatal' || ''
-    node.run_as_root "chef-solo -c #{node.path}/#{chef_config} #{chef_logging} -j #{node.path}/#{$chake_tmpdir}/#{hostname}.json --override-runlist recipe[#{$recipe_to_apply}]"
+    node.run_as_root "chef-solo -c #{node.path}/#{Chake.chef_config} #{chef_logging} -j #{node.path}/#{Chake.tmpdir}/#{hostname}.json --override-runlist recipe[#{$recipe_to_apply}]"
   end
   task "apply:#{hostname}" => converge_dependencies
 
@@ -247,7 +238,7 @@ $nodes.each do |node|
 
   desc 'checks connectivity and setup on all nodes'
   task "check:#{hostname}" => :connect_common do
-    node.run('sudo true')
+    node.run('sudo echo OK')
   end
 
 end
@@ -295,24 +286,24 @@ task :recipe_input, :recipe do |task,args|
 end
 
 desc "upload to all nodes"
-multitask :upload => $nodes.map { |node| "upload:#{node.hostname}" }
+multitask :upload => Chake.nodes.map { |node| "upload:#{node.hostname}" }
 
 desc "bootstrap all nodes"
-multitask :bootstrap => $nodes.map { |node| "bootstrap:#{node.hostname}" }
+multitask :bootstrap => Chake.nodes.map { |node| "bootstrap:#{node.hostname}" }
 
 desc "converge all nodes (default)"
-multitask "converge" => $nodes.map { |node| "converge:#{node.hostname}" }
+multitask "converge" => Chake.nodes.map { |node| "converge:#{node.hostname}" }
 
 desc "Apply <recipe> on all nodes"
-multitask "apply", [:recipe] => $nodes.map { |node| "apply:#{node.hostname}" }
+multitask "apply", [:recipe] => Chake.nodes.map { |node| "apply:#{node.hostname}" }
 
 desc "run <command> on all nodes"
-multitask :run, [:command] => $nodes.map { |node| "run:#{node.hostname}" }
+multitask :run, [:command] => Chake.nodes.map { |node| "run:#{node.hostname}" }
 
 task :default => :converge
 
 desc 'checks connectivity and setup on all nodes'
-multitask :check => ($nodes.map { |node| "check:#{node.hostname}" }) do
+multitask :check => (Chake.nodes.map { |node| "check:#{node.hostname}" }) do
   puts "✓ all hosts OK"
   puts "  - ssh connection works"
   puts "  - password-less sudo works"
@@ -326,7 +317,7 @@ task :console do
 
   puts 'chake - interactive console'
   puts '---------------------------'
-  puts 'all node data in available in $nodes'
+  puts 'all node data in available in Chake.nodes'
   puts
   IRB::Irb.new(workspace).run(IRB.conf)
 end

data/lib/chake/backend.rb

@@ -23,11 +23,13 @@ module Chake
 
     def run(cmd)
       printf "%#{Node.max_node_name_length}s: $ %s\n", node.hostname, cmd
-      output = IO.popen(command_runner + [cmd], err: [:child, :out])
-      output.each_line do |line|
+      io = IO.popen(command_runner + ['/bin/sh'], mode='w+', eer: [:child, :out])
+      io.write(cmd)
+      io.close_write
+      io.each_line do |line|
         printf "%#{Node.max_node_name_length}s: %s\n", node.hostname, line.strip
       end
-      output.close
+      io.close
       if $?
         status = $?.exitstatus
         if status != 0

data/lib/chake/config.rb

@@ -0,0 +1,21 @@
+require 'chake/node'
+
+module Chake
+  class << self
+    attr_accessor :chef_config
+    attr_accessor :nodes
+    attr_accessor :tmpdir
+  end
+end
+
+chef_config = ENV['CHAKE_CHEF_CONFIG'] || 'config.rb'
+nodes_file = ENV['CHAKE_NODES'] || 'nodes.yaml'
+nodes_directory = ENV['CHAKE_NODES_D'] || 'nodes.d'
+node_data = File.exists?(nodes_file) && YAML.load_file(nodes_file) || {}
+Dir.glob(File.join(nodes_directory, '*.yaml')).sort.each do |f|
+  node_data.merge!(YAML.load_file(f))
+end
+
+Chake.chef_config = chef_config
+Chake.nodes = node_data.map { |node,data| Chake::Node.new(node, data) }.reject(&:skip?).uniq(&:hostname)
+Chake.tmpdir = Chake.tmpdir

data/lib/chake/version.rb

@@ -1,3 +1,3 @@
 module Chake
-  VERSION = "0.19"
+  VERSION = "0.20"
 end

data/spec/spec_helper.rb

@@ -20,7 +20,9 @@ shared_examples "Chake::Backend" do |backend_class|
 
   it('runs commands') do
     io = StringIO.new("line 1\nline 2\n")
-    expect(IO).to receive(:popen).with(backend.command_runner + ['something'], Hash).and_return(io)
+    expect(IO).to receive(:popen).with(backend.command_runner + ['/bin/sh'], mode='w+', Hash).and_return(io)
+    expect(io).to receive(:write).with('something').ordered
+    expect(io).to receive(:close_write).ordered
     expect(backend).to receive(:printf).with(anything, "myhost", "something")
     expect(backend).to receive(:printf).with(anything, "myhost", "line 1")
     expect(backend).to receive(:printf).with(anything, "myhost", "line 2")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chake
 version: !ruby/object:Gem::Version
-  version: '0.19'
+  version: '0.20'
 platform: ruby
 authors:
 - Antonio Terceiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-17 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,8 +92,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".gitlab-ci.yml"
 - ChangeLog.md
 - Gemfile
 - LICENSE.txt
@@ -102,6 +100,31 @@ files:
 - bin/chake
 - chake.gemspec
 - chake.spec.erb
+- coverage/assets/0.10.0/application.css
+- coverage/assets/0.10.0/application.js
+- coverage/assets/0.10.0/colorbox/border.png
+- coverage/assets/0.10.0/colorbox/controls.png
+- coverage/assets/0.10.0/colorbox/loading.gif
+- coverage/assets/0.10.0/colorbox/loading_background.png
+- coverage/assets/0.10.0/favicon_green.png
+- coverage/assets/0.10.0/favicon_red.png
+- coverage/assets/0.10.0/favicon_yellow.png
+- coverage/assets/0.10.0/loading.gif
+- coverage/assets/0.10.0/magnify.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+- coverage/assets/0.10.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- coverage/assets/0.10.0/smoothness/images/ui-icons_222222_256x240.png
+- coverage/assets/0.10.0/smoothness/images/ui-icons_2e83ff_256x240.png
+- coverage/assets/0.10.0/smoothness/images/ui-icons_454545_256x240.png
+- coverage/assets/0.10.0/smoothness/images/ui-icons_888888_256x240.png
+- coverage/assets/0.10.0/smoothness/images/ui-icons_cd0a0a_256x240.png
+- coverage/index.html
 - examples/test/Rakefile
 - examples/test/config.rb
 - examples/test/cookbooks/example/files/host-homer/test.asc
@@ -113,11 +136,11 @@ files:
 - lib/chake/bootstrap/00_set_hostname.sh
 - lib/chake/bootstrap/01_debian.sh
 - lib/chake/bootstrap/99_unsupported.sh
+- lib/chake/config.rb
 - lib/chake/node.rb
 - lib/chake/readline.rb
 - lib/chake/tmpdir.rb
 - lib/chake/version.rb
-- man/.gitignore
 - man/Rakefile
 - man/readme2man.sed
 - spec/chake/backend/local_spec.rb

data/.gitignore

@@ -1,20 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-/examples/test/nodes.yaml
-/examples/test/.tmp
-.*.html

data/.gitlab-ci.yml

@@ -1,12 +0,0 @@
-before_script:
-  - pwd
-  - echo $USER
-  - bundle install --path .bundle
-
-tests:
-  script:
-    - bundle exec rake
-    - bundle exec rake -f man/Rakefile
-  cache:
-    paths:
-      - .bundle

data/man/.gitignore

@@ -1,2 +0,0 @@
-chake.1*
-chake.adoc