nugrant 1.0.1 → 1.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTBjZWZmNDZmODZhZjM5YWQ2ZmVkNWI5YjRkZDUwZjc2YTdlNWY2YQ==
+  data.tar.gz: !binary |-
+    MTI2MWU0MWJmNTEwZjI5ZWQxZTRkYWZhMDAwODM2N2I3NGQ1NWFhMQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    N2VjMzZkZGI4MTE3MDdlYjM1YTY5MzY4ZjIwZjQ3ZmM4Y2VmMjMzMzJlODE2
+    Mjk4ODFiNjNhNDdjM2U1ZWViMGYwMmE3OWU3NTI1ZmY2MTJkY2M5ZWI3MzNj
+    ZjM5NmM4NjY1OGI2NWY4OTY3YWMxMWEwMjdjYzRiODI0OTYxNTE=
+  data.tar.gz: !binary |-
+    Nzc0NzFiZTE1MDQ3MTE2ZDhlMWMzMTk3ZGYzMzQ3NDFlNWQ2ZDJiYWJjYzRi
+    OGRhYmIzODg3N2U5OWY0NjgwYjQyY2I5NDM0ZjBjMTVjNjM3ZDU0MWExMTVj
+    MDE4ODE4OTVkZDliNTg4YTAxMDRlYzBjODAwMTUwODFmMjU5YjE=

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+# 1.1.0 (May 17th, 2013)
+
+* Rewrite completely classes `Parameters` and `Bag`.
+* Reduced chances to have a parameter name collapsing with an
+  implementation method.
+* Removed dependency on `deep_merge`. We do now perform
+  our own merge.
+* Added possibility to iterate through keys by using
+  `.each`:
+
+  ```
+  config.user.local.each do |name, value|
+    puts "Key #{name}: #{value}"
+  end
+  ```
+
+### Backward Incompatibilities
+
+* `Parameters` is not extending the `Bag` class anymore.
+* `Parameters` and `Bag` attributes and methods are now almost
+  all prefixed with __ to reduce clashes to a minimum when
+  accessing parameters with method-like syntax
+  (i.e. `parameters.git.master` instead of `parameters['git']['master']`)
+
 # 1.0.1 (April 9th, 2013)
 
 * Fixed a crash when `user` config value is `nil` preventing `vagrant user parameters`

data/DEVELOPMENT.md

@@ -0,0 +1,34 @@
+# Nugrant [![Build Status](https://travis-ci.org/maoueh/nugrant.png)](https://travis-ci.org/maoueh/nugrant)
+
+Since at first I wanted to have support for plugin api V1 and V2 in the same
+codebase without having to switch between branches, development is a bit
+more complicated than usual.
+
+As many other ruby projects, Nugrant use `bundler` to manage its dependencies.
+However, as not many ruby projects, Nugrant supports two incompatible version
+of Vagrant.
+
+For this reason, the `Gemfile` used by `bundler` is conditional to an
+environment variable. The environment used is `VAGRANT_PLUGIN_VERSION`.
+When it is set, it can take the value `v1` or `v2` which is the plugin
+version you want to test. By default, if the environment variable is
+not set, `v2` is the default.
+
+## Develop Nugrant for Vagrant api v1
+
+To do this, you will need to set and environment variable
+`VAGRANT_PLUGIN_VERSION` to `v1` prior to calling bundle
+install, like this:
+
+    VAGRANT_PLUGIN_VERSION="v1" bundle install
+
+This will instruct `bundler` to setup Vagrant `1.0.z`, which
+at the time of talking, is `1.0.7`.
+
+## Develop Nugrant for Vagrant api v2
+
+You can simply install the dependencies normally by doing:
+
+    bundle install
+
+

data/Gemfile

@@ -7,7 +7,7 @@ group :development do
     'v1' => {
         'home' => "~/.vagrant.d.v1",
         'gem' => Proc.new do
-            gem "vagrant", "~> 1.0.5"
+            gem "vagrant", "~> 1.0.7"
         end,
     },
     'v2' => {

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 ~> 1.0.0
+    nugrant ~> 1.0.1
 
 ### Vagrant
 
@@ -80,12 +80,14 @@ them all together in a single set. Merging is done in a fairly
 standard fashion.
 
 Here the precedence rules that apply when merging parameters
-from various location:
+from various location. List index indicate the priority of the
+entry. Entry with lower number has lower priority (values at this
+priority will be overridden by values defined on higher priorities).
 
- - Defaults
- - System
- - User
- - Project
+ 1. Defaults
+ 2. System
+ 3. User
+ 4. Project
 
 In text, this means that project parameters overrides user
 parameters, user parameters overrides system parameters and
@@ -103,32 +105,35 @@ and the format of the parameters file.
 
 ### Vagrant
 
-For example, let say the git repository you want to
-expose is not located under the root folder of
+All examples shown here are for Vagrant 1.1+. They have
+been tested with Vagrant 1.2.2. Keep this in mind when
+copying examples.
+
+Let start with a small use case. Say the git repository you want
+to share with your guest VM is not located under the root folder of
 your `Vagrantfile`. That means you will need to specify
-an absolute host path to share the folder on the guest vm.
+an absolute host path to share the folder on the guest VM.
 
 Your `Vagrantfile` would look like this:
 
-    Vagrant::Config.run do |config|
-      config.vm.share_folder "git", "/git", "/home/user/work/git"
+    Vagrant.configure("2") do |config|
+      config.vm.box = "base"
+      config.vm.synced_folder "/home/user/work/git", "/git"
     end
 
 However, what happens when multiple developers
 need to share the same `Vagrantfile`? This is the main
-use case this plugin address.
+use case this plugin try to address.
 
-When Vagrant starts, via any of the `vagrant` commands,
-it loads all vagrant plugins it founds under the `GEM_PATH`
-variable. If you installed the plugin with one of the two
-methods we listed above, you DO NOT need to setup this
-environment variable.
+When Vagrant starts, it loads all vagrant plugins it knows
+about. If you installed the plugin with one of the two
+methods we listed above, Vagrant will know about Nugrant
+and will load it correctly.
 
-To use the plugin, first create a yaml file named
-`.vagrantuser` where your `Vagrantfile` is located. The file
-must be a valid yaml file:
+To use the plugin, first create a YAML file named
+`.vagrantuser` in the same folder where your `Vagrantfile` is
+located. The file must be a valid YAML file:
 
-    vm_port: 2223
     repository:
       project: "/home/user/work/git"
 
@@ -137,10 +142,9 @@ is imported into the `config` object of the `Vagrantfile`
 under the key `user`. So, with the `.vagrantuser` file above, you
 could have this `Vagrantfile` that abstract absolute paths.
 
-    Vagrant::Config.run do |config|
-      config.ssh.port config.user.vm_port
-
-      config.vm.share_folder "git", "/git", config.user.repository.project
+    Vagrant.configure("2") do |config|
+      config.vm.box = "base"
+      config.vm.synced_folder config.user.repository.project, "/git"
     end
 
 This way, paths can be customized by every developer. They just
@@ -150,45 +154,65 @@ version control system so it is to committed with the project.
 
 Additionally, you can also have a `.vagrantuser` under your user home
 directory. This way, you can set parameters that will be
-available to all your `Vagrantfile'. The project `.vagrantuser`
-file will overrides parameters defined in the `.vagrantuser` file
-defined in the user home directory
+available to all your `Vagrantfile'. The `.vagrantuser` located
+within the same folder as the `Vagrantfile` file will overrides
+parameters defined in the `.vagrantuser` file defined in the user
+home directory.
 
 For example, you have `.vagrantuser` file located at `~/.vagrantuser`
 that has the following content:
 
-    vm_port: 2223
+    ssh_port: 2223
     repository:
       project: "/home/user/work/git"
 
-And another `.vagrantuser` at the root of your `Vagrantfile`:
+And another `.vagrantuser` within the same folder as your `Vagrantfile`:
 
-    vm_port: 3332
+    ssh_port: 3332
     repository:
       personal: "/home/user/personal/git"
 
 Then, the `Vagrantfile` could be defined like this:
 
-    Vagrant::Config.run do |config|
-      config.ssh.port config.user.vm_port
+    Vagrant.configure("2") do |config|
+      config.ssh.port config.user.ssh_port
 
-      config.vm.share_folder "git", "/git", config.user.repository.project
-      config.vm.share_folder "personal", "/personal", config.user.repository.personal
+      config.vm.synced_folder config.user.repository.project, "/git"
+      config.vm.synced_folder config.user.repository.personal, "/personal"
     end
 
 That would be equivalent to:
 
-    Vagrant::Config.run do |config|
+    Vagrant.configure("2") do |config|
       config.ssh.port 3332
 
-      config.vm.share_folder "git", "/git", "/home/user/work/git"
-      config.vm.share_folder "personal", "/personal", "/home/user/personal/git"
+      config.vm.synced_folder "/home/user/work/git", "/git"
+      config.vm.synced_folder "/home/user/personal/git", "/personal"
     end
 
 As you can see, the parameters defined in the second `.vagrantuser` file
 (the project one) overrides settings defined in the `.vagrantuser` found
 in the home directory (the user one).
 
+Here the list of locations where Nugrant looks for parameters:
+
+ 1. Defaults (via `config.user.defaults` in `Vagrantfile`)
+ 2. System (`/etc/.vagrantuser` on Unix, `%PROGRAMDATA%/.vagrantuser` or `%ALLUSERSPROFILE%/.vagrantuser` on Windows)
+ 3. Home (`~/.vagrantuser`)
+ 4. Project (`.vagrantuser` within the same folder as the `Vagrantfile`)
+
+### Paths
+
+When you want to specify paths on, specially on Windows, it's probably
+better to only use foward slash (`/`). The main reason for this is because
+Ruby, which will be used at the end by Vagrant is able to deal with forward
+slash even on Windows. This is great because with this, you can avoid
+values escaping in YAML file. If you need to use backward slash (`\`), don't
+forget to properly escape it!
+
+    value: "C:/Users/user/work/git"
+    value: "C:\\Users\\user\\work\\git"
+
 ### Parameters access
 
 Parameters in the `Vagrantfile` can be retrieved via method call
@@ -220,7 +244,7 @@ parameter `config.user.vm.ssh_port`.
 You can use the following snippet directly within your Vagrantfile
 to set a default value for this parameter:
 
-    Vagrant::Config.run do |config|
+    Vagrant.configure("2") do |config|
       config.user.defaults = {
         "vm" => {
           "ssh_port" => "3335"

data/lib/nugrant/bag.rb

@@ -1,44 +1,96 @@
 module Nugrant
   class Bag
-    def initialize(hash)
-      @bag = recompute(hash)
+    attr_reader :__elements
+
+    def initialize(elements = nil)
+      if elements.kind_of?(Bag)
+        @__elements = elements
+      end
+
+      __recompute(elements)
     end
 
-    def recompute(hash)
-      @bag = {}
-      return @bag if hash == nil
+    def [](key)
+      return __fetch(key)
+    end
+
+    def method_missing(method, *args, &block)
+      return __fetch(method.to_s)
+    end
+
+    def has?(key)
+      return @__elements.has_key?(key)
+    end
+
+    def empty?()
+      @__elements.size() <= 0
+    end
+
+    ##
+    # This method always perform a deep merge and will deep merge
+    # array scalar values only. This means that we do not merge
+    # within array themselves.
+    #
+    def __merge!(elements)
+      bag = elements.kind_of?(Bag) ? elements : Bag.new(elements)
+      return if bag.empty?()
+
+      bag.each do |key, value|
+        if has?(key)
+          current = @__elements[key]
+          if current.kind_of?(Bag) and value.kind_of?(Bag)
+            current.__merge!(value)
+          elsif current.kind_of?(Array) and value.kind_of?(Array)
+            @__elements[key] = current | value
+          else
+            @__elements[key] = value
+          end
 
-      hash.each do |key, value|
-        if not value.is_a?(Hash)
-          @bag[key] = value
           next
         end
 
-        # It is a hash, transform it into a bag
-        @bag[key] = Nugrant::Bag.new(value)
+        @__elements[key] = value
       end
-
-      return @bag
     end
 
-    def [](key)
-      return fetch(key)
+    def each()
+      @__elements.each do |key, value|
+        yield key, value
+      end
     end
 
-    def method_missing(method, *args, &block)
-      return fetch(method.to_s)
+    def __to_hash()
+      return {} if empty?()
+
+      hash = {}
+      each do |key, value|
+        hash[key] = value.kind_of?(Bag) ? value.__to_hash() : value
+      end
+
+      return hash
     end
 
-    def has_key?(key)
-      return @bag.has_key?(key)
+    def __recompute(hash = nil)
+      @__elements = {}
+      return if hash == nil or not hash.kind_of?(Hash)
+
+      hash.each do |key, value|
+        if not value.kind_of?(Hash)
+          @__elements[key] = value
+          next
+        end
+
+        # It is a hash, transform it into a bag
+        @__elements[key] = Bag.new(value)
+      end
     end
 
-    def fetch(key)
-      if not has_key?(key)
+    def __fetch(key)
+      if not has?(key)
         raise KeyError, "Undefined parameter '#{key}'"
       end
 
-      return @bag[key]
+      return @__elements[key]
     end
   end
 end

data/lib/nugrant/helper/bag.rb

@@ -0,0 +1,42 @@
+require 'json'
+require 'yaml'
+
+require 'nugrant/bag'
+
+module Nugrant
+  module Helper
+    module Bag
+      def self.read(filepath, filetype, error_handler = nil)
+        data = parse_data(filepath, filetype, error_handler)
+
+        return Nugrant::Bag.new(data)
+      end
+
+      def self.parse_data(filepath, filetype, error_handler = nil)
+        return if not File.exists?(filepath)
+
+        begin
+          File.open(filepath, "rb") do |file|
+            parsing_method = "parse_#{filetype}"
+            return send(parsing_method, file.read)
+          end
+        rescue => error
+          if error_handler
+            # TODO: Implements error handler logic
+            error_handler.handle("Could not parse the user #{filetype} parameters file '#{filepath}': #{error}")
+          end
+        end
+      end
+
+      def self.parse_json(data_string)
+        JSON.parse(data_string)
+      end
+
+      def self.parse_yml(data_string)
+        YAML::ENGINE.yamler= 'syck' if defined?(YAML::ENGINE)
+
+        YAML.load(data_string)
+      end
+    end
+  end
+end

data/lib/nugrant/parameters.rb

@@ -1,98 +1,54 @@
-require 'deep_merge'
-require 'json'
-require 'ostruct'
-require 'yaml'
-
 require 'nugrant/bag'
+require 'nugrant/helper/bag'
 
 module Nugrant
-  class Parameters < Nugrant::Bag
-    attr_reader :defaults, :system, :user, :project, :all
-
-    def initialize(config = nil)
-      if config == nil
-        config = Nugrant::Config.new()
-      end
+  class Parameters
+    attr_reader :__defaults, :__system, :__user, :__project, :__all
 
-      @config = config
+    def initialize(config = nil, defaults = nil)
+      @__config = config || Config.new()
 
-      @defaults = nil
-      @system = parse_parameters(@config.system_params_path)
-      @user = parse_parameters(@config.user_params_path)
-      @project = parse_parameters(@config.project_params_path)
+      @__defaults = defaults || Bag.new()
+      @__system = Helper::Bag.read(@__config.system_params_path, @__config.params_filetype)
+      @__user = Helper::Bag.read(@__config.user_params_path, @__config.params_filetype)
+      @__project = Helper::Bag.read(@__config.project_params_path, @__config.params_filetype)
 
-      @all = compute_all()
+      __compute_all()
     end
 
-    def defaults=(parameters)
-      @defaults = parameters
-
-      # When defaults change, we need to recompute parameters hierarchy
-      compute_all()
+    def [](key)
+      return @__all[key]
     end
 
-    def compute_all()
-      @all = Hash.new()
-      @all.deep_merge!(@defaults) if @defaults != nil
-      @all.deep_merge!(@system) if @system != nil
-      @all.deep_merge!(@user) if @user != nil
-      @all.deep_merge!(@project) if @project != nil
-
-      self.recompute(@all)
-
-      return @all
+    def method_missing(method, *args, &block)
+      return  @__all[method.to_s]
     end
 
-    def parse_parameters(file_path)
-      data = parse_data(file_path)
-      if data == nil || !data.kind_of?(Hash)
-        return
-      end
-
-      restricted_key = has_restricted_keys?(data)
-      if restricted_key
-        raise ArgumentError, "The key '#{restricted_key}' has restricted usage and cannot be defined"
-      end
-
-      return data
+    def empty?()
+      @__all.empty?()
     end
 
-    def parse_data(file_path)
-      return if not File.exists?(file_path)
-
-      begin
-        File.open(file_path, "rb") do |file|
-          parsing_method = "parse_#{@config.params_filetype}"
-          return send(parsing_method, file.read)
-        end
-      rescue => error
-        # TODO: log this message "Could not parse the user #{@config.params_filetype} parameters file '#{file_path}': #{error}"
-      end
+    def has?(key)
+      return @__all.has?(key)
     end
 
-    def parse_json(data_string)
-      JSON.parse(data_string)
+    def each(&block)
+      @__all.each(&block)
     end
 
-    def parse_yml(data_string)
-      YAML::ENGINE.yamler= 'syck' if defined?(YAML::ENGINE)
+    def defaults=(elements)
+      @__defaults = Bag.new(elements)
 
-      YAML.load(data_string)
+      # When defaults change, we need to recompute parameters hierarchy
+      __compute_all()
     end
 
-    def has_restricted_keys?(parameters)
-      parameters.each do |key, value|
-        if key == "defaults"
-          return "defaults"
-        end
-
-        if value.is_a?(Hash)
-          result = has_restricted_keys?(value)
-          return result if result
-        end
-      end
-
-      return false
+    def __compute_all()
+      @__all = Bag.new()
+      @__all.__merge!(@__defaults)
+      @__all.__merge!(@__system)
+      @__all.__merge!(@__user)
+      @__all.__merge!(@__project)
     end
   end
 end

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

@@ -81,27 +81,27 @@ module Nugrant
           end
 
           def defaults(parameters)
-            print_results("Defaults", parameters.defaults)
+            print_bag("Defaults", parameters.__defaults)
           end
 
           def system(parameters)
-            print_results("System", parameters.system)
+            print_bag("System", parameters.__system)
           end
 
           def user(parameters)
-            print_results("User", parameters.user)
+            print_bag("User", parameters.__user)
           end
 
           def project(parameters)
-            print_results("Project", parameters.project)
+            print_bag("Project", parameters.__project)
           end
 
           def all(parameters)
-            print_results("All", parameters.all)
+            print_bag("All", parameters.__all)
           end
 
-          def print_results(kind, parameters)
-            if !parameters || parameters.empty?()
+          def print_bag(kind, bag)
+            if !bag || bag.empty?()
               print_header(kind)
               @env.ui.info(" Empty", :prefix => false)
               @env.ui.info("", :prefix => false)
@@ -110,7 +110,7 @@ module Nugrant
 
             print_parameters(kind, {
               'config' => {
-                'user' => parameters
+                'user' => bag.__to_hash()
               }
             })
           end
@@ -127,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/vagrant/v1/config/user.rb

@@ -19,6 +19,10 @@ module Nugrant
             return @parameters.method_missing(method, *args, &block)
           end
 
+          def each(&block)
+            @parameters.each(&block)
+          end
+
           def defaults(parameters)
             @parameters.defaults(parameters)
           end

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

@@ -81,27 +81,27 @@ module Nugrant
           end
 
           def defaults(parameters)
-            print_results("Defaults", parameters.defaults)
+            print_bag("Defaults", parameters.__defaults)
           end
 
           def system(parameters)
-            print_results("System", parameters.system)
+            print_bag("System", parameters.__system)
           end
 
           def user(parameters)
-            print_results("User", parameters.user)
+            print_bag("User", parameters.__user)
           end
 
           def project(parameters)
-            print_results("Project", parameters.project)
+            print_bag("Project", parameters.__project)
           end
 
           def all(parameters)
-            print_results("All", parameters.all)
+            print_bag("All", parameters.__all)
           end
 
-          def print_results(kind, parameters)
-            if !parameters || parameters.empty?()
+          def print_bag(kind, bag)
+            if !bag || bag.empty?()
               print_header(kind)
               @env.ui.info(" Empty", :prefix => false)
               @env.ui.info("", :prefix => false)
@@ -110,7 +110,7 @@ module Nugrant
 
             print_parameters(kind, {
               'config' => {
-                'user' => parameters
+                'user' => bag.__to_hash()
               }
             })
           end

data/lib/nugrant/vagrant/v2/config/user.rb

@@ -19,6 +19,10 @@ module Nugrant
             return @parameters.method_missing(method, *args, &block)
           end
 
+          def each(&block)
+            @parameters.each(&block)
+          end
+
           def defaults(parameters)
             @parameters.defaults(parameters)
           end

data/lib/nugrant/version.rb

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

data/nugrant.gemspec

@@ -28,7 +28,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "deep_merge", "~> 1.0.0"
-
   gem.add_development_dependency "rake"
 end

data/test/lib/nugrant/test_bag.rb

@@ -0,0 +1,117 @@
+require 'test/unit'
+
+require 'nugrant/bag'
+
+module Nugrant
+  class TestBag < Test::Unit::TestCase
+    def create_bag(parameters)
+      return Bag.new(parameters)
+    end
+
+    def assert_bag(parameters, bag)
+      assert_kind_of(Bag, bag)
+
+      parameters.each do |key, value|
+        if not value.kind_of?(Hash)
+          assert_equal(value, bag.send(key))
+          assert_equal(value, bag[key])
+          next
+        end
+
+        assert_bag(value, bag.send(key))
+        assert_bag(value, bag[key])
+      end
+    end
+
+    def run_test_bag(parameters)
+      bag = create_bag(parameters)
+
+      assert_bag(parameters, bag)
+    end
+
+    def test_bag()
+      run_test_bag({"first" => "value1", "second" => "value2"})
+
+      run_test_bag({
+        "first" => {
+          "level1" => "value1",
+          "level2" => "value2",
+        },
+        "second" => {
+          "level1" => "value3",
+          "level2" => "value4",
+        },
+        "third" => "value5"
+      })
+
+      run_test_bag({
+        "first" => {
+          "level1" => {
+            "level11" => "value1",
+            "level12" => "value2",
+          },
+          "level2" => {
+            "level21" => "value3",
+            "level22" => "value4",
+          },
+          "level3" => "value5",
+        },
+        "second" => {
+          "level1" => {
+            "level11" => "value6",
+            "level12" => "value7",
+          },
+          "level2" => {
+            "level21" => "value8",
+            "level22" => "value9",
+          },
+          "level3" => "value10",
+        },
+        "third" => "value11"
+      })
+    end
+
+    def test_undefined_value()
+      bag = create_bag({"value" => "one"})
+
+      assert_raise(KeyError) do
+        bag.invalid_value
+      end
+
+      assert_raise(KeyError) do
+        bag["invalid_value"]
+      end
+    end
+
+    def test_to_hash()
+      hash = create_bag({}).__to_hash()
+
+      assert_kind_of(Hash, hash)
+      assert_equal({}, hash)
+
+      hash = create_bag({"value" => {"one" => "value", "two" => "value"}}).__to_hash()
+
+      assert_kind_of(Hash, hash)
+      assert_kind_of(Hash, hash['value'])
+      assert_kind_of(String, hash['value']['one'])
+      assert_kind_of(String, hash['value']['two'])
+      assert_equal({"value" => {"one" => "value", "two" => "value"}}, hash)
+    end
+
+    def test_merge_array()
+      bag1 = create_bag({"first" => [1, 2]})
+      bag2 = create_bag({"first" => [2, 3]})
+
+      bag1.__merge!(bag2);
+
+      assert_equal({"first" => [1, 2, 3]}, bag1.__to_hash())
+
+      bag1 = create_bag({"first" => [1, 2]})
+      bag2 = create_bag({"first" => "string"})
+
+      bag1.__merge!(bag2);
+
+      assert_equal({"first" => "string"}, bag1.__to_hash())
+    end
+  end
+end

data/test/lib/nugrant/test_parameters.rb

@@ -24,11 +24,17 @@ class Nugrant::TestParameters < Test::Unit::TestCase
 
   def assert_level(parameters, results)
     results.each do |key, value|
-      assert_equal(value, parameters.send(key), "method(#{key})")
+      assert_equal(value, parameters.send(key), "array[#{key}]")
       assert_equal(value, parameters[key], "array[#{key}]")
     end
 
-    assert_equal(false, parameters.has_key?("0.0.0"))
+    assert_key_error(parameters, "0.0.0")
+  end
+
+  def assert_key_error(parameters, key)
+    assert_raise(KeyError) do
+      parameters[key]
+    end
   end
 
   def test_params_level_1()
@@ -109,7 +115,7 @@ class Nugrant::TestParameters < Test::Unit::TestCase
         "0.0.1" => "system",
       })
 
-      assert_equal(false, parameters.has_key?("0.0.0"))
+      assert_key_error(parameters, "0.0.0")
     end
   end
 
@@ -117,7 +123,16 @@ class Nugrant::TestParameters < Test::Unit::TestCase
     assert_level(parameters.send(key), results)
     assert_level(parameters[key], results)
 
-    assert_equal(false, parameters.has_key?("0.0.0"))
+    assert_key_error(parameters, "0.0.0")
+  end
+
+  def test_params_array()
+    file_path = "params_array"
+    filetypes.each do |params_filetype|
+      parameters = create_parameters(params_filetype, file_path, invalid_path, invalid_path)
+
+      assert_equal(["1", "2", "3"], parameters['level1']['level2'])
+    end
   end
 
   def test_file_nil()
@@ -131,15 +146,12 @@ class Nugrant::TestParameters < Test::Unit::TestCase
   def run_test_file_invalid(invalid_value)
     filetypes.each do |params_filetype|
       parameters = create_parameters(params_filetype, "params_simple", invalid_path, invalid_path)
-      assert_equal("value", parameters.test)
       assert_equal("value", parameters["test"])
 
       parameters = create_parameters(params_filetype, invalid_path, "params_simple", invalid_path)
-      assert_equal("value", parameters.test)
       assert_equal("value", parameters["test"])
 
       parameters = create_parameters(params_filetype, invalid_path, invalid_path, "params_simple")
-      assert_equal("value", parameters.test)
       assert_equal("value", parameters["test"])
 
       parameters = create_parameters(params_filetype, invalid_path, invalid_path, invalid_path)
@@ -159,24 +171,22 @@ class Nugrant::TestParameters < Test::Unit::TestCase
     filetypes.each do |params_filetype|
       parameters = create_parameters(params_filetype, file_path, invalid_path, invalid_path)
 
-      assert_equal("value1", parameters.level1)
-      assert_equal("value2", parameters.level2.first)
+      assert_equal("value1", parameters['level1'])
+      assert_equal("value2", parameters['level2']['first'])
     end
   end
 
   def test_restricted_defaults_usage()
     filetypes.each do |params_filetype|
-      assert_raise(ArgumentError) do
-        results = create_parameters(params_filetype, "params_defaults_at_root", invalid_path, invalid_path)
-        puts("Results: #{results.inspect} (Should have thrown!)")
-      end
+      parameters = create_parameters(params_filetype, "params_defaults_at_root", invalid_path, invalid_path)
+
+      assert_equal("value", parameters.defaults)
     end
 
     filetypes.each do |params_filetype|
-      assert_raise(ArgumentError) do
-        results = create_parameters(params_filetype, "params_defaults_not_at_root", invalid_path, invalid_path)
-        puts("Results: #{results.inspect} (Should have thrown!)")
-      end
+      parameters = create_parameters(params_filetype, "params_defaults_not_at_root", invalid_path, invalid_path)
+
+      assert_equal("value", parameters.level.defaults)
     end
   end
 
@@ -185,8 +195,8 @@ class Nugrant::TestParameters < Test::Unit::TestCase
       parameters = create_parameters(params_filetype, "params_simple", invalid_path, invalid_path)
       parameters.defaults = {"test" => "override1", "level" => "new1"}
 
-      assert_equal("value", parameters.test)
-      assert_equal("new1", parameters.level)
+      assert_equal("value", parameters['test'])
+      assert_equal("new1", parameters['level'])
     end
   end
 
@@ -195,7 +205,7 @@ class Nugrant::TestParameters < Test::Unit::TestCase
       parameters = create_parameters(params_filetype, "params_empty", invalid_path, invalid_path)
       parameters.defaults = {"test" => "value"}
 
-      assert_equal("value", parameters.test)
+      assert_equal("value", parameters['test'])
     end
   end
 
@@ -205,7 +215,7 @@ class Nugrant::TestParameters < Test::Unit::TestCase
         parameters = create_parameters(params_filetype, "params_#{wrong_type}", invalid_path, invalid_path)
         parameters.defaults = {"test" => "value"}
 
-        assert_equal("value", parameters.test)
+        assert_equal("value", parameters['test'])
       end
     end
   end

data/test/resources/Vagrantfile.v1.fake

@@ -1,9 +1,10 @@
 Vagrant::Config.run do |config|
   config.user.defaults = {
-    'value' => "test"
+    'first' => "value1",
+    'second' => "value2"
   }
-
-  config.vm.box = "testing"
-
-  puts config.user.user.vm_port
+  
+  config.user.each do |name, value|
+    puts "Parameters #{name}: #{value.inspect}"
+  end
 end

data/test/resources/Vagrantfile.v2.fake

@@ -2,10 +2,13 @@ Vagrant.require_plugin('nugrant')
 
 Vagrant.configure("2") do |config|
   config.user.defaults = {
-    'value' => "test"
+    'local' => {
+        'first' => "value1",
+        'second' => "value2"
+    }
   }
-
-  config.vm.box = "testing"
-
-  puts config.user.value
+  
+  config.user.local.each do |name, value|
+    puts "Parameters #{name}: #{value}"
+  end
 end

data/test/resources/json/params_array.json

@@ -0,0 +1,5 @@
+{
+    "level1": {
+        "level2": ["1", "2", "3"]
+    }
+}

data/test/resources/yml/params_array.yml

@@ -0,0 +1,5 @@
+level1:
+  level2:
+  - "1"
+  - "2"
+  - "3"

metadata

@@ -1,36 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: nugrant
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Matthieu Vachon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: deep_merge
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +43,7 @@ files:
 - .project
 - .travis.yml
 - CHANGELOG.md
+- DEVELOPMENT.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -69,6 +51,7 @@ files:
 - lib/nugrant.rb
 - lib/nugrant/bag.rb
 - lib/nugrant/config.rb
+- lib/nugrant/helper/bag.rb
 - lib/nugrant/helper/yaml.rb
 - lib/nugrant/parameters.rb
 - lib/nugrant/vagrant/v1/command/parameters.rb
@@ -82,9 +65,9 @@ files:
 - lib/nugrant/version.rb
 - lib/vagrant_init.rb
 - nugrant.gemspec
+- test/lib/nugrant/test_bag.rb
 - test/lib/nugrant/test_config.rb
 - test/lib/nugrant/test_parameters.rb
-- test/lib/nugrant/test_parameters_bag.rb
 - test/resources/.vagrantuser
 - test/resources/README.md
 - test/resources/Vagrantfile.v1.empty
@@ -93,6 +76,7 @@ files:
 - 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_defaults_at_root.json
@@ -108,6 +92,7 @@ files:
 - test/resources/json/params_user_1.json
 - test/resources/json/params_user_2.json
 - test/resources/json/params_windows_eol.json
+- test/resources/yml/params_array.yml
 - test/resources/yml/params_boolean.yml
 - test/resources/yml/params_combinations.yml
 - test/resources/yml/params_defaults_at_root.yml
@@ -125,38 +110,31 @@ files:
 - test/resources/yml/params_windows_eol.yml
 homepage: https://github.com/maoueh/nugrant
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -217736077
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -217736077
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Library to handle user specific parameters from various location.
 test_files:
+- test/lib/nugrant/test_bag.rb
 - test/lib/nugrant/test_config.rb
 - test/lib/nugrant/test_parameters.rb
-- test/lib/nugrant/test_parameters_bag.rb
 - test/resources/.vagrantuser
 - test/resources/README.md
 - test/resources/Vagrantfile.v1.empty
@@ -165,6 +143,7 @@ test_files:
 - 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_defaults_at_root.json
@@ -180,6 +159,7 @@ test_files:
 - test/resources/json/params_user_1.json
 - test/resources/json/params_user_2.json
 - test/resources/json/params_windows_eol.json
+- test/resources/yml/params_array.yml
 - test/resources/yml/params_boolean.yml
 - test/resources/yml/params_combinations.yml
 - test/resources/yml/params_defaults_at_root.yml

data/test/lib/nugrant/test_parameters_bag.rb

@@ -1,84 +0,0 @@
-require 'nugrant'
-require 'nugrant/parameters'
-require 'test/unit'
-
-class Nugrant::TestBag < Test::Unit::TestCase
-  def create_bag(parameters)
-    return Nugrant::Bag.new(parameters)
-  end
-
-  def assert_bag(parameters, bag)
-    assert_kind_of(Nugrant::Bag, bag)
-
-    parameters.each do |key, value|
-      if not value.is_a?(Hash)
-        assert_equal(value, bag.send(key))
-        assert_equal(value, bag[key])
-        next
-      end
-
-      assert_bag(value, bag.send(key))
-      assert_bag(value, bag[key])
-    end
-  end
-
-  def run_test_bag(parameters)
-    bag = create_bag(parameters)
-
-    assert_bag(parameters, bag)
-  end
-
-  def test_bag()
-    run_test_bag({"first" => "value1", "second" => "value2"})
-
-    run_test_bag({
-      "first" => {
-        "level1" => "value1",
-        "level2" => "value2",
-      },
-      "second" => {
-        "level1" => "value3",
-        "level2" => "value4",
-      },
-      "third" => "value5"
-    })
-
-    run_test_bag({
-      "first" => {
-        "level1" => {
-          "level11" => "value1",
-          "level12" => "value2",
-        },
-        "level2" => {
-          "level21" => "value3",
-          "level22" => "value4",
-        },
-        "level3" => "value5",
-      },
-      "second" => {
-        "level1" => {
-          "level11" => "value6",
-          "level12" => "value7",
-        },
-        "level2" => {
-          "level21" => "value8",
-          "level22" => "value9",
-        },
-        "level3" => "value10",
-      },
-      "third" => "value11"
-    })
-  end
-
-  def test_undefined_value()
-    bag = create_bag({"value" => "one"})
-
-    assert_raise(KeyError) do
-      bag.invalid_value
-    end
-
-    assert_raise(KeyError) do
-      bag["invalid_value"]
-    end
-  end
-end