chake 0.11 → 0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1984eadb9d5b222a4e1aed1b8180b04819c8158b
-  data.tar.gz: ec4ed19becc23cbe25377524ddc800fbc8da1e4c
+  metadata.gz: bd36fdb7ba1e6821df011b23e5124f0a1a333666
+  data.tar.gz: c8a209c44c58782d0faf734faa5aa782c5fd64f1
 SHA512:
-  metadata.gz: 32a7a9675766f6ea039d8e1c07587c210e831e97d497f2f229be1f4253b2c0c1374a74be6e27f679fd5eedaa4905ca380a02d98d5e41fceb69989240be3e4576
-  data.tar.gz: 775af5a4f9d52c8d70a10cab818a235a6af76b8b167c7616d6fcb97dcd343195f44da6df986200bc19f19dfb04a6e5bfa696d2d8831dc324e2d2ef9da4bf5819
+  metadata.gz: d62c682ea5e0bad45b623a3aa20fc4eb07c7d05f2a823710ce40c34065c474396c03d0dc2a4af71b48a0eadfdfcaaad50116369347791001aeef392aeabfdf77
+  data.tar.gz: e4709a62cbaa6e046be70f8252e49b1ba5a34842f48f17d85a30eb659250ab43d14e78172a041f4791ae1af80f6e89837e1ffae04366fe641c505f0c25244ad4

data/.gitlab-ci.yml

@@ -0,0 +1,10 @@
+before_script:
+  - pwd
+  - echo $USER
+  - bundle install --path .bundle
+
+tests:
+  script: bundle exec rake
+  cache:
+    paths:
+      - .bundle

data/ChangeLog.md

@@ -1,3 +1,10 @@
+# 0.12
+
+* Switch manpage build from ronn to asciidoctor
+* Add ability to override the Chef configuration file by setting
+  `$CHAKE_CHEF_CONFIG` (default: `config.rb`)
+* bootstrap: ensure short hostname is in /etc/hosts
+
 # 0.11
 
 * bootstrap: make sure FQDN matches hostname

data/README.md

@@ -1,5 +1,10 @@
-chake(1) - serverless configuration with chef
-=============================================
+# chake(1)
+
+## NAME
+
+chake - serverless configuration with chef
+
+## Introduction
 
 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
@@ -26,14 +31,12 @@ $ chake init
 
 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. |
-| `Rakefile` | Contains just the `require 'chake'` line. You can augment it with other tasks specific to your intrastructure. |
+* `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.
+* `Rakefile`: Contains just the `require 'chake'` line. You can augment it with other tasks specific to your intrastructure.
 
 After the repository is created, you can call either `chake` or `rake`, as they
 are completely equivalent.
@@ -191,14 +194,11 @@ the node URLs:
 [backend://][username@]hostname[:port][/path]
 ```
 
-|Parameter|Meaning|Default value|
-|---------|-------|-------------|
-| backend | backend to use to connect to the host. `ssh` or `local` | `ssh` |
-| username | user name to connect with | The username on your local workstation |
-| hostname | the hostname to connect to | _none_ |
-| port | port number to connect to | 22 |
-| /path | where to store the cookbooks at the node | `/var/tmp/chef.$USERNAME` |
-
+* `backend`: backend to use to connect to the host. `ssh` or `local` (default: `ssh`)
+* `username`: user name to connect with (default: the username on your local workstation)
+* `hostname`: the hostname to connect to (default: _none_)
+* `port`: port number to connect to (default: 22)
+* `/path`:  where to store the cookbooks at the node (default: `/var/tmp/chef.$USERNAME`)
 
 ## Extra features
 
@@ -298,6 +298,8 @@ vice-versa.
   Directory containing node definition files servers to be managed. Default: `nodes.d`.
 * `$CHAKE_TMPDIR`:
   Directory used to store temporary cache files. Default: `tmp/chake`.
+* `$CHAKE_CHEF_CONFIG`:
+  Chef configuration file, relative to the root of the repository. Default: `config.rb`.
 
 ## See also
 

data/Rakefile

@@ -20,6 +20,8 @@ task 'build:debsrc' => ['build:tarball'] do
   chdir 'pkg' do
     sh 'gem2deb', '--no-wnpp-check', '-s', '-p', pkg.name, "#{dirname}.tar.gz"
     chdir dirname do
+      ln 'man/Rakefile', 'debian/dh_ruby.rake'
+      sh "sed -i -e 's/-1/-1~0/ ; s/\*.*/* Development snapshot/' debian/changelog"
       sh 'dpkg-buildpackage', '-S', '-us', '-uc'
     end
   end
@@ -30,7 +32,7 @@ task 'deb:install' => 'build:debsrc'do
   chdir "pkg/#{pkg.name}-#{pkg.version}" do
     sh 'fakeroot debian/rules binary'
   end
-  sh 'sudo', 'dpkg', '-i', "pkg/#{pkg.name}_#{pkg.version}-1_all.deb"
+  sh 'sudo', 'dpkg', '-i', "pkg/#{pkg.name}_#{pkg.version}-1~0_all.deb"
 end
 
 desc 'Create source RPM package'

data/chake.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "asciidoctor", '>= 1.5.3'
 
   spec.add_dependency "rake"
 end

data/lib/chake.rb

@@ -9,6 +9,7 @@ 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) || {}
@@ -212,13 +213,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}/config.rb #{chef_logging} -j #{node.path}/#{$chake_tmpdir}/#{hostname}.json"
+    node.run_as_root "chef-solo -c #{node.path}/#{chef_config} #{chef_logging} -j #{node.path}/#{$chake_tmpdir}/#{hostname}.json"
   end
 
   desc 'apply <recipe> on #{hostname}'
   task "apply:#{hostname}", [:recipe] => [:recipe_input] do |task, args|
     chef_logging = Rake.application.options.silent && '-l fatal' || ''
-    node.run_as_root "chef-solo -c #{node.path}/config.rb #{chef_logging} -j #{node.path}/#{$chake_tmpdir}/#{hostname}.json --override-runlist recipe[#{$recipe_to_apply}]"
+    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}]"
   end
   task "apply:#{hostname}" => converge_dependencies
 

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

@@ -5,6 +5,11 @@ hostname --file /etc/hostname
 
 fqdn=$(hostname --fqdn || true)
 if [ "$fqdn" != "$hostname" ]; then
+  # if hostname is bar.example.com, we also want `bar` to be in /etc/hosts
+  short_hostname=$(echo "$hostname" | cut -d . -f 1)
+  if [ "$short_hostname" != "$hostname" ] && ! grep -q "\s${short_hostname}" /etc/hosts; then
+    hostname="$hostname $short_hostname"
+  fi
   printf "127.0.1.1\t%s\n" "$hostname" >> /etc/hosts
 fi
 

data/lib/chake/version.rb

@@ -1,3 +1,3 @@
 module Chake
-  VERSION = "0.11"
+  VERSION = "0.12"
 end

data/man/Rakefile

@@ -1,10 +1,15 @@
 task :default => 'man/chake.1'
 
-file 'man/chake.1' => ['man/chake.1.ronn', 'man/readme2man.sed'] do
-  sh 'ronn --roff man/chake.1.ronn'
+file 'man/chake.1' => ['man/chake.adoc'] do
+  command = 'asciidoctor --backend manpage --out-file man/chake.1 man/chake.adoc'
+  if ENV['SOURCE_DATE_EPOCH']
+    date = Time.at(ENV['SOURCE_DATE_EPOCH'].to_i)
+    command << " --attribute docdate=#{date.strftime('%Y-%m-%d')}"
+  end
+  sh command
 end
 
-file 'man/chake.1.ronn' => 'README.md' do |t|
+file 'man/chake.adoc' => ['README.md', 'man/readme2man.sed'] do |t|
   sh "sed -f man/readme2man.sed README.md > #{t.name} || (rm -f #{t.name}; false)"
 end
 
@@ -18,5 +23,5 @@ end
 
 task :clean do
   rm_f 'man/chake.1'
-  rm_f 'man/chake.1.ronn'
+  rm_f 'man/chake.adoc'
 end

data/man/readme2man.sed

@@ -1,3 +1,5 @@
+1a :doctype: manpage
+
 /^## Install/,/^[^#]/ d
 /^## Contributing/,$ d
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chake
 version: !ruby/object:Gem::Version
-  version: '0.11'
+  version: '0.12'
 platform: ruby
 authors:
 - Antonio Terceiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: asciidoctor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +93,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ChangeLog.md
 - Gemfile
 - LICENSE.txt
@@ -141,3 +156,4 @@ test_files:
 - spec/chake/backend_spec.rb
 - spec/chake/node_spec.rb
 - spec/spec_helper.rb
+has_rdoc: