nugrant 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16c6ab3c8e5e927d721709d9ef50c994386f71be
-  data.tar.gz: 5b07b32caedb79df6a879906c302a1512baaccaa
+  metadata.gz: 36479d2a076b5dfd5f938969edcdc48f12ea9501
+  data.tar.gz: 162d0feefe4e742beeef2561187335ef313d79cd
 SHA512:
-  metadata.gz: 008a2bf813159fd4676e722658aa817589284092d437269501b7316aea71c927cecb5268935b9614b3c6ef152324c2a9e880216670fbe4afc95e77d762abe5c0
-  data.tar.gz: 159c9c629ae3e3db4c6ecbf79754a4108a1fb5e5df51109d33908e1f893c1413d7dbfd40530623cd70c14089fe4cc412f2b1cc427bd04325ada59fe56b984bf8
+  metadata.gz: 0b5d3e769d89e6f527b39aa90696c19c1425a4058c08378dc89f6da33927599d1ce2566b883a012c185c6559b99575abe64863b2b9cf339752cbf72272284841
+  data.tar.gz: 96f6cb2405b5ea6a8a501662f3c36e78d6d9285fbf4b28ba834fff8fa9e7f22ce878cf96c5b4d194fd565ccd6d00c7583c4e97b482409502c4c84c4f4df54b3e

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 
 rvm:
-  - "1.9.3"
-  - "2.0.0"
-  - "2.1.0"
+  - 1.9.3
+  - 2.0.0
+  - 2.1
 
-before_install:
-  - gem install bundler -v '= 1.6.7'
+bundler_args: --without doc guard --jobs 7
+
+script: bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+# 2.1.1 (December 2nd, 2014)
+
+ * Permit numeric keys in bag. They are converted to symbol
+   like others.
+
+   Fixes [issue #26](https://github.com/maoueh/nugrant/issues/26) again.
+
+ * Removed old code that was switching YAML engine to `syck` when
+   it was available.
+
+   Fixes [issue #14](https://github.com/maoueh/nugrant/issues/14) again.
+
+ * Fixed auto export variables on `vagrant provision` feature. The
+   initial release is not working correctly.
+
+ * Changed how module shortcut is defined. The shortcut is now defined
+   inside the class using it to avoid already defined warnings.
+
+   Fixes [issue #24](https://github.com/maoueh/nugrant/issues/24).
+
 # 2.1.0 (November 1st, 2014)
 
  * Added possibility to specify the script path where to generate

data/Gemfile

@@ -5,7 +5,7 @@ group :development do
   gem "minitest", "~> 5.3"
   gem "minitest-reporters", "~> 1.0"
 
-  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git", :tag => "v1.6.2"
+  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git", :branch => "master"
 end
 
 group :plugins do

data/lib/nugrant/bag.rb

@@ -166,8 +166,9 @@ module Nugrant
     private
 
     def __convert_key(key)
-      return key.to_sym() if key.respond_to?(:to_sym)
+      return key.to_s().to_sym() if !key.nil? && key.respond_to?(:to_s)
 
+      raise ArgumentError, "Key cannot be nil" if key.nil?
       raise ArgumentError, "Key cannot be converted to symbol, current value [#{key}] (#{key.class.name})"
     end
 

data/lib/nugrant/helper/bag.rb

@@ -31,8 +31,6 @@ module Nugrant
       end
 
       def self.parse_yaml(io)
-        YAML::ENGINE.yamler = 'syck' if (defined?(Syck) || defined?(YAML::Syck)) && defined?(YAML::ENGINE)
-
         YAML.load(io.read())
       end
     end

data/lib/nugrant/vagrant/v2/action/auto_export.rb

@@ -2,12 +2,12 @@ require 'nugrant'
 require 'nugrant/helper/env/exporter'
 require 'nugrant/parameters'
 
-EnvExporter = Nugrant::Helper::Env::Exporter
-
 module Nugrant
   module Vagrant
     module V2
       module Action
+        EnvExporter = Nugrant::Helper::Env::Exporter
+
         class AutoExport
           def initialize(app, env)
             @app = app
@@ -24,16 +24,16 @@ module Nugrant
 
             Array(@config.user.auto_export).each do |exporter|
               if exporter == :terminal or not EnvExporter.valid?(exporter)
-                env[:ui].warn("ERROR: Invalid config.user.auto_export value '#{format}'", :prefix => false)
+                env[:ui].warn("ERROR: Invalid config.user.auto_export value '#{exporter}'", :prefix => false)
                 next
               end
 
-              env[:ui].info("Configuration exported '#{format}'", :prefix => false)
+              env[:ui].info("Configuration exported '#{exporter}'", :prefix => false)
 
               case
-              when format == :script
+              when exporter == :script
                 EnvExporter.script_exporter(@config.user.__all, options)
-              when format == :autoenv
+              when exporter == :autoenv
                 EnvExporter.autoenv_exporter(@config.user.__all, options)
               end
             end

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

@@ -2,13 +2,13 @@ require 'nugrant'
 require 'nugrant/helper/env/exporter'
 require 'nugrant/parameters'
 
-EnvExporter = Nugrant::Helper::Env::Exporter
-
 module Nugrant
   module Vagrant
     module V2
       module Command
         class Env < ::Vagrant.plugin("2", :command)
+          EnvExporter = Nugrant::Helper::Env::Exporter
+
           def self.synopsis
             "env utilities to export config.user as environment variables in host machine"
           end
@@ -34,13 +34,6 @@ module Nugrant
                                "Changing the format will also change where they are displayed.\n"
               parser.separator ""
 
-              parser.separator "Available formats:"
-              parser.separator "  autoenv  => Write commands to a file named `.env` in the current directory.\n" +
-                               "               See https://github.com/kennethreitz/autoenv for more info."
-              parser.separator "  terminal => Display commands to terminal so they can be sourced."
-              parser.separator "  script   => Write commands to a bash script named `nugrant2env.sh` so it can be sourced."
-              parser.separator ""
-
               parser.separator "Available options:"
               parser.separator ""
 
@@ -59,6 +52,14 @@ module Nugrant
               parser.on("-h", "--help", "Prints this help") do
                 @show_help = true
               end
+
+              parser.separator ""
+              parser.separator "Available formats:"
+              parser.separator "    autoenv   Write commands to a file named `.env` in the current directory."
+              parser.separator "              See https://github.com/kennethreitz/autoenv for more info."
+              parser.separator "    terminal  Write commands to terminal so they can be sourced."
+              parser.separator "    script    Write commands to a bash script named `nugrant2env.sh` so it can be sourced."
+              parser.separator ""
             end
           end
 

data/lib/nugrant/version.rb

@@ -1,3 +1,3 @@
 module Nugrant
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/test/lib/nugrant/test_bag.rb

@@ -214,6 +214,12 @@ module Nugrant
       end
     end
 
+    def test_numeric_keys_converted_to_string
+      bag1 = create_bag({1 => "value1"})
+
+      assert_all_access_equal("value1", bag1, :'1')
+    end
+
     def test_custom_key_error_handler
       bag = create_bag({:value => "one"}, :key_error => Proc.new do |key|
         raise IndexError

data/test/lib/nugrant/test_parameters.rb

@@ -11,10 +11,10 @@ module Nugrant
     @@INVALID_PATH = "impossible_file_path.yamljson.impossible"
 
     def create_parameters(format, current_filename, user_filename, system_filename, defaults = {}, options = {})
-      extension = case
-        when format = :json
+      extension = case format
+        when :json
           "json"
-        when format = :yaml
+        when :yml, :yaml
           "yml"
         else
           raise ArgumentError, "Format [#{format}] is currently not supported"
@@ -419,6 +419,12 @@ module Nugrant
       assert_equal(["1", "2", "3", "3", "6", "7"], parameters3.level1.level2)
     end
 
+    def test_numeric_key_in_yaml_converted_to_symbol()
+      parameters = create_parameters(:yaml, "params_numeric_key", invalid_path, invalid_path)
+
+      assert_equal("value1", parameters.servers[:'1'])
+    end
+
     def formats()
       @@FORMATS
     end

data/test/resources/vagrantfiles/v2.auto_export

@@ -0,0 +1,13 @@
+Vagrant.configure("2") do |config|
+  config.user.auto_export = [:autoenv, :script]
+
+  config.user.defaults = {
+    'local' => {
+        'first' => "value1",
+    },
+  }
+
+  #config.vm.box = "opscode_centos-7.0_x86-64"
+
+  raise "You need to define `config.vm.box` for this test"
+end

data/test/resources/yaml/params_boolean.yml

@@ -1 +1 @@
-true
+false

data/test/resources/yaml/params_numeric_key.yml

@@ -0,0 +1,3 @@
+servers:
+ 1: "value1"
+ 2: "value2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nugrant
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Matthieu Vachon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-01 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -103,6 +103,7 @@ files:
 - 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.auto_export
 - test/resources/vagrantfiles/v2.defaults_mixed_string_symbols
 - test/resources/vagrantfiles/v2.defaults_null_values_in_vagrantuser
 - test/resources/vagrantfiles/v2.defaults_using_string
@@ -120,6 +121,7 @@ files:
 - 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_numeric_key.yml
 - test/resources/yaml/params_simple.yml
 - test/resources/yaml/params_system_1.yml
 - test/resources/yaml/params_system_2.yml