ansible-role 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f1cf7d575a1bb920b0f57499836483d8c570c01
-  data.tar.gz: 075233d62a814983654a189e0b4a50a316e2a9e1
+  metadata.gz: 48e3658dd970690e8ce5b234e26952eb65e27a4f
+  data.tar.gz: bd1f9cd75e037ff472e35bef3f3f0238f65e2b9f
 SHA512:
-  metadata.gz: b81de9728a240695b65a62ecbc03420de61ec530a5cd576dd830c0463ed30beaedbeb54e4b70d52c7aced63ea8a0448706db2f805544493ca12801c1224fab5c
-  data.tar.gz: 51448b9b894718146ef9ec57246f095f18461ed90258bd0ac01325f6b9ff504594c0aee6d0fb88069f5d3991a275c1908eb557c82cccf186b11b9a6b3ef662c0
+  metadata.gz: b045b4d110bae1efd69b31a44378e4c63bc0277676b9069b1ce90da1819de16099d15e5a07855820ff0059021b67e9dace36d63415864195a9c0e7c3791af633
+  data.tar.gz: 5c5e6217a12f8b3785315203949d62dbdfec635941ddb4df052d89c90fe0671e7a0dbd9f060b06c25624f55efeb0023243306b53a4eb7f344cba4b33bda92c3a

data/.atomignore

@@ -0,0 +1,2 @@
+/bin
+/pkg

data/.gitignore

@@ -1,8 +1,3 @@
-.*
-*~
+.DS_Store
+/bin/
 /pkg/
-!.empty_directory
-!.editorconfig
-!.travis.yml
-!.clog.toml
-!.git*

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+<a name="v1.0.0"></a>
+## v1.0.0 (2016-02-18)
+
+
+#### Features
+
+*   remove sudo: yes from test ([bee6998e](https://github.com/weareinteractive/gem-ansible-role/commit/bee6998e061770d22a3308e060a3bb5e20294bcc))
+*   sync travis tests with ansible-galaxy init ([4ec83a74](https://github.com/weareinteractive/gem-ansible-role/commit/4ec83a741909d0073fbf99d21e99e8a5ed670292))
+* **init:**
+  *  add all variables to generated readme.yml ([75200e51](https://github.com/weareinteractive/gem-ansible-role/commit/75200e5132c17501875a9653a0ea37711715a456))
+  *  remove galaxy user prompt due to galaxy's organization support ([e69f577a](https://github.com/weareinteractive/gem-ansible-role/commit/e69f577ad16355b3dbae86c560daa43ca230dc44))
+  *  refactor ansible badge to new url ([cc49bba1](https://github.com/weareinteractive/gem-ansible-role/commit/cc49bba1a4c1f7729b33799e908b2dfdc7bf2f81))
+  *  add files directory ([0798b907](https://github.com/weareinteractive/gem-ansible-role/commit/0798b907393ae38622b04703c3a62bd6cdf1d357))
+  *  simpler gitignore ([958fbf33](https://github.com/weareinteractive/gem-ansible-role/commit/958fbf33c6dac82902d736c3b9c6fedc0fa84b5c))
+
+
+
 <a name="v0.2.0"></a>
 ## v0.2.0 (2015-12-08)
 

data/Gemfile.lock

@@ -1,12 +1,14 @@
 PATH
   remote: .
   specs:
-    ansible-role (1.0.0)
+    ansible-role (0.2.0)
+      git
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
+    git (1.2.9.1)
     rake (10.4.2)
     thor (0.19.1)
 
@@ -17,3 +19,6 @@ DEPENDENCIES
   ansible-role!
   bundler
   rake
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -5,20 +5,20 @@
 [![GitHub Stars](https://img.shields.io/github/stars/weareinteractive/gem-ansible-role.svg)](https://github.com/weareinteractive/gem-ansible-role)
 
 
-> Gem with some useful Ansible role command line tools.
+> Ansible role command line tool for.
 >
-> * Initialize new ansible roles
-> * Re-Generate README.md
+> * Initialize a new Ansible role
+> * Re-Generating README.md
 
 ## Installation
 
-```
+```bash
 $ gem install ansible-role
 ```
 
 ## Usage
 
-```
+```bash
 $ ansible-role
 Commands:
   ansible-role docgen          # Generate README file
@@ -26,6 +26,93 @@ Commands:
   ansible-role init            # Initialize new role
 ```
 
+### Init
+
+`ansible-role init` generates a role skeleton including:
+
+* [`Travis`](https://travis-ci.org): for testing
+* [`Vagrant`](http://www.vagrantup.com): for local testing
+* [`clog-cli`](https://github.com/clog-tool/clog-cli): for CHANGELOG generation
+* [`.editorconfig`](http://editorconfig.org/): for consistent code
+
+```bash
+$ mkdir my-role
+$ cd my-role
+$ ansible-role init
+
+To generate your role, please give me some info about:
+
+• Author
+  Name [franklin <franklin@weareinteractive.com>]: franklin <franklin@weareinteractive.com
+  Company: We Are Interactive
+
+• Role
+  Name [my-role]: my-role
+  Description [Best role ever!]: My best role ever!
+  Category [development]: system
+  Min ansible version [2.0]: 2.0
+
+• GitHub
+  User/Organization [franklin]: weareinteractive
+  Repository [barfoo]: ansible-my-role
+
+       exist
+      create  .clog.toml
+      create  .editorconfig
+      create  .gitignore
+      create  .travis.yml
+      create  CHANGELOG.md
+      create  LICENSE
+      create  Vagrantfile
+      create  defaults/main.yml
+      create  handlers/main.yml
+      create  meta/main.yml
+      create  meta/readme.yml
+      create  tasks/config.yml
+      create  tasks/install.yml
+      create  tasks/main.yml
+      create  tasks/manage.yml
+      create  tasks/service.yml
+      create  templates/etc/my-role.conf.j2
+      create  tests/main.yml
+      create  vars/main.yml
+      create  README.md
+```
+
+### Docgen
+
+`ansible-role docgen` generates a `README.md` file frrom `meta/readme.yml` and your role files:
+
+```bash
+$ cd my-role
+$ ansible-role docgen
+
+```
+
+You can configure the generated README through these variables:
+
+```yaml
+---
+galaxy_name: weareinteractive.my-role
+github_user: weareinteractive
+github_name: ansible-my-role
+badges: |
+  [![Build Status](https://img.shields.io/travis/weareinteractive/ansible-my-role.svg)](https://travis-ci.org/weareinteractive/ansible-my-role)
+  [![Galaxy](http://img.shields.io/badge/galaxy-weareinteractive.my-role-blue.svg)](https://galaxy.ansible.com/weareinteractive/my-role)
+  [![GitHub Tags](https://img.shields.io/github/tag/weareinteractive/ansible-my-role.svg)](https://github.com/weareinteractive/ansible-my-role)
+  [![GitHub Stars](https://img.shields.io/github/stars/weareinteractive/ansible-my-role.svg)](https://github.com/weareinteractive/ansible-my-role)
+description: |
+  > * installs foo
+  > * configures foo
+after_dependencies: |
+  * foo dependency
+  * bar dependency
+after_handlers: |
+  ## Rules
+
+  Some other important section...
+```
+
 ## Contributing
 In lieu of a formal styleguide, take care to maintain the existing coding style. Add unit tests for any new or changed functionality.
 

data/lib/ansible/role/cli.rb

@@ -36,21 +36,17 @@ module Ansible
         @data[:name] = prompt "  Name", "my-role", true
         @data[:description] = prompt "  Description", "Best role ever!", true
         @data[:category] = prompt "  Category", "development", true
-        @data[:min_ansible_version] = prompt "  Min ansible version", "1.9", true
+        @data[:min_ansible_version] = prompt "  Min ansible version", "2.0", true
         @data[:var_name] = @data[:name].sub("-", "_")
         puts ""
 
         say "• GitHub", :yellow
-        @data[:github_user] = prompt "  User", g.config('user.name'), true
+        @data[:github_user] = prompt "  User/Organization", g.config('user.name'), true
         @data[:github_name] = prompt "  Repository", File.basename(Dir.getwd)
         @data[:github_path] = "#{@data[:github_user]}/#{@data[:github_name]}"
         puts ""
 
-        say "• Ansible Galaxy", :yellow
-        @data[:galaxy_user] = prompt "  User", ENV['username']
-        puts ""
-
-        @data[:role_name] = "#{@data[:galaxy_user]}.#{@data[:name]}"
+        @data[:role_name] = "#{@data[:github_user]}.#{@data[:name]}"
 
         # render templates
         directory  "templates/ansible/role/init", Dir.getwd

data/lib/ansible/role/version.rb

@@ -1,5 +1,5 @@
 module Ansible
   module Role
-    VERSION = "0.2.0"
+    VERSION = "1.0.0"
   end
 end

data/templates/ansible/role/init/.clog.toml.tt

@@ -0,0 +1,4 @@
+[clog]
+changelog = "CHANGELOG.md"
+repository = "https://github.com/<%= @data[:github_path] %>"
+from-latest-tag = true

data/templates/ansible/role/init/.gitignore

@@ -1,6 +1,2 @@
-.*
-*~
-!.editorconfig
-!.travis.yml
-!.clog.toml
-!.git*
+.DS_Store
+.vagrant

data/templates/ansible/role/init/.travis.yml.tt

@@ -0,0 +1,39 @@
+---
+language: python
+python: "2.7"
+
+# Use the new container infrastructure
+sudo: false
+
+# Install ansible
+addons:
+  apt:
+    packages:
+    - python-pip
+
+install:
+  # Install ansible
+  - pip install ansible
+
+  # Check ansible version
+  - ansible --version
+
+  # Create inventory file
+  - printf 'localhost' > tests/inventory
+
+  # Create ansible.cfg with correct roles_path
+  - printf '[defaults]\nroles_path=../' > ansible.cfg
+
+  # Create role name symlink
+  - ln -s ./ ../<%= @data[:role_name] %>
+
+script:
+  # Basic role syntax check
+  - ansible-playbook -i tests/inventory tests/main.yml --syntax-check
+  # TODO run ansible lint
+  # - ansible-lint -L tests/inventory
+  # Run test playbooke
+  - ansible-playbook -i tests/inventory tests/main.yml
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/

data/templates/ansible/role/init/meta/readme.yml.tt

@@ -5,7 +5,7 @@ github_user: <%= @data[:github_user] %>
 github_name: <%= @data[:github_name] %>
 badges: |
   [![Build Status](https://img.shields.io/travis/<%= @data[:github_path] %>.svg)](https://travis-ci.org/<%= @data[:github_path] %>)
-  [![Galaxy](http://img.shields.io/badge/galaxy-<%= @data[:role_name] %>-blue.svg)](https://galaxy.ansible.com/list#/roles/<%= @data[:galaxy_id] %>)
+  [![Galaxy](http://img.shields.io/badge/galaxy-<%= @data[:role_name] %>-role-blue.svg)](https://galaxy.ansible.com/<%= @data[:github_user] %>/<%= @data[:name] %>)
   [![GitHub Tags](https://img.shields.io/github/tag/<%= @data[:github_path] %>.svg)](https://github.com/<%= @data[:github_path] %>)
   [![GitHub Stars](https://img.shields.io/github/stars/<%= @data[:github_path] %>.svg)](https://github.com/<%= @data[:github_path] %>)
 description: |
@@ -13,4 +13,9 @@ description: |
   > * configures <%= @data[:name] %>
   > * manages <%= @data[:name] %>
   > * configures service
+after_dependencies: |
+  * foo dependency
+after_handlers: |
+  ## Another Section
 
+  Lorem ipsum dolor sit atem ...

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

@@ -1,7 +1,6 @@
 ---
 
 - hosts: all
-  sudo: yes
   roles:
     - <%= @data[:role_name] %>
   vars:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible-role
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - franklin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -74,6 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".atomignore"
 - ".clog.toml"
 - ".editorconfig"
 - ".gitignore"
@@ -92,11 +93,12 @@ files:
 - templates/ansible/role/init/.clog.toml.tt
 - templates/ansible/role/init/.editorconfig
 - templates/ansible/role/init/.gitignore
-- templates/ansible/role/init/.travis.yml
+- 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/defaults/main.yml.tt
+- templates/ansible/role/init/files/.empty_directory
 - templates/ansible/role/init/handlers/main.yml.tt
 - templates/ansible/role/init/meta/main.yml.tt
 - templates/ansible/role/init/meta/readme.yml.tt
@@ -107,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:
@@ -129,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Command line snippets.

data/templates/ansible/role/init/.travis.yml

@@ -1,10 +0,0 @@
----
-
-language: ruby
-sudo: required
-services:
-  - docker
-install:
-  - docker pull franklinkim/ansible:ubuntu-trusty
-script:
-  - docker run -v $(pwd):/opt/ansible franklinkim/ansible:ubuntu-trusty tests/run.sh

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

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# define variables
-ROLE_NAME=<%= @data[:role_name] %>
-
-# install dependencies
-# ansible-galaxy install galaxyuser.role_name
-
-# create role symnlink
-ln -s $(pwd) /usr/share/ansible/roles/$ROLE_NAME
-
-# run test playbooks
-ansible-playbook -vvvv -i 'localhost,' -c local $(pwd)/tests/main.yml