From 65ad1457ecb2183090d1c23ed8efb1d9534cd022 Mon Sep 17 00:00:00 2001 From: Fabio Rapposelli Date: Wed, 6 Jul 2016 18:03:08 +0200 Subject: [PATCH] backporting fixes and cutting v0.3.3 --- .ruby-version | 1 + README.md | 19 ++++--------------- Rakefile | 14 ++------------ lib/vagrant-vcenter/version.rb | 2 +- vagrant-vcenter.gemspec | 6 ++++-- 5 files changed, 12 insertions(+), 30 deletions(-) create mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..5859406 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.2.3 diff --git a/README.md b/README.md index 65e8f1a..fc2d5a4 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Join the chat at https://gitter.im/frapposelli/vagrant-vcenter](https://badges.gitter.im/frapposelli/vagrant-vcenter.svg)](https://gitter.im/frapposelli/vagrant-vcenter?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -[Version 0.3.2](../../releases/tag/v0.3.2) has been released! +[Version 0.3.3](../../releases/tag/v0.3.3) has been released! ------------- Please note that this software is still Alpha/Beta quality and is not recommended for production usage. @@ -12,7 +12,7 @@ We have a wide array of boxes available at [Vagrant Cloud](https://vagrantcloud. This plugin supports the universal [```vmware_ovf``` box format](https://github.com/gosddc/packer-post-processor-vagrant-vmware-ovf/wiki/vmware_ovf-Box-Format), that is 100% portable between [vagrant-vcloud](https://github.com/frapposelli/vagrant-vcloud), [vagrant-vcenter](https://github.com/gosddc/vagrant-vcenter) and [vagrant-vcloudair](https://github.com/gosddc/vagrant-vcloudair), no more double boxes!. -Changes in [version 0.3.1](../../releases/tag/v0.3.1) include: +Changes in [version 0.3.3](../../releases/tag/v0.3.3) include: Changes @@ -24,17 +24,6 @@ Fixes - Fixed some commands in unwanted situations (SSH when machine suspended/off) - Refactored code to avoid code duplication - -Changes in [version 0.3.0](../../releases/tag/v0.3.0) include: - -Fixes - -- ```vmware_ovf``` support! -- You can now specify network using the ```public_network``` notation of Vagrant. -- Plugin is now operating in parallel, MOAR SPEED! -- Create the VM folder if it doesn't exist. -- Several bug fixes. - Install ------------- @@ -107,7 +96,7 @@ Vagrant.configure('2') do |config| gateway: '10.250.254.254', dns_server_list: ['8.8.4.4', '8.8.8.8'], dns_suffix_list: ['ad.lab.gosddc.com'] - + # Let's override some provider settings for specific VMs node_config.vm.provider :vcenter do |override| # Override number of cpu and memory based on what's in the nodes array @@ -141,4 +130,4 @@ What is still missing: - Some spaghetti code here and there. - Bugs, bugs and BUGS!. -If you're a developer and want to lend us a hand, head over to our ```develop``` branch and send us PRs! +If you're a developer and want to lend us a hand, send us PRs! diff --git a/Rakefile b/Rakefile index 68cad6c..3d06a00 100644 --- a/Rakefile +++ b/Rakefile @@ -1,17 +1,7 @@ require 'rubygems' require 'bundler/setup' +require 'bundler/gem_tasks' require 'rspec/core/rake_task' -# Immediately sync all stdout so that tools like buildbot can -# immediately load in the output. -$stdout.sync = true -$stderr.sync = true - -# Change to the y of this file. -Dir.chdir(File.expand_path('../', __FILE__)) - -Bundler::GemHelper.install_tasks - RSpec::Core::RakeTask.new - -task :default => 'spec' \ No newline at end of file +task :default => 'spec' diff --git a/lib/vagrant-vcenter/version.rb b/lib/vagrant-vcenter/version.rb index 4c1f0fb..4359eb6 100644 --- a/lib/vagrant-vcenter/version.rb +++ b/lib/vagrant-vcenter/version.rb @@ -1,6 +1,6 @@ module VagrantPlugins # Set version for vagrant-vcenter gem. module VCenter - VERSION = '0.3.2' + VERSION = '0.3.3' end end diff --git a/vagrant-vcenter.gemspec b/vagrant-vcenter.gemspec index 13eb8d2..f05fa65 100644 --- a/vagrant-vcenter.gemspec +++ b/vagrant-vcenter.gemspec @@ -1,3 +1,4 @@ +# encoding: UTF-8 $LOAD_PATH.unshift File.expand_path('../lib', __FILE__) require 'vagrant-vcenter/version' @@ -7,19 +8,20 @@ Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.authors = 'Fabio Rapposelli' s.email = 'fabio@gosddc.com' - s.homepage = 'https://github.com/gosddc/vagrant-vcenter' + s.homepage = 'https://github.com/frapposelli/vagrant-vcenter' s.license = 'MIT' s.summary = 'VMware vCenter® Vagrant provider' s.description = 'Enables Vagrant to manage machines with VMware vCenter®.' s.add_runtime_dependency 'vagrant-rbvmomi', '~> 1.8.1' s.add_runtime_dependency 'log4r', '~> 1.1.10' - s.add_runtime_dependency 'pry' + s.add_development_dependency 'bundler' s.add_development_dependency 'rake' s.add_development_dependency 'rspec-core', '~> 2.12.2' s.add_development_dependency 'rspec-expectations', '~> 2.12.1' s.add_development_dependency 'rspec-mocks', '~> 2.12.1' + s.add_development_dependency 'rubocop' s.files = `git ls-files`.split($RS) s.executables = s.files.grep(/^bin/) { |f| File.basename(f) }