vagrant-libvirt 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bc2f0fdfc01511f71626fdc2fe8b7cbe21c6a09
-  data.tar.gz: a6af2428f90f0ccc535835336f07cf1f765dd4ba
+  metadata.gz: 3dfc179b111aedecd88900df94faec1f9d949c88
+  data.tar.gz: e829ca23a1935b411bbdeddc78b57229c13c6014
 SHA512:
-  metadata.gz: 62d3180bf379f2b6d264c6c8e8fa29e8d340b5d6dd74c456ac536967c8c10c77b42a942963569db8e6ed936622a8b20ebf9dbb6f81a12b99e420290b943b5b54
-  data.tar.gz: 6b6ff342e37bfe6c6ceae077d974dad0cedae2eed7581529b2e0b465dac81a007b6ed17c026e6125a160c741abe3322b3338e8e9a584ed1abbbcfb2b79a3ed1b
+  metadata.gz: ad2d3f5717e17e96b422d485a08bc1ffc99d8dd53ccd4f82f9a2fea88de56b939773ac033b9f031ebc2e141dd3aa80ff6dbadf2212f9dbeaff04d006ca7092a8
+  data.tar.gz: 4c27f90f010454367c90b8eb94d621ce20d300ea4c289ae42285982dfb694e50640cfe5b96789e898471938df0f18c8905ace44584bf7b08abf95073149fd94b

data/lib/vagrant-libvirt/action/set_name_of_domain.rb

@@ -1,3 +1,4 @@
+require 'securerandom'
 module VagrantPlugins
   module ProviderLibvirt
     module Action
@@ -5,28 +6,19 @@ module VagrantPlugins
       # Setup name for domain and domain volumes.
       class SetNameOfDomain
         def initialize(app, env)
-          @logger     = Log4r::Logger.new("vagrant_libvirt::action::set_name_of_domain")
-          @app = app
+          @logger = Log4r::Logger.new("vagrant_libvirt::action::set_name_of_domain")
+          @app    = app
         end
 
         def call(env)
-          require 'securerandom'
-          config = env[:machine].provider_config
-          if config.default_prefix.nil?
-            env[:domain_name] = env[:root_path].basename.to_s.dup
-          else
-            env[:domain_name] = config.default_prefix.to_s
-          end
-          env[:domain_name].gsub!(/[^-a-z0-9_]/i, '')
-          env[:domain_name] << '_'
-          env[:domain_name] << env[:machine].name.to_s
-          
+          env[:domain_name] = build_domain_name(env)
+
           begin
-          @logger.info("Looking for domain #{env[:domain_name]} through list #{env[:libvirt_compute].servers.all}")
-          # Check if the domain name is not already taken
-          
+            @logger.info("Looking for domain #{env[:domain_name]} through list #{env[:libvirt_compute].servers.all}")
+            # Check if the domain name is not already taken
+
             domain = ProviderLibvirt::Util::Collection.find_matching(
-            env[:libvirt_compute].servers.all, env[:domain_name])
+              env[:libvirt_compute].servers.all, env[:domain_name])
           rescue Fog::Errors::Error => e
             @logger.info("#{e}")
             domain = nil
@@ -34,13 +26,33 @@ module VagrantPlugins
 
           @logger.info("Looking for domain #{env[:domain_name]}")
 
-          if domain != nil
+          unless domain.nil?
             raise ProviderLibvirt::Errors::DomainNameExists,
               :domain_name => env[:domain_name]
           end
 
           @app.call(env)
         end
+
+        # build domain name
+        # avoids `domain about to create is already taken`
+        # parsable and sortable by epoch time
+        # @example
+        #   development-centos-6-chef-11_1404488971_3b7a569e2fd7c554b852
+        # @return [String] libvirt domain name
+        def build_domain_name(env)
+          postfix = "#{Time.now.utc.to_i}_#{SecureRandom.hex(10)}"
+          config = env[:machine].provider_config
+          domain_name = 
+            if config.default_prefix.nil?
+              env[:root_path].basename.to_s.dup
+            else
+              config.default_prefix.to_s
+            end
+          domain_name.gsub!(/[^-a-z0-9_]/i, '')
+          domain_name << "_#{postfix}"           
+        end
+
       end
 
     end

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.18'
+    VERSION = '0.0.19'
   end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require 'vagrant-libvirt'
+require 'support/environment_helper'
+
+RSpec.configure do |spec|
+end

data/spec/support/environment_helper.rb

@@ -0,0 +1,36 @@
+require "ostruct"
+require "pathname"
+
+class EnvironmentHelper
+
+  attr_writer :default_prefix, :domain_name
+
+  def [](value)
+    self.send(value.to_sym)
+  end
+
+  def machine
+    self
+  end
+
+  def provider_config
+    self
+  end
+
+  def default_prefix
+    # noop 
+  end
+
+  def root_path
+    Pathname.new("./spec/support/foo")
+  end
+
+  def domain_name
+    #noop
+  end
+
+  def libvirt_compute
+    OpenStruct.new(servers: [])
+  end
+
+end

data/spec/vagrant-libvirt/action/set_name_of_domain_spec.rb

@@ -0,0 +1,14 @@
+require "spec_helper"
+
+describe VagrantPlugins::ProviderLibvirt::Action::SetNameOfDomain do
+  before :each do
+    @env = EnvironmentHelper.new
+  end
+
+  it "builds uniqie domain name" do
+    dmn = VagrantPlugins::ProviderLibvirt::Action::SetNameOfDomain.new(Object.new, @env)
+    first  = dmn.build_domain_name(@env)
+    second = dmn.build_domain_name(@env)
+    first.should_not eq(second) 
+  end
+end

data/vagrant-libvirt.gemspec

@@ -16,6 +16,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = VagrantPlugins::ProviderLibvirt::VERSION
 
+  gem.add_development_dependency "rspec-core", "~> 2.12.2"
+  gem.add_development_dependency "rspec-expectations", "~> 2.12.1"
+  gem.add_development_dependency "rspec-mocks", "~> 2.12.1"
+
   gem.add_runtime_dependency 'fog', '~> 1.15'
   gem.add_runtime_dependency 'ruby-libvirt', '~> 0.4.0'
   gem.add_runtime_dependency 'nokogiri', '~> 1.5.9'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,8 +10,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.2
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.1
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +180,9 @@ files:
 - lib/vagrant-libvirt/util/timer.rb
 - lib/vagrant-libvirt/version.rb
 - locales/en.yml
+- spec/spec_helper.rb
+- spec/support/environment_helper.rb
+- spec/vagrant-libvirt/action/set_name_of_domain_spec.rb
 - tools/prepare_redhat_for_box.sh
 - vagrant-libvirt.gemspec
 homepage: https://github.com/pradels/vagrant-libvirt
@@ -164,4 +209,7 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Vagrant provider for libvirt.
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/support/environment_helper.rb
+- spec/vagrant-libvirt/action/set_name_of_domain_spec.rb