orats 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 900468501d2bdb5ee06430e7de9e55210e0fd9e3
-  data.tar.gz: 35bd5ced9a746b08df3d53ab77e00df05b1e3f6a
+  metadata.gz: 93556f428c47b927511dad2d9bc4581f08512abe
+  data.tar.gz: f20bb7f697ce51209756d7ab10274f5df982847d
 SHA512:
-  metadata.gz: 3547beb75f9d5fe77cd7cb686891c183336e549ac6b7c320cc076cbddf51c143d921a1526e11ad021af648d3a4e04c0986bb1093af2d144ca4d9ab0683019428
-  data.tar.gz: 0c59fd65f93cbd8b0729e2f219a817df0036e2bd7372038f68da780d6743902fa1c079db101560cca29173990c17c1413aeaab0a3d5e0901d8f68c5a5d19091b
+  metadata.gz: 7c17135f4b66475105a0226cca3c8431155e6e776ed517655d3dccb4f71bd9b7f27099624d51352009eaf23e6aa24b032b28c1a620f34c9e9db59ce892a69aa7
+  data.tar.gz: 79546ec90a891606628f65699c0d5cb6d82f638252a095fcd801bb5c7578f267fcaee1830ab0743dc879a0d9c292bcb1699287870fb34bf57b1ff2498624882f

data/README.md

@@ -25,6 +25,8 @@ Gems will also be updated once they are proven to work on the target rails/ruby
         - [Ansible roles](#ansible-roles-used)
         - [FAQ](#playbook-faq)
             - [What is the Galaxyfile?](#what-is-the-galaxyfile)
+    - [Role](#role)
+        - [Try it](#try-the-role-command)
     - [Diff](#diff)
         - [Try it](#try-the-diff-command)
     - [Templates](#templates)
@@ -105,6 +107,13 @@ Here is an overview of the available commands. You can find out more information
     - Template:
         - Optionally takes: `--custom []`
 
+- **Create a new ansible role**:
+    - `orats role <TARGET_PATH>`
+    - Configuration:
+        - Optionally takes: `--repo-name []`
+    - Template:
+        - Optionally takes: `--custom []`
+
 - **Delete a directory and optionally all data associated to it**:
     - `orats nuke <TARGET_PATH>`
     - Optionally takes: `--skip-data [false]`
@@ -181,8 +190,8 @@ Everything is broken up into ansible roles so you can quickly scale out horizont
 - **Security**:
     - Logging into the server is only possible with an ssh key
     - Root login is disable
-    - fail2ban is setup
-    - ufw (firewall) is setup to block any ports not exposed by you
+    - fail2ban is setup and configurable
+    - ferm (firewall) is setup to block any ports not exposed by you
     - All stack specific processes are running with less privileges than root
 - **User**:
     - A single deploy user is created
@@ -202,8 +211,10 @@ Everything is broken up into ansible roles so you can quickly scale out horizont
 #### Ansible roles used
 
 - `nickjj.locale` https://github.com/nickjj/ansible-locale [![Build Status](https://secure.travis-ci.org/nickjj/ansible-locale.png)](http://travis-ci.org/nickjj/ansible-locale)
+- `nickjj.sshd` https://github.com/nickjj/ansible-sshd [![Build Status](https://secure.travis-ci.org/nickjj/ansible-sshd.png)](http://travis-ci.org/nickjj/ansible-sshd)
+- `nickjj.ferm` https://github.com/nickjj/ansible-ferm [![Build Status](https://secure.travis-ci.org/nickjj/ansible-ferm.png)](http://travis-ci.org/nickjj/ansible-ferm)
+- `nickjj.fail2ban` https://github.com/nickjj/ansible-fail2ban [![Build Status](https://secure.travis-ci.org/nickjj/ansible-fail2ban.png)](http://travis-ci.org/nickjj/ansible-fail2ban)
 - `nickjj.user` https://github.com/nickjj/ansible-user [![Build Status](https://secure.travis-ci.org/nickjj/ansible-user.png)](http://travis-ci.org/nickjj/ansible-user)
-- `nickjj.security` https://github.com/nickjj/ansible-security
 - `nickjj.postgres` https://github.com/nickjj/ansible-postgres [![Build Status](https://secure.travis-ci.org/nickjj/ansible-postgres.png)](http://travis-ci.org/nickjj/ansible-postgres)
 - `nickjj.ruby` https://github.com/nickjj/ansible-ruby [![Build Status](https://secure.travis-ci.org/nickjj/ansible-ruby.png)](http://travis-ci.org/nickjj/ansible-ruby)
 - `nickjj.rails` https://github.com/nickjj/ansible-rails [![Build Status](https://secure.travis-ci.org/nickjj/ansible-rails.png)](http://travis-ci.org/nickjj/ansible-rails)
@@ -241,6 +252,50 @@ Since the roles are self contained in the playbook this allows you to have
 multiple playbooks with certain role versions in case you have older orats 
 projects which require older role versions.
 
+### Role
+
+The role command generates an ansible role with a few opinions. The 
+`ansible-galaxy` command that ships with ansible already comes with an `init`
+ function but the formatting of the files wasn't to my liking.
+ 
+I also wanted it to add in tests using travis-ci and setup a basic 
+idempotence test for all new roles.
+
+#### Changes vs ansible-galaxy init
+
+All of the changes have git commits to go with them. After generating a role you
+ can type `git reflog` to get a list of changes.
+
+- **Core changes**:
+    - Add travis-ci tests
+    - Remove the `vars` folder
+    - Add `LICENSE` (MIT)
+    - Add `.gitignore`
+- **meta/main.yml**:
+    - Automatically fill in the author name based on your git name
+- **README.md**:
+    - Add a travis badge
+    - Add a section to link back to your role on the official ansible galaxy
+    - Automatically fill in your repo name, role name and name where necessary
+    - Add instructions for using the role in an example playbook
+    - Add a todo list for you to make the role your own
+
+#### Try the role command
+
+##### Basic
+
+`orats role your_github_user_name.myrole`
+
+##### Custom repo name
+
+`orats role your_github_user_name.mynewrole --repo-name ansible-mynewrole`
+
+The custom repo name is probably what you'll want to use all the time if you 
+plan to make your roles open source. For example my roles are named things like `nickjj.postgres` and `nickjj.rails`. However my repos are named `ansible-postgres` and `ansible-rails`.
+
+When you submit your role to the galaxy you would use `rails` as the 
+optional name for your role.
+
 ### Diff
 
 The goal of the diff command is to compare your orats generated files with 

data/lib/orats/cli.rb

@@ -2,6 +2,7 @@ require 'thor'
 require 'orats/commands/project/exec'
 require 'orats/commands/inventory'
 require 'orats/commands/playbook'
+require 'orats/commands/role'
 require 'orats/commands/nuke'
 require 'orats/commands/diff/exec'
 
@@ -79,6 +80,26 @@ module Orats
       Commands::Playbook.new(target_path, options).init
     end
 
+    option :repo_name, default: '', aliases: '-r'
+    option :custom, default: '', aliases: '-c'
+    desc 'role TARGET_PATH [options]', ''
+    long_desc <<-D
+      `orats role target_path` will create an ansible role suitable for the galaxy.
+
+      Configuration:
+
+      `--repo-name` if your github repo name is different than the full role name
+
+      Template features:
+
+      `--custom` will let you supply a custom template, a url or file is ok but urls
+ must start with http or https []
+    D
+
+    def role(target_path)
+      Commands::Role.new(target_path, options).init
+    end
+
     option :skip_data, type: :boolean, default: false, aliases: '-D'
     option :redis_password, default: '', aliases: '-d'
     desc 'nuke TARGET_PATH [options]', ''

data/lib/orats/commands/project/rails.rb

@@ -2,9 +2,9 @@ module Orats
   module Commands
     module Project
       module Rails
-        def check_exit_conditions
+        def check_exit_conditions(check_running_processes: true)
           exit_if_process :not_found, 'rails', 'git'
-          exit_if_process :not_running, 'postgres', 'redis'
+          exit_if_process :not_running, 'postgres', 'redis' if check_running_processes
           exit_if_path_exists
           exit_if_invalid_template
         end
@@ -132,12 +132,14 @@ module Orats
         private
 
         def exit_if_invalid_template
-          if @options[:template].length > 0
+          template = @options[:template] || ''
+
+          if template.length > 0
             log_task 'Check if template exists'
 
-            unless template_exist?(@options[:template])
+            unless template_exist?(template)
               log_error 'error', 'Cannot find template', 'message',
-                        "'#{@options[:template]}' is not a valid template name",
+                        "'#{template}' is not a valid template name",
                         true do
                 log_status_bottom 'tip',
                                   'run `orats templates` to get a list of valid templates',

data/lib/orats/commands/role.rb

@@ -0,0 +1,70 @@
+require 'orats/commands/common'
+require 'orats/commands/project/rails'
+
+module Orats
+  module Commands
+    class Role < Common
+      include Project::Rails
+
+      def initialize(target_path = '', options = {})
+        super
+      end
+
+      def init
+        check_exit_conditions check_running_processes: false
+        exit_if_invalid_role_name
+
+        rails_template 'role'
+        custom_rails_template unless @options[:custom].empty?
+
+        repo_name = @options[:repo_name].empty? ? base_file_name :
+            @options[:repo_name]
+
+        log_task 'Update place holder repo name'
+        gsub_file "#{@target_path}/README.md", 'repo_name',
+                  repo_name
+        gsub_file "#{@target_path}/tests/main.yml", 'repo_name',
+                  repo_name
+        git_commit 'Update place holder repo name'
+
+        log_success
+      end
+
+      private
+
+      def base_file_name
+        File.basename(@target_path)
+      end
+
+      def exit_if_invalid_role_name
+        log_task 'Check if role name is valid'
+
+        unless base_file_name.count('.') == 1
+          log_error 'error', 'Invalid role name', 'message',
+                    "'#{base_file_name}' is invalid, it must contain 1 period",
+                    true do
+            log_status_bottom 'tip',
+                              'Your role name should be github_user.role_name',
+                              :white
+          end
+
+          exit 1
+        end
+      end
+
+      def log_success
+        log_status_top 'success', 'Everything has been setup successfully',
+                       :cyan
+        puts
+        log_status_bottom 'question', 'What should you do next?', :yellow, true
+        log_status_bottom 'answer', 'Check the readme in the role',
+                          :white
+
+        log_status_bottom 'question', 'Are you new to ansible?', :yellow, true
+        log_status_bottom 'answer',
+                          'http://docs.ansible.com/intro_getting_started.html',
+                          :white
+      end
+    end
+  end
+end

data/lib/orats/templates/includes/common/.gitignore

@@ -0,0 +1,6 @@
+.DS_Store
+*/**.DS_Store
+._*
+.*.sw*
+*~
+.idea/

data/lib/orats/templates/includes/inventory/group_vars/all.yml

@@ -30,6 +30,27 @@ ansible_ssh_user: deploy
 # https://github.com/nickjj/ansible-locale/#role-variables
 # -----------------------------------------------------------------------------
 
+# -----------------------------------------------------------------------------
+# sshd
+# -----------------------------------------------------------------------------
+# default values you can overwrite with documentation:
+# https://github.com/nickjj/ansible-sshd/#role-variables
+# -----------------------------------------------------------------------------
+
+# -----------------------------------------------------------------------------
+# ferm
+# -----------------------------------------------------------------------------
+# default values you can overwrite with documentation:
+# https://github.com/nickjj/ansible-ferm/#role-variables
+# -----------------------------------------------------------------------------
+
+# -----------------------------------------------------------------------------
+# fail2ban
+# -----------------------------------------------------------------------------
+# default values you can overwrite with documentation:
+# https://github.com/nickjj/ansible-fail2ban/#role-variables
+# -----------------------------------------------------------------------------
+
 # -----------------------------------------------------------------------------
 # user
 # -----------------------------------------------------------------------------

data/lib/orats/templates/includes/playbook/Galaxyfile

@@ -1,8 +1,10 @@
 nickjj.locale,v0.1.1
+nickjj.sshd,v0.1.2
+nickjj.ferm,v0.1.1
+nickjj.fail2ban,v0.1.2
 nickjj.user,v0.1.0
-nickjj.security,v0.1.2
 nickjj.postgres,v0.1.3
-nickjj.ruby,v0.1.7
+nickjj.ruby,v0.1.9
 nickjj.nodejs,v0.1.1
 nickjj.nginx,v0.1.4
 nickjj.rails,v0.2.2

data/lib/orats/templates/includes/playbook/common.yml

@@ -0,0 +1,23 @@
+---
+- name: ensure all servers are commonly configured without sudo
+  hosts: all:!localhost
+  sudo: false
+
+  tasks:
+    - name: ensure IP address of the ansible controller is set
+      set_fact:
+        ansible_controller: '{{ ansible_env.SSH_CLIENT.split(" ") | first }}/32'
+      when: (ansible_controller is undefined and ansible_connection != "local")
+      tags: [common, ferm]
+
+
+- name: ensure all servers are commonly configured with sudo
+  hosts: all
+  sudo: true
+
+  roles:
+    - { role: nickjj.locale, tags: [common, locale] }
+    - { role: nickjj.sshd, tags: [common, sshd] }
+    - { role: nickjj.ferm, tags: [common, ferm] }
+    - { role: nickjj.fail2ban, tags: [common, fail2ban] }
+    - { role: nickjj.user, tags: [common, user] }

data/lib/orats/templates/includes/playbook/site.yml

@@ -1,23 +1,11 @@
 ---
-- name: ensure all servers are commonly configured
-  hosts: all
-  sudo: true
-
-  roles:
-    - { role: nickjj.locale, tags: [common, locale] }
-    - { role: nickjj.user, tags: [common, user] }
+- include: common.yml
 
 - name: ensure database servers are configured
   hosts: database
   sudo: true
 
   roles:
-    - role: nickjj.security
-      tags: [database, security]
-      security_ufw_ports:
-        - rule: deny
-          port: 80
-          proto: tcp
     - { role: nickjj.postgres, tags: [database, postgres] }
 
 - name: ensure cache servers are configured
@@ -25,12 +13,6 @@
   sudo: true
 
   roles:
-    - role: nickjj.security
-      tags: [cache, security]
-      security_ufw_ports:
-        - rule: deny
-          port: 80
-          proto: tcp
     - { role: DavidWittman.redis, tags: [cache, redis] }
 
 - name: ensure app servers are configured
@@ -38,12 +20,12 @@
   sudo: true
 
   roles:
-    - role: nickjj.security
-      tags: [app, security]
-      security_ufw_ports:
-        - rule: allow
-          port: 80
-          proto: tcp
+    - role: nickjj.ferm
+      tags: [app, ferm]
+      ferm_input_list:
+        - type: "dport_accept"
+          dport: ["http", "https"]
+
     - { role: nickjj.ruby, tags: [app, ruby] }
     - { role: nickjj.nodejs, tags: [app, nodejs] }
     - { role: nickjj.nginx, tags: [app, nginx] }

data/lib/orats/templates/includes/role/.travis.yml

@@ -0,0 +1,19 @@
+---
+language: "python"
+python: "2.7"
+
+env:
+  - SITE_AND_INVENTORY="tests/main.yml -i tests/inventory"
+
+install:
+  - "pip install ansible==1.6.2"
+  - "printf '[defaults]\nroles_path = ../' > ansible.cfg"
+
+script:
+  - "ansible-playbook $SITE_AND_INVENTORY --syntax-check"
+  - "ansible-playbook $SITE_AND_INVENTORY --connection=local -vvvv"
+  - >
+    ansible-playbook $SITE_AND_INVENTORY --connection=local
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)

data/lib/orats/templates/includes/role/README.md

@@ -0,0 +1,62 @@
+## What is repo_name? [![Build Status](https://secure.travis-ci.org/github_user/repo_name.png)](http://travis-ci.org/github_user/repo_name)
+
+It is an [ansible](http://www.ansible.com/home) role to <enter what the role is about>.
+
+### What problem does it solve and why is it useful?
+
+Thanks for generating a role with orats. Here's your todo list:
+
+- Change `meta/main.yml` to your liking
+- Create your awesome role
+- Fill out this readme properly
+- Sign up for [travis-ci.org](http://travis-ci.org) (it is free for public repos)
+- Review `.travis.yml` and write reasonable tests
+- Push your role to github and tag it with a version number
+- Publish your role on the [ansible galaxy](https://galaxy.ansible.com) if it's not private
+- Replace the `role_id` with your id in the `Ansible galaxy` section of this readme
+
+## Role variables
+
+Below is a list of default values along with a description of what they do.
+
+```
+# Add your default role variables here.
+```
+
+## Example playbook
+
+For the sake of this example let's assume you have a group called **foo** and you have a typical `site.yml` file.
+
+To use this role edit your `site.yml` file to look something like this:
+
+```
+---
+- name: ensure foo servers are configured
+- hosts: foo
+
+  roles:
+    - { role: github_user.role_name, tags: role_name }
+```
+
+Let's say you want to edit a few values, you can do this by opening or creating `group_vars/foo.yml` which is located relative to your `inventory` directory and then making it look something like this:
+
+```
+---
+# Overwrite the defaults here.
+```
+
+## Installation
+
+`$ ansible-galaxy install github_user.role_name`
+
+## Requirements
+
+Tested on <enter your OS of choice>.
+
+## Ansible galaxy
+
+You can find it on the official [ansible galaxy](https://galaxy.ansible.com/list#/roles/role_id) if you want to rate it.
+
+## License
+
+MIT

data/lib/orats/templates/includes/role/meta/main.yml

@@ -0,0 +1,123 @@
+---
+galaxy_info:
+  author: author_name
+  description: Enter a short description about this role.
+  company: Your company (optional).
+  # Some suggested licenses:
+  # - BSD (default)
+  # - MIT
+  # - GPLv2
+  # - GPLv3
+  # - Apache
+  # - CC-BY
+  license: license MIT
+  min_ansible_version: 1.6
+  #
+  # Below are all platforms currently available. Just uncomment
+  # the ones that apply to your role. If you don't see your
+  # platform on this list, let us know and we'll get it added!
+  #
+  #platforms:
+  #- name: EL
+  #  versions:
+  #  - all
+  #  - 5
+  #  - 6
+  #  - 7
+  #- name: GenericUNIX
+  #  versions:
+  #  - all
+  #  - any
+  #- name: Fedora
+  #  versions:
+  #  - all
+  #  - 16
+  #  - 17
+  #  - 18
+  #  - 19
+  #  - 20
+  #- name: opensuse
+  #  versions:
+  #  - all
+  #  - 12.1
+  #  - 12.2
+  #  - 12.3
+  #  - 13.1
+  #  - 13.2
+  #- name: Amazon
+  #  versions:
+  #  - all
+  #  - 2013.03
+  #  - 2013.09
+  #- name: GenericBSD
+  #  versions:
+  #  - all
+  #  - any
+  #- name: FreeBSD
+  #  versions:
+  #  - all
+  #  - 8.0
+  #  - 8.1
+  #  - 8.2
+  #  - 8.3
+  #  - 8.4
+  #  - 9.0
+  #  - 9.1
+  #  - 9.1
+  #  - 9.2
+  #- name: Ubuntu
+  #  versions:
+  #  - all
+  #  - lucid
+  #  - maverick
+  #  - natty
+  #  - oneiric
+  #  - precise
+  #  - quantal
+  #  - raring
+  #  - saucy
+  #  - trusty
+  #- name: SLES
+  #  versions:
+  #  - all
+  #  - 10SP3
+  #  - 10SP4
+  #  - 11
+  #  - 11SP1
+  #  - 11SP2
+  #  - 11SP3
+  #- name: GenericLinux
+  #  versions:
+  #  - all
+  #  - any
+  #- name: Debian
+  #  versions:
+  #  - all
+  #  - etch
+  #  - lenny
+  #  - squeeze
+  #  - wheezy
+  #
+  # Below are all categories currently available. Just as with
+  # the platforms above, uncomment those that apply to your role.
+  #
+  #categories:
+  #- cloud
+  #- cloud:ec2
+  #- cloud:gce
+  #- cloud:rax
+  #- clustering
+  #- database
+  #- database:nosql
+  #- database:sql
+  #- development
+  #- monitoring
+  #- networking
+  #- packaging
+  #- system
+  #- web
+dependencies: []
+  # List your role dependencies here, one per line. Only
+  # dependencies available via galaxy should be listed here.
+  # Be sure to remove the '[]' above if you add dependencies
+  # to this list.

data/lib/orats/templates/includes/role/tests/inventory

@@ -0,0 +1 @@
+localhost

data/lib/orats/templates/includes/role/tests/main.yml

@@ -0,0 +1,7 @@
+---
+- hosts: localhost
+  remote_user: travis
+  sudo: true
+
+  roles:
+    - repo_name

data/lib/orats/templates/playbook.rb

@@ -1,5 +1,3 @@
-require 'securerandom'
-
 # =============================================================================
 # template for generating an orats ansible playbook for ansible 1.6.x
 # =============================================================================
@@ -9,10 +7,6 @@ require 'securerandom'
 # -----------------------------------------------------------------------------
 # private functions
 # -----------------------------------------------------------------------------
-def generate_token
-  SecureRandom.hex(64)
-end
-
 def method_to_sentence(method)
   method.tr!('_', ' ')
   method[0] = method[0].upcase
@@ -65,6 +59,13 @@ def add_playbook_directory
   git_commit 'Initial commit'
 end
 
+def add_gitignore
+  log_task __method__
+
+  copy_from_local_gem '../common/.gitignore', '.gitignore'
+  git_commit 'Add .gitignore'
+end
+
 def add_license
   log_task __method__
 
@@ -78,11 +79,18 @@ def add_license
   git_commit 'Add MIT license'
 end
 
-def add_main_playbook
+def add_common_plays
+  log_task __method__
+
+  copy_from_local_gem 'common.yml'
+  git_commit 'Add common playsk'
+end
+
+def add_site_plays
   log_task __method__
 
   copy_from_local_gem 'site.yml'
-  git_commit 'Add the main playbook'
+  git_commit 'Add the site plays'
 end
 
 def add_galaxyfile
@@ -103,7 +111,9 @@ end
 
 delete_generated_rails_code
 add_playbook_directory
+add_gitignore
 add_license
-add_main_playbook
+add_common_plays
+add_site_plays
 add_galaxyfile
 remove_unused_files_from_git

data/lib/orats/templates/role.rb

@@ -0,0 +1,144 @@
+# =============================================================================
+# template for generating an orats ansible role for ansible 1.6.x
+# =============================================================================
+# view the task list at the bottom of the file
+# -----------------------------------------------------------------------------
+
+# -----------------------------------------------------------------------------
+# private functions
+# -----------------------------------------------------------------------------
+def method_to_sentence(method)
+  method.tr!('_', ' ')
+  method[0] = method[0].upcase
+  method
+end
+
+def log_task(message)
+  puts
+  say_status 'task', "#{method_to_sentence(message.to_s)}:", :yellow
+  puts '-'*80, ''; sleep 0.25
+end
+
+def git_commit(message)
+  git add: '-A'
+  git commit: "-m '#{message}'"
+end
+
+def git_config(field)
+  command         = "git config --global user.#{field}"
+  git_field_value = run(command, capture: true).gsub("\n", '')
+  default_value   = "YOUR_#{field.upcase}"
+
+  git_field_value.to_s.empty? ? default_value : git_field_value
+end
+
+def copy_from_local_gem(source, dest = '')
+  dest = source if dest.empty?
+
+  base_path = "#{File.expand_path File.dirname(__FILE__)}/includes/role"
+
+  run "mkdir -p #{File.dirname(dest)}" unless Dir.exist?(File.dirname(dest))
+  run "cp -f #{base_path}/#{source} #{dest}"
+end
+
+# ---
+
+def delete_generated_rails_code
+  log_task __method__
+
+  run 'rm -rf * .git .gitignore'
+end
+
+def add_role_directory
+  log_task __method__
+
+  run "mkdir -p #{app_name}"
+  run "mv #{app_name}/* ."
+  run "rm -rf #{app_name}"
+  git :init
+  git_commit 'Initial commit'
+end
+
+def add_gitignore
+  log_task __method__
+
+  copy_from_local_gem '../common/.gitignore', '.gitignore'
+  git_commit 'Add .gitignore'
+end
+
+def add_main_role
+  log_task __method__
+
+  folders = %w(defaults files handlers tasks templates)
+
+  run "mkdir #{folders.join(' ')}"
+
+  folders.delete_if { |folder| folder == 'files' || folder == 'templates' }
+  folders.each do |folder|
+    run "echo '---\n# #{folder} go here' > #{folder}/main.yml"
+  end
+end
+
+def add_license
+  log_task __method__
+
+  author_name  = git_config 'name'
+  author_email = git_config 'email'
+
+  copy_from_local_gem '../common/LICENSE', 'LICENSE'
+  gsub_file 'LICENSE', 'Time.now.year', Time.now.year.to_s
+  gsub_file 'LICENSE', 'author_name', author_name
+  gsub_file 'LICENSE', 'author_email', author_email
+  git_commit 'Add MIT license'
+end
+
+def add_readme
+  log_task __method__
+
+  role_info   = File.basename(app_name).split('_')
+  github_user = role_info[0]
+  role_name   = role_info[1]
+
+  copy_from_local_gem 'README.md'
+  gsub_file 'README.md', 'github_user', github_user
+  gsub_file 'README.md', 'role_name', role_name
+  git_commit 'Add readme'
+end
+
+def add_meta_information
+  log_task __method__
+
+  author_name = git_config 'name'
+
+  copy_from_local_gem 'meta/main.yml'
+  gsub_file 'meta/main.yml', 'author_name', author_name
+  git_commit 'Add meta information'
+end
+
+def add_tests_and_travis
+  log_task __method__
+
+  copy_from_local_gem '.travis.yml'
+  copy_from_local_gem 'tests/main.yml'
+  copy_from_local_gem 'tests/inventory'
+  git_commit 'Add tests and travis-ci'
+end
+
+def remove_unused_files_from_git
+  log_task __method__
+
+  git add: '-u'
+  git_commit 'Remove unused files'
+end
+
+# ---
+
+delete_generated_rails_code
+add_role_directory
+add_gitignore
+add_main_role
+add_license
+add_readme
+add_meta_information
+add_tests_and_travis
+remove_unused_files_from_git

data/lib/orats/version.rb

@@ -1,3 +1,3 @@
 module Orats
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

data/test/integration/cli_test.rb

@@ -49,6 +49,36 @@ class TestCLI < Minitest::Test
     assert_playbook target_path
   end
 
+  def test_role
+    @target_path = 'githubname.myrole'
+    @extra_flags = '-r ansible-myrole'
+
+    out, err = capture_orats('role')
+
+    assert_match /success/, out, err
+
+    absolute_target_path = "#{TEST_PATH}/#{@target_path}"
+
+    assert_path "#{absolute_target_path}/.gitignore"
+    assert_path "#{absolute_target_path}/.travis.yml"
+    assert_path "#{absolute_target_path}/README.md"
+    assert_path "#{absolute_target_path}/LICENSE"
+    assert_path "#{absolute_target_path}/tests"
+    assert_path "#{absolute_target_path}/tests/main.yml"
+    assert_path "#{absolute_target_path}/tests/inventory"
+    refute_path "#{absolute_target_path}/files/main.yml"
+    refute_path "#{absolute_target_path}/templates/main.yml"
+
+    meta_main  = IO.read("#{absolute_target_path}/meta/main.yml")
+    readme     = IO.read("#{absolute_target_path}/README.md")
+    tests_main = IO.read("#{absolute_target_path}/tests/main.yml")
+
+    refute meta_main.include?('author_name')
+    assert_count readme, 'githubname.myrole', 2
+    assert_count readme, 'ansible-myrole', 3
+    assert_count tests_main, 'myrole', 1
+  end
+
   def test_diff
     assert_diff
 
@@ -136,6 +166,7 @@ class TestCLI < Minitest::Test
 
     assert_orats 'playbook', 'success'
     assert_path "#{TEST_PATH}/#{@target_path}/Galaxyfile"
+    assert_ansible_yaml "#{TEST_PATH}/#{@target_path}/common.yml"
     assert_ansible_yaml "#{TEST_PATH}/#{@target_path}/site.yml"
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orats
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Nick Janetakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -93,9 +93,11 @@ files:
 - lib/orats/commands/project/exec.rb
 - lib/orats/commands/project/rails.rb
 - lib/orats/commands/project/server.rb
+- lib/orats/commands/role.rb
 - lib/orats/commands/ui.rb
 - lib/orats/templates/auth.rb
 - lib/orats/templates/base.rb
+- lib/orats/templates/includes/common/.gitignore
 - lib/orats/templates/includes/common/LICENSE
 - lib/orats/templates/includes/inventory/group_vars/all.yml
 - lib/orats/templates/includes/inventory/hosts
@@ -149,8 +151,15 @@ files:
 - lib/orats/templates/includes/new/rails/test/fixtures/accounts.yml
 - lib/orats/templates/includes/new/rails/test/models/account_test.rb
 - lib/orats/templates/includes/playbook/Galaxyfile
+- lib/orats/templates/includes/playbook/common.yml
 - lib/orats/templates/includes/playbook/site.yml
+- lib/orats/templates/includes/role/.travis.yml
+- lib/orats/templates/includes/role/README.md
+- lib/orats/templates/includes/role/meta/main.yml
+- lib/orats/templates/includes/role/tests/inventory
+- lib/orats/templates/includes/role/tests/main.yml
 - lib/orats/templates/playbook.rb
+- lib/orats/templates/role.rb
 - lib/orats/version.rb
 - orats.gemspec
 - test/integration/cli_test.rb