shelter 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e6809cf1cc3418ab086795b255461754ce0be7a
-  data.tar.gz: 40bd1fd16a6f62e754a840f0941a7acfe8d653f1
+  metadata.gz: 62ec7754e2e7dcd08f0dba471c3ebeeb09836edb
+  data.tar.gz: 5ccd488f997f030c0c2268192c70c38ef72f70b8
 SHA512:
-  metadata.gz: f1637a566b08c10a54ff2253af02e047decdfa67a4c0a3582c4c91b34b57aa70f6de04357b32e0e5e90d884e9f39d5f1f0a3c6a7d4a81d8b2267f2bbf5581cb4
-  data.tar.gz: 27ec4c6ed3bc358586bd60ad66c5c00d9a7380024aa1277dafb2beb00ae4a819f3e92b9bc79ab7574aea144725130a73f88057d4302fa0862f0ff0a1000a097a
+  metadata.gz: d61b98c4356bff597e3a990af0570a4b0aa87caadbf922ad33e5bd1f816d29f4da9362e293fff87c509a67992f6c8809614c67896d1b17998a0c182fb071e163
+  data.tar.gz: 501b0a2d33ba7e989481054813d2ad235386df9b5248a390a44f2ea2a34d3a2892376b1f984e2b37a7effb46c2843cadf6f3ec4e88ff69dbd5d32074d17fe3e9

data/README.md

@@ -1,95 +1,55 @@
-[![Gem Version](https://badge.fury.io/rb/shelter.svg)](https://badge.fury.io/rb/shelter)
-[![Build Status](https://travis-ci.org/Yitsushi/shelter.svg?branch=master)](https://travis-ci.org/Yitsushi/shelter)
+Manage your infrastructure in one place Edit
 
-# Configuration
+# Getting Started
 
-Create `Shelterfile.rb`:
+1. Create a directory for your project:
+
+```
+$ mkdir myinfra && cd myinfra
+```
+
+2. Create your `Shelterfile.rb` and define your environment:
 
 ```ruby
 Shelter::CLI::App.config do |c|
+  # All of them are optional
   c.ansible_directory = 'ansible'
   c.stack_directory = 'stack'
   c.plugin_directory = 'plugin'
   c.inventory_directory = 'inventory'
+  c.resource_directory = 'resources'
   c.secure_root = ENV.fetch('CHEPPERS_SECURE')
 end
 ```
 
-# Inventory script
-
-Create a ruby file under your inventory directory:
+3. Create the directory structure
 
-```ruby
-# inventory/my_inventory.rb
-module Inventory
-  class MyInventory
-    def load(inventory)
-      inventory.add_group_vars 'groupname', ch_env: 'value'
-      inventory.add_server 'groupname', 'ip-address'
-    end
-  end
-end
 ```
-
-# Define a stack
-
-Create a directory under your `stack` directory (eg: `random`)
-and create your template there. `cli.rb` will be loaded.
-
-```ruby
-# stack/random_stack/cli.rb:
-module Stack
-  class RandomStack < Shelter::CLI::Stack::CloudFormation
-    set_attr :stack_name, 'random'
-    set_attr :template_file, File.expand_path('template.yaml', File.dirname(__FILE__))
-    set_attr :meta, {
-      type: 'development',
-      client: 'cheppers',
-      application: 'random'
-    }
-  end
-end
+$ mkdir -p ansible stack plugin inventory resources/templates
 ```
 
-# Create plugin
-
-Create a directory under your `plugin` directory and place your code there.
-`main.rb` will be loaded.
-
-### Example #1: extra command
-
-```ruby
-# plugin/check/main.rb
-require 'thor'
-
-module Plugin
-  class Check < Thor
-    desc 'environment', 'Check environment'
-    def environment
-      puts "check"
-    end
-  end
-end
+4. Create your first Ansible playbook: `ansible/configuration.yaml`
 
-Shelter::CLI::App.register(Plugin::Check, 'check', 'check [COMMAND]', 'check plugin')
+```yaml
+---
+- name: Ping all hosts
+  hosts: all
+  tasks:
+    - ping:
 ```
 
-### Example #2: extra command under a specific namespace
+# Documentation
 
-```ruby
-# plugin/ansible_scanner/main.rb
-require 'thor'
+- [Resource management](https://yitsushi.github.io/shelter/docs/resource-management/)
+- [Inventory scripts](https://yitsushi.github.io/shelter/docs/inventory-scripts/)
+- [Define a Stack](https://yitsushi.github.io/shelter/docs/define-a-stack/)
+- [Write Your Own Plugin](https://yitsushi.github.io/shelter/docs/write-your-own-plugin/)
 
-module Plugin
-  class Ansible < Thor
-    desc 'scanner', 'scanner'
-    def scanner
-      puts "scan"
-    end
+## Code Status
 
-    default_task :scanner
-  end
-end
+[![Gem Version](https://badge.fury.io/rb/shelter.svg)](https://badge.fury.io/rb/shelter)
+[![Build Status](https://travis-ci.org/Yitsushi/shelter.svg?branch=master)](https://travis-ci.org/Yitsushi/shelter)
 
-Shelter::CLI::Command::Ansible.register(Plugin::Ansible, 'scanner', 'scanner', 'Scan')
-```
+## License
+
+Shelter is released under the [MIT License](http://www.opensource.org/licenses/MIT).

data/lib/cli/app.rb

@@ -2,6 +2,7 @@
 
 require 'thor'
 
+require_all(File.join(File.dirname(__FILE__), 'helpers'))
 require_all(File.join(File.dirname(__FILE__), 'command'))
 require_all(File.join(File.dirname(__FILE__), 'stack'))
 
@@ -24,7 +25,14 @@ module Shelter
         'ansible',
         'ansible [COMMAND]',
         'Ansible related commands'
-      )
+      ) if File.directory?(App.config.ansible_directory)
+
+      register(
+        Shelter::CLI::Command::Resource,
+        'resource',
+        'resource [COMMAND]',
+        'Resource management'
+      ) if File.directory?(App.config.resource_directory)
 
       # Register server managers
       base_path = File.join(App.config.stack_directory, '*')

data/lib/cli/command/ansible.rb

@@ -21,6 +21,7 @@ module Shelter
                       type: :string,
                       default: nil,
                       desc: 'Specify inventory file/script'
+        # Calls Ansible with the `configuration.yaml` playbook
         def update
           ansible_execute(
             'configuration',
@@ -32,7 +33,7 @@ module Shelter
         end
 
         no_commands do
-          include Shelter::CLI::AnsibleHelpers
+          include Shelter::CLI::Helpers::Ansible
         end
       end
     end

data/lib/cli/command/resource.rb

@@ -0,0 +1,307 @@
+# frozen_string_literal: true
+
+require 'thor'
+require 'yaml'
+
+module Shelter
+  module CLI
+    module Command
+      ##
+      # Resource subcommand for Shelter
+      #
+      # = Basic Directory Structure
+      #
+      # By default Shelter is looking for a directory named +resources+
+      # with a subdirectory name +templates+.
+      #
+      # In the +templates+ subdirectory we can define different templates.
+      # They have to be a valid CloudFormation +.yaml+ file.
+      #
+      # In the +resources+ directory we can define different resources.
+      # They have to be defined in +.yaml+ format with a few specific
+      # tags in it.
+      #
+      #   +-- resources
+      #   |   +-- templates
+      #   |   |   `-- restricted-s3.yaml
+      #   |   `-- testbucketresource.yaml
+      #
+      # You can specify where is your +resources+ directory in +Shelterfile.rb+
+      # with +resource_directory+.
+      #
+      # == Templates definition
+      #
+      # In our example above, we have only one template named +restricted-s3+.
+      # This template defined a CloudFormation stack that contains
+      # an S3 bucket, an IAM User and a Policy for that specific user which
+      # restricts the user to be able to reach only our new
+      # S3 Bucket, but nothing else. User we create the IAM User,
+      # we create a new AccessKey pair, so we can use the credentials in our
+      # infrastucrute. Now, for the simplicity we did not define a KMS key.
+      #
+      # As an output we export the newly created +AccessKeyID+
+      # and +AccessKeySecret+ pair.
+      #
+      # We have three template parameters:
+      #
+      # - S3 Bucket name
+      # - Client name for tagging our S3 Bucket (reason: billing)
+      # - Project name for tagging our S3 Bucket (reason: billing)
+      #
+      # resources/templates/restricted-s3.yaml:
+      #
+      #   ---
+      #   AWSTemplateFormatVersion: "2010-09-09"
+      #   Parameters:
+      #     BucketName:
+      #       Type: String
+      #       Description: Created S3 bucket
+      #     Client:
+      #       Type: String
+      #       Description: Name of the client for tagging
+      #     Project:
+      #       Type: String
+      #       Description: Project tag
+      #   Resources:
+      #     Bucket:
+      #       Type: AWS::S3::Bucket
+      #       Properties:
+      #         BucketName: !Ref BucketName
+      #         Tags:
+      #           - { Key: "project", Value: !Ref Project }
+      #           - { Key: "client", Value: !Ref Client }
+      #     S3Policy:
+      #       Type: "AWS::IAM::Policy"
+      #       Properties:
+      #         PolicyName: !Join ["-", ["s3", !Ref BucketName]]
+      #         Users:
+      #           - !Ref NewUser
+      #         PolicyDocument:
+      #           Version: "2012-10-17"
+      #           Statement:
+      #             - Effect: "Allow"
+      #               Action:
+      #                 - "s3:PutObject"
+      #                 - "s3:GetObjectAcl"
+      #                 - "s3:GetObject"
+      #                 - "s3:GetObjectTorrent"
+      #                 - "s3:GetBucketTagging"
+      #                 - "s3:GetObjectTagging"
+      #                 - "s3:ListBucket"
+      #                 - "s3:PutObjectTagging"
+      #                 - "s3:DeleteObject"
+      #               Resource:
+      #                 - !GetAtt [Bucket, Arn]
+      #                 - !Join ["", [!GetAtt [Bucket, Arn], "/*"]]
+      #     NewUser:
+      #       Type: "AWS::IAM::User"
+      #       Properties:
+      #         UserName: !Join ["-", ["s3", !Ref BucketName, "user"]]
+      #         Path: /
+      #     AccessKey:
+      #       Type: AWS::IAM::AccessKey
+      #       Properties:
+      #         UserName: !Ref NewUser
+      #
+      #   Outputs:
+      #     AccessKeyID:
+      #       Value:
+      #         !Ref AccessKey
+      #     SecretKeyID:
+      #       Value: !GetAtt AccessKey.SecretAccessKey
+      #
+      # == Resource definition
+      #
+      # Now we have a template named +restricted-s3+. We can start creating
+      # resources with this template. For now we can create a backup user
+      # and S3 bucket, so all of our servers with a specific label can
+      # call AWS API to make some backup on our specific S3 bucket.
+      #
+      # Let's create a file under +resources+:
+      #
+      #   ---
+      #   name: testbucketresource
+      #   template: restricted-s3
+      #   capabilities:
+      #     - CAPABILITY_NAMED_IAM
+      #   tags:
+      #     random: yes
+      #     project: test
+      #     client: cheppers
+      #     extra: something
+      #   parameters:
+      #     BucketName: my-testresource
+      #     Client: cheppers
+      #     Project: test
+      #
+      # Here we go. Basically all of the keys in this file are required,
+      # or if we don't define them, they will be empty (like tags).
+      #
+      # ==== Name
+      #
+      # This will be the name of our resource. It will be stack name as well,
+      # but prefixed with the +res-+ string.
+      # In this case +res-testbucketresource+.
+      #
+      # ==== Template
+      #
+      # This value defines which one of our template we want to use.
+      # In this case we want to use our only one +restricted-s3+ which
+      # is defined in +resources/templates/restricted-s3.yaml+.
+      #
+      # ==== Capabilities
+      #
+      # AWS CloudFormation capabilities. For more details check.
+      # [AWS API Documentation](http://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_CreateStack.html).
+      # Now we want to manage IAM resources, so we need +CAPABILITY_IAM+
+      # in general, but now we give them custom names
+      # so we need +CAPABILITY_NAMED_IAM+.
+      #
+      # ==== Tags
+      #
+      # This is a simple key-value list. Our CloudFormation stack
+      # will be tagged with these tags.
+      #
+      # === Parameters
+      #
+      # This is a simple ket-value list. That's how we can
+      # define parameters for our CloudFormation template.
+      ##
+      class Resource < Thor
+        desc 'list', 'List all managed resources'
+        # With +list+ we can check our resource inventory.
+        #
+        #   $ bundle exec shelter resource list
+        #   testbucketresource
+        def list
+          Dir.glob("#{App.config.resource_directory}/*.yaml").each do |res|
+            puts File.basename(res, '.yaml')
+          end
+        end
+
+        desc 'status <resource-name>', 'Resource status'
+        # With +status+ we can ask for the stack status.
+        #
+        #   $ bundle exec shelter resource status testbucketresource
+        #   Resource ID: AKIXXXXXXXXXXXXXXXXX
+        #     Resource Type: AWS::IAM::AccessKey
+        #     Resource Status: CREATE_COMPLETE
+        #   Resource ID: cheppers-testresource
+        #     Resource Type: AWS::S3::Bucket
+        #     Resource Status: CREATE_COMPLETE
+        #   Resource ID: s3-cheppers-testresource-user
+        #     Resource Type: AWS::IAM::User
+        #     Resource Status: CREATE_COMPLETE
+        #   Resource ID: res-t-S3Po-W66XXXXXXXXX
+        #     Resource Type: AWS::IAM::Policy
+        #     Resource Status: CREATE_COMPLETE
+        def status(resource_name)
+          resource = read_resource(resource_name)
+
+          stack = cf_client.describe_stacks(
+            stack_name: resource['name']
+          ).stacks.first
+
+          cf_client.describe_stack_resources(
+            stack_name: stack.stack_name
+          ).stack_resources.each { |r| display_stack_resource(r) }
+        rescue Aws::CloudFormation::Errors::ValidationError
+          puts "#{resource_name} does not exist"
+        end
+
+        desc 'output <resource-name>', 'Display resource output'
+        # If we defined Outputs in our template, we can easily
+        # list them all with +output+ command
+        #
+        #   $ bundle exec shelter resource output testbucketresource
+        #   AccessKeyID: AKIXXXXXXXXXXXXXXXXX
+        #   SecretKeyID: 3cXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXuI
+        def output(resource_name)
+          resource = read_resource(resource_name)
+
+          stack = cf_client.describe_stacks(
+            stack_name: resource['name']
+          ).stacks.first
+
+          stack.outputs.each { |out| display_stack_output(out) }
+        end
+
+        desc 'update <resource-name>', 'Update a specific resource'
+        # With +update+, we can update a specific resource.
+        #
+        #   $ bundle exec shelter resource update testbucketresource
+        #   Waiting for 'stack_update_complete' on 'res-testbucketresource'...
+        def update(resource_name)
+          res = read_resource(resource_name)
+          cf_client.update_stack(
+            stack_name: res['name'], capabilities: res['capabilities'],
+            template_body: read_template(res['template']),
+            tags: res['tags'], parameters: res['parameters']
+          )
+          wait_until(:stack_update_complete, resource['name'])
+        rescue Aws::CloudFormation::Errors::ValidationError => e
+          puts e.message
+        end
+
+        desc 'delete <resource-name>', 'Delete a specific resource'
+        # With +delete+ we can delete the whole stack.
+        #
+        #   $ bundle exec shelter resource delete testbucketresource
+        #   Waiting for 'stack_delete_complete' on 'res-testbucketresource'...
+        def delete(resource_name)
+          resource = read_resource(resource_name)
+          cf_client.delete_stack(stack_name: resource['name'])
+          wait_until(:stack_delete_complete, resource['name'])
+        end
+
+        desc 'create <resource-name>', 'Create a specific resource'
+        # With +create+, we can create a specific resource.
+        #
+        #   $ bundle exec shelter resource create testbucketresource
+        #   Waiting for 'stack_create_complete' on 'res-testbucketresource'...
+        def create(resource_name)
+          res = read_resource(resource_name)
+          cf_client.create_stack(
+            stack_name: res['name'], capabilities: res['capabilities'],
+            template_body: read_template(res['template']),
+            tags: res['tags'], parameters: res['parameters']
+          )
+          wait_until(:stack_create_complete, res['name'])
+        end
+
+        private
+
+        no_commands do
+          include Shelter::CLI::Helpers::CloudFormation
+
+          # Reads and validates a resource description file.
+          #
+          # If mandatory fields are not defined, it will rais an error.
+          # For every other fields, it just fills with default value.
+          def read_resource(name)
+            res = YAML.load_file(
+              "#{App.config.resource_directory}/#{name}.yaml"
+            )
+            raise 'No name specified...' if res['name'].nil?
+
+            res['name'] = "res-#{res['name']}"
+            res['capabilities'] ||= []
+            res['tags'] = stack_meta(res['tags'] || {})
+            res['parameters'] = stack_params(res['parameters'] || {})
+            res
+          end
+
+          # Easier to reference on templates directory
+          def resource_template_dir
+            "#{App.config.resource_directory}/templates"
+          end
+
+          # It's simply reads a speciifc template file content
+          def read_template(name)
+            File.open("#{resource_template_dir}/#{name}.yaml").read
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cli/helpers/ansible_helper.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Shelter
+  module CLI
+    module Helpers
+      # Mixin module for Ansible
+      module Ansible
+        def vault_password_file
+          [
+            '--vault-password-file',
+            "#{App.config.secure_root}/ansible_vault_password"
+          ].join(' ')
+        end
+
+        def inventory_file(inventory)
+          inventory ||= App.config.inventory_script
+          "--inventory #{inventory}"
+        end
+
+        def command_bin
+          'ansible-playbook'
+        end
+
+        def new_server_params(server_user)
+          command = []
+          command << "--user #{server_user} --ask-pass" unless server_user.nil?
+          command
+        end
+
+        def optional_params(opts)
+          command = []
+          command << "--tags '#{opts[:tags].join(',')}'" unless
+            opts[:tags].empty?
+          command << "--skip-tags '#{opts[:skip].join(',')}'" unless
+            opts[:skip].empty?
+          command << "--limit '#{opts[:limit]}'" unless opts[:limit].nil?
+          command
+        end
+
+        # server_user: nil, inventory: nil,
+        # tags: [], skip: [], limit: nil
+        def ansible_execute(playbook, options = {})
+          params = {
+            inventory: nil, server_user: nil, tags: [], skip: [], limit: nil
+          }.merge(options)
+          command = [command_bin, inventory_file(params[:inventory]),
+                     vault_password_file]
+          command += new_server_params(params[:server_user])
+          command += optional_params(params)
+          command << "#{App.config.ansible_directory}/#{playbook}.yaml"
+
+          full_command = command.join(' ')
+          system full_command
+        end
+      end
+    end
+  end
+end

data/lib/cli/helpers/cloudformation_helper.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Shelter
+  module CLI
+    module Helpers
+      # Mixin module for CloudFormation
+      module CloudFormation
+        def cf_client
+          @cf_client ||= Aws::CloudFormation::Client.new(
+            credentials: Aws::Credentials.new(
+              ENV.fetch('AWS_ACCESS_KEY_ID'),
+              ENV.fetch('AWS_SECRET_ACCESS_KEY')
+            )
+          )
+        end
+
+        def wait_until(status, stack_name)
+          puts "Waiting for '#{status}' on '#{stack_name}'..."
+          cf_client.wait_until(
+            status,
+            stack_name: stack_name
+          )
+        end
+
+        def display_stack_resource(r)
+          puts "Resource ID: #{r.physical_resource_id}"
+          puts "  Resource Type: #{r.resource_type}"
+          puts "  Resource Status: #{r.resource_status}"
+        end
+
+        def display_stack_output(out)
+          puts out.description unless out.description.nil?
+          puts "#{out.output_key}: #{out.output_value}"
+        end
+
+        def stack_meta(res, type: 'resource')
+          tags = []
+
+          res.each do |key, value|
+            tags << { key: key.to_s, value: value.to_s }
+          end
+
+          tags << { key: 'type', value: type }
+
+          tags
+        end
+
+        def stack_params(res)
+          params = []
+
+          res.each do |key, value|
+            params << { parameter_key: key.to_s, parameter_value: value.to_s }
+          end
+
+          params
+        end
+      end
+    end
+  end
+end

data/lib/cli/stack/cloud_formation.rb

@@ -14,38 +14,51 @@ module Shelter
             stack_name: get_attr(:stack_name)
           ).stacks.first
 
-          puts "#{stack.stack_name} exists | #{stack.creation_time}"
-
           cf_client.describe_stack_resources(
             stack_name: stack.stack_name
           ).stack_resources.each { |r| display_stack_resource(r) }
+        rescue Aws::CloudFormation::Errors::ValidationError
+          puts "#{get_attr(:stack_name)} does not exist"
+        end
+
+        desc 'output', 'Display resource output'
+        def output
+          stack = cf_client.describe_stacks(
+            stack_name: get_attr(:stack_name)
+          ).stacks.first
+
+          stack.outputs.each { |out| display_stack_output(out) }
         end
 
         desc 'create', 'Create stack'
         def create
           cf_client.create_stack(
             stack_name: get_attr(:stack_name),
+            capabilities: get_attr(:capabilities),
             template_body: File.open(get_attr(:template_file)).read,
-            capabilities: ['CAPABILITY_IAM'],
-            tags: stack_meta
-          )
-          cf_client.wait_until(
-            :stack_create_complete,
-            stack_name: get_attr(:stack_name)
+            tags: meta, parameters: stack_params(get_attr(:parameters))
           )
+          wait_until(:stack_create_complete, get_attr(:stack_name))
         end
 
         desc 'update', 'Update stack'
         def update
           cf_client.update_stack(
             stack_name: get_attr(:stack_name),
+            capabilities: get_attr(:capabilities),
             template_body: File.open(get_attr(:template_file)).read,
-            capabilities: ['CAPABILITY_IAM']
-          )
-          cf_client.wait_until(
-            :stack_update_complete,
-            stack_name: get_attr(:stack_name)
+            tags: meta, parameters: stack_params(get_attr(:parameters))
           )
+          wait_until(:stack_update_complete, get_attr(:stack_name))
+        rescue Aws::CloudFormation::Errors::ValidationError => e
+          puts e.message
+        end
+
+        desc 'delete', 'Delete the stack'
+        def delete
+          raise 'Stack is not deletable!!!' unless get_attr(:deletable)
+          cf_client.delete_stack(stack_name: get_attr(:stack_name))
+          wait_until(:stack_delete_complete, get_attr(:stack_name))
         end
 
         # Attribute helpers
@@ -53,7 +66,10 @@ module Shelter
           class << self
             attr_accessor :_attr
             def set_attr(name, value)
-              self._attr ||= {}
+              self._attr ||= {
+                tags: {},
+                parameters: {}
+              }
               self._attr[name] = value
             end
           end
@@ -65,28 +81,16 @@ module Shelter
 
         # AWS helpers
         no_commands do
-          def cf_client
-            @cf_client ||= Aws::CloudFormation::Client.new(
-              credentials: Aws::Credentials.new(
-                ENV.fetch('AWS_ACCESS_KEY_ID'),
-                ENV.fetch('AWS_SECRET_ACCESS_KEY')
-              )
-            )
-          end
-
-          def display_stack_resource(r)
-            puts "Stack Name: #{r.stack_name}"
-            puts "Resource ID: #{r.physical_resource_id}"
-            puts "Resource Type: #{r.resource_type}"
-            puts "Resource Status: #{r.resource_status}"
-          end
+          include Shelter::CLI::Helpers::CloudFormation
 
-          def stack_meta
-            [
-              { key: 'client', value: get_attr(:meta)[:client] },
-              { key: 'type', value: get_attr(:meta)[:type] },
-              { key: 'application', value: get_attr(:meta)[:application] }
-            ]
+          def meta
+            stack_meta(
+              get_attr(:tags).merge(
+                client: get_attr(:meta)[:client],
+                application: get_attr(:meta)[:application]
+              ),
+              type: get_attr(:meta)[:type]
+            )
           end
         end
       end

data/lib/configuration.rb

@@ -8,13 +8,15 @@ module Shelter
                   :secure_root,
                   :inventory_script,
                   :inventory_directory,
-                  :plugin_directory
+                  :plugin_directory,
+                  :resource_directory
 
     attr_reader   :project_root
 
     def initialize
       @ansible_directory = 'ansible'
       @stack_directory = 'stacks'
+      @resource_directory = 'resources'
       @secure_root = ENV.fetch('SECURE', 'secure')
       @inventory_script = File.join(
         File.dirname($PROGRAM_NAME),

data/lib/shelter.rb

@@ -27,9 +27,15 @@ LIB_ROOT = File.expand_path('../', __FILE__)
 
 def require_all(dir)
   path = File.join(dir, '*')
+  later = []
   Dir.glob(path).each do |file|
     require file if File.file?(file)
-    require_all(file) if File.directory?(file)
+    later << file if File.directory?(file)
+  end
+
+  # Require subdirs
+  later.each do |file|
+    require_all(file)
   end
 end
 

data/lib/version.rb

@@ -3,5 +3,5 @@
 module Shelter
   # Current version to publish
   # Gemspec also uses this constant
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelter
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Balazs Nadasdi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -86,16 +86,20 @@ executables:
 - shelter
 - shelter-inventory
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- LICENSE.md
+- README.md
 files:
-- LICENSE
+- LICENSE.md
 - README.md
 - bin/shelter
 - bin/shelter-inventory
 - lib/ansible/inventory.rb
-- lib/cli/ansible_helper.rb
 - lib/cli/app.rb
 - lib/cli/command/ansible.rb
+- lib/cli/command/resource.rb
+- lib/cli/helpers/ansible_helper.rb
+- lib/cli/helpers/cloudformation_helper.rb
 - lib/cli/stack/cloud_formation.rb
 - lib/configuration.rb
 - lib/shelter.rb
@@ -105,7 +109,11 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- "--main"
+- README.md
+- "--line-numbers"
+- "--all"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement

data/lib/cli/ansible_helper.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-module Shelter
-  module CLI
-    # Mixin module for Ansible
-    module AnsibleHelpers
-      def vault_password_file
-        [
-          '--vault-password-file',
-          "#{App.config.secure_root}/ansible_vault_password"
-        ].join(' ')
-      end
-
-      def inventory_file(inventory)
-        inventory ||= App.config.inventory_script
-        "--inventory #{inventory}"
-      end
-
-      def command_bin
-        'ansible-playbook'
-      end
-
-      def new_server_params(server_user)
-        command = []
-        command << "--user #{server_user} --ask-pass" unless server_user.nil?
-        command
-      end
-
-      def optional_params(opts)
-        command = []
-        command << "--tags '#{opts[:tags].join(',')}'" unless opts[:tags].empty?
-        command << "--skip-tags '#{opts[:skip].join(',')}'" unless
-          opts[:skip].empty?
-        command << "--limit '#{opts[:limit]}'" unless opts[:limit].nil?
-        command
-      end
-
-      # server_user: nil, inventory: nil,
-      # tags: [], skip: [], limit: nil
-      def ansible_execute(playbook, options = {})
-        params = {
-          inventory: nil, server_user: nil, tags: [], skip: [], limit: nil
-        }.merge(options)
-        command = [command_bin, inventory_file(params[:inventory]),
-                   vault_password_file]
-        command += new_server_params(params[:server_user])
-        command += optional_params(params)
-        command << "#{App.config.ansible_directory}/#{playbook}.yaml"
-
-        full_command = command.join(' ')
-        system full_command
-      end
-    end
-  end
-end