chef-metal 0.8 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9811bbe55b66c09c1a01be9e87b80b918f2c5428
-  data.tar.gz: 1e5f30552fb823c7e11c9df9e1e08d5682604556
+  metadata.gz: 9c05f6095c83aebd085f44c69d10452e2f728a8f
+  data.tar.gz: 33ba5db04ce1618c3a7afd442c22a8274b99220c
 SHA512:
-  metadata.gz: e94c8a56ae93cdb19752de8ce82c33c5954def45c751b472d941c1c68242c03086fc50daa3f94bc4a9d87763049eea99e4b70b10312f738fa6e78fc768ec53f5
-  data.tar.gz: 91d84206a6fdcb0120f090255e4137e64b98a954c1af11e25bd8db127073744a9bdaad9ebde088d9ec3f96925ef07f87b6f7522ce7652b54f137b04c2b5ba779
+  metadata.gz: bbee9f82bd18b9b9742b405ba71cf06cbae8460e43776af454116cfd108cb44d7282360617f0e0e6802e06ccb3bb7b90f5d982a16049e3f61bed99ddba46e25d
+  data.tar.gz: 8f843e5e1c33c312e3e0d4131ea0d736846f5c7af18d766162521d7e106e2ead430e05b614d8ab7f71240580fc25dba2c4bbfe6ffae88472a7d13e325fb8ece2

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Chef Metal Changelog
 
+## 0.8.1 (4/9/2014)
+
+- Bug: error! was not raising an error in the SSH and WinRM transports
+- Transports: stream output automatically when in debug
+- Support the :read_only execute hint (for Docker)
+- Add more metal command lines (converge, update, delete)
+- Add ChefMetal.connect_to_machine(machine_name) method to get Machine object for a node name
+
 ## 0.8 (4/8/2014)
 
 - New machine_execute resource! (irving@getchef.com)

data/bin/metal

@@ -8,6 +8,8 @@ require 'chef/rest'
 require 'chef/application'
 require 'chef/knife'
 require 'chef/server_api'
+require 'chef_metal/action_handler'
+require 'chef_metal/version'
 
 class ChefMetal::Application < Chef::Application
 
@@ -59,6 +61,16 @@ class ChefMetal::Application < Chef::Application
     :long         => "--chef-zero-port PORT",
     :description  => "Port to start chef-zero on"
 
+  option :read_only,
+    :long         => "--[no-]read-only",
+    :description  => "Promise that execution will not modify the machine (helps with Docker in particular)"
+
+  option :stream,
+    :long         => "--[no-]stream",
+    :default      => true,
+    :boolean      => true,
+    :description  => "Whether to stream output from the machine (default: true)"
+
   def reconfigure
     super
 
@@ -100,41 +112,77 @@ class ChefMetal::Application < Chef::Application
     Chef::Application.setup_server_connectivity
 
     command = cli_arguments.shift
+    exit_code = 0
     case command
     when 'execute'
-      exit_code = 0
-      each_machine(cli_arguments.shift) do |machine|
-        puts "#{machine.node['name']}: running '#{cli_arguments.join(' ')}'"
-        result = machine.execute_always(cli_arguments.join(' '))
-        puts result.stdout if result.stdout != ''
-        STDERR.puts result.stderr if result.stderr != ''
+      each_machine(cli_arguments.shift) do |machine, provisioner|
+        puts "[#{machine.node['name']}] running '#{cli_arguments.join(' ')}'"
+        result = machine.execute(action_handler, cli_arguments.join(' '), :read_only => config[:read_only], :stream => config[:stream])
+        puts result.stdout if result.stdout != '' && !config[:stream] && Chef::Config.log_level != :debug
+        STDERR.puts result.stderr if result.stderr != '' && !config[:stream] && Chef::Config.log_level != :debug
         exit_code = result.exitstatus if result.exitstatus != 0
       end
-      exit(exit_code) if exit_code != 0
+    when 'converge'
+      each_machine(cli_arguments.shift) do |machine, provisioner|
+        machine.converge(action_handler)
+      end
+    when 'delete'
+      each_machine(cli_arguments.shift) do |machine, provisioner|
+        provisioner.delete_machine(action_handler, machine.node)
+      end
+    when 'update'
+      each_machine(cli_arguments.shift) do |machine, provisioner|
+        machine = provisioner.acquire_machine(action_handler, machine.node)
+        machine.setup_convergence(action_handler)
+        machine.converge(action_handler)
+      end
+    when 'stop'
+      each_machine(cli_arguments.shift) do |machine, provisioner|
+        provisioner.stop_machine(action_handler, machine.node)
+      end
+    when 'cat'
+      each_machine(cli_arguments.shift) do |machine, provisioner|
+        cli_arguments.each do |remote_path|
+          puts machine.read_file(remote_path)
+        end
+      end
     else
       Chef::Log.error("Command '#{command}' unrecognized")
     end
 
     Chef::Application.destroy_server_connectivity
+    exit(exit_code) if exit_code != 0
   end
 
+  private
+
   def rest
     @rest ||= Chef::ServerAPI.new()
   end
 
   def each_machine(spec)
     spec.split(',').each do |name|
-      node = rest.get("/nodes/#{name}")
-      provisioner_output = node['normal']['provisioner_output']
-      if !provisioner_output
-        Chef::Log.error("Node #{name} was not provisioned with Metal.")
-        next
-      end
+      yield ChefMetal.connect_to_machine(name)
+    end
+  end
 
-      provisioner = ChefMetal.provisioner_for_node(node)
-      machine = provisioner.connect_to_machine(node)
+  def action_handler
+    @action_handler ||= ActionHandler.new
+  end
+
+  class ActionHandler < ChefMetal::ActionHandler
+    def recipe_context
+      # TODO: somehow remove this code; should context really always be needed?
+      node = Chef::Node.new
+      node.name 'nothing'
+      node.automatic[:platform] = 'metal'
+      node.automatic[:platform_version] = ChefMetal::VERSION
+      Chef::RunContext.new(node, {},
+        Chef::EventDispatch::Dispatcher.new(Chef::Formatters::Doc.new(STDOUT,STDERR)))
+    end
 
-      yield machine
+    def debug_name
+      'metal'
     end
   end
 end

data/lib/chef_metal.rb

@@ -67,4 +67,15 @@ module ChefMetal
     provisioner_class = @@registered_provisioner_classes[cluster_type]
     provisioner_class.inflate(node)
   end
+
+  def self.connect_to_machine(name)
+    rest = Chef::ServerAPI.new()
+    node = rest.get("/nodes/#{name}")
+    provisioner_output = node['normal']['provisioner_output']
+    if !provisioner_output
+      raise "Node #{name} was not provisioned with Metal."
+    end
+    provisioner = provisioner_for_node(node)
+    provisioner.connect_to_machine(node)
+  end
 end

data/lib/chef_metal/convergence_strategy/install_msi.rb

@@ -34,7 +34,7 @@ module ChefMetal
 
       def converge(action_handler, machine)
         # TODO For some reason I get a 500 back if I don't do -l debug
-        machine.transport.execute("chef-client -l debug")
+        machine.execute(action_handler, "chef-client -l debug")
       end
     end
   end

data/lib/chef_metal/machine/basic_machine.rb

@@ -24,8 +24,10 @@ module ChefMetal
       end
 
       def execute(action_handler, command, options = {})
-        action_handler.converge_by "run '#{command}' on #{node['name']}" do
-          transport.execute(command, options).error!
+        action_handler.perform_action "run '#{command}' on #{node['name']}" do
+          result = transport.execute(command, options)
+          result.error!
+          result
         end
       end
 
@@ -39,7 +41,7 @@ module ChefMetal
 
       def download_file(action_handler, path, local_path)
         if files_different?(path, local_path)
-          action_handler.converge_by "download file #{path} on #{node['name']} to #{local_path}" do
+          action_handler.perform_action "download file #{path} on #{node['name']} to #{local_path}" do
             transport.download_file(path, local_path)
           end
         end
@@ -50,7 +52,7 @@ module ChefMetal
           if options[:ensure_dir]
             create_dir(action_handler, dirname_on_machine(path))
           end
-          action_handler.converge_by "write file #{path} on #{node['name']}" do
+          action_handler.perform_action "write file #{path} on #{node['name']}" do
             transport.write_file(path, content)
           end
         end
@@ -61,7 +63,7 @@ module ChefMetal
           if options[:ensure_dir]
             create_dir(action_handler, dirname_on_machine(path))
           end
-          action_handler.converge_by "upload file #{local_path} to #{path} on #{node['name']}" do
+          action_handler.perform_action "upload file #{local_path} to #{path} on #{node['name']}" do
             transport.upload_file(local_path, path)
           end
         end

data/lib/chef_metal/machine/unix_machine.rb

@@ -18,7 +18,7 @@ module ChefMetal
       # Delete file
       def delete_file(action_handler, path)
         if file_exists?(path)
-          action_handler.converge_by "delete file #{path} on #{node['name']}" do
+          action_handler.perform_action "delete file #{path} on #{node['name']}" do
             transport.execute("rm -f #{path}").error!
           end
         end
@@ -26,7 +26,7 @@ module ChefMetal
 
       # Return true or false depending on whether file exists
       def file_exists?(path)
-        result = transport.execute("ls -d #{path}")
+        result = transport.execute("ls -d #{path}", :read_only => true)
         result.exitstatus == 0 && result.stdout != ''
       end
 
@@ -36,7 +36,7 @@ module ChefMetal
         end
 
         # Get remote checksum of file
-        result = transport.execute("md5sum -b #{path}")
+        result = transport.execute("md5sum -b #{path}", :read_only => true)
         result.error!
         remote_sum = result.stdout.split(' ')[0]
 
@@ -55,7 +55,7 @@ module ChefMetal
 
       def create_dir(action_handler, path)
         if !file_exists?(path)
-          action_handler.converge_by "create directory #{path} on #{node['name']}" do
+          action_handler.perform_action "create directory #{path} on #{node['name']}" do
             transport.execute("mkdir #{path}").error!
           end
         end
@@ -66,17 +66,17 @@ module ChefMetal
         if attributes[:mode] || attributes[:owner] || attributes[:group]
           current_attributes = get_attributes(path)
           if attributes[:mode] && current_attributes[:mode].to_i != attributes[:mode].to_i
-            action_handler.converge_by "change mode of #{path} on #{node['name']} from #{current_attributes[:mode].to_i} to #{attributes[:mode].to_i}" do
+            action_handler.perform_action "change mode of #{path} on #{node['name']} from #{current_attributes[:mode].to_i} to #{attributes[:mode].to_i}" do
               transport.execute("chmod #{attributes[:mode].to_i} #{path}").error!
             end
           end
           if attributes[:owner] && current_attributes[:owner] != attributes[:owner]
-            action_handler.converge_by "change group of #{path} on #{node['name']} from #{current_attributes[:owner]} to #{attributes[:owner]}" do
+            action_handler.perform_action "change group of #{path} on #{node['name']} from #{current_attributes[:owner]} to #{attributes[:owner]}" do
               transport.execute("chown #{attributes[:owner]} #{path}").error!
             end
           end
           if attributes[:group] && current_attributes[:group] != attributes[:group]
-            action_handler.converge_by "change group of #{path} on #{node['name']} from #{current_attributes[:group]} to #{attributes[:group]}" do
+            action_handler.perform_action "change group of #{path} on #{node['name']} from #{current_attributes[:group]} to #{attributes[:group]}" do
               transport.execute("chgrp #{attributes[:group]} #{path}").error!
             end
           end
@@ -85,7 +85,7 @@ module ChefMetal
 
       # Get file attributes { :mode, :owner, :group }
       def get_attributes(path)
-        file_info = transport.execute("stat -c '%a %U %G %n' #{path}").stdout.split(/\s+/)
+        file_info = transport.execute("stat -c '%a %U %G %n' #{path}", :read_only => true).stdout.split(/\s+/)
         if file_info.size <= 1
           raise "#{path} does not exist in set_attributes()"
         end

data/lib/chef_metal/machine/windows_machine.rb

@@ -15,7 +15,7 @@ module ChefMetal
       # Delete file
       def delete_file(action_handler, path)
         if file_exists?(path)
-          action_handler.converge_by "delete file #{escape(path)} on #{node['name']}" do
+          action_handler.perform_action "delete file #{escape(path)} on #{node['name']}" do
             transport.execute("Remove-Item #{escape(path)}").error!
           end
         end
@@ -23,12 +23,12 @@ module ChefMetal
 
       # Return true or false depending on whether file exists
       def file_exists?(path)
-        parse_boolean(transport.execute("Test-Path #{escape(path)}").stdout)
+        parse_boolean(transport.execute("Test-Path #{escape(path)}", :read_only => true).stdout)
       end
 
       def files_different?(path, local_path, content=nil)
         # Get remote checksum of file (from http://stackoverflow.com/a/13926809)
-        result = transport.execute <<-EOM
+        result = transport.execute(<<-EOM, :read_only => true)
 $md5 = [System.Security.Cryptography.MD5]::Create("MD5")
 $fd = [System.IO.File]::OpenRead(#{path.inspect})
 $buf = new-object byte[] (1024*1024*8) # 8mb buffer
@@ -60,7 +60,7 @@ EOM
 
       def create_dir(action_handler, path)
         if !file_exists?(path)
-          action_handler.converge_by "create directory #{path} on #{node['name']}" do
+          action_handler.perform_action "create directory #{path} on #{node['name']}" do
             transport.execute("New-Item #{escape(path)} -Type directory")
           end
         end

data/lib/chef_metal/transport.rb

@@ -42,14 +42,14 @@ module ChefMetal
         if stdout_chunk
           if options[:stream_stdout]
             options[:stream_stdout].print stdout_chunk
-          elsif options[:stream]
+          elsif options[:stream] || Chef::Config.log_level == :debug
             STDOUT.print stdout_chunk
           end
         end
         if stderr_chunk
           if options[:stream_stderr]
             options[:stream_stderr].print stderr_chunk
-          elsif options[:stream]
+          elsif options[:stream] || Chef::Config.log_level == :debug
             STDERR.print stderr_chunk
           end
         end

data/lib/chef_metal/transport/ssh.rb

@@ -173,6 +173,7 @@ module ChefMetal
           if exitstatus != 0
             # TODO stdout/stderr is already printed at info/debug level.  Let's not print it twice, it's a lot.
             msg = "Error: command '#{command}' exited with code #{exitstatus}.\n"
+            raise msg
           end
         end
       end

data/lib/chef_metal/transport/winrm.rb

@@ -92,8 +92,9 @@ $file.Close
         def error!
           if exitstatus != 0
             msg = "Error: command '#{command}' exited with code #{exitstatus}.\n"
-            msg << "STDOUT: #{stdout}" if !options[:stream] && !options[:stream_stdout]
-            msg << "STDERR: #{stderr}" if !options[:stream] && !options[:stream_stderr]
+            msg << "STDOUT: #{stdout}" if !options[:stream] && !options[:stream_stdout] && Chef::Config.log_level != :debug
+            msg << "STDERR: #{stderr}" if !options[:stream] && !options[:stream_stderr] && Chef::Config.log_level != :debug
+            raise msg
           end
         end
       end

data/lib/chef_metal/version.rb

@@ -1,3 +1,3 @@
 module ChefMetal
-  VERSION = '0.8'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: 0.8.1
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef