nugrant 1.0.0 → 1.0.1

data/.travis.yml

@@ -3,3 +3,4 @@ rvm:
   - "1.8.7"
   - "1.9.2"
   - "1.9.3"
+  - "2.0.0"

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.0.1 (April 9th, 2013)
+
+* Fixed a crash when `user` config value is `nil` preventing `vagrant user parameters`
+  from working as expected. [GH-4](https://github.com/maoueh/nugrant/issues/4)
+* Fixed a bug preventing the version from being printed when doing `vagrant user -v`.
+
 # 1.0.0 (March 21th, 2013)
 
 * For now on, this gem will follow semantic versioning.

data/Gemfile

@@ -5,13 +5,13 @@ gemspec
 group :development do
   vagrant_dependencies = {
     'v1' => {
-        'home' => "C:/Users/Matt/.vagrant.d.v1",
+        'home' => "~/.vagrant.d.v1",
         'gem' => Proc.new do
             gem "vagrant", "~> 1.0.5"
         end,
     },
     'v2' => {
-        'home' => "C:/Users/Matt/.vagrant.d",
+        'home' => "~/.vagrant.d",
         'gem' => Proc.new do
             gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
         end,
@@ -21,7 +21,7 @@ group :development do
   vagrant_plugin_version = ENV['VAGRANT_PLUGIN_VERSION'] || "v2"
   vagrant_dependency = vagrant_dependencies[vagrant_plugin_version]
 
-  ENV['VAGRANT_HOME'] = vagrant_dependency['home']
+  ENV['VAGRANT_HOME'] = File.expand_path(vagrant_dependency['home'])
 
   vagrant_dependency['gem'].call()
 end

data/README.md

@@ -17,7 +17,7 @@ If you would like to use Nugrant as a library, simply reference
 it as a dependency of your application. Probably by adding it to
 your `Gemfile` or your `.gemspec` file.
 
-    nugrant ~> 0.0.15
+    nugrant ~> 1.0.0
 
 ### Vagrant
 
@@ -25,22 +25,50 @@ If you would like to use Nugrant as a Vagrant plugin, the
 detailed installation steps are provided below. Without a
 doubt, you need Vagrant installed for those steps to work ;)
 
-There are two different ways to install the gem. You can
-install it via Vagrant or via the system gem container.
+First of all, Vagrant's plugin system is very well done and
+Nugrant supports version `v1` (1.0.z branch, like 1.0.7) and
+`v2` (1.y.z branch, like 1.1.3). However, the installation
+procedure between the two versions is different.
+
+To know which version you currently have installed, type
+`vagrant -v` in a terminal.
+
+#### Version 1.0.z (latest version tested 1.0.7)
+
+In this version, there is two different ways to install Nugrant.
+You can install it via Vagrant or directly via the system gem
+container.
 
 When you install via Vagrant, the main benefit is that
 it's decoupled from other system gems. There is less
 chance for this gem's dependencies, even if they are minimal,
 to clash with gems already installed on your system. This is the
-recommended installation method. To install, simply run:
+recommended installation method. To install, simply run in
+a terminal:
 
     > vagrant gem install nugrant
 
-If you prefer to install the gem in a system wide manner,
-please use this command instead:
+If you prefer to install the gem in via the system gem
+container, please use this command instead:
 
     > gem install nugrant
 
+#### Version 1.y.z (latest version tested 1.1.3)
+
+In those versions, probably until 2.y.z is out, there
+is a new way to install and register plugin with the Vagrant
+environment.
+
+To install when using one of this versions, simply run in a
+terminal:
+
+    > vagrant plugin install nugrant
+
+Since the plugin system has been completely rewritten in those
+versions, it is not possible anymore to make the plugin available
+within Vagrant when installing Nugrant in the system
+gem container.
+
 ## Usage
 
 Whether used as a library or a Vagrant plugin, Nugrant has some

data/lib/nugrant/vagrant/v1/command/parameters.rb

@@ -60,7 +60,8 @@ module Nugrant
 
             @logger.debug("'Parameters' each target VM...")
             with_target_vms(arguments) do |vm|
-              parameters = vm.config.keys[:user].parameters
+              config = vm.config.keys[:user]
+              parameters = config ? config.parameters : Nugrant::Parameters.new()
 
               @env.ui.info("# Vm '#{vm.name}'", :prefix => false)
 

data/lib/nugrant/vagrant/v1/command/root.rb

@@ -1,4 +1,5 @@
 require 'nugrant'
+require 'nugrant/version'
 
 module Nugrant
   module Vagrant

data/lib/nugrant/vagrant/v2/command/parameters.rb

@@ -60,7 +60,8 @@ module Nugrant
 
             @logger.debug("'Parameters' each target VM...")
             with_target_vms(arguments) do |vm|
-              parameters = vm.config.user.parameters
+              config = vm.config.user
+              parameters = config ? config.parameters : Nugrant::Parameters.new()
 
               @env.ui.info("# Vm '#{vm.name}'", :prefix => false)
 
@@ -126,10 +127,6 @@ module Nugrant
             @env.ui.info(" #{kind.capitalize} Parameters", :prefix => false)
             @env.ui.info(" " + "-" * length, :prefix => false)
           end
-
-          def compute_header_length(string)
-
-          end
         end
       end
     end

data/lib/nugrant/version.rb

@@ -1,3 +1,3 @@
 module Nugrant
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/resources/Vagrantfile.v1.empty

@@ -0,0 +1,2 @@
+Vagrant::Config.run do |config|
+end

data/test/resources/Vagrantfile.v1.fake

@@ -5,5 +5,5 @@ Vagrant::Config.run do |config|
 
   config.vm.box = "testing"
 
-  puts config.user.value
+  puts config.user.user.vm_port
 end

data/test/resources/Vagrantfile.v2.empty

@@ -0,0 +1,4 @@
+Vagrant.require_plugin('nugrant')
+
+Vagrant.configure("2") do |config|
+end

data/test/resources/Vagrantfile.v2.fake

@@ -1,3 +1,5 @@
+Vagrant.require_plugin('nugrant')
+
 Vagrant.configure("2") do |config|
   config.user.defaults = {
     'value' => "test"

data/test/resources/Vagrantfile.v2.real

@@ -1,3 +1,5 @@
+Vagrant.require_plugin('nugrant')
+
 Vagrant.configure("2") do |config|
   config.vm.box = "base"
   config.vm.box_url = "http://domain.com/path/to/above.box"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nugrant
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -87,8 +87,10 @@ files:
 - test/lib/nugrant/test_parameters_bag.rb
 - test/resources/.vagrantuser
 - test/resources/README.md
+- test/resources/Vagrantfile.v1.empty
 - test/resources/Vagrantfile.v1.fake
 - test/resources/Vagrantfile.v1.real
+- test/resources/Vagrantfile.v2.empty
 - test/resources/Vagrantfile.v2.fake
 - test/resources/Vagrantfile.v2.real
 - test/resources/json/params_boolean.json
@@ -135,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -164582307
+      hash: -217736077
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -164582307
+      hash: -217736077
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -157,8 +159,10 @@ test_files:
 - test/lib/nugrant/test_parameters_bag.rb
 - test/resources/.vagrantuser
 - test/resources/README.md
+- test/resources/Vagrantfile.v1.empty
 - test/resources/Vagrantfile.v1.fake
 - test/resources/Vagrantfile.v1.real
+- test/resources/Vagrantfile.v2.empty
 - test/resources/Vagrantfile.v2.fake
 - test/resources/Vagrantfile.v2.real
 - test/resources/json/params_boolean.json