chake 0.10.2 → 0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a066ad18b894e6b4a17a6e67ddeea63e4120f56
-  data.tar.gz: 00cfd9eadc606cd339292a23ad92a35b1d519a96
+  metadata.gz: 1984eadb9d5b222a4e1aed1b8180b04819c8158b
+  data.tar.gz: ec4ed19becc23cbe25377524ddc800fbc8da1e4c
 SHA512:
-  metadata.gz: 3c4df34f504c93cbc041bd7a0eb8364b8f82163ac9a0fafe7dbf8f2980d2792a7d3d9eba727cd8709889564edc0ba4ea653e986b93628d56d8d26b07caf2d6d8
-  data.tar.gz: 1e7531dd97822ec1afce9e1fc2b56175c6f0547639ccd9c5924846cefd369ca40be35c6c549ce5cd1306231681166608409b44b01c2c258cc93c5be54c3eb77e
+  metadata.gz: 32a7a9675766f6ea039d8e1c07587c210e831e97d497f2f229be1f4253b2c0c1374a74be6e27f679fd5eedaa4905ca380a02d98d5e41fceb69989240be3e4576
+  data.tar.gz: 775af5a4f9d52c8d70a10cab818a235a6af76b8b167c7616d6fcb97dcd343195f44da6df986200bc19f19dfb04a6e5bfa696d2d8831dc324e2d2ef9da4bf5819

data/ChangeLog.md

@@ -1,3 +1,14 @@
+# 0.11
+
+* bootstrap: make sure FQDN matches hostname
+* Add `rake check` task to check SSH connectivity and sudo setup
+* Add tasks to apply a single recipe to nodes: `rake apply[recipe]` and `rake
+  apply:$NODE[recipe]`. If `[recipe]` is not passed in the command line, the
+  user is prompted for the recipe name.
+* run task changed to have the same interface and behavior as the new apply
+  task: `rake run[command]`, or `rake run:$NODE[command]`. If `[command]` is
+  not passed in the command line, the user is prompted for the command.
+
 # 0.10.2
 
 * Fix check for modified files at the upload phase. Now chake will properly

data/README.md

@@ -38,7 +38,7 @@ A brief explanation of the created files:
 After the repository is created, you can call either `chake` or `rake`, as they
 are completely equivalent.
 
-## Managing nodes and recipes
+## Managing nodes
 
 Just after you created your repository, the contents of `nodes.yaml` is the
 following:
@@ -95,6 +95,24 @@ password prompts, you can:
 - Configure passwordless `sudo` access for the user you use to connect to your
   nodes.
 
+## Checking connectivity and initial host setup
+
+To check whether hosts are correcly configured, you can use the `check` task:
+
+```bash
+$ rake check
+```
+
+That will run the the `sudo true` command on each host. If that pass without
+you having to passwords, you are sure that
+
+* you have SSH access to each host; and
+* the user you are connecting as has password-less sudo correctly setup.
+
+```bash
+$ rake check
+```
+
 ## Applying cookbooks
 
 To apply the configuration to all nodes, run
@@ -109,6 +127,44 @@ To apply the configuration to a single node, run
 $ rake converge:$NODE
 ```
 
+To apply a single recipe on all nodes, run
+
+```bash
+$ rake apply[myrecipe]
+```
+
+To apply a single recipe on a specific node, run
+
+```bash
+$ rake apply:$NODE[myrecipe]
+```
+
+If you don't inform a recipe in the command line, you will be prompted for one.
+
+To run a shell command on all nodes, run
+
+```
+$ rake run[command]
+```
+
+If the `command` you want to run contains spaces, or other characters that are
+special do the shell, you have to quote them.
+
+To run a shell command on a specific node, run
+
+```
+$ rake run:$NODE[command]
+```
+
+If you don't inform a command in the command line, you will be prompted for
+one.
+
+To check the existing tasks, run
+
+```bash
+$ rake -T
+```
+
 ## Writing cookbooks
 
 Since chake is actually a wrapper for Chef Solo, you should read the [chef

data/lib/chake.rb

@@ -7,6 +7,7 @@ require 'tmpdir'
 require 'chake/version'
 require 'chake/node'
 require 'chake/readline'
+require 'chake/tmpdir'
 
 nodes_file = ENV['CHAKE_NODES'] || 'nodes.yaml'
 nodes_directory = ENV['CHAKE_NODES_D'] || 'nodes.d'
@@ -15,7 +16,7 @@ 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')
+$chake_tmpdir = Chake.tmpdir
 
 desc "Initializes current directory with sample structure"
 task :init do
@@ -206,33 +207,80 @@ $nodes.each do |node|
     end
   end
 
+  converge_dependencies = [:converge_common, "bootstrap:#{hostname}", "upload:#{hostname}"]
+
   desc "converge #{hostname}"
-  task "converge:#{hostname}" => [:converge_common, "bootstrap:#{hostname}", "upload:#{hostname}"] do
+  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"
   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}]"
+  end
+  task "apply:#{hostname}" => converge_dependencies
+
   desc "run a command on #{hostname}"
-  task "run:#{hostname}" => 'run_input' do
-    node.run($cmd)
+  task "run:#{hostname}", [:command] => [:run_input] do
+    node.run($cmd_to_run)
   end
 
   desc "Logs in to a shell on #{hostname}"
   task "login:#{hostname}" do
     node.run_shell
   end
+
+  desc 'checks connectivity and setup on all nodes'
+  task "check:#{hostname}" do
+    node.run('sudo true')
+  end
+
 end
 
-task :run_input do
-  puts "# Enter command to run (use arrow keys for history):"
-  $cmd = ENV['CMD'] || Chake::Readline.readline
-  if !$cmd || $cmd.strip == ''
+task :run_input, :command do |task,args|
+  $cmd_to_run = args[:command]
+  if !$cmd_to_run
+    puts "# Enter command to run (use arrow keys for history):"
+    $cmd_to_run = Chake::Readline::Commands.readline
+  end
+  if !$cmd_to_run || $cmd_to_run.strip == ''
     puts
     puts "I: no command provided, operation aborted."
     exit(1)
   end
 end
 
+task :recipe_input, :recipe do |task,args|
+  $recipe_to_apply = args[:recipe]
+
+  if !$recipe_to_apply
+    recipes = Dir['**/*/recipes/*.rb'].map do |f|
+      f =~ %r{(.*/)?(.*)/recipes/(.*).rb$}
+      cookbook = $2
+      recipe = $3
+      recipe = nil if recipe == 'default'
+      [cookbook,recipe].compact.join('::')
+    end.sort
+    puts 'Available recipes:'
+
+    IO.popen('column', 'w') do |column|
+      column.puts(recipes)
+    end
+
+    $recipe_to_apply = Chake::Readline::Recipes.readline
+    if !$recipe_to_apply || $recipe_to_apply.empty?
+      puts
+      puts "I: no recipe provided, operation aborted."
+      exit(1)
+    end
+    if !recipes.include?($recipe_to_apply)
+      abort "E: no such recipe: #{$recipe_to_apply}"
+    end
+  end
+end
+
 desc "upload to all nodes"
 task :upload => $nodes.map { |node| "upload:#{node.hostname}" }
 
@@ -242,7 +290,15 @@ task :bootstrap => $nodes.map { |node| "bootstrap:#{node.hostname}" }
 desc "converge all nodes (default)"
 task "converge" => $nodes.map { |node| "converge:#{node.hostname}" }
 
-desc "run a command on all nodes"
-task :run => $nodes.map { |node| "run:#{node.hostname}" }
+desc "Apply <recipe> on all nodes"
+task "apply", [:recipe] => $nodes.map { |node| "apply:#{node.hostname}" }
+
+desc "run <command> on all nodes"
+task :run, [:command] => $nodes.map { |node| "run:#{node.hostname}" }
 
 task :default => :converge
+
+desc 'checks connectivity and setup on all nodes'
+task :check => ($nodes.map { |node| "check:#{node.hostname}" }) do
+  puts "✓ all hosts OK"
+end

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

@@ -3,6 +3,11 @@ hostname="$1"
 echo "$hostname" > /etc/hostname
 hostname --file /etc/hostname
 
+fqdn=$(hostname --fqdn || true)
+if [ "$fqdn" != "$hostname" ]; then
+  printf "127.0.1.1\t%s\n" "$hostname" >> /etc/hosts
+fi
+
 # 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

data/lib/chake/readline.rb

@@ -1,26 +1,33 @@
 require 'etc'
 require 'readline'
 
+require 'chake/tmpdir'
+
 module Chake
 
-  module Readline
+  class Readline
 
     class << self
 
       def history_file
-        File.join(Dir.home, '.chake_history')
+        raise NotImplementedError
+      end
+
+      def history
+        @history ||= []
+      end
+
+      def prompt
+        raise NotImplementedError
       end
 
       def init
         return if !File.exists?(history_file)
-        File.readlines(history_file).each do |line|
-          @last = line.strip
-          ::Readline::HISTORY.push(@last)
-        end
+        @history = File.readlines(history_file).map(&:strip)
       end
 
       def finish
-        history = ::Readline::HISTORY.map { |line| line }
+        return if !File.writable?(File.dirname(history_file)) || history.empty?
         File.open(history_file, 'w') do |f|
           history.last(500).each do |line|
             f.puts(line)
@@ -29,20 +36,45 @@ module Chake
       end
 
       def readline
-        input = ::Readline.readline('$ ')
+        ::Readline::HISTORY.clear
+        history.each do |cmd|
+          ::Readline::HISTORY.push(cmd)
+        end
+        input = ::Readline.readline(prompt)
         if input && input.strip != '' && input != @last
-          ::Readline::HISTORY.push(input)
+          history.push(input)
         end
         input
       end
 
     end
 
+    class Commands < Readline
+      def self.history_file
+        File.join(Chake.tmpdir, '.commands_history')
+      end
+      def self.prompt
+        '$ '
+      end
+    end
+
+    class Recipes < Readline
+      def self.history_file
+        File.join(Chake.tmpdir, '.recipes_history')
+      end
+      def self.prompt
+        '> '
+      end
+    end
+
   end
 
 end
 
-Chake::Readline.init
-at_exit do
-  Chake::Readline.finish
+Chake::Readline.constants.each do |subclass|
+  subclass = Chake::Readline.const_get(subclass)
+  subclass.init
+  at_exit do
+    subclass.finish
+  end
 end

data/lib/chake/tmpdir.rb

@@ -0,0 +1,5 @@
+module Chake
+  def self.tmpdir
+    ENV.fetch('CHAKE_TMPDIR', 'tmp/chake')
+  end
+end

data/lib/chake/version.rb

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

data/spec/spec_helper.rb

@@ -1,5 +1,9 @@
-require 'simplecov'
-SimpleCov.start
+begin
+  require 'simplecov'
+  SimpleCov.start
+rescue LoadError
+  puts "W: simplecov not installed, we won't have a coverage report"
+end
 
 require 'chake/node'
 require 'chake/backend'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chake
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: '0.11'
 platform: ruby
 authors:
 - Antonio Terceiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ files:
 - lib/chake/bootstrap/99_unsupported.sh
 - lib/chake/node.rb
 - lib/chake/readline.rb
+- lib/chake/tmpdir.rb
 - lib/chake/version.rb
 - man/.gitignore
 - man/Rakefile
@@ -140,4 +141,3 @@ test_files:
 - spec/chake/backend_spec.rb
 - spec/chake/node_spec.rb
 - spec/spec_helper.rb
-has_rdoc: