chake 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eb55dbcfe2c5a55b4f25f91577343bdcb012e2b
-  data.tar.gz: 5a5bba8b619a44b1b020dd1b08dbadf4a13b6f60
+  metadata.gz: 41bab755897f490a53f097a252bc9b67ec0f36c9
+  data.tar.gz: a63cf815c00c0698f39e7786f43f57ce97f09e1f
 SHA512:
-  metadata.gz: adbbf6f0e28b6786f237d3fe98b6328dc392f29270c3cdc8237bb79b5ed650fdfc096fae134f252d03a25af9b8ee2a3bb50a44c2d0bdd4b2d390cbd9313f6369
-  data.tar.gz: 28aa419d152a89658fccc7abe108cf68743c3e79babe5a8f249836f62fcc35949f18a79a459cd23f5086002ccca4ba2262cdf98a120182abd64e76bba18ab164
+  metadata.gz: 7c19065bb9da3196b99040a53ea4d8ee1472b721658b9492a64e93ae650eece308d9ea1797eff52b163a4b2afb9ca675e1326de255720cd7d9188a99738a4330
+  data.tar.gz: 87b95fd2d51d8791b74542825e4cefac9d34b5a44a17e6c1676fd6517e7c8dd612fc00e252616a3ff923dec2cb1c4e1f6f4b75248cef5cccebf524422d2e62a4

data/ChangeLog.md

@@ -1,3 +1,11 @@
+# 0.7
+
+* gemspec: improve summary and description
+* Also for encrypted files under $cookbook/files/, and not only under
+  $cookbook/files/\*/.
+* Allow overriding tmpdir with `$CHAKE_TMPDIR`
+* Stop cloud-init from resetting the hostname
+
 # 0.6
 
 * Support a ssh prefix command by setting `$CHAKE_SSH_PREFIX` in the

data/README.md

@@ -209,7 +209,8 @@ vice-versa.
 | `$CHAKE_SSH_CONFIG` | local SSH configuration file | `.ssh_config` |
 | `$CHAKE_SSH_PREFIX` | Command to prefix SSH (and rsync over SSH) calls with | _none_ |
 | `$CHAKE_RSYNC_OPTIONS` | extra options to pass to `rsync`. Useful to e.g. exclude large files from being upload to each server | _none_ |
-| `$CHAKE_NODES` | File containing the list of servers to be managed | _nodes.yaml` |
+| `$CHAKE_NODES` | File containing the list of servers to be managed | `nodes.yaml` |
+| `$CHAKE_TMPDIR` | Directory used to store temporary cache files | `tmp/chake` |
 
 ## Contributing
 

data/chake.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Chake::VERSION
   spec.authors       = ["Antonio Terceiro"]
   spec.email         = ["terceiro@softwarelivre.org"]
-  spec.summary       = %q{Simple host management with chef and rake. No chef server required.}
-  spec.description   = %q{chake provides a set of rake tasks that you can use to manage any number of hosts via SSH. It doesn't require a chef server; all you need is a workstation from where you can SSH into all your hosts.}
+  spec.summary       = %q{serverless configuration management tool for chef}
+  spec.description   = %q{chake allows one to manage a number of hosts via SSH by combining chef (solo) and rake. It doesn't require a chef server; all you need is a workstation from where you can SSH into all your hosts. chake automates copying the configuration management repository to the target host (including managing encrypted files), running chef on them, and arbitraty commands on the hosts.}
   spec.homepage      = "https://gitlab.com/terceiro/chake"
   spec.license       = "MIT"
 

data/lib/chake.rb

@@ -11,7 +11,7 @@ require 'chake/node'
 nodes_file = ENV['CHAKE_NODES'] || 'nodes.yaml'
 node_data = File.exists?(nodes_file) && YAML.load_file(nodes_file) || {}
 $nodes = node_data.map { |node,data| Chake::Node.new(node, data) }.reject(&:skip?).uniq(&:hostname)
-$chake_tmpdir = 'tmp/chake'
+$chake_tmpdir = ENV.fetch('CHAKE_TMPDIR', 'tmp/chake')
 
 desc "Initializes current directory with sample structure"
 task :init do
@@ -75,7 +75,8 @@ task :nodes do
 end
 
 def encrypted_for(node)
-  Dir.glob("**/files/{default,host-#{node}}/*.{asc,gpg}").inject({}) do |hash, key|
+  encrypted_files = Dir.glob("**/files/{default,host-#{node}}/*.{asc,gpg}") + Dir.glob("**/files/*.{asc,gpg}")
+  encrypted_files.inject({}) do |hash, key|
     hash[key] = key.sub(/\.(asc|gpg)$/, '')
     hash
   end
@@ -104,21 +105,19 @@ def write_json_file(file, data)
   end
 end
 
-platforms = Dir.glob(File.expand_path('chake/bootstrap/*.sh', File.dirname(__FILE__))).sort
+bootstrap_steps = Dir.glob(File.expand_path('chake/bootstrap/*.sh', File.dirname(__FILE__))).sort
 
 $nodes.each do |node|
 
   hostname = node.hostname
   bootstrap_script = File.join($chake_tmpdir, 'bootstrap-' + hostname)
 
-  file bootstrap_script => platforms do |t|
+  file bootstrap_script => bootstrap_steps do |t|
     mkdir_p(File.dirname(bootstrap_script))
     File.open(t.name, 'w') do |f|
       f.puts '#!/bin/sh'
       f.puts 'set -eu'
-      f.puts "echo '#{hostname}' > /etc/hostname"
-      f.puts 'hostname --file /etc/hostname'
-      platforms.each do |platform|
+      bootstrap_steps.each do |platform|
         f.puts(File.read(platform))
       end
     end
@@ -139,7 +138,7 @@ $nodes.each do |node|
       sh *scp, bootstrap_script, node.scp_dest + target
 
       # run bootstrap script
-      node.run_as_root(target)
+      node.run_as_root("#{target} #{hostname}")
 
       # overwrite config with current contents
       mkdir_p File.dirname(config)

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

@@ -0,0 +1,9 @@
+hostname="$1"
+
+echo "$hostname" > /etc/hostname
+hostname --file /etc/hostname
+
+# Stop cloud-init from resetting the hostname
+if [ -f /etc/cloud/cloud.cfg ]; then
+  sed -i -e '/^\s*-\s*\(set_hostname\|update_hostname\)/d' /etc/cloud/cloud.cfg
+fi

data/lib/chake/version.rb

@@ -1,3 +1,3 @@
 module Chake
-  VERSION = "0.6"
+  VERSION = "0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chake
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Antonio Terceiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,9 +52,11 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: chake provides a set of rake tasks that you can use to manage any number
-  of hosts via SSH. It doesn't require a chef server; all you need is a workstation
-  from where you can SSH into all your hosts.
+description: chake allows one to manage a number of hosts via SSH by combining chef
+  (solo) and rake. It doesn't require a chef server; all you need is a workstation
+  from where you can SSH into all your hosts. chake automates copying the configuration
+  management repository to the target host (including managing encrypted files), running
+  chef on them, and arbitraty commands on the hosts.
 email:
 - terceiro@softwarelivre.org
 executables:
@@ -79,8 +81,9 @@ files:
 - lib/chake/backend.rb
 - lib/chake/backend/local.rb
 - lib/chake/backend/ssh.rb
-- lib/chake/bootstrap/00_centos7.sh
-- lib/chake/bootstrap/00_debian.sh
+- lib/chake/bootstrap/00_set_hostname.sh
+- lib/chake/bootstrap/01_centos7.sh
+- lib/chake/bootstrap/01_debian.sh
 - lib/chake/bootstrap/99_unsupported.sh
 - lib/chake/node.rb
 - lib/chake/version.rb
@@ -112,7 +115,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Simple host management with chef and rake. No chef server required.
+summary: serverless configuration management tool for chef
 test_files:
 - spec/chake/backend/local_spec.rb
 - spec/chake/backend/ssh_spec.rb