nugrant 2.0.0.dev1 → 2.0.0.dev2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjIwNTk3YTQ5YjkyNTY5NWNkZjhlZWFlMDRmZGJkNDE4OWNjZGRiYQ==
+    MTc4MzNjMDg2Mzk2MDU0MTFkODU5M2NmY2Y3ZmNjMWEzZjUyNDJlYg==
   data.tar.gz: !binary |-
-    Yjg0NmU5NDc2MzM3ZTk0Yjg3OTkxZDhiZGIzY2YxMDEzYzNmOTk4OA==
+    ODg2OWRhZDJkN2ZmYTU3ZmYyODg5YjAxZWI5NjhmNTFjZGU3M2E4Mw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjBlNmI3MjJhYTJhZGZkYTFjNzA4YjU0ZGMyMjc0YzY4NzZlOGZmNjE1OTYz
-    MjdiNzBmYmFiZjE5NWJjY2I5OGRjZWUxZWY2ZGFhN2EwZDlhMzYyNmNiMTI1
-    ZmZmMjhlODkyMDJmOTM0Y2RiMzJlYzc1MGYwZGZhNzM1MjQ1NDU=
+    OTc5ZDY1N2IzZGYwN2M5Y2IxOWEzYmMxODFjYjlkMmY0ODEzNWIzMTA3MGY2
+    YzYyZGIxOWRlYjc0N2E0MGYyNjdhZDZlNzg5YzlkMzM5NGJlYjg4OTljYTM1
+    NjhkZDYzODJiYjA0MGE3MWQ0MTcyOThmYTMzYzUwMTU5YjY0ODE=
   data.tar.gz: !binary |-
-    Yjc3YmZkNzk1Y2I1OTNmYTQ2M2Q3NDYyNzlhMTM0MzY4NDI1ODA2OTY1MjRk
-    MGMyMzJkZTMzNWMyODE4NTU5MTkyOGQxNTRmYmJhODZhZDg0ODBmNDY3OTI5
-    OGY0OGNiYWZhOGI5N2Y3MDlhZDk3ZjgwZjIyYzU0ZmQ1MDJiN2I=
+    ZjQyNzc2M2Q2YjdlZTc0YzE1ZDFlNjFlMzY1M2UwOTQzZjU2ZWM5ZGQ5ZDc4
+    ZDVlZmQwZjEwMDk5Yzk1YjlhNjgxNjlmZWU0NDQyYmZjNjc4MjQxMDA3NmRj
+    MTlmYWQ4NjFiYjJjNWI5YTRmYzNmM2RiYTQ2NmFhZDg2YWUxMzY=

data/lib/nugrant/bag.rb

@@ -15,7 +15,7 @@ module Nugrant
     end
 
     def method_missing(method, *args, &block)
-      return __fetch(method.to_s)
+      return __fetch(method)
     end
 
     def has?(key)
@@ -64,7 +64,7 @@ module Nugrant
 
       hash = {}
       each do |key, value|
-        hash[key] = value.kind_of?(Bag) ? value.__to_hash() : value
+        hash[key.to_sym()] = value.kind_of?(Bag) ? value.__to_hash() : value
       end
 
       return hash
@@ -76,12 +76,12 @@ module Nugrant
 
       hash.each do |key, value|
         if not value.kind_of?(Hash)
-          @__elements[key] = value
+          @__elements[key.to_sym()] = value
           next
         end
 
         # It is a hash, transform it into a bag
-        @__elements[key] = Bag.new(value)
+        @__elements[key.to_sym()] = Bag.new(value)
       end
     end
 

data/lib/nugrant/config.rb

@@ -60,7 +60,7 @@ module Nugrant
     #                         parameters should resides. The parameters loaded from this
     #                         location have the second highest precedence.
     #                           Defaults => "~/#{@params_filename}"
-    #  * +:user_path+       - The system path is the location where system wide
+    #  * +:system_path+     - The system path is the location where system wide
     #                         parameters should resides. The parameters loaded from this
     #                         location have the third highest precedence.
     #                           Defaults => Default system path depending on OS + @params_filename

data/lib/nugrant/helper/bag.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'multi_json'
 require 'yaml'
 
 require 'nugrant/bag'

data/lib/nugrant/parameters.rb

@@ -1,4 +1,5 @@
 require 'nugrant/bag'
+require 'nugrant/config'
 require 'nugrant/helper/bag'
 
 module Nugrant
@@ -35,7 +36,7 @@ module Nugrant
     end
 
     def method_missing(method, *args, &block)
-      return  @__all[method.to_s]
+      return  @__all[method]
     end
 
     def empty?()
@@ -78,5 +79,9 @@ module Nugrant
       @__all.__merge!(@__user)
       @__all.__merge!(@__current)
     end
+
+    def __to_hash()
+      @__all.__to_hash()
+    end
   end
 end

data/lib/nugrant/version.rb

@@ -1,3 +1,3 @@
 module Nugrant
-  VERSION = "2.0.0.dev1"
+  VERSION = "2.0.0.dev2"
 end

data/nugrant.gemspec

@@ -28,5 +28,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.requirements << "json if you plan to use json parameters format"
+
+  gem.add_dependency 'multi_json', '~> 1.7'
+
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "json"
 end

data/test/lib/nugrant/test_bag.rb

@@ -30,49 +30,49 @@ module Nugrant
     end
 
     def test_bag()
-      run_test_bag({"first" => "value1", "second" => "value2"})
+      run_test_bag({:first => "value1", :second => "value2"})
 
       run_test_bag({
-        "first" => {
-          "level1" => "value1",
-          "level2" => "value2",
+        :first => {
+          :level1 => "value1",
+          :level2 => "value2",
         },
-        "second" => {
-          "level1" => "value3",
-          "level2" => "value4",
+        :second => {
+          :level1 => "value3",
+          :level2 => "value4",
         },
-        "third" => "value5"
+        :third => "value5"
       })
 
       run_test_bag({
-        "first" => {
-          "level1" => {
-            "level11" => "value1",
-            "level12" => "value2",
+        :first => {
+          :level1 => {
+            :level11 => "value1",
+            :level12 => "value2",
           },
-          "level2" => {
-            "level21" => "value3",
-            "level22" => "value4",
+          :level2 => {
+            :level21 => "value3",
+            :level22 => "value4",
           },
-          "level3" => "value5",
+          :level3 => "value5",
         },
-        "second" => {
-          "level1" => {
-            "level11" => "value6",
-            "level12" => "value7",
+        :second => {
+          :level1 => {
+            :level11 => "value6",
+            :level12 => "value7",
           },
-          "level2" => {
-            "level21" => "value8",
-            "level22" => "value9",
+          :level2 => {
+            :level21 => "value8",
+            :level22 => "value9",
           },
-          "level3" => "value10",
+          :level3 => "value10",
         },
-        "third" => "value11"
+        :third => "value11"
       })
     end
 
     def test_undefined_value()
-      bag = create_bag({"value" => "one"})
+      bag = create_bag({:value => "one"})
 
       assert_raise(KeyError) do
         bag.invalid_value
@@ -89,29 +89,29 @@ module Nugrant
       assert_kind_of(Hash, hash)
       assert_equal({}, hash)
 
-      hash = create_bag({"value" => {"one" => "value", "two" => "value"}}).__to_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)
+      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 = create_bag({:first => [1, 2]})
+      bag2 = create_bag({:first => [2, 3]})
 
       bag1.__merge!(bag2);
 
-      assert_equal({"first" => [1, 2, 3]}, bag1.__to_hash())
+      assert_equal({:first => [1, 2, 3]}, bag1.__to_hash())
 
-      bag1 = create_bag({"first" => [1, 2]})
-      bag2 = create_bag({"first" => "string"})
+      bag1 = create_bag({:first => [1, 2]})
+      bag2 = create_bag({:first => "string"})
 
       bag1.__merge!(bag2);
 
-      assert_equal({"first" => "string"}, bag1.__to_hash())
+      assert_equal({:first => "string"}, bag1.__to_hash())
     end
   end
 end

data/test/lib/nugrant/test_parameters.rb

@@ -52,13 +52,13 @@ class Nugrant::TestParameters < Test::Unit::TestCase
       parameters = create_parameters(format, "params_current_1", "params_user_1", "params_system_1")
 
       assert_level(parameters, {
-        "1.1.1" => "current",
-        "1.1.0" => "current",
-        "1.0.1" => "current",
-        "0.1.1" => "user",
-        "1.0.0" => "current",
-        "0.1.0" => "user",
-        "0.0.1" => "system",
+        :'1.1.1' => "current",
+        :'1.1.0' => "current",
+        :'1.0.1' => "current",
+        :'0.1.1' => "user",
+        :'1.0.0' => "current",
+        :'0.1.0' => "user",
+        :'0.0.1' => "system",
       })
     end
   end
@@ -67,65 +67,65 @@ class Nugrant::TestParameters < Test::Unit::TestCase
     formats.each do |format|
       parameters = create_parameters(format, "params_current_2", "params_user_2", "params_system_2")
 
-      run_second_level(parameters, "1.1.1", {
-        "1.1.1" => "current",
-        "1.1.0" => "current",
-        "1.0.1" => "current",
-        "0.1.1" => "user",
-        "1.0.0" => "current",
-        "0.1.0" => "user",
-        "0.0.1" => "system",
+      run_second_level(parameters, :'1.1.1', {
+        :'1.1.1' => "current",
+        :'1.1.0' => "current",
+        :'1.0.1' => "current",
+        :'0.1.1' => "user",
+        :'1.0.0' => "current",
+        :'0.1.0' => "user",
+        :'0.0.1' => "system",
       })
 
-      run_second_level(parameters, "1.1.0", {
-        "1.1.1" => "current",
-        "1.1.0" => "current",
-        "1.0.1" => "current",
-        "0.1.1" => "user",
-        "1.0.0" => "current",
-        "0.1.0" => "user",
+      run_second_level(parameters, :'1.1.0', {
+        :'1.1.1' => "current",
+        :'1.1.0' => "current",
+        :'1.0.1' => "current",
+        :'0.1.1' => "user",
+        :'1.0.0' => "current",
+        :'0.1.0' => "user",
       })
 
-      run_second_level(parameters, "1.0.1", {
-        "1.1.1" => "current",
-        "1.1.0" => "current",
-        "1.0.1" => "current",
-        "0.1.1" => "system",
-        "1.0.0" => "current",
-        "0.0.1" => "system",
+      run_second_level(parameters, :'1.0.1', {
+        :'1.1.1' => "current",
+        :'1.1.0' => "current",
+        :'1.0.1' => "current",
+        :'0.1.1' => "system",
+        :'1.0.0' => "current",
+        :'0.0.1' => "system",
       })
 
-      run_second_level(parameters, "0.1.1", {
-        "1.1.1" => "user",
-        "1.1.0" => "user",
-        "1.0.1" => "system",
-        "0.1.1" => "user",
-        "0.1.0" => "user",
-        "0.0.1" => "system",
+      run_second_level(parameters, :'0.1.1', {
+        :'1.1.1' => "user",
+        :'1.1.0' => "user",
+        :'1.0.1' => "system",
+        :'0.1.1' => "user",
+        :'0.1.0' => "user",
+        :'0.0.1' => "system",
       })
 
-      run_second_level(parameters, "1.0.0", {
-        "1.1.1" => "current",
-        "1.1.0" => "current",
-        "1.0.1" => "current",
-        "1.0.0" => "current",
+      run_second_level(parameters, :'1.0.0', {
+        :'1.1.1' => "current",
+        :'1.1.0' => "current",
+        :'1.0.1' => "current",
+        :'1.0.0' => "current",
       })
 
-      run_second_level(parameters, "0.1.0", {
-        "1.1.1" => "user",
-        "1.1.0" => "user",
-        "0.1.1" => "user",
-        "0.1.0" => "user",
+      run_second_level(parameters, :'0.1.0', {
+        :'1.1.1' => "user",
+        :'1.1.0' => "user",
+        :'0.1.1' => "user",
+        :'0.1.0' => "user",
       })
 
-      run_second_level(parameters, "0.0.1", {
-        "1.1.1" => "system",
-        "1.0.1" => "system",
-        "0.1.1" => "system",
-        "0.0.1" => "system",
+      run_second_level(parameters, :'0.0.1', {
+        :'1.1.1' => "system",
+        :'1.0.1' => "system",
+        :'0.1.1' => "system",
+        :'0.0.1' => "system",
       })
 
-      assert_key_error(parameters, "0.0.0")
+      assert_key_error(parameters, :'0.0.0')
     end
   end
 
@@ -133,7 +133,7 @@ class Nugrant::TestParameters < Test::Unit::TestCase
     assert_level(parameters.send(key), results)
     assert_level(parameters[key], results)
 
-    assert_key_error(parameters, "0.0.0")
+    assert_key_error(parameters, :'0.0.0')
   end
 
   def test_params_array()
@@ -141,7 +141,7 @@ class Nugrant::TestParameters < Test::Unit::TestCase
     formats.each do |format|
       parameters = create_parameters(format, file_path, invalid_path, invalid_path)
 
-      assert_equal(["1", "2", "3"], parameters['level1']['level2'])
+      assert_equal(["1", "2", "3"], parameters[:level1][:level2])
     end
   end
 
@@ -156,13 +156,13 @@ class Nugrant::TestParameters < Test::Unit::TestCase
   def run_test_file_invalid(invalid_value)
     formats.each do |format|
       parameters = create_parameters(format, "params_simple", invalid_path, invalid_path)
-      assert_equal("value", parameters["test"])
+      assert_equal("value", parameters[:test])
 
       parameters = create_parameters(format, invalid_path, "params_simple", invalid_path)
-      assert_equal("value", parameters["test"])
+      assert_equal("value", parameters[:test])
 
       parameters = create_parameters(format, invalid_path, invalid_path, "params_simple")
-      assert_equal("value", parameters["test"])
+      assert_equal("value", parameters[:test])
 
       parameters = create_parameters(format, invalid_path, invalid_path, invalid_path)
       assert_not_nil(parameters)
@@ -181,8 +181,8 @@ class Nugrant::TestParameters < Test::Unit::TestCase
     formats.each do |format|
       parameters = create_parameters(format, 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
 
@@ -203,19 +203,19 @@ class Nugrant::TestParameters < Test::Unit::TestCase
   def test_defaults()
     formats.each do |format|
       parameters = create_parameters(format, "params_simple", invalid_path, invalid_path)
-      parameters.defaults = {"test" => "override1", "level" => "new1"}
+      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
 
   def test_empty_file()
     formats.each do |format|
       parameters = create_parameters(format, "params_empty", invalid_path, invalid_path)
-      parameters.defaults = {"test" => "value"}
+      parameters.defaults = {:test => "value"}
 
-      assert_equal("value", parameters['test'])
+      assert_equal("value", parameters[:test])
     end
   end
 
@@ -223,9 +223,9 @@ class Nugrant::TestParameters < Test::Unit::TestCase
     ["boolean", "list"].each do |wrong_type|
       formats.each do |format|
         parameters = create_parameters(format, "params_#{wrong_type}", invalid_path, invalid_path)
-        parameters.defaults = {"test" => "value"}
+        parameters.defaults = {:test => "value"}
 
-        assert_equal("value", parameters['test'])
+        assert_equal("value", parameters[:test])
       end
     end
   end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: nugrant
 version: !ruby/object:Gem::Version
-  version: 2.0.0.dev1
+  version: 2.0.0.dev2
 platform: ruby
 authors:
 - Matthieu Vachon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  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
@@ -24,6 +38,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  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'
 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
@@ -125,7 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
-requirements: []
+requirements:
+- json if you plan to use json parameters format
 rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: