vagrant-cloudstack 1.3.0 → 1.4.0

data/spec/vagrant-cloudstack/model/cloudstack_resource_spec.rb

@@ -1,73 +1,95 @@
-require 'spec_helper'
-require 'vagrant-cloudstack/model/cloudstack_resource'
-
-include VagrantPlugins::Cloudstack::Model
-
-describe CloudstackResource do
-  context 'when all attribtues are defined' do
-    let(:resource) { CloudstackResource.new('id', 'name', 'kind') }
-
-    describe '#to_s' do
-      it 'prints the resource with all attributes' do
-        expect(resource.to_s).to be_eql 'kind - id:name'
-      end
-    end
-
-    describe '#is_undefined?' do
-      it { expect(resource.is_undefined?).to be_eql false }
-    end
-
-    describe '#is_id_undefined?' do
-      it { expect(resource.is_id_undefined?).to be_eql false }
-    end
-
-    describe '#is_name_undefined?' do
-      it { expect(resource.is_name_undefined?).to be_eql false }
-    end
-  end
-
-  context 'when kind is not defined' do
-    describe '#new' do
-      it 'raises an error when kind is nil' do
-        expect { CloudstackResource.new('id', 'name', nil) }.to raise_error('Resource must have a kind')
-      end
-
-      it 'raises an error when kind is empty' do
-        expect { CloudstackResource.new('id', 'name', '') }.to raise_error('Resource must have a kind')
-      end
-    end
-  end
-
-  describe '#is_undefined?' do
-    it { expect(CloudstackResource.new('', '', 'kind').is_undefined?).to be_eql true }
-    it { expect(CloudstackResource.new(nil, '', 'kind').is_undefined?).to be_eql true }
-    it { expect(CloudstackResource.new('', nil, 'kind').is_undefined?).to be_eql true }
-    it { expect(CloudstackResource.new(nil, nil, 'kind').is_undefined?).to be_eql true }
-    it { expect(CloudstackResource.new('id', nil, 'kind').is_undefined?).to be_eql false }
-    it { expect(CloudstackResource.new(nil, 'name', 'kind').is_undefined?).to be_eql false }
-    it { expect(CloudstackResource.new('id', '', 'kind').is_undefined?).to be_eql false }
-    it { expect(CloudstackResource.new('', 'name', 'kind').is_undefined?).to be_eql false }
-  end
-
-  describe '#is_id_undefined?' do
-    it { expect(CloudstackResource.new('', 'name', 'kind').is_id_undefined?).to be_eql true }
-    it { expect(CloudstackResource.new(nil, 'name', 'kind').is_id_undefined?).to be_eql true }
-    it { expect(CloudstackResource.new('', '', 'kind').is_id_undefined?).to be_eql true }
-    it { expect(CloudstackResource.new(nil, '', 'kind').is_id_undefined?).to be_eql true }
-    it { expect(CloudstackResource.new('', nil, 'kind').is_id_undefined?).to be_eql true }
-    it { expect(CloudstackResource.new(nil, nil, 'kind').is_id_undefined?).to be_eql true }
-    it { expect(CloudstackResource.new('id', nil, 'kind').is_id_undefined?).to be_eql false }
-    it { expect(CloudstackResource.new('id', '', 'kind').is_id_undefined?).to be_eql false }
-  end
-
-  describe '#is_name_undefined?' do
-    it { expect(CloudstackResource.new('id', '', 'kind').is_name_undefined?).to be_eql true }
-    it { expect(CloudstackResource.new('id', nil, 'kind').is_name_undefined?).to be_eql true }
-    it { expect(CloudstackResource.new('', '', 'kind').is_name_undefined?).to be_eql true }
-    it { expect(CloudstackResource.new(nil, '', 'kind').is_name_undefined?).to be_eql true }
-    it { expect(CloudstackResource.new('', nil, 'kind').is_name_undefined?).to be_eql true }
-    it { expect(CloudstackResource.new(nil, nil, 'kind').is_name_undefined?).to be_eql true }
-    it { expect(CloudstackResource.new(nil, 'name', 'kind').is_name_undefined?).to be_eql false }
-    it { expect(CloudstackResource.new('', 'name', 'kind').is_name_undefined?).to be_eql false }
-  end
-end
+require 'spec_helper'
+require 'vagrant-cloudstack/model/cloudstack_resource'
+
+include VagrantPlugins::Cloudstack::Model
+
+describe CloudstackResource do
+  context 'when all attribtues are defined' do
+    let(:resource) { CloudstackResource.new('id', 'name', 'kind') }
+
+    describe '#to_s' do
+      it 'prints the resource with all attributes' do
+        expect(resource.to_s).to be_eql 'kind - id:name'
+      end
+    end
+
+    describe '#is_undefined?' do
+      it { expect(resource.is_undefined?).to be_eql false }
+    end
+
+    describe '#is_id_undefined?' do
+      it { expect(resource.is_id_undefined?).to be_eql false }
+    end
+
+    describe '#is_name_undefined?' do
+      it { expect(resource.is_name_undefined?).to be_eql false }
+    end
+  end
+
+  context 'when kind is not defined' do
+    describe '#new' do
+      it 'raises an error when kind is nil' do
+        expect { CloudstackResource.new('id', 'name', nil) }.to raise_error('Resource must have a kind')
+      end
+
+      it 'raises an error when kind is empty' do
+        expect { CloudstackResource.new('id', 'name', '') }.to raise_error('Resource must have a kind')
+      end
+    end
+  end
+
+  describe '#is_undefined?' do
+    it { expect(CloudstackResource.new('', '', 'kind').is_undefined?).to be_eql true }
+    it { expect(CloudstackResource.new(nil, '', 'kind').is_undefined?).to be_eql true }
+    it { expect(CloudstackResource.new('', nil, 'kind').is_undefined?).to be_eql true }
+    it { expect(CloudstackResource.new(nil, nil, 'kind').is_undefined?).to be_eql true }
+    it { expect(CloudstackResource.new('id', nil, 'kind').is_undefined?).to be_eql false }
+    it { expect(CloudstackResource.new(nil, 'name', 'kind').is_undefined?).to be_eql false }
+    it { expect(CloudstackResource.new('id', '', 'kind').is_undefined?).to be_eql false }
+    it { expect(CloudstackResource.new('', 'name', 'kind').is_undefined?).to be_eql false }
+  end
+
+  describe '#is_id_undefined?' do
+    it { expect(CloudstackResource.new('', 'name', 'kind').is_id_undefined?).to be_eql true }
+    it { expect(CloudstackResource.new(nil, 'name', 'kind').is_id_undefined?).to be_eql true }
+    it { expect(CloudstackResource.new('', '', 'kind').is_id_undefined?).to be_eql true }
+    it { expect(CloudstackResource.new(nil, '', 'kind').is_id_undefined?).to be_eql true }
+    it { expect(CloudstackResource.new('', nil, 'kind').is_id_undefined?).to be_eql true }
+    it { expect(CloudstackResource.new(nil, nil, 'kind').is_id_undefined?).to be_eql true }
+    it { expect(CloudstackResource.new('id', nil, 'kind').is_id_undefined?).to be_eql false }
+    it { expect(CloudstackResource.new('id', '', 'kind').is_id_undefined?).to be_eql false }
+  end
+
+  describe '#is_name_undefined?' do
+    it { expect(CloudstackResource.new('id', '', 'kind').is_name_undefined?).to be_eql true }
+    it { expect(CloudstackResource.new('id', nil, 'kind').is_name_undefined?).to be_eql true }
+    it { expect(CloudstackResource.new('', '', 'kind').is_name_undefined?).to be_eql true }
+    it { expect(CloudstackResource.new(nil, '', 'kind').is_name_undefined?).to be_eql true }
+    it { expect(CloudstackResource.new('', nil, 'kind').is_name_undefined?).to be_eql true }
+    it { expect(CloudstackResource.new(nil, nil, 'kind').is_name_undefined?).to be_eql true }
+    it { expect(CloudstackResource.new(nil, 'name', 'kind').is_name_undefined?).to be_eql false }
+    it { expect(CloudstackResource.new('', 'name', 'kind').is_name_undefined?).to be_eql false }
+  end
+
+  describe '#create_id_list' do
+    subject { CloudstackResource.create_id_list(ids, kind) }
+
+    let(:kind) { 'network' }
+    let(:ids)  { %w(id1 id2) }
+
+    its(:count) { should eq 2 }
+    its([0])    { should be_a_resource('id1', nil, kind) }
+    its([1])    { should be_a_resource('id2', nil, kind) }
+  end
+
+  describe '#create_name_list' do
+    subject { CloudstackResource.create_name_list(names, kind) }
+
+    let(:kind)  { 'network' }
+    let(:names) { %w(name1 name2) }
+
+    its(:count) { should eq 2 }
+    its([0])    { should be_a_resource(nil, 'name1', kind) }
+    its([1])    { should be_a_resource(nil, 'name2', kind) }
+  end
+end

data/spec/vagrant-cloudstack/service/cloudstack_resource_service_spec.rb

@@ -1,43 +1,43 @@
-require 'spec_helper'
-require 'vagrant-cloudstack/model/cloudstack_resource'
-require 'vagrant-cloudstack/service/cloudstack_resource_service'
-
-include VagrantPlugins::Cloudstack::Model
-include VagrantPlugins::Cloudstack::Service
-
-describe CloudstackResourceService do
-  let(:cloudstack_compute) { double('Fog::Compute::Cloudstack') }
-  let(:ui) { double('Vagrant::UI') }
-  let(:service) { CloudstackResourceService.new(cloudstack_compute, ui) }
-
-  before do
-    response = {
-      'listkindsresponse' => {
-        'kind' => [{ 'id' => 'resource id', 'name' => 'resource name' }]
-      }
-    }
-    allow(cloudstack_compute).to receive(:send).with(:list_kinds, { 'id' => 'resource id' }).and_return(response)
-    allow(cloudstack_compute).to receive(:send).with(:list_kinds, {}).and_return(response)
-
-    allow(ui).to receive(:detail)
-    allow(ui).to receive(:info)
-  end
-
-  describe '#sync_resource' do
-    it 'retrives the missing name' do
-      resource = CloudstackResource.new('resource id', nil, 'kind')
-      service.sync_resource(resource)
-
-      expect(resource.name).to be_eql 'resource name'
-      expect(resource.id).to be_eql 'resource id'
-    end
-
-    it 'retrives the missing id' do
-      resource = CloudstackResource.new(nil, 'resource name', 'kind')
-      service.sync_resource(resource)
-
-      expect(resource.id).to be_eql 'resource id'
-      expect(resource.name).to be_eql 'resource name'
-    end
-  end
-end
+require 'spec_helper'
+require 'vagrant-cloudstack/model/cloudstack_resource'
+require 'vagrant-cloudstack/service/cloudstack_resource_service'
+
+include VagrantPlugins::Cloudstack::Model
+include VagrantPlugins::Cloudstack::Service
+
+describe CloudstackResourceService do
+  let(:cloudstack_compute) { double('Fog::Compute::Cloudstack') }
+  let(:ui) { double('Vagrant::UI') }
+  let(:service) { CloudstackResourceService.new(cloudstack_compute, ui) }
+
+  before do
+    response = {
+      'listkindsresponse' => {
+        'kind' => [{ 'id' => 'resource id', 'name' => 'resource name' }]
+      }
+    }
+    allow(cloudstack_compute).to receive(:send).with(:list_kinds, { 'id' => 'resource id' }).and_return(response)
+    allow(cloudstack_compute).to receive(:send).with(:list_kinds, {}).and_return(response)
+
+    allow(ui).to receive(:detail)
+    allow(ui).to receive(:info)
+  end
+
+  describe '#sync_resource' do
+    it 'retrives the missing name' do
+      resource = CloudstackResource.new('resource id', nil, 'kind')
+      service.sync_resource(resource)
+
+      expect(resource.name).to be_eql 'resource name'
+      expect(resource.id).to be_eql 'resource id'
+    end
+
+    it 'retrives the missing id' do
+      resource = CloudstackResource.new(nil, 'resource name', 'kind')
+      service.sync_resource(resource)
+
+      expect(resource.id).to be_eql 'resource id'
+      expect(resource.name).to be_eql 'resource name'
+    end
+  end
+end

data/spec/vagrant-cloudstack/support/be_a_resource.rb

@@ -0,0 +1,6 @@
+RSpec::Matchers.define :be_a_resource do |id, name, kind|
+  match do |actual|
+    actual.is_a?(VagrantPlugins::Cloudstack::Model::CloudstackResource) &&
+      actual.id == id && actual.name == name && actual.kind == kind
+  end
+end

data/vagrant-cloudstack.gemspec

@@ -1,59 +1,59 @@
-$:.unshift File.expand_path('../lib', __FILE__)
-require 'vagrant-cloudstack/version'
-
-Gem::Specification.new do |s|
-  s.name          = 'vagrant-cloudstack'
-  s.version       = VagrantPlugins::Cloudstack::VERSION
-  s.platform      = Gem::Platform::RUBY
-  s.license       = 'MIT'
-  s.authors       = ['Mitchell Hashimoto', 'Carl Loa Odin', 'Tor-Åke Fransson', 'Olle Lundberg', 'Roeland Kuipers', 'Yuichi Uemura', 'Atsushi Sasaki', 'Nicolas Brechet', 'Peter Jönsson', 'Christophe Roux', 'Andrei Chiriaev', 'Miguel Ferreira', 'Timothy van Zadelhoff', 'Geurt Schimmel', 'Bob van den Heuvel']
-  s.email         = 'int-toolkit@schubergphilis.com'
-  s.homepage      = 'https://github.com/schubergphilis/vagrant-cloudstack/'
-  s.summary       = 'Enables Vagrant to manage machines in Cloudstack.'
-  s.description   = 'Provides a cloudstack provider in Vagrant via which Vagrant can manage machines in CloudStack.'
-
-  s.required_rubygems_version = '>= 1.3.6'
-  s.rubyforge_project         = 'vagrant-cloudstack'
-
-  s.add_runtime_dependency 'fog', '~> 1.32', '>= 1.32.0'
-
-  s.add_development_dependency 'rake',                '>= 10.4', '~> 10.5'
-  s.add_development_dependency 'rspec-core',          '~> 2.14', '>= 2.14.7'
-  s.add_development_dependency 'rspec-expectations',  '~> 2.14', '>= 2.14.4'
-  s.add_development_dependency 'rspec-mocks',         '~> 2.14', '>= 2.14.4'
-
-  # The following block of code determines the files that should be included
-  # in the gem. It does this by reading all the files in the directory where
-  # this gemspec is, and parsing out the ignored files from the gitignore.
-  # Note that the entire gitignore(5) syntax is not supported, specifically
-  # the "!" syntax, but it should mostly work correctly.
-  root_path      = File.dirname(__FILE__)
-  all_files      = Dir.chdir(root_path) { Dir.glob('**/{*,.*}') }
-  all_files.reject! { |file| ['.', '..'].include?(File.basename(file)) }
-  gitignore_path = File.join(root_path, '.gitignore')
-  gitignore      = File.readlines(gitignore_path)
-  gitignore.map!    { |line| line.chomp.strip }
-  gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }
-
-  unignored_files = all_files.reject do |file|
-    # Ignore any directories, the gemspec only cares about files
-    next true if File.directory?(file)
-
-    # Ignore any paths that match anything in the gitignore. We do
-    # two tests here:
-    #
-    #   - First, test to see if the entire path matches the gitignore.
-    #   - Second, match if the basename does, this makes it so that things
-    #     like '.DS_Store' will match sub-directories too (same behavior
-    #     as git).
-    #
-    gitignore.any? do |ignore|
-      File.fnmatch(ignore, file) ||
-        File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
-    end
-  end
-
-  s.files         = unignored_files
-  s.executables   = unignored_files.map { |f| f[/^bin\/(.*)/, 1] }.compact
-  s.require_path  = 'lib'
-end
+$:.unshift File.expand_path('../lib', __FILE__)
+require 'vagrant-cloudstack/version'
+
+Gem::Specification.new do |s|
+  s.name          = 'vagrant-cloudstack'
+  s.version       = VagrantPlugins::Cloudstack::VERSION
+  s.platform      = Gem::Platform::RUBY
+  s.license       = 'MIT'
+  s.authors       = ['Mitchell Hashimoto', 'Carl Loa Odin', 'Tor-Åke Fransson', 'Olle Lundberg', 'Roeland Kuipers', 'Yuichi Uemura', 'Atsushi Sasaki', 'Nicolas Brechet', 'Peter Jönsson', 'Christophe Roux', 'Andrei Chiriaev', 'Miguel Ferreira', 'Timothy van Zadelhoff', 'Geurt Schimmel', 'Bob van den Heuvel']
+  s.email         = 'int-toolkit@schubergphilis.com'
+  s.homepage      = 'https://github.com/missioncriticalcloud/vagrant-cloudstack/'
+  s.summary       = 'Enables Vagrant to manage machines in Cloudstack.'
+  s.description   = 'Provides a cloudstack provider in Vagrant via which Vagrant can manage machines in CloudStack.'
+
+  s.required_rubygems_version = '>= 1.3.6'
+  s.rubyforge_project         = 'vagrant-cloudstack'
+
+  s.add_runtime_dependency 'fog', '~> 1.32', '>= 1.32.0'
+
+  s.add_development_dependency 'rake',                '>= 10.4', '~> 10.5'
+  s.add_development_dependency 'rspec-core',          '~> 2.14', '>= 2.14.7'
+  s.add_development_dependency 'rspec-expectations',  '~> 2.14', '>= 2.14.4'
+  s.add_development_dependency 'rspec-mocks',         '~> 2.14', '>= 2.14.4'
+
+  # The following block of code determines the files that should be included
+  # in the gem. It does this by reading all the files in the directory where
+  # this gemspec is, and parsing out the ignored files from the gitignore.
+  # Note that the entire gitignore(5) syntax is not supported, specifically
+  # the "!" syntax, but it should mostly work correctly.
+  root_path      = File.dirname(__FILE__)
+  all_files      = Dir.chdir(root_path) { Dir.glob('**/{*,.*}') }
+  all_files.reject! { |file| ['.', '..'].include?(File.basename(file)) }
+  gitignore_path = File.join(root_path, '.gitignore')
+  gitignore      = File.readlines(gitignore_path)
+  gitignore.map!    { |line| line.chomp.strip }
+  gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }
+
+  unignored_files = all_files.reject do |file|
+    # Ignore any directories, the gemspec only cares about files
+    next true if File.directory?(file)
+
+    # Ignore any paths that match anything in the gitignore. We do
+    # two tests here:
+    #
+    #   - First, test to see if the entire path matches the gitignore.
+    #   - Second, match if the basename does, this makes it so that things
+    #     like '.DS_Store' will match sub-directories too (same behavior
+    #     as git).
+    #
+    gitignore.any? do |ignore|
+      File.fnmatch(ignore, file) ||
+        File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
+    end
+  end
+
+  s.files         = unignored_files
+  s.executables   = unignored_files.map { |f| f[/^bin\/(.*)/, 1] }.compact
+  s.require_path  = 'lib'
+end

data/vagrant-cloudstack.spec

@@ -1,42 +1,42 @@
-%define gemdir /usr/lib/vagrant-cloudstack/gems
-Name:	 vagrant-cloudstack
-Version:	%{gemver}
-Release:	3%{?dist}
-Summary:	vagrant cloudstack plugin
-
-License:	MIT
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-Source0:        vagrant-cloudstack-%{version}.tar.gz
-BuildRequires:  rubygems 
-Requires:	vagrant >= 1.2.0 libxml2-devel libxslt-devel libffi-devel ruby-devel
-
-%description
-vagrant cloudstack
-
-
-%prep
-%setup -q
-
-%build
-env LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 bundle package
-env LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 gem build vagrant-cloudstack.gemspec
-
-
-%install
-mkdir -p %{buildroot}/%{gemdir}
-cp vagrant-cloudstack-%{version}.gem %{buildroot}/%{gemdir}
-cp vendor/cache/*.gem %{buildroot}/%{gemdir}
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%post
-cd %{gemdir}
-gem install --local fog --no-rdoc --no-ri
-
-%files
-%defattr(-,root,root,-)
-%{gemdir}
+%define gemdir /usr/lib/vagrant-cloudstack/gems
+Name:	 vagrant-cloudstack
+Version:	%{gemver}
+Release:	3%{?dist}
+Summary:	vagrant cloudstack plugin
+
+License:	MIT
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+Source0:        vagrant-cloudstack-%{version}.tar.gz
+BuildRequires:  rubygems 
+Requires:	vagrant >= 1.2.0 libxml2-devel libxslt-devel libffi-devel ruby-devel
+
+%description
+vagrant cloudstack
+
+
+%prep
+%setup -q
+
+%build
+env LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 bundle package
+env LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 gem build vagrant-cloudstack.gemspec
+
+
+%install
+mkdir -p %{buildroot}/%{gemdir}
+cp vagrant-cloudstack-%{version}.gem %{buildroot}/%{gemdir}
+cp vendor/cache/*.gem %{buildroot}/%{gemdir}
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%post
+cd %{gemdir}
+gem install --local fog --no-rdoc --no-ri
+
+%files
+%defattr(-,root,root,-)
+%{gemdir}