rbovirt 0.0.31 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b97753a15261f2aefe05f131f10919c4e4462b86
-  data.tar.gz: e11ea2283df23bc959a966d4c3f0b5a48a60a25b
+  metadata.gz: 7991aae185eb77ee7fbe2f7a371ec001e8467b32
+  data.tar.gz: 9b07677921a2e7acab03aebe8cbcf5a990323a5e
 SHA512:
-  metadata.gz: 254c0845f58a8c0c81cdfd092d83138bb9347aeee338606e283e8d91d9f8791533e9bda06804b487d57e38dc722c982872a6982bfbbb73c064a725364454676e
-  data.tar.gz: 98637488a24997cc47b4ab67384b7b5994841fb953e1ca72bf9154dc129973e5418d07662445b12ba106e23df6510be4dca7d8f6b1b77bacb18db98c22a79d72
+  metadata.gz: f5b2f8246ad14e6bff574b11a9192fe55180fe5cea6a28377783296f6db6e9919873ff853f3a74fb2213cda72d93d3c57d21fd31621fdff2c36c0284cfb8f742
+  data.tar.gz: afbca20bf62bd4e45f45734723cbd7ef84a50f85c24ed5c2360843d547a2ef99bea3de9b9146e91bf37369a78b463e55c090e2a2569463f722c53e765984ccd9

data/CHANGES.rdoc

@@ -6,6 +6,16 @@ _rbovirt_ project.
 Note that this list of changes was added with the 0.0.30 release,
 previous releases aren't described here.
 
+== 0.0.32 / 2015-01-14
+
+New features:
+
+* Added support for template versions.
+
+Bug fixes:
+
+* Handle correctly the _cloud-init_ +phone_home+ option.
+
 == 0.0.31 / 2014-12-11
 
 New features:

data/lib/ovirt/template.rb

@@ -1,6 +1,6 @@
 module OVIRT
   class Template < BaseObject
-    attr_reader :description, :status, :cluster, :creation_time, :os, :storage, :display, :profile, :memory
+    attr_reader :description, :status, :cluster, :creation_time, :os, :storage, :display, :profile, :memory, :version
 
     def initialize(client, xml)
       super(client, xml[:id], xml[:href], (xml/'name').first.text)
@@ -30,6 +30,7 @@ module OVIRT
     private
     def parse_xml_attributes!(xml)
       @description = ((xml/'description').first.text rescue '')
+      @version = TemplateVersion.new((xml/'version').first)
       @status = ((xml/'status').first.text rescue 'unknown')
       @memory = (xml/'memory').first.text
       @profile = (xml/'type').first.text

data/lib/ovirt/template_version.rb

@@ -0,0 +1,14 @@
+module OVIRT
+  class TemplateVersion
+    attr_reader :base_template, :version_number, :version_name
+    def initialize(xml)
+      parse_xml_attributes(xml) if xml
+    end
+
+    def parse_xml_attributes(xml)
+      @base_template = (xml/"base_template").first[:id]
+      @version_number = (xml/"version_number").first.text
+      @version_name = (xml/"version_name").first.text
+    end
+  end
+end

data/lib/ovirt/version.rb

@@ -1,3 +1,3 @@
 module OVIRT
-  VERSION = "0.0.31"
+  VERSION = "0.0.32"
 end

data/lib/ovirt/vm.rb

@@ -120,11 +120,13 @@ module OVIRT
       ssh_authorized_keys = opts[:ssh_authorized_keys]
       fileslist           = opts[:files]
       runcmd              = opts[:runcmd]
+      extracmd            = nil 
       unless opts[:phone_home].nil?
         phone_home = \
-        "phone_home\n" \
+        "phone_home:\n" \
         "  url: #{opts[:phone_home]['url']}\n" \
         "  post: #{opts[:phone_home]['post']}\n"
+        extracmd   = phone_home
       end
       cmdlist             = 'runcmd:'
       unless runcmd.nil?
@@ -133,6 +135,11 @@ module OVIRT
 	  "#{cmdlist}\n" \
           "- #{cmd}\n"
         end
+        if extracmd.nil?
+          extracmd = cmdlist
+        else
+          extracmd = extracmd +cmdlist
+        end
       end
       builder   = Nokogiri::XML::Builder.new do
         action {
@@ -194,20 +201,13 @@ module OVIRT
                 }
               regenerate_ssh_keys 'true'
               files {
-	        unless runcmd.nil?
+	        unless extracmd.nil?
                   file {
                     name_   'ignored'
-                    content cmdlist
+                    content extracmd
                     type    'PLAINTEXT'
                    }
                 end
-	        unless phone_home.nil?
-                  file {
-                    name_   'ignored'
-                    content phone_home
-                    type    'PLAINTEXT'
-                  }
-                end
                 unless fileslist.nil?
                   fileslist.each do |fileentry|
                     file {

data/lib/rbovirt.rb

@@ -4,6 +4,7 @@ require "ovirt/datacenter"
 require "ovirt/host"
 require "ovirt/storage_domain"
 require "ovirt/template"
+require "ovirt/template_version"
 require "ovirt/vm"
 require "ovirt/volume"
 require "ovirt/interface"

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: rbovirt
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.32
 platform: ruby
 authors:
 - Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -90,8 +90,8 @@ extra_rdoc_files:
 - README.rdoc
 - CHANGES.rdoc
 files:
-- .document
-- .gitignore
+- ".document"
+- ".gitignore"
 - CHANGES.rdoc
 - Gemfile
 - LICENSE.txt
@@ -113,6 +113,7 @@ files:
 - lib/ovirt/quota.rb
 - lib/ovirt/storage_domain.rb
 - lib/ovirt/template.rb
+- lib/ovirt/template_version.rb
 - lib/ovirt/version.rb
 - lib/ovirt/vm.rb
 - lib/ovirt/volume.rb
@@ -131,27 +132,27 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - rbovirt
-- --main
+- "--main"
 - README.rdoc
-- --line-numbers
-- --inline-source
+- "--line-numbers"
+- "--inline-source"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Ruby client for oVirt REST API