abiquo-chef-agent 2.0.4 → 2.0.5

data/Gemfile

@@ -1,6 +1,9 @@
+source 'https://rubygems.org'
+
 group :development do
-  gem "rspec", ">= 0"
-  gem "bundler", "~> 1.0.0"
+  gem "rspec"
+  gem "rspec-collection_matchers"
   gem "jeweler"
   gem "simplecov", ">= 0"
+  gem "xml-simple"
 end

data/bin/abiquo-chef-run

@@ -163,9 +163,7 @@ else
   log "done"
 
   #
-  # Everything in place, no run the client
-  #
-  # first, we run it once to register and apply recipes
+  # Everything in place, so run the client
   cmd = "chef-client -N #{node_name} --once -j /etc/chef/first-boot.json -L /var/log/chef-client.log"
   log "Running chef-client first time"
   log cmd
@@ -184,22 +182,5 @@ else
   if $? != 0
     log "chef-client run failed", :error
     log output, :info
-  else
-    log "Running chef-client in daemon mode"
-    # Run the chef-client if not already running
-    if not (`ps aux|grep "chef-client "| grep -v grep|wc -l`.to_i > 0)
-        # Now we run it in daemon mode
-        cmd = "chef-client -N #{node_name} -i 1800 -d -L /var/log/chef-client.log"
-        output = `#{cmd}`
-        if $? != 0
-          log "Running chef-client in daemon mode failed.", :error
-          log output
-        else
-          log "Success."
-        end
-    else
-        log "chef-client already running."
-        log `ps aux|grep "chef-client "| grep -v grep`
-    end
   end
 end

data/install.sh

@@ -7,7 +7,7 @@ fi
 
 DIST="dist/centos"
 
-echo "Installing ntp..."
+echo "Installing NTP..."
 yum --quiet --assumeyes install ntp
 
 echo "Installing Chef..."
@@ -23,6 +23,11 @@ chmod +x /etc/init.d/abiquo-chef-run
 chkconfig --add abiquo-chef-run
 chkconfig abiquo-chef-run on
 
+echo "Configuring DHCP..."
 cp ${DIST}/dhclient.conf /etc/dhcp/
+IFACES=`ip link show | grep ^[0-9]: | grep -iv loopback | cut -d: -f2 | tr -d ' '`
+for IFACE in ${IFACES}; do
+    cp ${DIST}/dhclient.conf /etc/dhcp/dhclient-${IFACE}.conf
+done
 
 echo "Done!"

data/lib/abiquo-chef-agent.rb

@@ -5,7 +5,7 @@ require 'time'
 module Abiquo
   module Chef
 
-    VERSION="2.0.4"
+    VERSION="2.0.5"
 
     class Config
       def self.chef_config_dir

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-require 'rspec/autorun'
 require 'simplecov'
+require 'rspec/collection_matchers'
 
 SimpleCov.start do
   add_filter '/spec/'

data/spec/unit/bootstrap_config_parser_spec.rb

@@ -83,16 +83,16 @@ describe "Bootstrap Config Parser" do
 
     describe "name" do
       it "should be a string" do
-        @cp.node_name.should be_a(String)
+        expect(@cp.node_name).to be_a(String)
       end
       it "should start with ABQ-" do
-        @cp.node_name.should match(/^ABQ-/)
+        expect(@cp.node_name).to match(/^ABQ-/)
       end
     end
 
     describe "node_config" do
       it "should be a Hash" do
-        @cp.node_config.should be_a(Hash)
+        expect(@cp.node_config).to be_a(Hash)
       end
 
       it "runlist should be an empty missing" do
@@ -101,22 +101,22 @@ describe "Bootstrap Config Parser" do
       end
 
       it "should have three elements" do
-        @cp.node_config.should have(3).items
+        expect(@cp.node_config).to have(3).items
       end
 
       it "runlist should have a two items in the runlist" do
-        @cp.node_config["run_list"].should have(2).items
+        expect(@cp.node_config["run_list"]).to have(2).items
       end
 
       it "should be an array of strings" do
         @cp.node_config["run_list"].each do |i|
-          i.should be_a(String)
+          expect(i).to be_a(String)
         end
       end
 
       it "should have a recipe and a role" do
-        @cp.node_config["run_list"].first.should match(/role\[/)
-        @cp.node_config["run_list"].last.should match(/recipe\[/)
+        expect(@cp.node_config["run_list"].first).to match(/role\[/)
+        expect(@cp.node_config["run_list"].last).to match(/recipe\[/)
       end
 
       it "should contains boundary and newrelic" do
@@ -133,29 +133,29 @@ describe "Bootstrap Config Parser" do
 
       it "attributes should be missing" do
         cp = BootstrapConfigParser.new(File.read(data_dir + "bootstrap_empty_runlist_no_attributes.xml"))
-        cp.node_config.size.should be(0)
+        expect(cp.node_config.size).to be(0)
       end
 
     end
 
     describe "chef-server-url" do
       it "should be a URL" do
-        @cp.chef_server_url.should match(/^http(s)?:\/\//)
+        expect(@cp.chef_server_url).to match(/^http(s)?:\/\//)
       end
     end
 
     describe "validation-client-name" do
       it "should be a String" do
-        @cp.validation_client_name.should be_a(String)
+        expect(@cp.validation_client_name).to be_a(String)
       end
     end
 
     describe "validation_cert" do
       it 'should start with -----BEGIN RSA PRIVATE KEY' do
-        @cp.validation_cert.should match(/^-----BEGIN RSA PRIVATE KEY/)
+        expect(@cp.validation_cert).to match(/^-----BEGIN RSA PRIVATE KEY/)
       end
       it 'should end with END RSA PRIVATE KEY-----' do
-        @cp.validation_cert.should match(/END RSA PRIVATE KEY-----$/)
+        expect(@cp.validation_cert).to match(/END RSA PRIVATE KEY-----$/)
       end
     end
 

data/spec/unit/config_spec.rb

@@ -8,31 +8,31 @@ describe Abiquo::Chef::Config do
   describe "default options" do
 
     it "should have a valid chef_config_dir" do
-      @config.chef_config_dir.should be_a(String)
+      expect(@config.chef_config_dir).to be_a(String)
     end
     
     it "should have a valid ntp_server" do
-      @config.ntp_server.should be_a(String)
+      expect(@config.ntp_server).to be_a(String)
     end
 
     it "should have a valid log_file" do
-      @config.log_file.should be_a(String)
+      expect(@config.log_file).to be_a(String)
     end
     
     it "should have a valid bootstrap_backup_file" do
-      @config.bootstrap_backup_file.should be_a(String)
+      expect(@config.bootstrap_backup_file).to be_a(String)
     end
     
     it "should have a valid validation_cert" do
-      @config.validation_cert.should be_a(String)
+      expect(@config.validation_cert).to be_a(String)
     end
     
     it "should have a valid client_cert_file" do
-      @config.client_cert_file.should be_a(String)
+      expect(@config.client_cert_file).to be_a(String)
     end
 
     it "should have a valid bootstrap xml mediatype" do
-      @config.bootstrap_mediatype.should match(/^application\/vnd.abiquo.[a-z]+\+xml(;version=[0-9](\.[0-9]+)+)?$/)
+      expect(@config.bootstrap_mediatype).to match(/^application\/vnd.abiquo.[a-z]+\+xml(;version=[0-9](\.[0-9]+)+)?$/)
     end
 
   end

data/spec/unit/util_spec.rb

@@ -11,39 +11,39 @@ describe Util do
 
   describe 'parse_leases_file' do
     it 'parse leases file without error' do
-      @leases.should be_a(Hash)
+      expect(@leases).to be_a(Hash)
     end
 
     it 'should not be empty' do
-      @leases.should_not be_empty
+      expect(@leases).to_not be_empty
     end
 
     it 'should find a valid ip address' do
-      @leases[:ip].should match(/([0-9]{1,3}\.){3}[0-9]{1,3}/)
+      expect(@leases[:ip]).to match(/([0-9]{1,3}\.){3}[0-9]{1,3}/)
     end
 
     it 'should  have a valid API URL' do
-      @leases[:abiquo_api_url].should match(/http(s)?:\/\//)
+      expect(@leases[:abiquo_api_url]).to match(/http(s)?:\/\//)
     end
 
     it 'should return latest lease' do
-      @leases[:renew].should eql(Time.parse('2012-11-18 05:48:45 +0100'))
+      expect(@leases[:renew]).to eql(Time.parse('2012-11-18 05:48:45 +0100'))
     end
 
     it 'should  have a valid token' do
-      @leases[:abiquo_api_token].should have_at_least(5).characters
+      expect(@leases[:abiquo_api_token]).to have_at_least(5).characters
     end
 
   end
 
   describe 'find_leases_file' do
     it 'should find a lease file' do
-      Util.find_leases_file([data_dir + "dhclient/"]).should have(1).item
+      expect(Util.find_leases_file([data_dir + "dhclient/"])).to have(1).item
     end
 
     it 'should return an empty list' do
-      Util.find_leases_file([]).should have(0).items
-      Util.find_leases_file(['/tmp']).should have(0).items
+      expect(Util.find_leases_file([])).to have(0).items
+      expect(Util.find_leases_file(['/tmp'])).to have(0).items
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abiquo-chef-agent
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -31,21 +31,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +78,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: run-as-root
   requirement: !ruby/object:Gem::Requirement
@@ -225,6 +241,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2626624219569308421
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: