abiquo-chef-agent 1.0.5 → 1.0.6

data/Rakefile

@@ -1,10 +1,11 @@
 require 'rubygems'
 require 'rake'
+require './lib/abiquo-chef-agent.rb'
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  gem.version = Abiquo::Chef::VERSION
 
   gem.name = "abiquo-chef-agent"
   gem.homepage = "http://github.com/abiquo/abiquo-chef-agent"
@@ -27,7 +28,7 @@ task :default => :build
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = Abiquo::Chef::VERSION
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "abiquo-chef-agent #{version}"

data/bin/abiquo-chef-run

@@ -154,15 +154,19 @@ else
   log "Running chef-client first time"
   log cmd
   output = `#{cmd}`
+  #
+  # Remove validation certs and bootstrap XML
+  #
+  if File.exist?(Abiquo::Chef::Config.validation_cert)
+    FileUtils.rm(Abiquo::Chef::Config.validation_cert)
+  end
+  if File.exist?(Abiquo::Chef::Config.bootstrap_backup_file)
+    FileUtils.rm(Abiquo::Chef::Config.bootstrap_backup_file)
+  end
   if $? != 0
     log "chef-client run failed", :error
     log output, :debug
   else
-    #
-    # Remove validation certs and bootstrap XML
-    #
-    FileUtils.rm(Abiquo::Chef::Config.validation_cert)
-    FileUtils.rm(Abiquo::Chef::Config.bootstrap_backup_file)
     log "Setting hostname"
     output = `hostname #{node_name} 2>&1`
     log output, :debug

data/lib/abiquo-chef-agent.rb

@@ -3,7 +3,7 @@ require 'xmlsimple'
 module Abiquo
   module Chef
 
-    VERSION="1.0.5"
+    VERSION="1.0.6"
 
     class Config
       def self.chef_config_dir
@@ -37,6 +37,11 @@ module Abiquo
       attr_reader :run_list, :node_name, :validation_client_name
       attr_reader :chef_server_url, :validation_cert
 
+      #
+      # Parses an XML chunk
+      #
+      # xml: the xml content
+      #
       def initialize(xml)
         @raw_xml = xml
         #
@@ -70,10 +75,7 @@ module Abiquo
         if not @chef_server_url or @chef_server_url.strip.chomp.empty?
           raise Exception.new("Invalid bootstrap XML. Missing <chef-server-url> info.")
         end
-        @run_list = @node_info['runlist'].first['element']
-        if not @run_list
-          raise Exception.new("Invalid bootstrap XML. Missing <runlist>> info.")
-        end
+        @run_list = @node_info['runlist'].first['element'] || []
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abiquo-chef-agent
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-09 00:00:00.000000000 Z
+date: 2011-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: run-as-root
-  requirement: &15727060 !ruby/object:Gem::Requirement
+  requirement: &20338440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15727060
+  version_requirements: *20338440
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &15726200 !ruby/object:Gem::Requirement
+  requirement: &20337840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15726200
+  version_requirements: *20337840
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &15725080 !ruby/object:Gem::Requirement
+  requirement: &20337240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15725080
+  version_requirements: *20337240
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &15724260 !ruby/object:Gem::Requirement
+  requirement: &20336640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15724260
+  version_requirements: *20336640
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &15748820 !ruby/object:Gem::Requirement
+  requirement: &20336020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15748820
+  version_requirements: *20336020
 description: Abiquo Chef Agent
 email: srubio@abiquo.com
 executables:
@@ -78,7 +78,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - bin/abiquo-chef-run
 - lib/abiquo-chef-agent.rb
 - scripts/abiquo-chef-agent.init

data/VERSION

@@ -1 +0,0 @@
-1.0.5