ansible-role 1.0.1 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: be87bffbde98bdedefd9484f1eeab58abbfd7741
4
- data.tar.gz: d1473384723811a1ffa6678b9418075129df465d
3
+ metadata.gz: dcb4952bf88d2fa5c043e2f316434f0fcd0049cf
4
+ data.tar.gz: a332289b82d6f25cca668f5db6dfd1b011914fcc
5
5
  SHA512:
6
- metadata.gz: 9e4d9cef73c5fb61212aa872ac41f07d113c3ce5de33f8720b5a67094e7a6906d7571e094c36a29d6580c56f726136ff218555f831e9a148d5f53bb6f1b108a4
7
- data.tar.gz: 6f44911d8912c80744a8add693afe2137b94dfa0a5e6af6a4095913e763c590521e6e10c3d092259e540b34ee34d7de433197ee2411405f7c56a8333a10c9944
6
+ metadata.gz: 74c80d129613398b6957d52241b8c1a6ce680c9b02f7dcad00b7a54eae8e532c913b784788f3f332d3e35105ee2e0b8bc5fee4a51385a7e0a946707e317cbd18
7
+ data.tar.gz: 5e15ad9752140688d1341c5679eef7fabd34f93088b6720672e7801448f4898d65017e662248db05b6d22f346cbc1ab5a17dfbe24812662bc7b6e34cc5e51cbb
data/CHANGELOG.md CHANGED
@@ -1,3 +1,13 @@
1
+ <a name="v1.1.0"></a>
2
+ ## v1.1.0 (2016-02-20)
3
+
4
+
5
+ #### Features
6
+
7
+ * **init:** remove Vagrant and run test with Docker throuch makefile ([2d4b3820](https://github.com/weareinteractive/gem-ansible-role/commit/2d4b3820beb50fa8a5edafb39bdaa036eb721cc3))
8
+
9
+
10
+
1
11
  <a name="v1.0.0"></a>
2
12
  ## v1.0.0 (2016-02-18)
3
13
 
data/README.md CHANGED
@@ -30,7 +30,7 @@ Commands:
30
30
  Initialize a new role including:
31
31
 
32
32
  * [`Travis`](https://travis-ci.org): for testing
33
- * [`Vagrant`](https://www.vagrantup.com/): for local testing
33
+ * [`Docker`](https://www.docker.com/): for local testing
34
34
  * [`clog-cli`](https://github.com/clog-tool/clog-cli): for generating CHANGELOG
35
35
  * [`.editorconfig`](http://editorconfig.org/): for consistent coding stlye
36
36
 
@@ -62,7 +62,7 @@ To generate your role, please give me some info about:
62
62
  create .travis.yml
63
63
  create CHANGELOG.md
64
64
  create LICENSE
65
- create Vagrantfile
65
+ create Makefile
66
66
  create defaults/main.yml
67
67
  create files
68
68
  create handlers/main.yml
@@ -75,7 +75,6 @@ To generate your role, please give me some info about:
75
75
  create tasks/service.yml
76
76
  create templates/etc/my-role.conf.j2
77
77
  create tests/main.yml
78
- create tests/run.sh
79
78
  create vars/main.yml
80
79
  create README.md
81
80
  ```
@@ -3,7 +3,6 @@ require "git"
3
3
  require "thor"
4
4
  require "yaml"
5
5
  require "ostruct"
6
- require "fileutils"
7
6
 
8
7
  module Ansible
9
8
  module Role
@@ -52,9 +51,6 @@ module Ansible
52
51
  # render templates
53
52
  directory "templates/ansible/role/init", Dir.getwd
54
53
 
55
- # set mode
56
- FileUtils.chmod("a+x", "tests/run.sh")
57
-
58
54
  # generate docs
59
55
  docgen
60
56
 
@@ -1,5 +1,5 @@
1
1
  module Ansible
2
2
  module Role
3
- VERSION = "1.0.1"
3
+ VERSION = "1.1.0"
4
4
  end
5
5
  end
@@ -61,7 +61,7 @@ This is an example playbook:
61
61
  ```shell
62
62
  $ git clone https://github.com/<%= @data[:meta][:readme]["github_user"] %>/<%= @data[:meta][:readme]["github_name"] %>.git
63
63
  $ cd <%= @data[:meta][:readme]["github_name"] %>
64
- $ vagrant up
64
+ $ make test
65
65
  ```
66
66
 
67
67
  ## Contributing
@@ -0,0 +1,11 @@
1
+ PWD=$(shell pwd)
2
+ ROLE_NAME=<%= @data[:role_name] %>
3
+ ROLE_PATH=/etc/ansible/roles/$(ROLE_NAME)
4
+ TEST_VERSION=ansible --version
5
+ TEST_SYNTAX=ansible-playbook -vv -i 'localhost,' -c local $(ROLE_PATH)/tests/main.yml --syntax-check
6
+ TEST_PLAYBOOK=ansible-playbook -vv -i 'localhost,' -c local $(ROLE_PATH)/tests/main.yml
7
+ TEST_CMD=$(TEST_VERSION); $(TEST_SYNTAX); $(TEST_PLAYBOOK)
8
+
9
+ .PHONY: test
10
+ test:
11
+ docker run -it --rm -e "ROLE_NAME=$(ROLE_NAME)" -v $(PWD):$(ROLE_PATH) williamyeh/ansible:ubuntu14.04 /bin/bash -c "$(TEST_CMD)"
@@ -1,5 +1,9 @@
1
1
  ---
2
2
  - hosts: all
3
+ # pre_tasks for installing dependencies for running the tests within docker
4
+ # pre_tasks:
5
+ # - name: Installing openssh
6
+ # action: "{{ ansible_pkg_mgr }} pkg=my-package state=present"
3
7
  roles:
4
8
  - <%= @data[:role_name] %>
5
9
  vars:
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ansible-role
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - franklin
@@ -96,7 +96,7 @@ files:
96
96
  - templates/ansible/role/init/.travis.yml.tt
97
97
  - templates/ansible/role/init/CHANGELOG.md
98
98
  - templates/ansible/role/init/LICENSE.tt
99
- - templates/ansible/role/init/Vagrantfile
99
+ - templates/ansible/role/init/Makefile.tt
100
100
  - templates/ansible/role/init/defaults/main.yml.tt
101
101
  - templates/ansible/role/init/files/.empty_directory
102
102
  - templates/ansible/role/init/handlers/main.yml.tt
@@ -109,7 +109,6 @@ files:
109
109
  - templates/ansible/role/init/tasks/service.yml.tt
110
110
  - templates/ansible/role/init/templates/etc/%name%.conf.j2
111
111
  - templates/ansible/role/init/tests/main.yml.tt
112
- - templates/ansible/role/init/tests/run.sh.tt
113
112
  - templates/ansible/role/init/vars/main.yml
114
113
  homepage: https://github.com/weareinteractive/gem-ansible-role
115
114
  licenses:
@@ -1,23 +0,0 @@
1
- # -*- mode: ruby -*-
2
- # vi: set ft=ruby :
3
-
4
- Vagrant.configure("2") do |config|
5
- config.vbguest.no_remote = true
6
- config.vbguest.auto_update = false
7
-
8
- config.vm.define 'trusty' do |instance|
9
- instance.vm.box = 'ubuntu/trusty64'
10
- end
11
-
12
- config.vm.define 'precise' do |instance|
13
- instance.vm.box = 'ubuntu/precise64'
14
- end
15
-
16
- # View the documentation for the provider you're using for more
17
- # information on available options.
18
- config.vm.provision "ansible" do |ansible|
19
- ansible.playbook = "tests/main.yml"
20
- ansible.verbose = 'vvvv'
21
- ansible.sudo = true
22
- end
23
- end
@@ -1,20 +0,0 @@
1
- #!/bin/bash
2
-
3
- # define variables
4
- ROLE_NAME=<%= @data[:role_name] %>
5
-
6
- # create role symnlink
7
- ln -s $(pwd) /usr/share/ansible/roles/$ROLE_NAME
8
-
9
- # echo 'installing dependencies'
10
- # apt-get update
11
- # apt-get install -qq ...
12
-
13
- echo 'checking version'
14
- ansible --version
15
-
16
- echo 'checking syntax'
17
- ansible-playbook -vvvv -i 'localhost,' -c local $(pwd)/tests/main.yml --syntax-check
18
-
19
- echo 'running playbook'
20
- ansible-playbook -vvvv -i 'localhost,' -c local $(pwd)/tests/main.yml