nugrant 0.0.13 → 0.0.14

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.0.14
+
+* Renamed `ParameterBag` to `Bag`
+* Cleanup `Bag` api
+ * Renamed method `has_param?` to `has_key?` in `Bag`
+ * Removed method `get_params` from `Bag`
+
 # 0.0.13
 
 * Cleanup `Parameters` and `ParameterBag` interface
@@ -24,8 +31,8 @@
 
 # 0.0.10
 
-* Added a subcommand `parameters` for vagrant command `user`.
-* Added a vagrant command `vagrant user subcommand [options]`.
+* Added a subcommand `parameters` for vagrant command `user`
+* Added a vagrant command `vagrant user subcommand [options]`
 
 # 0.0.9
 

data/lib/nugrant.rb

@@ -1,6 +1,5 @@
 require 'nugrant'
 require 'nugrant/config'
-require 'nugrant/parameter_bag'
 require 'nugrant/parameters'
 
 unless defined?(KeyError)

data/lib/nugrant/bag.rb

@@ -0,0 +1,44 @@
+module Nugrant
+  class Bag
+    def initialize(hash)
+      @bag = recompute(hash)
+    end
+
+    def recompute(hash)
+      @bag = {}
+      return @bag if hash == nil
+
+      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)
+      end
+
+      return @bag
+    end
+
+    def [](key)
+      return fetch(key)
+    end
+
+    def method_missing(method, *args, &block)
+      return fetch(method.to_s)
+    end
+
+    def has_key?(key)
+      return @bag.has_key?(key)
+    end
+
+    def fetch(key)
+      if not has_key?(key)
+        raise KeyError, "Undefined parameter '#{key}'"
+      end
+
+      return @bag[key]
+    end
+  end
+end

data/lib/nugrant/parameters.rb

@@ -3,8 +3,10 @@ require 'json'
 require 'ostruct'
 require 'yaml'
 
+require 'nugrant/bag'
+
 module Nugrant
-  class Parameters < Nugrant::ParameterBag
+  class Parameters < Nugrant::Bag
     attr_reader :defaults, :system, :user, :project, :all
 
     def initialize(config = nil)

data/lib/nugrant/version.rb

@@ -1,3 +1,3 @@
 module Nugrant
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/nugrant.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.name          = "nugrant"
   gem.version       = Nugrant::VERSION
   gem.authors       = ["Matthieu Vachon"]
-  gem.email         = ["matthieu.ouellette-vachon@nuecho.com"]
-  gem.homepage      = "https://github.com/nuecho/nugrant"
+  gem.email         = ["matthieu.o.vachon@gmail.com"]
+  gem.homepage      = "https://github.com/maoueh/nugrant"
   gem.summary       = "Vagrant plugin to enable user specific configuration parameters."
   gem.description   = <<-EOF
      This gem is in fact a Vagrant plugin. By installing this gem, it will be

data/test/lib/nugrant/test_parameters.rb

@@ -28,7 +28,7 @@ class Nugrant::TestParameters < Test::Unit::TestCase
       assert_equal(value, parameters[key], "array[#{key}]")
     end
 
-    assert_equal(false, parameters.has_param?("0.0.0"))
+    assert_equal(false, parameters.has_key?("0.0.0"))
   end
 
   def test_params_level_1()
@@ -109,7 +109,7 @@ class Nugrant::TestParameters < Test::Unit::TestCase
         "0.0.1" => "system",
       })
 
-      assert_equal(false, parameters.has_param?("0.0.0"))
+      assert_equal(false, parameters.has_key?("0.0.0"))
     end
   end
 
@@ -117,7 +117,7 @@ class Nugrant::TestParameters < Test::Unit::TestCase
     assert_level(parameters.send(key), results)
     assert_level(parameters[key], results)
 
-    assert_equal(false, parameters.has_param?("0.0.0"))
+    assert_equal(false, parameters.has_key?("0.0.0"))
   end
 
   def test_file_nil()

data/test/lib/nugrant/test_parameters_bag.rb

@@ -2,13 +2,13 @@ require 'nugrant'
 require 'nugrant/parameters'
 require 'test/unit'
 
-class Nugrant::TestParameterBag < Test::Unit::TestCase
+class Nugrant::TestBag < Test::Unit::TestCase
   def create_bag(parameters)
-    return Nugrant::ParameterBag.new(parameters)
+    return Nugrant::Bag.new(parameters)
   end
 
   def assert_bag(parameters, bag)
-    assert_kind_of(Nugrant::ParameterBag, bag)
+    assert_kind_of(Nugrant::Bag, bag)
 
     parameters.each do |key, value|
       if not value.is_a?(Hash)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nugrant
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -65,7 +65,7 @@ description: ! "     This gem is in fact a Vagrant plugin. By installing this ge
   to\n     share a Vagrantfile to multiple developers but would like to customize\n
   \    some parameters for each users differently.\n"
 email:
-- matthieu.ouellette-vachon@nuecho.com
+- matthieu.o.vachon@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -81,9 +81,9 @@ files:
 - README.md
 - Rakefile
 - lib/nugrant.rb
+- lib/nugrant/bag.rb
 - lib/nugrant/config.rb
 - lib/nugrant/helper/yaml.rb
-- lib/nugrant/parameter_bag.rb
 - lib/nugrant/parameters.rb
 - lib/nugrant/vagrant/command/parameters.rb
 - lib/nugrant/vagrant/command/root.rb
@@ -127,7 +127,7 @@ files:
 - test/resources/yml/params_user_1.yml
 - test/resources/yml/params_user_2.yml
 - test/resources/yml/params_windows_eol.yml
-homepage: https://github.com/nuecho/nugrant
+homepage: https://github.com/maoueh/nugrant
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -141,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1143289133319579260
+      hash: 2259077300766997655
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1143289133319579260
+      hash: 2259077300766997655
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/nugrant/parameter_bag.rb

@@ -1,53 +0,0 @@
-module Nugrant
-  class ParameterBag
-    def initialize(parameters)
-      @bag = recompute(parameters)
-    end
-
-    def recompute(parameters)
-      @bag = transform(parameters)
-      return @bag
-    end
-
-    def transform(parameters)
-      bag = {}
-      return bag if parameters == nil
-
-      parameters.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::ParameterBag.new(value)
-      end
-
-      return bag
-    end
-
-    def [](param_name)
-      return get_param(param_name)
-    end
-
-    def method_missing(method, *args, &block)
-      return get_param(method.to_s)
-    end
-
-    def has_param?(param_name)
-      return @bag.has_key?(param_name)
-    end
-
-    def get_param(param_name)
-      if not has_param?(param_name)
-        raise KeyError, "Undefined parameter '#{param_name}'"
-      end
-
-      return @bag[param_name]
-    end
-
-    def get_params()
-      return @bag
-    end
-  end
-end