collect-agent 0.1.8 → 0.1.9

data/bin/collect-agent

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+# coding: utf-8
 
 require 'chef'
 require 'trollop'
@@ -16,8 +16,14 @@ EOS
 
   opt :config, "Config chef file", :default => "/etc/chef/client.rb"
   opt :plugins, "Ohai plugins directory", :default => "/etc/chef/ohai_plugins"
+  opt :cookbook, "Ohai download plugins from cookbook", :default => "commonlib"
+  opt :cookbook_path, "Cookbook path", :default => "files/default/ohai/plugins"
 end
 
+# Get chef config
+Chef::Config.from_file(opts[:config])
+Ohai::Log.level = Chef::Config[:log_level]
+
 # load ohai
 Ohai::Config[:plugin_path] << opts[:plugins]
 ohai = Ohai::System.new
@@ -25,7 +31,6 @@ ohai.all_plugins
 ohai.seen_plugins
 
 # get node
-Chef::Config.from_file(opts[:config])
 host = Chef::Config[:node_name] || ohai[:fqdn] || ohai[:hostname]
 client = Chef::REST.new(Chef::Config[:chef_server_url], host, Chef::Config[:client_key])
 node = client.get_rest("nodes/#{host}")
@@ -36,4 +41,12 @@ ohai.data.keys.each { |key| node.automatic_attrs[key] = ohai.data[key] }
 node.set[:collect_agent][:flag] = "collect_agent"
 
 # post node
-client.put_rest("nodes/#{host}", node)
+client.put_rest("nodes/#{host}", node)
+
+# upload plugins
+cookbook = client.get_rest("cookbooks/#{opts[:cookbook]}/latest")
+cookbook.to_hash['files'].each do |file|
+  dest = file['path'].gsub(opts[:cookbook_path], opts[:plugins])
+  tempfile = client.get_rest(file['url'], true)
+  FileUtils.mv(tempfile.path, dest)
+end

data/collect-agent.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "collect-agent"
-  s.version     = "0.1.8"
+  s.version     = "0.1.9"
   s.authors     = ["Vasiliev D.V."]
   s.email       = %w(vadv.mkn@gmail.com)
   s.homepage    = "https://git.undev.cc/megaadmins/collect-agent"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collect-agent
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef