knife-node-context-exec 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5269957a4d043e29c5f3444102508a935c9a50d
-  data.tar.gz: e9150da6b57f87de0169a74f8c0e975f2f18e56c
+  metadata.gz: 924b310b24ebca668eaa253f28aacf9c5b30f487
+  data.tar.gz: 5332adaa69f487fb901e1b56485803f9d9370839
 SHA512:
-  metadata.gz: f445ffbddd8a670aab38f429c3a45855b8ae6c066817fe6fca1195013d09e84782c3a1cf30eaaa6c7a74016b9ce9b5dc5214712b23150425f6caa3044a04335f
-  data.tar.gz: 233b49f475cb9c4d3d257d56e472a0d9c5edf0575c0ff3a4b427b30a97b1470d10a73113d2d3856e7768faac9f45be10bec68d962ba32db00723f02bcc97a119
+  metadata.gz: edb59950c594b10d4cc97194363cd9b0b9fb408fb07dea793c200c2c628fae43c493d24ab932160389e71d479f8c41f0320a9dc43ba1c7454b1e23ced2b6bdbf
+  data.tar.gz: 3b6854e76099d3214e2aced02dc6bc63b1769aea8742ca74517d3cf6e32a503b590f9bd46a33738befda25cba2e83f1c1b4b78a2284d1d194abe1ee8bb1aabfb

data/lib/chef/knife/context_exec.rb

@@ -1,73 +1,81 @@
 require 'knife-node-context-exec/version'
 require 'chef/knife'
 
-# The knife
-class ContextExec < Chef::Knife
-  banner 'knife context exec'
+module KnifeNodeContextExec
+  # The knife
+  class ContextExec < Chef::Knife
+    banner 'knife context exec'
 
-  deps do
-    require 'chef/search/query'
-    require 'knife-node-context-exec/runner'
-  end
+    deps do
+      require 'chef/search/query'
+      require 'knife-node-context-exec/runner'
+    end
 
-  option :environment,
-         short: '-E VALUE',
-         long: '--environment VALUE',
-         description: 'The environment to search.'
-  option :node_query,
-         short: '-Q VALUE',
-         long: '--query VALUE',
-         description: 'The node query.'
-  option :directory,
-         short: '-D VALUE',
-         long: '--directory VALUE',
-         description: 'A directory for working files.'
-  option :template_filename,
-         short: '-T VALUE',
-         long: '--template VALUE',
-         description: 'The filename of a template.'
-  option :script_filename,
-         short: '-S VALUE',
-         long: '--script VALUE',
-         description: 'The environment to search.'
-  option :command,
-         short: '-C VALUE',
-         long: '--command VALUE',
-         description: 'The command to run.'
-  option :filter_regex,
-         short: '-R VALUE',
-         long: '--regex VALUE',
-         description: 'A regex used to filter output.'
-  option :parallel,
-         short: '-P',
-         long: '--parallel',
-         description: 'Run in parallel?',
-         boolean: true | false,
-         default: false
+    option :environment,
+           short: '-E ENVIRONMENT',
+           long: '--environment ENVIRONMENT',
+           description: 'The environment to search.'
+    option :node_query,
+           short: '-Q QUERY',
+           long: '--query QUERY',
+           description: 'The node query.'
+    option :directory,
+           short: '-D DIRECTORY',
+           long: '--directory DIRECTORY',
+           description: 'A directory for working files.'
+    option :template_filename,
+           short: '-T TEMPLATE',
+           long: '--template TEMPLATE',
+           description: 'The filename of a template.'
+    option :script_filename,
+           short: '-S SCRIPT',
+           long: '--script SCRIPT',
+           description: 'The environment to search.'
+    option :command,
+           short: '-C COMMAND',
+           long: '--command COMMAND',
+           description: 'The command to run.'
+    option :filter_regex,
+           short: '-R REGEX',
+           long: '--regex REGEX',
+           description: 'A regex used to filter output.'
+    option :parallel,
+           short: '-P',
+           long: '--parallel',
+           description: 'Run in parallel?',
+           boolean: true | false,
+           default: false
 
-  def run
-    puts "knife context exec #{KnifeNodeContextExec::VERSION}"
-    environment = config[:environment].to_s
-    node_query = config[:node_query].to_s
-    directory = config[:directory].to_s
-    template_filename = config[:template_filename].to_s
-    script_filename = config[:script_filename].to_s
-    command = config[:command].to_s
-    filter_regex = config[:filter_regex].to_s
-    parallel = config[:parallel]
-    puts "Environment: #{environment}"
-    puts "Query:       #{node_query}"
-    puts "Directory:   #{directory}"
-    puts "Template:    #{template_filename}"
-    puts "Script:      #{script_filename}"
-    puts "Command:     #{command}"
-    puts "Regex:       #{filter_regex}"
-    puts "Parallel?    #{parallel}"
-    nodes = Chef::Search::Query.new.search(:node, node_query).first.select do |node|
-      node.environment == environment
+    def run
+      puts "knife context exec #{KnifeNodeContextExec::VERSION}"
+      environment = config[:environment].to_s
+      node_query = config[:node_query].to_s
+      directory = config[:directory].to_s
+      template_filename = config[:template_filename].to_s
+      script_filename = config[:script_filename].to_s
+      command = config[:command].to_s
+      filter_regex = config[:filter_regex].to_s
+      parallel = config[:parallel]
+      raise 'Some parameters are missing' if
+        environment.empty? || node_query.empty? || directory.empty? || template_filename.empty? ||
+        script_filename.empty? || command.empty? || filter_regex.empty?
+      directory = File.expand_path(directory)
+      template_filename = File.expand_path(template_filename)
+      script_filename = File.expand_path(script_filename)
+      puts "Environment: #{environment}"
+      puts "Query:       #{node_query}"
+      puts "Directory:   #{directory}"
+      puts "Template:    #{template_filename}"
+      puts "Script:      #{script_filename}"
+      puts "Command:     #{command}"
+      puts "Regex:       #{filter_regex}"
+      puts "Parallel?    #{parallel}"
+      nodes = Chef::Search::Query.new.search(:node, node_query).first.select do |node|
+        node.environment == environment
+      end
+      nodes.each { |node| puts "Found #{node.name}" }
+      KnifeNodeContextExec.run(nodes, directory, template_filename, script_filename, command, filter_regex,
+                               parallel, false)
     end
-    nodes.each { |node| puts "Found #{node.name}" }
-    KnifeNodeContextExec.run(nodes, directory, template_filename, script_filename, command, filter_regex,
-                             parallel, false)
   end
 end

data/lib/knife-node-context-exec/runner.rb

@@ -16,8 +16,8 @@ module KnifeNodeContextExec
     end
 
     def run
-      yield(">>>> Executing script for #{node.name}")
       @thread = Thread.new do
+        yield(">>>> Executing script for #{node.name} <<<<")
         script_directory = "#{working_directory}/#{node.name}"
         FileUtils.makedirs(script_directory)
         template = File.read(template_filename)
@@ -35,6 +35,7 @@ module KnifeNodeContextExec
           end
         end
       end
+      yield(">>>> Executing script for #{node.name} <<<<")
       self
     end
 

data/lib/knife-node-context-exec/version.rb

@@ -1,3 +1,3 @@
 module KnifeNodeContextExec
-  VERSION = '1.0.7'.freeze
+  VERSION = '1.0.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-node-context-exec
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Andrew Heald