chake 0.8 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe9856d68ffd9ce6f7026dfe84fc5431a6e3066e
-  data.tar.gz: 42b587ccb6da1cebe94fca85d9e0531e9015f1eb
+  metadata.gz: eec019d457b4b3b898996c028f7110da77fc8846
+  data.tar.gz: 24ce8d67959f35786d2cea082a518dc9d17f5597
 SHA512:
-  metadata.gz: b7be8eab84c150e1f342a1018f57309a19626f7cf5a9dba5ae50886fd8522aa3327fed89724690808b5cb1cbbf08674d5949c2ffd7160b98f132504e4758d453
-  data.tar.gz: 1a5980d029fb188928ca0655deedb35486a60b35952d6fa345c54b15a44727e7fe6342717ace3e08a30aaa294ecf8daf27e0d559121304c0339ec0547cb7c319
+  metadata.gz: 40af976047cf7d6a07bf6c47f599e9f8a0edbd3db240e413e306e1b05a28fe20435ffc13ba69dfdaeb5609303e65f31d91402cdcb009598fa6c52a0f77140168
+  data.tar.gz: 29ef77beb5bd171dac487ec5e3aa3563f886719e8ee6ca61f4e2e3bcd9a780e982c64b170a644b4e9ec90e0fd1f1c5475c6d83686c0ef46a598fbfc0c1128fb4

data/ChangeLog.md

@@ -1,3 +1,10 @@
+# 0.9
+
+* fix build step for obs uploads
+* add infrastructure to build and install a manpage
+* Add support for a nodes.d/ directory; very useful when dealing with a larger
+  amount of nodes.
+
 # 0.8
 
 * gemspec: minor improvements in the long description

data/README.md

@@ -1,6 +1,11 @@
-# chake
+chake(1) - serverless configuration with chef
+=============================================
 
-Simple host management with chef and rake. No chef server required.
+chake is a tool that helps you manage multiple hosts with, without the need for
+a chef server. Configuration is managed in a local directory, which should
+probably be under version control with **git(1)** or anything else.
+Configuration is usually deployed via rsync over SSH, and applied by invoking
+**chef-solo(1)** over SSH on each host.
 
 ## Installation
 
@@ -11,6 +16,7 @@ Simple host management with chef and rake. No chef server required.
 ```
 $ chake init
 [create] nodes.yaml
+[ mkdir] nodes.d/
 [create] config.rb
 [ mkdir] config/roles
 [ mkdir] cookbooks/basics/recipes/
@@ -23,6 +29,7 @@ A brief explanation of the created files:
 |File|Description|
 |----|-----------|
 | `nodes.yaml`  | where you will list the hosts you will be managing, and what recipes to apply to each of them. |
+| `nodes.d`  | a directory with multiple files in the same format as nodes.yaml. All files matching `*.yaml` in it will be added to the list of nodes. |
 | `config.rb` | contains the chef-solo configuration. You can modify it, but usually you won't need to. |
 | `config/roles` | directory is where you can put your role definitions. |
 | `cookbooks` | directory where you will store your cookbooks. A sample cookbook called "basics" is created, but feel free to remove it and add actual cookbooks. |
@@ -202,15 +209,26 @@ local://laptop:
 When you run `rake converge` on `desktop`, `laptop` will be skipped, and
 vice-versa.
 
-### Environment variables
-
-|Variable|Meaning|Default value|
-|--------|-------|-------------|
-| `$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_TMPDIR` | Directory used to store temporary cache files | `tmp/chake` |
+## Environment variables
+
+* `$CHAKE_SSH_CONFIG`:
+  Local SSH configuration file. Defaults to `.ssh_config`.
+* `$CHAKE_SSH_PREFIX`:
+  Command to prefix SSH (and rsync over SSH) calls with.
+* `$CHAKE_RSYNC_OPTIONS`:
+  extra options to pass to `rsync`. Useful to e.g. exclude large files from
+  being upload to each server.
+* `$CHAKE_NODES`:
+  File containing the list of servers to be managed. Default: `nodes.yaml`.
+* `$CHAKE_NODES_D`:
+  Directory containing node definition files servers to be managed. Default: `nodes.d`.
+* `$CHAKE_TMPDIR`:
+  Directory used to store temporary cache files. Default: `tmp/chake`.
+
+## See also
+
+* **rake(1)**, **chef-solo(1)**
+* Chef documentation: https://docs.chef.io/
 
 ## Contributing
 

data/Rakefile

@@ -8,7 +8,7 @@ end
 
 pkg = Gem::Specification.load('chake.gemspec')
 
-task 'build:tarball' => [:build] do
+task 'build:tarball' => 'bundler:build' do
   chdir 'pkg' do
     sh 'gem2tgz', "#{pkg.name}-#{pkg.version}.gem"
   end

data/lib/chake.rb

@@ -9,7 +9,11 @@ require 'chake/node'
 require 'chake/readline'
 
 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 = ENV.fetch('CHAKE_TMPDIR', 'tmp/chake')
 
@@ -28,6 +32,15 @@ EOF
       puts "[create] nodes.yaml"
     end
   end
+
+  if File.exist?('nodes.d')
+    puts '[exists] nodes.d/'
+  else
+    FileUtils.mkdir_p 'nodes.d'
+    puts '[ mkdir] nodes.d/'
+  end
+
+
   if File.exists?('config.rb')
     puts '[exists] config.rb'
   else

data/lib/chake/version.rb

@@ -1,3 +1,3 @@
 module Chake
-  VERSION = "0.8"
+  VERSION = "0.9"
 end

data/man/.gitignore

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

data/man/Rakefile

@@ -0,0 +1,22 @@
+task :default => 'man/chake.1'
+
+file 'man/chake.1' => ['man/chake.1.ronn', 'man/readme2man.sed'] do
+  sh 'ronn --roff man/chake.1.ronn'
+end
+
+file 'man/chake.1.ronn' => 'README.md' do |t|
+  sh "sed -f man/readme2man.sed README.md > #{t.name} || (rm -f #{t.name}; false)"
+end
+
+task :install => 'man/chake.1' do
+  prefix = ENV['PREFIX'] || File.exists?('debian/rules') && '/usr' || '/usr/local'
+  target = [ENV["DESTDIR"], prefix , 'man/man1'].compact
+  man = File.join(*target)
+  sh 'install', '-d', '-m', '0755', man
+  sh 'install', '-m', '0644', 'man/chake.1', man
+end
+
+task :clean do
+  rm_f 'man/chake.1'
+  rm_f 'man/chake.1.ronn'
+end

data/man/readme2man.sed

@@ -0,0 +1,4 @@
+/^## Install/,/^[^#]/ d
+/^## Contributing/,$ d
+
+s/^##\(.*\)/## \U\1/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chake
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: '0.9'
 platform: ruby
 authors:
 - Antonio Terceiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,9 @@ files:
 - lib/chake/node.rb
 - lib/chake/readline.rb
 - lib/chake/version.rb
+- man/.gitignore
+- man/Rakefile
+- man/readme2man.sed
 - spec/chake/backend/local_spec.rb
 - spec/chake/backend/ssh_spec.rb
 - spec/chake/backend_spec.rb
@@ -113,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: serverless configuration management tool for chef