nugrant 2.1.2 → 2.1.4

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

@@ -1,64 +1,64 @@
-require 'nugrant'
-require 'nugrant/vagrant/v2/helper'
-
-module Nugrant
-  module Vagrant
-    module V2
-      module Command
-        class RestrictedKeys < ::Vagrant.plugin("2", :command)
-          def self.synopsis
-            "prints list of restricted keys for method access"
-          end
-
-          def initialize(arguments, environment)
-            super(arguments, environment)
-
-            @show_help = false
-          end
-
-          def create_parser()
-            return OptionParser.new do |parser|
-              parser.banner = "Usage: vagrant user restricted-keys"
-              parser.separator ""
-
-              parser.separator "Available options:"
-              parser.separator ""
-
-              parser.on("-h", "--help", "Prints this help") do
-                @show_help = true
-              end
-
-               parser.separator ""
-               parser.separator "Prints keys that cannot be accessed using the method access syntax\n" +
-                                "(`config.user.<key>`). Use array access syntax (`config.user['<key>']`)\n" +
-                                "if you really want to use of the restricted keys.\n"
-            end
-          end
-
-          def execute
-            parser = create_parser()
-            arguments = parse_options(parser)
-
-            return help(parser) if @show_help
-
-            @env.ui.info("The following keys are restricted, i.e. that method access (`config.user.<key>`)", :prefix => false)
-            @env.ui.info("will not work. If you really want to use a restricted key, use array access ", :prefix => false)
-            @env.ui.info("instead (`config.user['<key>']`).", :prefix => false)
-            @env.ui.info("", :prefix => false)
-
-            @env.ui.info("You can run `vagrant user parameters` to check if your config currently defines", :prefix => false)
-            @env.ui.info("one or more restricted keys shown below.", :prefix => false)
-            @env.ui.info("", :prefix => false)
-
-            restricted_keys = Helper::get_restricted_keys()
-            @env.ui.info(restricted_keys.sort().join(", "), :prefix => false)
-          end
-
-          def help(parser)
-            @env.ui.info(parser.help, :prefix => false)
-          end
-        end
-      end
-    end
-  end
-end
+require 'nugrant'
+require 'nugrant/vagrant/v2/helper'
+
+module Nugrant
+  module Vagrant
+    module V2
+      module Command
+        class RestrictedKeys < ::Vagrant.plugin("2", :command)
+          def self.synopsis
+            "prints list of restricted keys for method access"
+          end
+
+          def initialize(arguments, environment)
+            super(arguments, environment)
+
+            @show_help = false
+          end
+
+          def create_parser()
+            return OptionParser.new do |parser|
+              parser.banner = "Usage: vagrant user restricted-keys"
+              parser.separator ""
+
+              parser.separator "Available options:"
+              parser.separator ""
+
+              parser.on("-h", "--help", "Prints this help") do
+                @show_help = true
+              end
+
+               parser.separator ""
+               parser.separator "Prints keys that cannot be accessed using the method access syntax\n" +
+                                "(`config.user.<key>`). Use array access syntax (`config.user['<key>']`)\n" +
+                                "if you really want to use of the restricted keys.\n"
+            end
+          end
+
+          def execute
+            parser = create_parser()
+            arguments = parse_options(parser)
+
+            return help(parser) if @show_help
+
+            @env.ui.info("The following keys are restricted, i.e. that method access (`config.user.<key>`)", :prefix => false)
+            @env.ui.info("will not work. If you really want to use a restricted key, use array access ", :prefix => false)
+            @env.ui.info("instead (`config.user['<key>']`).", :prefix => false)
+            @env.ui.info("", :prefix => false)
+
+            @env.ui.info("You can run `vagrant user parameters` to check if your config currently defines", :prefix => false)
+            @env.ui.info("one or more restricted keys shown below.", :prefix => false)
+            @env.ui.info("", :prefix => false)
+
+            restricted_keys = Helper::get_restricted_keys()
+            @env.ui.info(restricted_keys.sort().join(", "), :prefix => false)
+          end
+
+          def help(parser)
+            @env.ui.info(parser.help, :prefix => false)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,95 +1,95 @@
-require 'nugrant'
-require 'nugrant/vagrant/v2/command/env'
-require 'nugrant/vagrant/v2/command/parameters'
-require 'nugrant/vagrant/v2/command/restricted_keys'
-require 'nugrant/version'
-
-module Nugrant
-  module Vagrant
-    module V2
-      module Command
-        class Root < ::Vagrant.plugin("2", :command)
-          def self.synopsis
-            "manage Nugrant user defined parameters (config.user)"
-          end
-
-          def initialize(arguments, environment)
-            super(arguments, environment)
-
-            @arguments, @subcommand, @subarguments = split_main_and_subcommand(arguments)
-
-            # Change super class available arguments to main ones only
-            @argv = @arguments
-
-            @subcommands = ::Vagrant::Registry.new()
-            @subcommands.register(:env) do
-              Command::Env
-            end
-
-            @subcommands.register(:parameters) do
-              Command::Parameters
-            end
-
-            @subcommands.register(:'restricted-keys') do
-              Command::RestrictedKeys
-            end
-
-            @show_help = false
-            @show_version = false
-          end
-
-          def create_parser()
-            return OptionParser.new do |parser|
-              parser.banner = "Usage: vagrant user [-h] [-v] <subcommand> [<args>]"
-
-              parser.separator ""
-              parser.on("-h", "--help", "Prints this help") do
-                @show_help = true
-              end
-
-              parser.on("-v", "--version", "Prints plugin version and exit.") do
-                @show_version = true
-              end
-
-              parser.separator ""
-              parser.separator "Available subcommands:"
-
-              keys = []
-              @subcommands.each { |key, value| keys << key.to_s }
-
-              keys.sort.each do |key|
-                parser.separator "     #{key}"
-              end
-
-              parser.separator ""
-              parser.separator "For help on any individual command run `vagrant user <subcommand> -h`"
-            end
-          end
-
-          def execute
-            parser = create_parser()
-            arguments = parse_options(parser)
-
-            return version() if @show_version
-            return help(parser) if @show_help
-
-            command_class = @subcommands.get(@subcommand.to_sym) if @subcommand
-            return help(parser) if !command_class || !@subcommand
-
-            @logger.debug("Invoking nugrant command class: #{command_class} #{@subarguments.inspect}")
-
-            command_class.new(@subarguments, @env).execute
-          end
-
-          def help(parser)
-            @env.ui.info(parser.help, :prefix => false)
-          end
-
-          def version()
-            @env.ui.info("Nugrant version #{Nugrant::VERSION}", :prefix => false)
-          end
-        end
-      end
-    end
-  end
-end
+require 'nugrant'
+require 'nugrant/vagrant/v2/command/env'
+require 'nugrant/vagrant/v2/command/parameters'
+require 'nugrant/vagrant/v2/command/restricted_keys'
+require 'nugrant/version'
+
+module Nugrant
+  module Vagrant
+    module V2
+      module Command
+        class Root < ::Vagrant.plugin("2", :command)
+          def self.synopsis
+            "manage Nugrant user defined parameters (config.user)"
+          end
+
+          def initialize(arguments, environment)
+            super(arguments, environment)
+
+            @arguments, @subcommand, @subarguments = split_main_and_subcommand(arguments)
+
+            # Change super class available arguments to main ones only
+            @argv = @arguments
+
+            @subcommands = ::Vagrant::Registry.new()
+            @subcommands.register(:env) do
+              Command::Env
+            end
+
+            @subcommands.register(:parameters) do
+              Command::Parameters
+            end
+
+            @subcommands.register(:'restricted-keys') do
+              Command::RestrictedKeys
+            end
+
+            @show_help = false
+            @show_version = false
+          end
+
+          def create_parser()
+            return OptionParser.new do |parser|
+              parser.banner = "Usage: vagrant user [-h] [-v] <subcommand> [<args>]"
+
+              parser.separator ""
+              parser.on("-h", "--help", "Prints this help") do
+                @show_help = true
+              end
+
+              parser.on("-v", "--version", "Prints plugin version and exit.") do
+                @show_version = true
+              end
+
+              parser.separator ""
+              parser.separator "Available subcommands:"
+
+              keys = []
+              @subcommands.each { |key, value| keys << key.to_s }
+
+              keys.sort.each do |key|
+                parser.separator "     #{key}"
+              end
+
+              parser.separator ""
+              parser.separator "For help on any individual command run `vagrant user <subcommand> -h`"
+            end
+          end
+
+          def execute
+            parser = create_parser()
+            arguments = parse_options(parser)
+
+            return version() if @show_version
+            return help(parser) if @show_help
+
+            command_class = @subcommands.get(@subcommand.to_sym) if @subcommand
+            return help(parser) if !command_class || !@subcommand
+
+            @logger.debug("Invoking nugrant command class: #{command_class} #{@subarguments.inspect}")
+
+            command_class.new(@subarguments, @env).execute
+          end
+
+          def help(parser)
+            @env.ui.info(parser.help, :prefix => false)
+          end
+
+          def version()
+            @env.ui.info("Nugrant version #{Nugrant::VERSION}", :prefix => false)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,29 +1,29 @@
-require 'nugrant/mixin/parameters'
-require 'nugrant/vagrant/errors'
-require 'nugrant/vagrant/v2/helper'
-
-module Nugrant
-  module Vagrant
-    module V2
-      module Config
-        class User < ::Vagrant.plugin("2", :config)
-
-          include Mixin::Parameters
-
-          def initialize(defaults = {}, config = {})
-            setup!(defaults,
-              :params_filename => ".vagrantuser",
-              :current_path => Helper.find_project_path(),
-              :key_error => Proc.new do |key|
-                raise Errors::ParameterNotFoundError, :key => key.to_s
-              end,
-              :parse_error => Proc.new do |filename, error|
-                raise Errors::VagrantUserParseError, :filename => filename.to_s, :error => error
-              end
-            )
-          end
-        end
-      end
-    end
-  end
-end
+require 'nugrant/mixin/parameters'
+require 'nugrant/vagrant/errors'
+require 'nugrant/vagrant/v2/helper'
+
+module Nugrant
+  module Vagrant
+    module V2
+      module Config
+        class User < ::Vagrant.plugin("2", :config)
+
+          include Mixin::Parameters
+
+          def initialize(defaults = {}, config = {})
+            setup!(defaults,
+              :params_filename => ".vagrantuser",
+              :current_path => Helper.find_project_path(),
+              :key_error => Proc.new do |key|
+                raise Errors::ParameterNotFoundError, :key => key.to_s
+              end,
+              :parse_error => Proc.new do |filename, error|
+                raise Errors::VagrantUserParseError, :filename => filename.to_s, :error => error
+              end
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/nugrant/vagrant/v2/helper.rb

@@ -1,96 +1,96 @@
-require 'pathname'
-
-require 'nugrant'
-require 'nugrant/bag'
-require 'nugrant/vagrant/v2/config/user'
-
-module Nugrant
-  module Vagrant
-    module V2
-      class Helper
-
-        ##
-        # The project path is the path where the top-most (loaded last)
-        # Vagrantfile resides. It can be considered the project root for
-        # this environment.
-        #
-        # Copied from `lib\vagrant\environment.rb#532` (tag: v1.6.2)
-        #
-        # @return [String] The project path to use.
-        #
-        def self.find_project_path()
-          vagrantfile_name = ENV["VAGRANT_VAGRANTFILE"]
-          vagrantfile_name = [vagrantfile_name] if vagrantfile_name && !vagrantfile_name.is_a?(Array)
-
-          root_finder = lambda do |path|
-            vagrantfile = find_vagrantfile(path, vagrantfile_name)
-
-            return path if vagrantfile
-            return nil if path.root? || !File.exist?(path)
-
-            root_finder.call(path.parent)
-          end
-
-          root_finder.call(get_vagrant_working_directory())
-        end
-
-        ##
-        # Finds the Vagrantfile in the given directory.
-        #
-        # Copied from `lib\vagrant\environment.rb#732` (tag: v1.6.2)
-        #
-        # @param [Pathname] path Path to search in.
-        # @return [Pathname]
-        #
-        def self.find_vagrantfile(search_path, filenames = nil)
-          filenames ||= ["Vagrantfile", "vagrantfile"]
-          filenames.each do |vagrantfile|
-            current_path = search_path.join(vagrantfile)
-            return current_path if current_path.file?
-          end
-
-          nil
-        end
-
-        ##
-        # Returns Vagrant working directory to use.
-        #
-        # Copied from `lib\vagrant\environment.rb#80` (tag: v1.6.2)
-        #
-        # @return [Pathname] The working directory to start search in.
-        #
-        def self.get_vagrant_working_directory()
-          cwd = nil
-
-          # Set the default working directory to look for the vagrantfile
-          cwd ||= ENV["VAGRANT_CWD"] if ENV.has_key?("VAGRANT_CWD")
-          cwd ||= Dir.pwd
-          cwd = Pathname.new(cwd)
-
-          if !cwd.directory?
-            raise Errors::EnvironmentNonExistentCWD, cwd: cwd.to_s
-          end
-
-          cwd = cwd.expand_path
-        end
-
-        def self.get_restricted_keys()
-          bag_methods = Nugrant::Bag.instance_methods
-          parameters_methods = V2::Config::User.instance_methods
-
-          (bag_methods | parameters_methods).map(&:to_s)
-        end
-
-        def self.get_used_restricted_keys(hash, restricted_keys)
-          keys = []
-          hash.each do |key, value|
-            keys << key if restricted_keys.include?(key)
-            keys += get_used_restricted_keys(value, restricted_keys) if value.kind_of?(Hash)
-          end
-
-          keys.uniq
-        end
-      end
-    end
-  end
-end
+require 'pathname'
+
+require 'nugrant'
+require 'nugrant/bag'
+require 'nugrant/vagrant/v2/config/user'
+
+module Nugrant
+  module Vagrant
+    module V2
+      class Helper
+
+        ##
+        # The project path is the path where the top-most (loaded last)
+        # Vagrantfile resides. It can be considered the project root for
+        # this environment.
+        #
+        # Copied from `lib\vagrant\environment.rb#532` (tag: v1.6.2)
+        #
+        # @return [String] The project path to use.
+        #
+        def self.find_project_path()
+          vagrantfile_name = ENV["VAGRANT_VAGRANTFILE"]
+          vagrantfile_name = [vagrantfile_name] if vagrantfile_name && !vagrantfile_name.is_a?(Array)
+
+          root_finder = lambda do |path|
+            vagrantfile = find_vagrantfile(path, vagrantfile_name)
+
+            return path if vagrantfile
+            return nil if path.root? || !File.exist?(path)
+
+            root_finder.call(path.parent)
+          end
+
+          root_finder.call(get_vagrant_working_directory())
+        end
+
+        ##
+        # Finds the Vagrantfile in the given directory.
+        #
+        # Copied from `lib\vagrant\environment.rb#732` (tag: v1.6.2)
+        #
+        # @param [Pathname] path Path to search in.
+        # @return [Pathname]
+        #
+        def self.find_vagrantfile(search_path, filenames = nil)
+          filenames ||= ["Vagrantfile", "vagrantfile"]
+          filenames.each do |vagrantfile|
+            current_path = search_path.join(vagrantfile)
+            return current_path if current_path.file?
+          end
+
+          nil
+        end
+
+        ##
+        # Returns Vagrant working directory to use.
+        #
+        # Copied from `lib\vagrant\environment.rb#80` (tag: v1.6.2)
+        #
+        # @return [Pathname] The working directory to start search in.
+        #
+        def self.get_vagrant_working_directory()
+          cwd = nil
+
+          # Set the default working directory to look for the vagrantfile
+          cwd ||= ENV["VAGRANT_CWD"] if ENV.has_key?("VAGRANT_CWD")
+          cwd ||= Dir.pwd
+          cwd = Pathname.new(cwd)
+
+          if !cwd.directory?
+            raise Errors::EnvironmentNonExistentCWD, cwd: cwd.to_s
+          end
+
+          cwd = cwd.expand_path
+        end
+
+        def self.get_restricted_keys()
+          bag_methods = Nugrant::Bag.instance_methods
+          parameters_methods = V2::Config::User.instance_methods
+
+          (bag_methods | parameters_methods).map(&:to_s)
+        end
+
+        def self.get_used_restricted_keys(hash, restricted_keys)
+          keys = []
+          hash.each do |key, value|
+            keys << key if restricted_keys.include?(key)
+            keys += get_used_restricted_keys(value, restricted_keys) if value.kind_of?(Hash)
+          end
+
+          keys.uniq
+        end
+      end
+    end
+  end
+end

data/lib/nugrant/vagrant/v2/plugin.rb

@@ -1,34 +1,34 @@
-require 'nugrant/vagrant/v2/action'
-
-module Nugrant
-  module Vagrant
-    module V2
-      class Plugin < ::Vagrant.plugin("2")
-        name "Nugrant"
-        description <<-DESC
-          Plugin to define and use user specific parameters from various location inside your Vagrantfile.
-        DESC
-
-        class << self
-          def provision(hook)
-            hook.before(::Vagrant::Action::Builtin::Provision, Nugrant::Vagrant::V2::Action.auto_export)
-          end
-        end
-
-        action_hook(:nugrant_provision, :machine_action_up, &method(:provision))
-        action_hook(:nugrant_provision, :machine_action_reload, &method(:provision))
-        action_hook(:nugrant_provision, :machine_action_provision, &method(:provision))
-
-        command "user" do
-          require_relative "command/root"
-          Command::Root
-        end
-
-        config "user" do
-          require_relative "config/user"
-          Config::User
-        end
-      end
-    end
-  end
-end
+require 'nugrant/vagrant/v2/action'
+
+module Nugrant
+  module Vagrant
+    module V2
+      class Plugin < ::Vagrant.plugin("2")
+        name "Nugrant"
+        description <<-DESC
+          Plugin to define and use user specific parameters from various location inside your Vagrantfile.
+        DESC
+
+        class << self
+          def provision(hook)
+            hook.before(::Vagrant::Action::Builtin::Provision, Nugrant::Vagrant::V2::Action.auto_export)
+          end
+        end
+
+        action_hook(:nugrant_provision, :machine_action_up, &method(:provision))
+        action_hook(:nugrant_provision, :machine_action_reload, &method(:provision))
+        action_hook(:nugrant_provision, :machine_action_provision, &method(:provision))
+
+        command "user" do
+          require_relative "command/root"
+          Command::Root
+        end
+
+        config "user" do
+          require_relative "config/user"
+          Config::User
+        end
+      end
+    end
+  end
+end

data/lib/nugrant/version.rb

@@ -1,3 +1,3 @@
-module Nugrant
-  VERSION = "2.1.2"
-end
+module Nugrant
+  VERSION = "2.1.4"
+end