vagrant-templated 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77e216d71b5a1c6413ffa0cf9d4bc88b7d7aa0ca
-  data.tar.gz: 625c7ee241d9b164738504bd588de57ddb93915b
+  metadata.gz: 4307eaa387b3de9e14771895cb18f1e7d77010e5
+  data.tar.gz: ee3af7cf57704b6e792c315e2247ff00f8acc49b
 SHA512:
-  metadata.gz: 3ec071972e9006ac2fb265f7d6baff96bf0d4b9080e7b54f20393904fb21b040d7aec1b74e334d2c204260568dabc329bfb66b628db411438a64cde6ffd47dcd
-  data.tar.gz: e413ed3c16e7a8cbd3edf3510711fea2ea61e39d8dc80bc439487317f70f5704ea15d692d90744e2938321543a03346e7e76c6957aad0da3239ceb924ba91d2d
+  metadata.gz: 7829b77b92087c4354d041f3988a852c65741ae747bb6418e09bc826f260c9ac4d3795e43f18ffd39e556785800ca798833490f3d06a831dff0ba4908084c387
+  data.tar.gz: 68913f04ebb573382d6d9d61cb6730c8af1bc72b781fae05df8af4814624c24e1fdda7c7826ab7fc4fd20cfeeae6bad74abc4eed38f9633fbb9bba8ac99dea82

data/CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.1.4] - 2017-08-05
+### Added
+- Test all templates
+- Add comment attribute to private network
+- Add django1.11 template, with pyenv, including python 2 and 3
+- Add basic template, only apt and tz update
+- Add private network configuration and use it at rails5 template
+
 ## [0.1.3] - 2017-08-05
 ### Added
 - Refactor defaults to attributes, it's more self documented now

data/Gemfile.lock

@@ -23,7 +23,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-templated (0.1.2)
+    vagrant-templated (0.1.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -23,7 +23,12 @@ The new init action runs like this:
 vagrant templated init <template>
 ```
 
-The templates available at this moment are `rails5` and `vagrant-plugin`.
+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.
 
 In both cases a Vagrantfile and a Berksfile will be generated where you executing the command.
 
@@ -37,6 +42,14 @@ After checking out the repo, run `bundle install` to install dependencies. Then,
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/afaundes/vagrant-templated. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
+## 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
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/config/templates/attributes/base.yml

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

@@ -0,0 +1,32 @@
+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,6 +1,11 @@
 rails5:
   omnibus:
     chef_version: 12.21.1
+  network:
+    private_network:
+      ip: 192.168.33.101
+      comments:
+        - "TIP: Change the IP if it causes problem"
   berkself:
     cookbooks:
       apt: ~> 6.1.0

data/config/templates/files/Vagrantfile.erb

@@ -12,6 +12,15 @@ 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| -%>
+  <%= "# #{comment.strip}" %>
+  <%- end -%>
+  config.vm.network 'private_network', ip: '<%= template_attributes['network']['private_network']['ip'] %>'
+
+  <%- end -%>
   config.omnibus.chef_version = '<%= template_attributes['omnibus']['chef_version'] %>'
   config.vm.provision :chef_solo do |chef|
     <%- template_attributes['chef']['recipes'].each do |recipe| -%>

data/lib/vagrant-templated/version.rb

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

data/spec/tmp/basic/Berksfile

@@ -0,0 +1,6 @@
+# Berksfile generated with https://github.com/afaundez/vagrant-templated
+
+source 'https://supermarket.chef.io'
+
+cookbook 'apt', '~> 6.1.3'
+cookbook 'timezone_iii', '~> 1.0.4'

data/spec/tmp/basic/Berksfile.lock

@@ -0,0 +1,7 @@
+DEPENDENCIES
+  apt (~> 6.1.3)
+  timezone_iii (~> 1.0.4)
+
+GRAPH
+  apt (6.1.3)
+  timezone_iii (1.0.4)

data/spec/tmp/basic/Vagrantfile

@@ -0,0 +1,22 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+# Vagrantfile generated with https://github.com/afaundez/vagrant-templated
+
+["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}`"
+  end
+end
+
+Vagrant.configure('2') do |config|
+  config.vm.box = 'bento/ubuntu-16.04'
+  config.omnibus.chef_version = 'latest'
+  config.vm.provision :chef_solo do |chef|
+    chef.add_recipe 'apt'
+    chef.add_recipe 'timezone_iii'
+    
+    chef.json = {
+      "timezone_iii": "UTC"
+    }
+  end
+end

data/spec/tmp/django1.11/Berksfile

@@ -0,0 +1,7 @@
+# Berksfile generated with https://github.com/afaundez/vagrant-templated
+
+source 'https://supermarket.chef.io'
+
+cookbook 'apt', '~> 6.1.3'
+cookbook 'timezone_iii', '~> 1.0.4'
+cookbook 'pyenv', '~> 0.1.4'

data/spec/tmp/django1.11/Berksfile.lock

@@ -0,0 +1,9 @@
+DEPENDENCIES
+  apt (~> 6.1.3)
+  pyenv (~> 0.1.4)
+  timezone_iii (~> 1.0.4)
+
+GRAPH
+  apt (6.1.3)
+  pyenv (0.1.4)
+  timezone_iii (1.0.4)

data/spec/tmp/django1.11/Vagrantfile

@@ -0,0 +1,38 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+# Vagrantfile generated with https://github.com/afaundez/vagrant-templated
+
+["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}`"
+  end
+end
+
+Vagrant.configure('2') do |config|
+  config.vm.box = 'bento/ubuntu-16.04'
+
+  # TIP: choose an IP available in your network
+  config.vm.network 'private_network', ip: '192.168.33.101'
+
+  config.omnibus.chef_version = '12.21.1'
+  config.vm.provision :chef_solo do |chef|
+    chef.add_recipe 'apt'
+    chef.add_recipe 'timezone_iii'
+    chef.add_recipe 'pyenv::user'
+    
+    chef.json = {
+      "timezone": "UTC",
+      "pyenv": {
+        "user_installs": [
+          {
+            "user": "vagrant",
+            "pythons": [
+              "3.4.0",
+              "2.7.6"
+            ]
+          }
+        ]
+      }
+    }
+  end
+end

data/spec/vagrant_templated_spec.rb

@@ -63,7 +63,31 @@ describe Vagrant::Templated::Command::Init do
       }.to raise_error Vagrant::Errors::BerksfileTemplatedExistsError
     end
 
-    it 'should create Vagrantfile and Berksfile if both do not exist' do
+    it 'should create Vagrantfile and Berksfile if both do not exist using template base' do
+      expect{
+        described_class.new(['base'], @env).execute
+      }.to_not raise_error
+      expect(File.open(@vagrantfile).read).to include(vagrantfile_tag)
+      expect(File.open(@berksfile).read).to include(berksfile_tag)
+    end
+
+    it 'should create Vagrantfile and Berksfile if both do not exist using template vagrant-plugin' do
+      expect{
+        described_class.new(['vagrant-plugin'], @env).execute
+      }.to_not raise_error
+      expect(File.open(@vagrantfile).read).to include(vagrantfile_tag)
+      expect(File.open(@berksfile).read).to include(berksfile_tag)
+    end
+
+    it 'should create Vagrantfile and Berksfile if both do not exist using template django1.11' do
+      expect{
+        described_class.new(['django1.11'], @env).execute
+      }.to_not raise_error
+      expect(File.open(@vagrantfile).read).to include(vagrantfile_tag)
+      expect(File.open(@berksfile).read).to include(berksfile_tag)
+    end
+
+    it 'should create Vagrantfile and Berksfile if both do not exist using template rails5' do
       expect{
         described_class.new(['rails5'], @env).execute
       }.to_not raise_error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-templated
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Álvaro Faúndez
@@ -77,6 +77,8 @@ files:
 - bin/console
 - bin/setup
 - 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
@@ -91,6 +93,12 @@ files:
 - spec/tmp/.keep
 - spec/tmp/Berksfile
 - spec/tmp/Vagrantfile
+- spec/tmp/basic/Berksfile
+- spec/tmp/basic/Berksfile.lock
+- spec/tmp/basic/Vagrantfile
+- spec/tmp/django1.11/Berksfile
+- spec/tmp/django1.11/Berksfile.lock
+- spec/tmp/django1.11/Vagrantfile
 - spec/vagrant_templated_spec.rb
 - vagrant-templated.gemspec
 homepage: https://github.com/afaundez/vagrant-templated