vagrant-templated 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 247f877832f380fcdab41739e48f3ab5efc68cf3
-  data.tar.gz: '05639944992e7a4f91c738a07d08f7e0ebe3faa4'
+  metadata.gz: 77e216d71b5a1c6413ffa0cf9d4bc88b7d7aa0ca
+  data.tar.gz: 625c7ee241d9b164738504bd588de57ddb93915b
 SHA512:
-  metadata.gz: ce291b4a1a994e1903fc4925c2397a19ac26df60a80a7a3a60b1d3d20ee0630a44dd7fa1162dc8d55b5d886e3b1a54ab19477545c9aeaf930beb615ef24bbdaf
-  data.tar.gz: 5491a031e7d820e91c21b037c62e5d282521027477ff1200ae577aea7cdd1bd1007b57785420bb1eeeeba756b4e23da5f90bbb9a972a25b0bfa8011f61366fa4
+  metadata.gz: 3ec071972e9006ac2fb265f7d6baff96bf0d4b9080e7b54f20393904fb21b040d7aec1b74e334d2c204260568dabc329bfb66b628db411438a64cde6ffd47dcd
+  data.tar.gz: e413ed3c16e7a8cbd3edf3510711fea2ea61e39d8dc80bc439487317f70f5704ea15d692d90744e2938321543a03346e7e76c6957aad0da3239ceb924ba91d2d

data/CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.1.3] - 2017-08-05
+### Added
+- Refactor defaults to attributes, it's more self documented now
+- Move chef version to configuration files, fixing rails5 chef problem
+- Templates displayed at help generated with yml information
+- Refactor templates file structure: one yml per template
+
 ## [0.1.2] - 2017-08-04
 ### Added
 - Fix locale load

data/{lib/vagrant-templated/templates/defaults.yml → config/templates/attributes/rails5.yml}

@@ -1,4 +1,6 @@
 rails5:
+  omnibus:
+    chef_version: 12.21.1
   berkself:
     cookbooks:
       apt: ~> 6.1.0
@@ -32,27 +34,3 @@ rails5:
     vagrant-plugins:
       - vagrant-omnibus
       - vagrant-berkshelf
-vagrant-plugin:
-  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/templates/attributes/vagrant-plugin.yml

@@ -0,0 +1,26 @@
+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

data/{lib/vagrant-templated/templates → config/templates/files}/Berksfile.erb

@@ -2,6 +2,6 @@
 
 source 'https://supermarket.chef.io'
 
-<%- defaults[template]['berkself']['cookbooks'].each do |name, version| -%>
+<%- template_attributes['berkself']['cookbooks'].each do |name, version| -%>
 cookbook '<%= name %>', '<%= version %>'
 <%- end -%>

data/{lib/vagrant-templated/templates → config/templates/files}/Vagrantfile.erb

@@ -2,8 +2,8 @@
 # vi: set ft=ruby :
 # Vagrantfile generated with https://github.com/afaundez/vagrant-templated
 
-<%- if defaults[template]['require'] && defaults[template]['require']['vagrant-plugins'] -%>
-<%= defaults[template]['require']['vagrant-plugins'].to_a %>.each do |plugin_name|
+<%- 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
@@ -12,12 +12,12 @@ end
 
 Vagrant.configure('2') do |config|
   config.vm.box = 'bento/ubuntu-16.04'
-  config.omnibus.chef_version = :latest
+  config.omnibus.chef_version = '<%= template_attributes['omnibus']['chef_version'] %>'
   config.vm.provision :chef_solo do |chef|
-    <%- defaults[template]['chef']['recipes'].each do |recipe| -%>
+    <%- template_attributes['chef']['recipes'].each do |recipe| -%>
     chef.add_recipe '<%= recipe %>'
     <%- end -%>
-    <% lines = JSON.pretty_generate(defaults[template]['chef']['json']).lines %>
+    <% lines = JSON.pretty_generate(template_attributes['chef']['json']).lines %>
     chef.json = <%= lines.shift.strip %>
     <%- lines.each do |line| -%>
     <%= line.rstrip %>

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

@@ -6,30 +6,34 @@ module Vagrant
       class Init < Vagrant.plugin('2', :command)
 
         def execute
-          defaults = YAML.load_file File.join(File.dirname(File.expand_path(__FILE__)), '../templates/defaults.yml')
-          options = {}
+          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: rails'
+            o.separator 'Templates availables:'
             o.separator ''
-            o.separator '     rails5'
-            o.separator '     vagrant-plugin'
+            templates_attributes.keys.each do |template|
+              o.separator "     #{template}"
+            end
 
             o.separator ''
             o.separator 'Options:'
             o.separator ''
 
-            o.on('-f', '--force', 'Overwrite an existing box if it exists') do |f|
-              options[:force] = f
-            end
-
             o.on('-s', '--suffix SUFFIX', String,
-                 "Output suffix for Vagrantfile and Bersfile. '-' for stdout") do |suffix|
+                 "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)
@@ -46,7 +50,8 @@ module Vagrant
           end
 
           @env.ui.info("Detected template: #{template}", prefix: false, color: :yellow)
-          raise Vagrant::Errors::VagrantTemplatedOptionNotFound unless defaults.keys.include? template
+          raise Vagrant::Errors::VagrantTemplatedOptionNotFound unless templates_attributes.keys.include? template
+          template_attributes = templates_attributes[template]
 
           vagrantfile_save_path = nil
           berksfile_save_path = nil
@@ -59,8 +64,8 @@ module Vagrant
             raise Vagrant::Errors::BerksfileTemplatedExistsError if berksfile_save_path.exist?
           end
 
-          vagrantfile = ERB.new File.read(File.join(File.dirname(__FILE__), '../templates/Vagrantfile.erb')), nil, '-'
-          berksfile = ERB.new File.read(File.join(File.dirname(__FILE__), '../templates/Berksfile.erb')), nil, '-'
+          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, '-'
 
           contents = vagrantfile.result binding
           if vagrantfile_save_path

data/lib/vagrant-templated/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Templated
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-templated
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Álvaro Faúndez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2017-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,17 +77,20 @@ files:
 - bin/console
 - bin/setup
 - config/locales/en.yml
+- config/templates/attributes/rails5.yml
+- config/templates/attributes/vagrant-plugin.yml
+- config/templates/files/Berksfile.erb
+- config/templates/files/Vagrantfile.erb
 - lib/vagrant-templated.rb
 - lib/vagrant-templated/command/init.rb
 - lib/vagrant-templated/command/root.rb
 - lib/vagrant-templated/errors.rb
 - lib/vagrant-templated/plugin.rb
-- lib/vagrant-templated/templates/Berksfile.erb
-- lib/vagrant-templated/templates/Vagrantfile.erb
-- lib/vagrant-templated/templates/defaults.yml
 - lib/vagrant-templated/version.rb
 - spec/spec_helper.rb
 - spec/tmp/.keep
+- spec/tmp/Berksfile
+- spec/tmp/Vagrantfile
 - spec/vagrant_templated_spec.rb
 - vagrant-templated.gemspec
 homepage: https://github.com/afaundez/vagrant-templated