ansible-role 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be87bffbde98bdedefd9484f1eeab58abbfd7741
-  data.tar.gz: d1473384723811a1ffa6678b9418075129df465d
+  metadata.gz: dcb4952bf88d2fa5c043e2f316434f0fcd0049cf
+  data.tar.gz: a332289b82d6f25cca668f5db6dfd1b011914fcc
 SHA512:
-  metadata.gz: 9e4d9cef73c5fb61212aa872ac41f07d113c3ce5de33f8720b5a67094e7a6906d7571e094c36a29d6580c56f726136ff218555f831e9a148d5f53bb6f1b108a4
-  data.tar.gz: 6f44911d8912c80744a8add693afe2137b94dfa0a5e6af6a4095913e763c590521e6e10c3d092259e540b34ee34d7de433197ee2411405f7c56a8333a10c9944
+  metadata.gz: 74c80d129613398b6957d52241b8c1a6ce680c9b02f7dcad00b7a54eae8e532c913b784788f3f332d3e35105ee2e0b8bc5fee4a51385a7e0a946707e317cbd18
+  data.tar.gz: 5e15ad9752140688d1341c5679eef7fabd34f93088b6720672e7801448f4898d65017e662248db05b6d22f346cbc1ab5a17dfbe24812662bc7b6e34cc5e51cbb

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="v1.1.0"></a>
+## v1.1.0 (2016-02-20)
+
+
+#### Features
+
+* **init:**  remove Vagrant and run test with Docker throuch makefile ([2d4b3820](https://github.com/weareinteractive/gem-ansible-role/commit/2d4b3820beb50fa8a5edafb39bdaa036eb721cc3))
+
+
+
 <a name="v1.0.0"></a>
 ## v1.0.0 (2016-02-18)
 

data/README.md

@@ -30,7 +30,7 @@ Commands:
 Initialize a new role including:
 
 * [`Travis`](https://travis-ci.org): for testing
-* [`Vagrant`](https://www.vagrantup.com/): for local testing
+* [`Docker`](https://www.docker.com/): for local testing
 * [`clog-cli`](https://github.com/clog-tool/clog-cli): for generating CHANGELOG
 * [`.editorconfig`](http://editorconfig.org/): for consistent coding stlye
 
@@ -62,7 +62,7 @@ To generate your role, please give me some info about:
       create  .travis.yml
       create  CHANGELOG.md
       create  LICENSE
-      create  Vagrantfile
+      create  Makefile
       create  defaults/main.yml
       create  files
       create  handlers/main.yml
@@ -75,7 +75,6 @@ To generate your role, please give me some info about:
       create  tasks/service.yml
       create  templates/etc/my-role.conf.j2
       create  tests/main.yml
-      create  tests/run.sh
       create  vars/main.yml
       create  README.md
 ```

data/lib/ansible/role/cli.rb

@@ -3,7 +3,6 @@ require "git"
 require "thor"
 require "yaml"
 require "ostruct"
-require "fileutils"
 
 module Ansible
   module Role
@@ -52,9 +51,6 @@ module Ansible
         # render templates
         directory  "templates/ansible/role/init", Dir.getwd
 
-        # set mode
-        FileUtils.chmod("a+x", "tests/run.sh")
-
         # generate docs
         docgen
 

data/lib/ansible/role/version.rb

@@ -1,5 +1,5 @@
 module Ansible
   module Role
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/templates/ansible/role/docgen/README.md.tt

@@ -61,7 +61,7 @@ This is an example playbook:
 ```shell
 $ git clone https://github.com/<%= @data[:meta][:readme]["github_user"] %>/<%= @data[:meta][:readme]["github_name"] %>.git
 $ cd <%= @data[:meta][:readme]["github_name"] %>
-$ vagrant up
+$ make test
 ```
 
 ## Contributing

data/templates/ansible/role/init/Makefile.tt

@@ -0,0 +1,11 @@
+PWD=$(shell pwd)
+ROLE_NAME=<%= @data[:role_name] %>
+ROLE_PATH=/etc/ansible/roles/$(ROLE_NAME)
+TEST_VERSION=ansible --version
+TEST_SYNTAX=ansible-playbook -vv -i 'localhost,' -c local $(ROLE_PATH)/tests/main.yml --syntax-check
+TEST_PLAYBOOK=ansible-playbook -vv -i 'localhost,' -c local $(ROLE_PATH)/tests/main.yml
+TEST_CMD=$(TEST_VERSION); $(TEST_SYNTAX); $(TEST_PLAYBOOK)
+
+.PHONY: test
+test:
+	docker run -it --rm -e "ROLE_NAME=$(ROLE_NAME)" -v $(PWD):$(ROLE_PATH) williamyeh/ansible:ubuntu14.04 /bin/bash -c "$(TEST_CMD)"

data/templates/ansible/role/init/tests/main.yml.tt

@@ -1,5 +1,9 @@
 ---
 - hosts: all
+  # pre_tasks for installing dependencies for running the tests within docker
+  # pre_tasks:
+  #  - name: Installing openssh
+  #    action: "{{ ansible_pkg_mgr }} pkg=my-package state=present"
   roles:
     - <%= @data[:role_name] %>
   vars:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ansible-role
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - franklin
@@ -96,7 +96,7 @@ files:
 - templates/ansible/role/init/.travis.yml.tt
 - templates/ansible/role/init/CHANGELOG.md
 - templates/ansible/role/init/LICENSE.tt
-- templates/ansible/role/init/Vagrantfile
+- templates/ansible/role/init/Makefile.tt
 - templates/ansible/role/init/defaults/main.yml.tt
 - templates/ansible/role/init/files/.empty_directory
 - templates/ansible/role/init/handlers/main.yml.tt
@@ -109,7 +109,6 @@ files:
 - templates/ansible/role/init/tasks/service.yml.tt
 - templates/ansible/role/init/templates/etc/%name%.conf.j2
 - templates/ansible/role/init/tests/main.yml.tt
-- templates/ansible/role/init/tests/run.sh.tt
 - templates/ansible/role/init/vars/main.yml
 homepage: https://github.com/weareinteractive/gem-ansible-role
 licenses:

data/templates/ansible/role/init/Vagrantfile

@@ -1,23 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vbguest.no_remote = true
-  config.vbguest.auto_update = false
-
-  config.vm.define 'trusty' do |instance|
-    instance.vm.box = 'ubuntu/trusty64'
-  end
-
-  config.vm.define 'precise' do |instance|
-    instance.vm.box = 'ubuntu/precise64'
-  end
-
-  # View the documentation for the provider you're using for more
-  # information on available options.
-  config.vm.provision "ansible" do |ansible|
-    ansible.playbook = "tests/main.yml"
-    ansible.verbose = 'vvvv'
-    ansible.sudo = true
-  end
-end

data/templates/ansible/role/init/tests/run.sh.tt

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# define variables
-ROLE_NAME=<%= @data[:role_name] %>
-
-# create role symnlink
-ln -s $(pwd) /usr/share/ansible/roles/$ROLE_NAME
-
-# echo 'installing dependencies'
-# apt-get update
-# apt-get install -qq ...
-
-echo 'checking version'
-ansible --version
-
-echo 'checking syntax'
-ansible-playbook -vvvv -i 'localhost,' -c local $(pwd)/tests/main.yml --syntax-check
-
-echo 'running playbook'
-ansible-playbook -vvvv -i 'localhost,' -c local $(pwd)/tests/main.yml