nugrant 0.0.14 → 1.0.0.pre1

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

@@ -0,0 +1,33 @@
+require 'nugrant'
+
+module Nugrant
+  module Vagrant
+    module V1
+      module Config
+        class User < ::Vagrant::Config::Base
+          attr_reader :parameters
+
+          def initialize()
+            @parameters = Nugrant::Parameters.new()
+          end
+
+          def [](param_name)
+            return @parameters[param_name]
+          end
+
+          def method_missing(method, *args, &block)
+            return @parameters.method_missing(method, *args, &block)
+          end
+
+          def defaults(parameters)
+            @parameters.defaults(parameters)
+          end
+
+          def defaults=(parameters)
+            @parameters.defaults=(parameters)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+require 'nugrant/vagrant/v1/command/root'
+require 'nugrant/vagrant/v1/config/user'
+
+# Plugin bootstrap
+Vagrant.commands.register(:user) { Nugrant::Vagrant::V1::Command::Root }
+Vagrant.config_keys.register(:user) { Nugrant::Vagrant::V1::Config::User }

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

@@ -0,0 +1,137 @@
+require 'nugrant'
+require 'nugrant/helper/yaml'
+
+module Nugrant
+  module Vagrant
+    module V2
+      module Command
+        class Parameters < ::Vagrant.plugin("2", :command)
+          def initialize(arguments, environment)
+            super(arguments, environment)
+
+            @show_help = false
+            @show_defaults = false
+            @show_system = false
+            @show_user = false
+            @show_project = false
+          end
+
+          def create_parser()
+            return OptionParser.new do |parser|
+              parser.banner = "Usage: vagrant user parameters [<options>]"
+              parser.separator ""
+
+              parser.separator "Available options:"
+              parser.separator ""
+
+              parser.on("-h", "--help", "Print this help") do
+                @show_help = true
+              end
+
+              parser.on("-d", "--defaults", "Show only defaults parameters") do
+                @show_defaults = true
+              end
+
+              parser.on("-s", "--system", "Show only system parameters") do
+                @show_system = true
+              end
+
+              parser.on("-u", "--user", "Show only user parameters") do
+                 @show_user = true
+               end
+
+               parser.on("-p", "--project", "Show only project parameters") do
+                 @show_project = true
+               end
+
+               parser.separator ""
+               parser.separator "When no options is provided, the command prints the names and values \n" +
+                                "of all parameters that would be available for usage in the Vagrantfile.\n" +
+                                "The hierarchy of the parameters is respected, so the final values are\n" +
+                                "displayed."
+            end
+          end
+
+          def execute
+            parser = create_parser()
+            arguments = parse_options(parser)
+
+            return help(parser) if @show_help
+
+            @logger.debug("'Parameters' each target VM...")
+            with_target_vms(arguments) do |vm|
+              parameters = vm.config.user.parameters
+
+              @env.ui.info("# Vm '#{vm.name}'", :prefix => false)
+
+              defaults(parameters) if @show_defaults
+              system(parameters) if @show_system
+              user(parameters) if @show_user
+              project(parameters) if @show_project
+
+              all(parameters) if !@show_defaults && !@show_system && !@show_user && !@show_project
+            end
+
+            return 0
+          end
+
+          def help(parser)
+            @env.ui.info(parser.help, :prefix => false)
+          end
+
+          def defaults(parameters)
+            print_results("Defaults", parameters.defaults)
+          end
+
+          def system(parameters)
+            print_results("System", parameters.system)
+          end
+
+          def user(parameters)
+            print_results("User", parameters.user)
+          end
+
+          def project(parameters)
+            print_results("Project", parameters.project)
+          end
+
+          def all(parameters)
+            print_results("All", parameters.all)
+          end
+
+          def print_results(kind, parameters)
+            if !parameters || parameters.empty?()
+              print_header(kind)
+              @env.ui.info(" Empty", :prefix => false)
+              @env.ui.info("", :prefix => false)
+              return
+            end
+
+            print_parameters(kind, {
+              'config' => {
+                'user' => parameters
+              }
+            })
+          end
+
+          def print_parameters(kind, data)
+            string = Nugrant::Helper::Yaml.format(data.to_yaml, :indent => 1)
+
+            print_header(kind)
+            @env.ui.info(string, :prefix => false)
+            @env.ui.info("", :prefix => false)
+          end
+
+          def print_header(kind, length = 50)
+            @env.ui.info(" #{kind.capitalize} Parameters", :prefix => false)
+            @env.ui.info(" " + "-" * length, :prefix => false)
+          end
+
+          def compute_header_length(string)
+
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,81 @@
+require 'nugrant'
+require 'nugrant/version'
+
+module Nugrant
+  module Vagrant
+    module V2
+      module Command
+        class Root < ::Vagrant.plugin("2", :command)
+          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(:parameters) do
+              require File.expand_path("../parameters", __FILE__)
+              Parameters
+            end
+
+            @show_help = false
+            @show_version = false
+          end
+
+          def create_parser()
+            return OptionParser.new do |parser|
+              parser.banner = "Usage: vagrant user [-h] [-v] <command> [<args>]"
+
+              parser.separator ""
+              parser.on("-h", "--help", "Print this help") do
+                @show_help = true
+              end
+
+              parser.on("-v", "--version", "Print 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 COMMAND -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

@@ -0,0 +1,33 @@
+require 'nugrant'
+
+module Nugrant
+  module Vagrant
+    module V2
+      module Config
+        class User < ::Vagrant.plugin("2", :config)
+          attr_reader :parameters
+
+          def initialize()
+            @parameters = Nugrant::Parameters.new()
+          end
+
+          def [](param_name)
+            return @parameters[param_name]
+          end
+
+          def method_missing(method, *args, &block)
+            return @parameters.method_missing(method, *args, &block)
+          end
+
+          def defaults(parameters)
+            @parameters.defaults(parameters)
+          end
+
+          def defaults=(parameters)
+            @parameters.defaults=(parameters)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+
+module Nugrant
+  module Vagrant
+    module V2
+      class Plugin < ::Vagrant.plugin("2")
+        name "Nugrant"
+
+        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 = "0.0.14"
+  VERSION = "1.0.0.pre1"
 end

data/lib/vagrant_init.rb

@@ -1,7 +1,2 @@
 # This module will initialize the vagrant plugin
-require 'nugrant/vagrant/command/root'
-require 'nugrant/vagrant/config/user'
-
-# Plugin bootstrap
-Vagrant.commands.register(:user) { Nugrant::Vagrant::Command::Root }
-Vagrant.config_keys.register(:user) { Nugrant::Vagrant::Config::User }
+require "nugrant/vagrant/v1/plugin"

data/nugrant.gemspec

@@ -10,13 +10,17 @@ Gem::Specification.new do |gem|
   gem.authors       = ["Matthieu Vachon"]
   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.summary       = "Library to handle user specific parameters from various location."
   gem.description   = <<-EOF
-     This gem is in fact a Vagrant plugin. By installing this gem, it will be
-     possible to define user specific configuration files that will be merge
-     directly into the Vagrant configuration. This is useful if you need to
-     share a Vagrantfile to multiple developers but would like to customize
-     some parameters for each users differently.
+     Nugrant is a library to easily handle parameters that need to be
+     injected into an application via different sources (system, user,
+     project, defaults).
+
+     Nugrant can also be directly used as a Vagrant plugin. By activating
+     this gem with Vagrant, it will be possible to define user specific
+     parameters that will be injected directly into the Vagrantfile. This
+     is useful if you need to share a Vagrantfile to multiple developers
+     but would like to customize some parameters for each user differently.
   EOF
 
   gem.files         = `git ls-files`.split($/)
@@ -26,6 +30,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "deep_merge", "~> 1.0.0"
 
-  gem.add_development_dependency "rake", "~> 0.9.0"
-  gem.add_development_dependency "vagrant", "~> 1.0.5"
+  gem.add_development_dependency "rake"
 end

data/test/resources/Vagrantfile.v1.fake

@@ -0,0 +1,9 @@
+Vagrant::Config.run do |config|
+  config.user.defaults = {
+    'value' => "test"
+  }
+
+  config.vm.box = "testing"
+
+  puts config.user.value
+end

data/test/resources/Vagrantfile.v1.real

@@ -0,0 +1,19 @@
+Vagrant::Config.run do |config|
+  config.vm.box = "base"
+  config.vm.box_url = "http://domain.com/path/to/above.box"
+
+  config.vm.network :forwarded_port, guest: 80, host: 8080
+
+  config.vm.shared_folder "C:/Users/Matt/nugrant", "/vagrant_data"
+
+  config.vm.customize ["modifyvm", :id, "--memory", "256"]
+
+  config.vm.provision :chef_solo do |chef|
+    chef.cookbooks_path = "C:\Users\Matt\Work\kitchen\cookbooks"
+    chef.roles_path = "C:\Users\Matt\Work\kitchen\roles"
+    chef.nodes_path = "C:\Users\Matt\Work\kitchen\nodes"
+
+    chef.add_recipe "mysql"
+    chef.add_role "web"
+  end
+end

data/test/resources/Vagrantfile.v2.fake

@@ -0,0 +1,9 @@
+Vagrant.configure("2") do |config|
+  config.user.defaults = {
+    'value' => "test"
+  }
+
+  config.vm.box = "testing"
+
+  puts config.user.value
+end

data/test/resources/Vagrantfile.v2.real

@@ -0,0 +1,22 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = "base"
+  config.vm.box_url = "http://domain.com/path/to/above.box"
+
+  config.vm.network :forwarded_port, guest: 80, host: 8080
+  config.vm.network :private_network, ip: "10.0.0.2"
+
+  config.vm.synced_folder "C:/Users/Matt/nugrant", "/vagrant_data"
+
+  config.vm.provider :virtualbox do |virtualbox|
+    virtualbox.customize ["modifyvm", :id, "--memory", "256"]
+  end
+
+  config.vm.provision :chef_solo do |chef|
+    chef.cookbooks_path = "C:\Users\Matt\Work\kitchen\cookbooks"
+    chef.roles_path = "C:\Users\Matt\Work\kitchen\roles"
+    chef.nodes_path = "C:\Users\Matt\Work\kitchen\nodes"
+
+    chef.add_recipe "mysql"
+    chef.add_role "web"
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: nugrant
 version: !ruby/object:Gem::Version
-  version: 0.0.14
-  prerelease: 
+  version: 1.0.0.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - Matthieu Vachon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -32,38 +32,24 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: vagrant
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-description: ! "     This gem is in fact a Vagrant plugin. By installing this gem,
-  it will be\n     possible to define user specific configuration files that will
-  be merge\n     directly into the Vagrant configuration. This is useful if you need
-  to\n     share a Vagrantfile to multiple developers but would like to customize\n
-  \    some parameters for each users differently.\n"
+        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
+  \    this gem with Vagrant, it will be possible to define user specific\n     parameters
+  that will be injected directly into the Vagrantfile. This\n     is useful if you
+  need to share a Vagrantfile to multiple developers\n     but would like to customize
+  some parameters for each user differently.\n"
 email:
 - matthieu.o.vachon@gmail.com
 executables: []
@@ -85,9 +71,14 @@ files:
 - lib/nugrant/config.rb
 - lib/nugrant/helper/yaml.rb
 - lib/nugrant/parameters.rb
-- lib/nugrant/vagrant/command/parameters.rb
-- lib/nugrant/vagrant/command/root.rb
-- lib/nugrant/vagrant/config/user.rb
+- lib/nugrant/vagrant/v1/command/parameters.rb
+- lib/nugrant/vagrant/v1/command/root.rb
+- lib/nugrant/vagrant/v1/config/user.rb
+- lib/nugrant/vagrant/v1/plugin.rb
+- lib/nugrant/vagrant/v2/command/parameters.rb
+- lib/nugrant/vagrant/v2/command/root.rb
+- lib/nugrant/vagrant/v2/config/user.rb
+- lib/nugrant/vagrant/v2/plugin.rb
 - lib/nugrant/version.rb
 - lib/vagrant_init.rb
 - nugrant.gemspec
@@ -96,7 +87,10 @@ files:
 - test/lib/nugrant/test_parameters_bag.rb
 - test/resources/.vagrantuser
 - test/resources/README.md
-- test/resources/Vagrantfile
+- test/resources/Vagrantfile.v1.fake
+- test/resources/Vagrantfile.v1.real
+- test/resources/Vagrantfile.v2.fake
+- test/resources/Vagrantfile.v2.real
 - test/resources/json/params_boolean.json
 - test/resources/json/params_combinations.json
 - test/resources/json/params_defaults_at_root.json
@@ -141,29 +135,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2259077300766997655
+      hash: -870213585
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 2259077300766997655
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Vagrant plugin to enable user specific configuration parameters.
+summary: Library to handle user specific parameters from various location.
 test_files:
 - 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
+- test/resources/Vagrantfile.v1.fake
+- test/resources/Vagrantfile.v1.real
+- test/resources/Vagrantfile.v2.fake
+- test/resources/Vagrantfile.v2.real
 - test/resources/json/params_boolean.json
 - test/resources/json/params_combinations.json
 - test/resources/json/params_defaults_at_root.json