vagrant-templated 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 196467dafc7d0fb838929cfdfebc9052cd810801
-  data.tar.gz: 25537cefd79b74d9b6ca8111c909daa2c8750891
+  metadata.gz: 0de3022048ea907bdc99c4a5e89d69d851ed14d8
+  data.tar.gz: 7d3b70f7a0b47f25e332c2d03458e8e34e2e557e
 SHA512:
-  metadata.gz: 68e1887a3e31f12cde65436d300b8a211df90f13f328e63ee9792a3fa758d04c31c4f472f7aa26700819bd1999e332090fcd2247077f8a483892149265450767
-  data.tar.gz: 74df6feaef448cf17bdf717e3dcd4655449f4dda4f8f58807b4ec1a8684db77d30b52338c32a62f2a2da62cc923858f9b4e9eed47eed65a2d967d9a6e3679fea
+  metadata.gz: 6443c74321a96df9b12863f43d88a8d5bb1abdc1180bfb74c02e0c192db84b23cf787818ff3d9d04d7b716a0ef509b3c9d66792fb75215b0b053c4538556032e
+  data.tar.gz: c54d2c5a4171e52787923a05528f194f89e0be7c4c23af415179f0794a35cc7b38ee505d6498983d2931a6521953f8f5df2d6bd4d00268fa30f04a7936aceff0

data/Berksfile

@@ -1,5 +1,5 @@
-# Berksfile generated with https://github.com/afaundez/vagrant-templated
-
+# vagrant-templated berksfile for vagrant-plugin 1.9
+# check https://github.com/afaundez/vagrant-templated for more options
 source 'https://supermarket.chef.io'
 
 cookbook 'apt', '~> 6.1.0'

data/CHANGELOG.md

@@ -6,6 +6,24 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.2.0] - 2017-08-12
+### Added
+- Node.js 6 template
+- Cat option
+### Changed
+- Refactor config directories
+- Lock chef version for all templates
+- Move version from template name to a new option. If version not provided, using largest version
+- Refactor loading and accessing template attributes
+- Creating all error in vagrant templated module
+- Update vagrantfile and berksfile
+- Replace suffix with output option
+- Update readme
+## Removed
+- Vagrantfile's magic comments
+- Extra empty lines in templates
+
+
 ## [0.1.5] - 2017-08-07
 ### Added
 - Update Vagrantfile from vagrant-templated

data/README.md

@@ -1,9 +1,8 @@
-[![GitHub version](https://badge.fury.io/gh/afaundez%2Fvagrant-templated.svg)](https://badge.fury.io/gh/afaundez%2Fvagrant-templated)
 [![Gem Version](https://badge.fury.io/rb/vagrant-templated.svg)](https://badge.fury.io/rb/vagrant-templated)
 
 # VAGRANT TEMPLATED PLUGIN
 
-Vagrant Templated is [Vagrant](https://www.vagrantup.com/downloads.html) plugin that add a new vagrant action to start a new Project. You will be able to choose between templates and start with a project with a Vagrantfile (and Berksfile) with cookbooks and configurations.
+Vagrant Templated is [Vagrant](https://www.vagrantup.com/downloads.html) plugin that add a new vagrant action to start a new Project. You will be able to choose between templates and start with a project with a Vagrantfile (and Berksfile) with cookbooks and configurations already configured.
 
 I started this gem because every time I start a new project, for production or just testing something, after the traditional vagrant init I had look in others projects looking for a specific configuration (for example, a Rails 5 project)
 
@@ -15,7 +14,7 @@ With vagrant:
 vagrant plugin install vagrant-templated
 ```
 
-To use the Vagranfile and Berksfile created, you will need [chefdk](https://downloads.chef.io/chefdk), [vagrant-berkshelf](https://github.com/berkshelf/vagrant-berkshelf) and  [vagrant-omnibus](https://github.com/chef/vagrant-omnibus).
+To use the Vagranfile and Berksfile created, you will need [chefdk](https://downloads.chef.io/chefdk), [vagrant-berkshelf](https://github.com/berkshelf/vagrant-berkshelf) and [vagrant-omnibus](https://github.com/chef/vagrant-omnibus).
 
 
 ## Usage
@@ -23,23 +22,29 @@ To use the Vagranfile and Berksfile created, you will need [chefdk](https://down
 The new init action runs like this:
 
 ```shell
-vagrant templated init <template>
+vagrant templated init <template> [version]
 ```
 
 The templates available at this moment are:
 
-- `base`: apt and timezone update
-- `vagrant-plugin`: base and ruby 2.3
-- `django1.11`: base, python 2/3 (pyenv)
-- `rails5`: base, ruby 2.4 (rbenv), node and postgresql.
+- `base`
+  - `1.0`: apt and timezone update
+- `vagrant-plugin`:
+  - `1.9`: base, rbenv, ruby 2.3 and bundler
+- `django`:
+  - `1.11`: base, pyenv and python 2/3
+- `rails`:
+  - `5.1`: base, rbenv, ruby 2.4, bundler, node and postgresql
+- `nodejs`:
+  - `6.11`: base, nodenv and node 6.11
 
-In both cases a Vagrantfile and a Berksfile will be generated where you executing the command.
-
-Then, you just should `vagrant up` and enter the matrix.
+In both cases a Vagrantfile and a Berksfile will be generated where you executing the command. You should adapt these files to you projects, but it should work as a starting point.
 
 ## Development
 
-After checking out the repo, run `bundle install` to install dependencies. Then, run `bundle exec rake spec` to run the tests. Run `bundle exec vagrant templated init -h` and help will arise.
+After checking out the repo, you just should `vagrant up` and enter the matrix. Everything is at `/vagrant`.
+
+Inside the box run `bundle install` to install dependencies. Then, run `bundle exec rake spec` to run the tests. Run `bundle exec vagrant templated init -h` and help will arise.
 
 ## Contributing
 
@@ -47,11 +52,9 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/afaund
 
 ## TODO list
 
-- Refactor template management in a isolated component, making plugin more skinnier
 - Add multiple choices for some components. For example, rails5 add postgresql by default, but it could be mysql or sqlite3 (that what I have used). Maybe it would better to add everything and leave everything commented but one default.
 - Display ad hoc tips when new files are created
 - Add tips as a command
-- Refactor versions, maybe add version to the options
 
 ## License
 

data/Vagrantfile

@@ -1,7 +1,5 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-# Vagrantfile generated with https://github.com/afaundez/vagrant-templated
-
+# vagrant-templated vagrantfile for vagrant-plugin 1.9
+# check https://github.com/afaundez/vagrant-templated for more options
 ["vagrant-omnibus", "vagrant-berkshelf"].each do |plugin_name|
   unless Vagrant.has_plugin? plugin_name
     raise "#{plugin_name} plugin is required. Please run `vagrant plugin install #{plugin_name}`"
@@ -10,8 +8,7 @@ end
 
 Vagrant.configure('2') do |config|
   config.vm.box = 'bento/ubuntu-16.04'
-
-  config.omnibus.chef_version = 'latest'
+  config.omnibus.chef_version = '13.2.20'
   config.vm.provision :chef_solo do |chef|
     chef.add_recipe 'apt'
     chef.add_recipe 'ruby_build'

data/config/attributes/base/1.0.yml

@@ -0,0 +1,16 @@
+omnibus:
+  chef_version: 13.2.20
+berkself:
+  cookbooks:
+    apt: ~> 6.1.3
+    timezone_iii: ~> 1.0.4
+chef:
+  recipes:
+    - apt
+    - timezone_iii
+  json:
+    timezone_iii: UTC
+require:
+  vagrant-plugins:
+    - vagrant-omnibus
+    - vagrant-berkshelf

data/config/attributes/django/1.11.yml

@@ -0,0 +1,31 @@
+omnibus:
+  chef_version: 13.2.20
+network:
+  private_network:
+    ip: 192.168.33.101
+    comments:
+      - "TIP: the static IP must not collide with other machines on the same network"
+      - "TIP: Make sure to have something like this on your settings.py:"
+      - "ALLOWED_HOSTS = ['192.168.33.101', 'localhost', '127.0.0.1']"
+berkself:
+  cookbooks:
+    apt: ~> 6.1.3
+    timezone_iii: ~> 1.0.4
+    pyenv: ~> 0.1.4
+chef:
+  recipes:
+    - apt
+    - timezone_iii
+    - pyenv::user
+  json:
+    timezone: UTC
+    pyenv:
+      user_installs:
+        - user: vagrant
+          pythons:
+            - 3.4.0
+            - 2.7.6
+require:
+  vagrant-plugins:
+    - vagrant-omnibus
+    - vagrant-berkshelf

data/config/attributes/nodejs/6.11.yml

@@ -0,0 +1,28 @@
+omnibus:
+  chef_version: 13.2.20
+network:
+  private_network:
+    ip: 192.168.33.101
+    comments:
+      - "TIP: the static IP must not collide with other machines on the same network"
+berkself:
+  cookbooks:
+    apt: ~> 6.1.3
+    timezone_iii: ~> 1.0.4
+    nodenv: ~> 0.1.2
+chef:
+  recipes:
+    - apt
+    - timezone_iii
+    - nodenv
+  json:
+    timezone: UTC
+    nodenv:
+      user_installs:
+        - user: vagrant
+          nodes:
+            - 6.11.2
+require:
+  vagrant-plugins:
+    - vagrant-omnibus
+    - vagrant-berkshelf

data/config/attributes/rails/5.1.yml

@@ -0,0 +1,40 @@
+omnibus:
+  chef_version: 13.2.20
+network:
+  private_network:
+    ip: 192.168.33.101
+    comments:
+      - "TIP: the static IP must not collide with other machines on the same network"
+berkself:
+  cookbooks:
+    apt: ~> 6.1.0
+    timezone_iii: ~> 1.0.4
+    ruby_rbenv: ~> 1.2.0
+    nodejs: ~> 4.0.0
+    postgresql: ~> 6.1.1
+chef:
+  recipes:
+    - apt
+    - timezone_iii
+    - ruby_build
+    - ruby_rbenv::user
+    - nodejs
+    - postgresql::server
+  json:
+    timezone: UTC
+    rbenv:
+      user_installs:
+        - user: vagrant
+          rubies:
+            - 2.4.1
+          global: 2.4.1
+          gems:
+            2.4.1:
+              - name: bundler
+    postgresql:
+      password:
+        postgres: password
+require:
+  vagrant-plugins:
+    - vagrant-omnibus
+    - vagrant-berkshelf

data/config/attributes/vagrant-plugin/1.9.yml

@@ -0,0 +1,25 @@
+omnibus:
+  chef_version: 13.2.20
+berkself:
+  cookbooks:
+    apt: ~> 6.1.0
+    ruby_rbenv: ~> 1.2.0
+chef:
+  recipes:
+    - apt
+    - ruby_build
+    - ruby_rbenv::user
+  json:
+    rbenv:
+      user_installs:
+        - user: vagrant
+          rubies:
+            - 2.3.4
+          global: 2.3.4
+          gems:
+            2.3.4:
+              - name: bundler
+require:
+  vagrant-plugins:
+    - vagrant-omnibus
+    - vagrant-berkshelf

data/config/locales/en.yml

@@ -1,12 +1,25 @@
 en:
   vagrant:
     errors:
-      vagrantfile_templated_exists: |-
+      vagrant_templated_vagrantfile_exists: |-
         A `Vagrantfile` already exists in this directory. Remove it before
-        running `vagrant templated init`.
-      berksfile_templated_exists: |-
+        running `vagrant templated init` o use force option.
+      vagrant_templated_berksfile_exists: |-
         A `Berksfile` already exists in this directory. Remove it before
-        running `vagrant templated init`.
-      vagrant_templated_option_not_found: |-
-        Option for template not available. Check templates availables
+        running `vagrant templated init` o use force option.
+      vagrant_templated_template_not_found: |-
+        Template not available. Check templates availables
         running `vagrant templated init --help`.
+      vagrant_templated_version_not_found: |-
+        Version for template not available. Check versions availables
+        running `vagrant templated init --help`.
+      vagrant_templated_berksfile_write_error: |-
+        The user that is running Vagrant doesn't have the proper permissions
+        to write a Vagrantfile to the specified location. Please ensure that
+        you call `vagrant init` in a location where the proper permissions
+        are in place to create a Vagrantfile.
+      vagrant_templated_berksfile_write_error: |-
+        The user that is running Vagrant doesn't have the proper permissions
+        to write a Berksfile to the specified location. Please ensure that
+        you call `vagrant init` in a location where the proper permissions
+        are in place to create a Berksfile.

data/config/templates/{files/Berksfile.erb → Berksfile.erb}

@@ -1,5 +1,5 @@
-# Berksfile generated with https://github.com/afaundez/vagrant-templated
-
+# vagrant-templated berksfile for <%= template %> <%= version %>
+# check https://github.com/afaundez/vagrant-templated for more options
 source 'https://supermarket.chef.io'
 
 <%- template_attributes['berkself']['cookbooks'].each do |name, version| -%>

data/config/templates/{files/Vagrantfile.erb → Vagrantfile.erb}

@@ -1,18 +1,15 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-# Vagrantfile generated with https://github.com/afaundez/vagrant-templated
-
+# vagrant-templated vagrantfile for <%= template %> <%= version %>
+# check https://github.com/afaundez/vagrant-templated for more options
 <%- if template_attributes['require'] && template_attributes['require']['vagrant-plugins'] -%>
 <%= template_attributes['require']['vagrant-plugins'].to_a %>.each do |plugin_name|
   unless Vagrant.has_plugin? plugin_name
     raise "#{plugin_name} plugin is required. Please run `vagrant plugin install #{plugin_name}`"
   end
 end
-<%- end -%>
 
+<%- end -%>
 Vagrant.configure('2') do |config|
   config.vm.box = 'bento/ubuntu-16.04'
-
   <%- if template_attributes['network'] && template_attributes['network']['private_network'] -%>
 
   <%- Array(template_attributes['network']['private_network']['comments']).each do |comment| -%>

data/lib/vagrant-templated.rb

@@ -7,10 +7,9 @@ end
 require 'vagrant-templated/version'
 require 'vagrant-templated/plugin'
 require 'vagrant-templated/errors'
+require 'vagrant-templated/catalog'
 require 'vagrant-templated/command/root'
 require 'vagrant-templated/command/init'
 
-require 'erb'
-require 'yaml'
 require 'i18n'
 I18n.load_path << Dir.glob(File.join(File.dirname(File.expand_path(__FILE__)), "../config/locales/*.{rb,yml}"))

data/lib/vagrant-templated/catalog.rb

@@ -0,0 +1,72 @@
+require 'yaml'
+require 'erb'
+
+module Vagrant
+  module Templated
+    module Catalog
+      class << self
+
+        def vagrantfile_for(template, version)
+          template_attributes = attributes_for template, version
+          vagrantfile_template = File.read(Catalog.root.join 'config/templates/Vagrantfile.erb')
+          ERB.new(vagrantfile_template, nil, '-').result binding
+        end
+
+        def berksfile_for(template, version)
+          template_attributes = attributes_for template, version
+          berksfile_template = File.read(Catalog.root.join 'config/templates/Berksfile.erb')
+          ERB.new(berksfile_template, nil, '-').result binding
+        end
+
+        def patch(template, version)
+          max_version_for(template)
+        end
+
+        def templates
+          attributes.keys
+        end
+
+        def attributes_for(template, version)
+          raise Vagrant::Templated::Errors::VersionNotFound unless versions_for(template).include? version
+          attributes[template][version]
+        end
+
+        def max_version_for(template)
+          versions_for(template).max do |a, b|
+            Gem::Version.new(a) <=> Gem::Version.new(b)
+          end
+        end
+
+        def versions_for(template)
+          raise Vagrant::Templated::Errors::TemplateNotFound unless attributes.include? template
+          attributes[template].keys
+        end
+
+        def root
+          @root ||= Pathname.new File.expand_path '../..', File.dirname(File.expand_path(__FILE__))
+        end
+
+        private
+
+          def attributes
+            @attributes ||= load_attributes_files
+          end
+
+          def load_attributes_files
+            attributes = {}
+            attributes_filelist.each do |attributes_file|
+              template = File.basename File.dirname(attributes_file)
+              version = File.basename(attributes_file, '.yml')
+              attributes[template] ||= {}
+              attributes[template][version] ||= YAML.load_file(attributes_file)
+            end
+            attributes
+          end
+
+          def attributes_filelist
+            Dir.glob(root.join 'config/attributes/**/*.yml')
+          end
+      end
+    end
+  end
+end

data/lib/vagrant-templated/command/init.rb

@@ -1,106 +1,110 @@
-require 'optparse'
-
 module Vagrant
   module Templated
     module Command
       class Init < Vagrant.plugin('2', :command)
 
         def execute
-          root_path = File.expand_path '../../../', File.dirname(File.expand_path(__FILE__))
-          templates_attributes = Dir.glob(File.expand_path("config/templates/attributes/*.yml", root_path)).collect do |template|
-            YAML.load_file(template)
-          end.reduce Hash.new, :merge
-
-          options = {}
-          opts = OptionParser.new do |o|
-            o.banner = 'Usage: vagrant templated init [options] <template>'
-
-            o.separator ''
-            o.separator 'Templates availables:'
-            o.separator ''
-            templates_attributes.keys.each do |template|
-              o.separator "     #{template}"
-            end
-
-            o.separator ''
-            o.separator 'Options:'
-            o.separator ''
-
-            o.on('-s', '--suffix SUFFIX', String,
-                 "Output suffix for Vagrantfile and Berksfile. '-' for stdout") do |suffix|
-              options[:suffix] = suffix
-            end
-
-            o.on('-f', '--force', 'Overwrite an existing box if it exists') do |f|
-              options[:force] = f
-            end
-          end
-
-          argv = parse_options(opts)
-          return if !argv
-          if argv.empty? || argv.length > 2
-            raise Vagrant::Errors::CLIInvalidUsage,
-              help: opts.help.chomp
+          template, version, options = setup
+          return if template.nil?
+          @env.ui.info "vagrant-templated detected #{template} template", new_line: true
+          if version.nil? || version.empty?
+            version = Catalog.patch template, version
+            @env.ui.info "vagrant-templated didn't received a version, using largest available #{version}"
+          else
+            @env.ui.info "vagrant-templated detected #{version} version"
           end
 
-          template = argv[0]
-          if argv.length == 2
-            options[:name] = argv[0]
-            template = argv[1]
-          end
+          vagrantfile = Catalog.vagrantfile_for template, version
+          berksfile = Catalog.berksfile_for template, version
 
-          @env.ui.info("Detected template: #{template}", prefix: false, color: :yellow)
-          raise Vagrant::Errors::VagrantTemplatedOptionNotFound unless templates_attributes.keys.include? template
-          template_attributes = templates_attributes[template]
+          if options[:cat]
+            @env.ui.output vagrantfile
+            @env.ui.output berksfile
+          else
+            files_root = @env.cwd
+            if options[:output]
+              @env.ui.info "vagrant-templated received output path #{options[:output]}"
+              output_path = Pathname.new options[:output]
+              files_root =  if output_path.relative?
+                output_path.expand_path files_root
+              else
+                output_path
+              end
+              @env.ui.info "vagrant-templated will write the files in: #{files_root}"
+            end
 
-          vagrantfile_save_path = nil
-          berksfile_save_path = nil
-          if options[:suffix] != "-"
-            vagrantfile_save_path = Pathname.new(['Vagrantfile', options[:suffix]].compact.join('.')).expand_path(@env.cwd)
+            vagrantfile_save_path = Pathname.new('Vagrantfile').expand_path files_root
             vagrantfile_save_path.delete if vagrantfile_save_path.exist? && options[:force]
-            raise Vagrant::Errors::VagrantfileTemplatedExistsError if vagrantfile_save_path.exist?
-            berksfile_save_path = Pathname.new(['Berksfile', options[:suffix]].compact.join('.')).expand_path(@env.cwd)
-            berksfile_save_path.delete if berksfile_save_path.exist? && options[:force]
-            raise Vagrant::Errors::BerksfileTemplatedExistsError if berksfile_save_path.exist?
-          end
+            raise Vagrant::Templated::Errors::VagrantfileExistsError if vagrantfile_save_path.exist?
 
-          vagrantfile = ERB.new File.read(File.expand_path('config/templates/files/Vagrantfile.erb', root_path)), nil, '-'
-          berksfile = ERB.new File.read(File.expand_path('config/templates/files/Berksfile.erb', root_path)), nil, '-'
+            berksfile_save_path = Pathname.new('Berksfile').expand_path files_root
+            berksfile_save_path.delete if berksfile_save_path.exist? && options[:force]
+            raise Vagrant::Templated::Errors::BerksfileExistsError if berksfile_save_path.exist?
 
-          contents = vagrantfile.result binding
-          if vagrantfile_save_path
             begin
               vagrantfile_save_path.open('w+') do |f|
-                f.write(contents)
+                f.write vagrantfile
               end
+              @env.ui.info "vagrant-templated created #{vagrantfile_save_path}"
             rescue Errno::EACCES
-              raise Vagrant::Errors::VagrantfileWriteError
+              raise Vagrant::Templated::Errors::VagrantfileWriteError
             end
 
-            @env.ui.info('Templated Vagranfile created successfully', prefix: false)
-          else
-            @env.ui.info('VAGRANTFILE', prefix: false, color: :green)
-            @env.ui.info(contents, prefix: false)
-          end
-
-          contents = berksfile.result binding
-          if berksfile_save_path
             begin
               berksfile_save_path.open('w+') do |f|
-                f.write(contents)
+                f.write berksfile
               end
+              @env.ui.info "vagrant-templated created #{berksfile_save_path}"
             rescue Errno::EACCES
-              raise Vagrant::Errors::BerksfileWriteError
+              raise Vagrant::Templated::Errors::BerksfileWriteError
             end
-
-            @env.ui.info('Templated Berksfile created successfully', prefix: false)
-          else
-            @env.ui.info('BERKSFILE', prefix: false, color: :green)
-            @env.ui.info(contents, prefix: false)
           end
-            @env.ui.info('Vagrant Templated finished successfully.', prefix: false, color: :green)
+
+          @env.ui.success 'vagrant-templated finished successfully'
           0
         end
+
+        private
+
+          def setup
+            options = {}
+            opts = OptionParser.new do |o|
+              o.banner = 'Usage: vagrant templated init [options] <template> [version]'
+
+              o.separator ''
+              o.separator 'Templates and versions availables:'
+              o.separator ''
+              Catalog.templates.each do |template|
+                o.separator "     #{template}: #{Catalog.versions_for(template).join(', ')}"
+              end
+              o.separator ''
+              o.separator 'If no version is provided, larger version will be used.'
+
+              o.separator ''
+              o.separator 'Options:'
+              o.separator ''
+
+              o.on('-o', '--output OUTPUT', String, 'Output path for files. Default to `.`') do |o|
+                options[:output] = o
+              end
+
+              o.on('-c', '--cat', 'Output Vagrantfile and Berksfile to stdout') do |c|
+                options[:cat] = c
+              end
+
+              o.on('-f', '--force', 'Overwrite existing Vagrantfile and Berksfile if they exists') do |f|
+                options[:force] = f
+              end
+            end
+            argv = parse_options opts
+            return if !argv
+            if !argv || argv.empty? || argv.length > 2
+              raise Vagrant::Errors::CLIInvalidUsage,
+                help: opts.help.chomp
+            end
+            template, version = argv
+            [template, version, options]
+          end
       end
     end
   end

data/lib/vagrant-templated/errors.rb

@@ -1,15 +1,29 @@
 module Vagrant
-  module Errors
-    class VagrantfileTemplatedExistsError < VagrantError
-      error_key(:vagrantfile_templated_exists)
-    end
+  module Templated
+    module Errors
+      class VagrantfileExistsError < Vagrant::Errors::VagrantError
+        error_key(:vagrant_templated_vagrantfile_exists)
+      end
 
-    class BerksfileTemplatedExistsError < VagrantError
-      error_key(:berksfile_templated_exists)
-    end
+      class BerksfileExistsError < Vagrant::Errors::VagrantError
+        error_key(:vagrant_templated_berksfile_exists)
+      end
+
+      class TemplateNotFound < Vagrant::Errors::VagrantError
+        error_key(:vagrant_templated_template_not_found)
+      end
+
+      class VersionNotFound < Vagrant::Errors::VagrantError
+        error_key(:vagrant_templated_version_not_found)
+      end
+
+      class BerksfileWriteError < Vagrant::Errors::VagrantError
+        error_key(:vagrant_templated_berksfile_write_error)
+      end
 
-    class VagrantTemplatedOptionNotFound < VagrantError
-      error_key(:vagrant_templated_option_not_found)
+      class VagrantfileWriteError < Vagrant::Errors::VagrantError
+        error_key(:vagrant_templated_vagrantfile_write_error)
+      end
     end
   end
 end

data/lib/vagrant-templated/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Templated
-    VERSION = '0.1.5'
+    VERSION = '0.2.0'
   end
 end

data/spec/vagrant_templated_spec.rb

@@ -42,70 +42,102 @@ describe Vagrant::Templated::Command::Init do
 
   context 'when using a valid template' do
 
+    let(:vagrantfile_header) {
+      ERB.new "# vagrant-templated vagrantfile for <%= template %> <%= version %>\n"\
+      '# check https://github.com/afaundez/vagrant-templated for more options'
+    }
+    let(:berksfile_header) {
+      ERB.new "# vagrant-templated berksfile for <%= template %> <%= version %>\n"\
+      '# check https://github.com/afaundez/vagrant-templated for more options'
+    }
+
     it 'should raise error if Vagrantfile exists' do
       FileUtils.touch @vagrantfile
       expect{
-        described_class.new(['rails5'], @env).execute
-      }.to raise_error Vagrant::Errors::VagrantfileTemplatedExistsError
+        described_class.new(['rails'], @env).execute
+      }.to raise_error Vagrant::Templated::Errors::VagrantfileExistsError
     end
 
-    let(:vagrantfile_tag) { '# Vagrantfile generated with ' \
-      'https://github.com/afaundez/vagrant-templated'
-    }
-    let(:berksfile_tag) { '# Berksfile generated with ' \
-      'https://github.com/afaundez/vagrant-templated'
-    }
-
     it 'should raise error if Berksfile exists' do
       FileUtils.touch @berksfile
       expect{
-        described_class.new(['rails5'], @env).execute
-      }.to raise_error Vagrant::Errors::BerksfileTemplatedExistsError
+        described_class.new(['rails'], @env).execute
+      }.to raise_error Vagrant::Templated::Errors::BerksfileExistsError
     end
 
     it 'should create Vagrantfile and Berksfile if both do not exist using template base' do
+      template = 'base'
+      version = '1.0'
       expect{
-        described_class.new(['base'], @env).execute
+        described_class.new([template], @env).execute
       }.to_not raise_error
-      expect(File.open(@vagrantfile).read).to include(vagrantfile_tag)
-      expect(File.open(@berksfile).read).to include(berksfile_tag)
+      expect(File.open(@vagrantfile).read).to include(vagrantfile_header.result binding)
+      expect(File.open(@berksfile).read).to include(berksfile_header.result binding)
     end
 
     it 'should create Vagrantfile and Berksfile if both do not exist using template vagrant-plugin' do
+      template = 'vagrant-plugin'
+      version = '1.9'
       expect{
-        described_class.new(['vagrant-plugin'], @env).execute
+        described_class.new([template], @env).execute
       }.to_not raise_error
-      expect(File.open(@vagrantfile).read).to include(vagrantfile_tag)
-      expect(File.open(@berksfile).read).to include(berksfile_tag)
+      expect(File.open(@vagrantfile).read).to include(vagrantfile_header.result binding)
+      expect(File.open(@berksfile).read).to include(berksfile_header.result binding)
     end
 
-    it 'should create Vagrantfile and Berksfile if both do not exist using template django1.11' do
+
+    it 'should create Vagrantfile and Berksfile if both do not exist using template django' do
+      template = 'django'
+      version = '1.11'
       expect{
-        described_class.new(['django1.11'], @env).execute
+        described_class.new([template], @env).execute
       }.to_not raise_error
-      expect(File.open(@vagrantfile).read).to include(vagrantfile_tag)
-      expect(File.open(@berksfile).read).to include(berksfile_tag)
+      expect(File.open(@vagrantfile).read).to include(vagrantfile_header.result binding)
+      expect(File.open(@berksfile).read).to include(berksfile_header.result binding)
     end
 
-    it 'should create Vagrantfile and Berksfile if both do not exist using template rails5' do
+
+    it 'should create Vagrantfile and Berksfile if both do not exist using template rails' do
+      template = 'rails'
+      version = '5.1'
       expect{
-        described_class.new(['rails5'], @env).execute
+        described_class.new([template], @env).execute
       }.to_not raise_error
-      expect(File.open(@vagrantfile).read).to include(vagrantfile_tag)
-      expect(File.open(@berksfile).read).to include(berksfile_tag)
+      expect(File.open(@vagrantfile).read).to include(vagrantfile_header.result binding)
+      expect(File.open(@berksfile).read).to include(berksfile_header.result binding)
     end
 
-    context 'and using a suffix' do
+
+    it 'should create Vagrantfile and Berksfile if both do not exist using template nodejs' do
+      template = 'nodejs'
+      version = '6.11'
+      expect{
+        described_class.new([template], @env).execute
+      }.to_not raise_error
+      expect(File.open(@vagrantfile).read).to include(vagrantfile_header.result binding)
+      expect(File.open(@berksfile).read).to include(berksfile_header.result binding)
+    end
+
+    context 'and using and output' do
+
+      before :example do
+        @cwd = File.join @tmp, SecureRandom.urlsafe_base64
+        FileUtils.mkdir_p @cwd
+        @env = Vagrant::Environment.new cwd: @cwd
+        @output = 'output'
+        FileUtils.mkdir_p File.join(@cwd, @output)
+        @vagrantfile = File.join @cwd, @output, 'Vagrantfile'
+        @berksfile = File.join @cwd, @output, 'Berksfile'
+      end
 
       it 'should create Vagrantfile and Berksfile if both do not exist' do
-        suffix = 'custom-sufix'
+        template = 'rails'
+        version = '5.1'
         expect{
-          described_class.new(['rails5', '--suffix',  suffix], @env).execute
+          described_class.new([template, '--output',  @output], @env).execute
         }.to_not raise_error
-        tag_vagrantfile = [@vagrantfile, suffix].join('.')
-        expect(File.open(tag_vagrantfile).read).to include(vagrantfile_tag)
-        tag_berksfile = [@berksfile, suffix].join('.')
-        expect(File.open(tag_berksfile).read).to include(berksfile_tag)
+        expect(File.open(@vagrantfile).read).to include(vagrantfile_header.result binding)
+        expect(File.open(@berksfile).read).to include(berksfile_header.result binding)
       end
 
     end
@@ -113,34 +145,40 @@ describe Vagrant::Templated::Command::Init do
     context 'and forcing' do
 
       it 'should replace existing Vagrantfile' do
+        template = 'rails'
+        version = '5.1'
         FileUtils.touch File.join(@cwd, 'Vagrantfile')
-        args = ['rails5', '--force']
+        args = [template, '--force']
         expect{
           described_class.new(args, @env).execute
         }.to_not raise_error
-        expect(File.open(@vagrantfile).read).to include(vagrantfile_tag)
-        expect(File.open(@berksfile).read).to include(berksfile_tag)
+        expect(File.open(@vagrantfile).read).to include(vagrantfile_header.result binding)
+        expect(File.open(@berksfile).read).to include(berksfile_header.result binding)
       end
 
       it 'should replace existing Berksfile' do
+        template = 'rails'
+        version = '5.1'
         FileUtils.touch File.join(@cwd, 'Berksfile')
-        args = ['rails5', '--force']
+        args = [template, '--force']
         expect{
           described_class.new(args, @env).execute
         }.to_not raise_error
-        expect(File.open(@vagrantfile).read).to include(vagrantfile_tag)
-        expect(File.open(@berksfile).read).to include(berksfile_tag)
+        expect(File.open(@vagrantfile).read).to include(vagrantfile_header.result binding)
+        expect(File.open(@berksfile).read).to include(berksfile_header.result binding)
       end
 
       it 'should replace existing Vagrantfile and Berksfile' do
+        template = 'rails'
+        version = '5.1'
         FileUtils.touch File.join(@cwd, 'Vagrantfile')
         FileUtils.touch File.join(@cwd, 'Berksfile')
-        args = ['rails5', '--force']
+        args = [template, '--force']
         expect{
           described_class.new(args, @env).execute
         }.to_not raise_error
-        expect(File.open(@vagrantfile).read).to include(vagrantfile_tag)
-        expect(File.open(@berksfile).read).to include(berksfile_tag)
+        expect(File.open(@vagrantfile).read).to include(vagrantfile_header.result binding)
+        expect(File.open(@berksfile).read).to include(berksfile_header.result binding)
       end
 
     end
@@ -152,7 +190,7 @@ describe Vagrant::Templated::Command::Init do
     it 'should raise an error' do
       expect{
         described_class.new(['fake-template'], @env).execute
-      }.to raise_error Vagrant::Errors::VagrantTemplatedOptionNotFound
+      }.to raise_error Vagrant::Templated::Errors::TemplateNotFound
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-templated
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Álvaro Faúndez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2017-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,14 +77,16 @@ files:
 - Vagrantfile
 - bin/console
 - bin/setup
+- config/attributes/base/1.0.yml
+- config/attributes/django/1.11.yml
+- config/attributes/nodejs/6.11.yml
+- config/attributes/rails/5.1.yml
+- config/attributes/vagrant-plugin/1.9.yml
 - config/locales/en.yml
-- config/templates/attributes/base.yml
-- config/templates/attributes/django1.11.yml
-- config/templates/attributes/rails5.yml
-- config/templates/attributes/vagrant-plugin.yml
-- config/templates/files/Berksfile.erb
-- config/templates/files/Vagrantfile.erb
+- config/templates/Berksfile.erb
+- config/templates/Vagrantfile.erb
 - lib/vagrant-templated.rb
+- lib/vagrant-templated/catalog.rb
 - lib/vagrant-templated/command/init.rb
 - lib/vagrant-templated/command/root.rb
 - lib/vagrant-templated/errors.rb

data/config/templates/attributes/base.yml

@@ -1,17 +0,0 @@
-base:
-  omnibus:
-    chef_version: latest
-  berkself:
-    cookbooks:
-      apt: ~> 6.1.3
-      timezone_iii: ~> 1.0.4
-  chef:
-    recipes:
-      - apt
-      - timezone_iii
-    json:
-      timezone_iii: UTC
-  require:
-    vagrant-plugins:
-      - vagrant-omnibus
-      - vagrant-berkshelf

data/config/templates/attributes/django1.11.yml

@@ -1,32 +0,0 @@
-django1.11:
-  omnibus:
-    chef_version: 12.21.1
-  network:
-    private_network:
-      ip: 192.168.33.101
-      comments:
-        - "TIP: Change the IP if it causes problem"
-        - "TIP: Make sure to have something like this on your settings.py:"
-        - "ALLOWED_HOSTS = ['192.168.33.101', 'localhost', '127.0.0.1']"
-  berkself:
-    cookbooks:
-      apt: ~> 6.1.3
-      timezone_iii: ~> 1.0.4
-      pyenv: ~> 0.1.4
-  chef:
-    recipes:
-      - apt
-      - timezone_iii
-      - pyenv::user
-    json:
-      timezone: UTC
-      pyenv:
-        user_installs:
-          - user: vagrant
-            pythons:
-              - 3.4.0
-              - 2.7.6
-  require:
-    vagrant-plugins:
-      - vagrant-omnibus
-      - vagrant-berkshelf

data/config/templates/attributes/rails5.yml

@@ -1,41 +0,0 @@
-rails5:
-  omnibus:
-    chef_version: latest
-  network:
-    private_network:
-      ip: 192.168.33.101
-      comments:
-        - "TIP: Change the IP if it causes problem"
-  berkself:
-    cookbooks:
-      apt: ~> 6.1.0
-      timezone_iii: ~> 1.0.4
-      ruby_rbenv: ~> 1.2.0
-      nodejs: ~> 4.0.0
-      postgresql: ~> 6.1.1
-  chef:
-    recipes:
-      - apt
-      - timezone_iii
-      - ruby_build
-      - ruby_rbenv::user
-      - nodejs
-      - postgresql::server
-    json:
-      timezone: UTC
-      rbenv:
-        user_installs:
-          - user: vagrant
-            rubies:
-              - 2.4.1
-            global: 2.4.1
-            gems:
-              2.4.1:
-                - name: bundler
-      postgresql:
-        password:
-          postgres: password
-  require:
-    vagrant-plugins:
-      - vagrant-omnibus
-      - vagrant-berkshelf

data/config/templates/attributes/vagrant-plugin.yml

@@ -1,26 +0,0 @@
-vagrant-plugin:
-  omnibus:
-    chef_version: latest
-  berkself:
-    cookbooks:
-      apt: ~> 6.1.0
-      ruby_rbenv: ~> 1.2.0
-  chef:
-    recipes:
-      - apt
-      - ruby_build
-      - ruby_rbenv::user
-    json:
-      rbenv:
-        user_installs:
-          - user: vagrant
-            rubies:
-              - 2.3.4
-            global: 2.3.4
-            gems:
-              2.3.4:
-                - name: bundler
-  require:
-    vagrant-plugins:
-      - vagrant-omnibus
-      - vagrant-berkshelf