nugrant 2.0.0.dev2 → 2.0.0.pre1

data/test/lib/test_helper.rb

@@ -0,0 +1,3 @@
+require "minitest/reporters"
+
+Minitest::Reporters.use!

data/test/resources/json/params_user_nil_values.json

@@ -0,0 +1,9 @@
+{
+  "nil": null,
+  "deep": {
+    "nil": null,
+    "deeper": {
+      "nil": null
+    }
+  }
+}

data/test/resources/vagrantfiles/v2.defaults_mixed_string_symbols

@@ -0,0 +1,18 @@
+Vagrant.configure("2") do |config|
+  config.user.defaults = {
+    'single' => 1,
+    :local => {
+        'first' => "value1",
+        :second => "value2"
+    }
+  }
+
+  puts config.user.single
+  puts config.user[:single]
+
+  puts config.user.local.first
+  puts config.user[:local]["first"]
+
+  puts config.user.local.second
+  puts config.user["local"][:second]
+end

data/test/resources/vagrantfiles/v2.defaults_null_values_in_vagrantuser

@@ -0,0 +1,23 @@
+# Source from https://github.com/maoueh/nugrant/issues/12#issuecomment-27054150
+# but slightly modified
+Vagrant.configure('2') do |config|
+   config.user.defaults = {
+     "host" => {
+       "rails_server_port" => 3000,
+       "apps_folder" => "../../rails-apps/" },
+     "plugins" => {
+       "vagrant_cachier" => {
+         "enabled" => false
+       }
+     }
+   }
+
+  puts "Host Rails Server Port: #{config.user.host.rails_server_port}"
+  puts "Host App Folder: #{config.user.host.apps_folder}"
+  puts "Gitconfig Name: #{config.user.gitconfig.name}"
+  puts "Gitconfig Email: #{config.user.gitconfig.email}"
+
+  if config.user.plugins.vagrant_cachier.enabled
+    puts "Vagrant Cachier is Enabled!"
+  end
+end

data/test/resources/vagrantfiles/v2.defaults_using_string

@@ -0,0 +1,18 @@
+Vagrant.configure("2") do |config|
+  config.user.defaults = {
+    'single' => 1,
+    'local' => {
+        'first' => "value1",
+        'second' => "value2"
+    }
+  }
+
+  puts config.user.single
+  puts config.user[:single]
+
+  puts config.user.local.first
+  puts config.user[:local]["first"]
+
+  puts config.user.local.second
+  puts config.user["local"][:second]
+end

data/test/resources/vagrantfiles/v2.defaults_using_symbol

@@ -0,0 +1,18 @@
+Vagrant.configure("2") do |config|
+  config.user.defaults = {
+    :single => 1,
+    :local => {
+      :first => "value1",
+      :second => "value2"
+    }
+  }
+
+  puts config.user.single
+  puts config.user[:single]
+
+  puts config.user.local.first
+  puts config.user[:local]["first"]
+
+  puts config.user.local.second
+  puts config.user["local"][:second]
+end

data/test/resources/{Vagrantfile.v2.empty → vagrantfiles/v2.empty}

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

data/test/resources/{Vagrantfile.v2.fake → vagrantfiles/v2.fake}

@@ -1,5 +1,3 @@
-Vagrant.require_plugin('nugrant')
-
 Vagrant.configure("2") do |config|
   config.user.defaults = {
     'local' => {
@@ -7,8 +5,11 @@ Vagrant.configure("2") do |config|
         'second' => "value2"
     }
   }
-  
+
   config.user.local.each do |name, value|
     puts "Parameters #{name}: #{value}"
   end
+
+  puts "User has local (symbol)" if config.user.has?(:local)
+  puts "User has local (string)" if config.user.has?("local")
 end

data/test/resources/vagrantfiles/v2.missing_parameter

@@ -0,0 +1,3 @@
+Vagrant.configure("2") do |config|
+  puts config.user.unkown_for_sure
+end

data/test/resources/{Vagrantfile.v2.real → vagrantfiles/v2.real}

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

data/test/resources/yaml/params_user_nil_values.yml

@@ -0,0 +1,5 @@
+nil:
+deep:
+  nil:
+  deeper:
+    nil:

metadata

@@ -1,64 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: nugrant
 version: !ruby/object:Gem::Version
-  version: 2.0.0.dev2
+  version: 2.0.0.pre1
 platform: ruby
 authors:
 - Matthieu Vachon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: insensitive_hash
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
-- !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'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.8'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-description: ! "     Nugrant is a library to easily handle parameters that need to
-  be\n     injected into an application via different sources (system, user,\n     project,
-  defaults).\n\n     Nugrant can also be directly used as a Vagrant plugin. By activating\n
-  \    this gem with Vagrant, it will be possible to define user specific\n     parameters
-  that will be injected directly into the Vagrantfile. This\n     is useful if you
-  need to share a Vagrantfile to multiple developers\n     but would like to customize
-  some parameters for each user differently.\n"
+        version: '1.8'
+description: |2
+       Nugrant is a library to easily handle parameters that need to be
+       injected into an application via different sources (system, user,
+       project, defaults).
+
+       Nugrant can also be directly used as a Vagrant plugin. By activating
+       this gem with Vagrant, it will be possible to define user specific
+       parameters that will be injected directly into the Vagrantfile. This
+       is useful if you need to share a Vagrantfile to multiple developers
+       but would like to customize some parameters for each user differently.
 email:
 - matthieu.o.vachon@gmail.com
 executables: []
@@ -80,30 +69,34 @@ files:
 - lib/nugrant/bag.rb
 - lib/nugrant/config.rb
 - lib/nugrant/helper/bag.rb
+- lib/nugrant/helper/env/exporter.rb
+- lib/nugrant/helper/env/namer.rb
+- lib/nugrant/helper/parameters.rb
+- lib/nugrant/helper/stack.rb
 - lib/nugrant/helper/yaml.rb
+- lib/nugrant/mixin/parameters.rb
 - lib/nugrant/parameters.rb
-- lib/nugrant/vagrant/v1/command/parameters.rb
-- lib/nugrant/vagrant/v1/command/root.rb
-- lib/nugrant/vagrant/v1/config/user.rb
-- lib/nugrant/vagrant/v1/plugin.rb
+- lib/nugrant/vagrant/errors.rb
+- lib/nugrant/vagrant/v2/command/env.rb
+- lib/nugrant/vagrant/v2/command/helper.rb
 - lib/nugrant/vagrant/v2/command/parameters.rb
+- lib/nugrant/vagrant/v2/command/restricted_keys.rb
 - lib/nugrant/vagrant/v2/command/root.rb
 - lib/nugrant/vagrant/v2/config/user.rb
 - lib/nugrant/vagrant/v2/plugin.rb
 - lib/nugrant/version.rb
-- lib/vagrant_init.rb
+- locales/en.yml
 - nugrant.gemspec
+- test/lib/nugrant/helper/env/test_exporter.rb
+- test/lib/nugrant/helper/test_bag.rb
+- test/lib/nugrant/helper/test_parameters.rb
+- test/lib/nugrant/helper/test_stack.rb
 - test/lib/nugrant/test_bag.rb
 - test/lib/nugrant/test_config.rb
 - test/lib/nugrant/test_parameters.rb
+- test/lib/test_helper.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_array.json
 - test/resources/json/params_boolean.json
 - test/resources/json/params_combinations.json
@@ -119,7 +112,16 @@ files:
 - test/resources/json/params_unix_eol.json
 - test/resources/json/params_user_1.json
 - test/resources/json/params_user_2.json
+- test/resources/json/params_user_nil_values.json
 - test/resources/json/params_windows_eol.json
+- test/resources/vagrantfiles/v2.defaults_mixed_string_symbols
+- test/resources/vagrantfiles/v2.defaults_null_values_in_vagrantuser
+- test/resources/vagrantfiles/v2.defaults_using_string
+- test/resources/vagrantfiles/v2.defaults_using_symbol
+- test/resources/vagrantfiles/v2.empty
+- test/resources/vagrantfiles/v2.fake
+- test/resources/vagrantfiles/v2.missing_parameter
+- test/resources/vagrantfiles/v2.real
 - test/resources/yaml/params_array.yml
 - test/resources/yaml/params_boolean.yml
 - test/resources/yaml/params_combinations.yml
@@ -135,6 +137,7 @@ files:
 - test/resources/yaml/params_unix_eol.yml
 - test/resources/yaml/params_user_1.yml
 - test/resources/yaml/params_user_2.yml
+- test/resources/yaml/params_user_nil_values.yml
 - test/resources/yaml/params_windows_eol.yml
 homepage: https://github.com/maoueh/nugrant
 licenses: []
@@ -145,62 +148,26 @@ 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: 1.3.1
-requirements:
-- json if you plan to use json parameters format
+requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Library to handle user specific parameters from various location.
 test_files:
+- test/lib/nugrant/helper/env/test_exporter.rb
+- test/lib/nugrant/helper/test_bag.rb
+- test/lib/nugrant/helper/test_parameters.rb
+- test/lib/nugrant/helper/test_stack.rb
 - test/lib/nugrant/test_bag.rb
 - test/lib/nugrant/test_config.rb
 - test/lib/nugrant/test_parameters.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_array.json
-- test/resources/json/params_boolean.json
-- test/resources/json/params_combinations.json
-- test/resources/json/params_current_1.json
-- test/resources/json/params_current_2.json
-- test/resources/json/params_defaults_at_root.json
-- test/resources/json/params_defaults_not_at_root.json
-- test/resources/json/params_empty.json
-- test/resources/json/params_list.json
-- test/resources/json/params_simple.json
-- test/resources/json/params_system_1.json
-- test/resources/json/params_system_2.json
-- test/resources/json/params_unix_eol.json
-- test/resources/json/params_user_1.json
-- test/resources/json/params_user_2.json
-- test/resources/json/params_windows_eol.json
-- test/resources/yaml/params_array.yml
-- test/resources/yaml/params_boolean.yml
-- test/resources/yaml/params_combinations.yml
-- test/resources/yaml/params_current_1.yml
-- test/resources/yaml/params_current_2.yml
-- test/resources/yaml/params_defaults_at_root.yml
-- test/resources/yaml/params_defaults_not_at_root.yml
-- test/resources/yaml/params_empty.yml
-- test/resources/yaml/params_list.yml
-- test/resources/yaml/params_simple.yml
-- test/resources/yaml/params_system_1.yml
-- test/resources/yaml/params_system_2.yml
-- test/resources/yaml/params_unix_eol.yml
-- test/resources/yaml/params_user_1.yml
-- test/resources/yaml/params_user_2.yml
-- test/resources/yaml/params_windows_eol.yml
+- test/lib/test_helper.rb

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

@@ -1,134 +0,0 @@
-require 'nugrant'
-require 'nugrant/helper/yaml'
-
-module Nugrant
-  module Vagrant
-    module V1
-      module Command
-        class Parameters < ::Vagrant::Command::Base
-          def initialize(arguments, environment)
-            super(arguments, environment)
-
-            @show_help = false
-            @show_defaults = false
-            @show_system = false
-            @show_user = false
-            @show_project = false
-          end
-
-          def create_parser()
-            return OptionParser.new do |parser|
-              parser.banner = "Usage: vagrant user parameters [<options>]"
-              parser.separator ""
-
-              parser.separator "Available options:"
-              parser.separator ""
-
-              parser.on("-h", "--help", "Print this help") do
-                @show_help = true
-              end
-
-              parser.on("-d", "--defaults", "Show only defaults parameters") do
-                @show_defaults = true
-              end
-
-              parser.on("-s", "--system", "Show only system parameters") do
-                @show_system = true
-              end
-
-              parser.on("-u", "--user", "Show only user parameters") do
-                 @show_user = true
-               end
-
-               parser.on("-p", "--project", "Show only project parameters") do
-                 @show_project = true
-               end
-
-               parser.separator ""
-               parser.separator "When no options is provided, the command prints the names and values \n" +
-                                "of all parameters that would be available for usage in the Vagrantfile.\n" +
-                                "The hierarchy of the parameters is respected, so the final values are\n" +
-                                "displayed."
-            end
-          end
-
-          def execute
-            parser = create_parser()
-            arguments = parse_options(parser)
-
-            return help(parser) if @show_help
-
-            @logger.debug("'Parameters' each target VM...")
-            with_target_vms(arguments) do |vm|
-              config = vm.config.keys[:user]
-              parameters = config ? config.parameters : Nugrant::Parameters.new()
-
-              @env.ui.info("# Vm '#{vm.name}'", :prefix => false)
-
-              defaults(parameters) if @show_defaults
-              system(parameters) if @show_system
-              user(parameters) if @show_user
-              project(parameters) if @show_project
-
-              all(parameters) if !@show_defaults && !@show_system && !@show_user && !@show_project
-            end
-
-            return 0
-          end
-
-          def help(parser)
-            @env.ui.info(parser.help, :prefix => false)
-          end
-
-          def defaults(parameters)
-            print_bag("Defaults", parameters.__defaults)
-          end
-
-          def system(parameters)
-            print_bag("System", parameters.__system)
-          end
-
-          def user(parameters)
-            print_bag("User", parameters.__user)
-          end
-
-          def project(parameters)
-            print_bag("Project", parameters.__project)
-          end
-
-          def all(parameters)
-            print_bag("All", parameters.__all)
-          end
-
-          def print_bag(kind, bag)
-            if !bag || bag.empty?()
-              print_header(kind)
-              @env.ui.info(" Empty", :prefix => false)
-              @env.ui.info("", :prefix => false)
-              return
-            end
-
-            print_parameters(kind, {
-              'config' => {
-                'user' => bag.__to_hash()
-              }
-            })
-          end
-
-          def print_parameters(kind, data)
-            string = Nugrant::Helper::Yaml.format(data.to_yaml, :indent => 1)
-
-            print_header(kind)
-            @env.ui.info(string, :prefix => false)
-            @env.ui.info("", :prefix => false)
-          end
-
-          def print_header(kind, length = 50)
-            @env.ui.info(" #{kind.capitalize} Parameters", :prefix => false)
-            @env.ui.info(" " + "-" * length, :prefix => false)
-          end
-        end
-      end
-    end
-  end
-end