shelter 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4af3e0a261fda7eac0a113a58b69e2584709775
-  data.tar.gz: 231b3b5e68efab28aced80863dde26ce4325f8ed
+  metadata.gz: 0e6809cf1cc3418ab086795b255461754ce0be7a
+  data.tar.gz: 40bd1fd16a6f62e754a840f0941a7acfe8d653f1
 SHA512:
-  metadata.gz: 3b202c423bd81af7ea1a143d7ee790b3c615809ff1b1a159f28a2bf1cacc9e319ac7da0a404952e7d87934607ccbad5bae80866594a6c9c762b556dfd58dc281
-  data.tar.gz: d680464d08151bb0e0c8c6d2f65d45cdf5b438a6925b5cce6971212712557f8ded5d6e63ff63980b92c521f8958f4a9a22d43afe670f91be627a1e724447ba2b
+  metadata.gz: f1637a566b08c10a54ff2253af02e047decdfa67a4c0a3582c4c91b34b57aa70f6de04357b32e0e5e90d884e9f39d5f1f0a3c6a7d4a81d8b2267f2bbf5581cb4
+  data.tar.gz: 27ec4c6ed3bc358586bd60ad66c5c00d9a7380024aa1277dafb2beb00ae4a819f3e92b9bc79ab7574aea144725130a73f88057d4302fa0862f0ff0a1000a097a

data/README.md

@@ -1,8 +1,11 @@
+[![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)
+
 # Configuration
 
 Create `Shelterfile.rb`:
 
-```
+```ruby
 Shelter::CLI::App.config do |c|
   c.ansible_directory = 'ansible'
   c.stack_directory = 'stack'
@@ -16,7 +19,7 @@ end
 
 Create a ruby file under your inventory directory:
 
-```
+```ruby
 # inventory/my_inventory.rb
 module Inventory
   class MyInventory
@@ -33,7 +36,7 @@ end
 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
@@ -55,7 +58,7 @@ Create a directory under your `plugin` directory and place your code there.
 
 ### Example #1: extra command
 
-```
+```ruby
 # plugin/check/main.rb
 require 'thor'
 
@@ -73,7 +76,7 @@ Shelter::CLI::App.register(Plugin::Check, 'check', 'check [COMMAND]', 'check plu
 
 ### Example #2: extra command under a specific namespace
 
-```
+```ruby
 # plugin/ansible_scanner/main.rb
 require 'thor'
 

data/lib/cli/ansible_helper.rb

@@ -26,22 +26,25 @@ module Shelter
         command
       end
 
-      def optional_params(tags: [], skip: [], limit: nil)
+      def optional_params(opts)
         command = []
-        command << "--tags '#{tags.join(',')}'" unless tags.empty?
-        command << "--skip-tags '#{skip.join(',')}'" unless skip.empty?
-        command << "--limit '#{limit}'" unless limit.nil?
+        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
 
-      def ansible_execute(
-        playbook,
-        server_user: nil, inventory: nil,
-        tags: [], skip: [], limit: nil
-      )
-        command = [command_bin, inventory_file(inventory), vault_password_file]
-        command += new_server_params(server_user)
-        command += optional_params(tags: tags, skip: skip, limit: limit)
+      # 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(' ')

data/lib/cli/stack/cloud_formation.rb

@@ -10,24 +10,15 @@ module Shelter
       class CloudFormation < Thor
         desc 'status', 'Stack status'
         def status
-          target_stack = cf_client.describe_stacks(
+          stack = cf_client.describe_stacks(
             stack_name: get_attr(:stack_name)
           ).stacks.first
 
-          puts "#{target_stack.stack_name} exists..."
-          puts "Created: #{target_stack.creation_time}"
+          puts "#{stack.stack_name} exists | #{stack.creation_time}"
 
-          resources = cf_client.describe_stack_resources(
-            stack_name: target_stack.stack_name
-          )
-          resources.stack_resources.each do |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
-        rescue Exception => e
-          raise Thor::Error, e.message
+          cf_client.describe_stack_resources(
+            stack_name: stack.stack_name
+          ).stack_resources.each { |r| display_stack_resource(r) }
         end
 
         desc 'create', 'Create stack'
@@ -36,24 +27,12 @@ module Shelter
             stack_name: get_attr(:stack_name),
             template_body: File.open(get_attr(:template_file)).read,
             capabilities: ['CAPABILITY_IAM'],
-            tags: [
-              { key: 'client', value: get_attr(:meta)[:client] },
-              { key: 'type', value: get_attr(:meta)[:type] },
-              { key: 'application', value: get_attr(:meta)[:application] }
-            ]
+            tags: stack_meta
           )
-          i = 0
           cf_client.wait_until(
             :stack_create_complete,
             stack_name: get_attr(:stack_name)
-          ) do |w|
-            w.before_attempt do
-              i = (i + 1) % SPINNER.size
-              print "\r#{SPINNER[i]}"
-            end
-          end
-        rescue Exception => e
-          raise Thor::Error, e.message
+          )
         end
 
         desc 'update', 'Update stack'
@@ -63,32 +42,29 @@ module Shelter
             template_body: File.open(get_attr(:template_file)).read,
             capabilities: ['CAPABILITY_IAM']
           )
-          i = 0
           cf_client.wait_until(
             :stack_update_complete,
             stack_name: get_attr(:stack_name)
-          ) do |w|
-            w.before_attempt do
-              i = (i + 1) % SPINNER.size
-              print "\r#{SPINNER[i]}"
-            end
-          end
-        rescue Exception => e
-          raise Thor::Error, e.message
+          )
         end
 
+        # Attribute helpers
         no_commands do
           class << self
+            attr_accessor :_attr
             def set_attr(name, value)
-              @@_attr ||= {}
-              @@_attr[name] = value
+              self._attr ||= {}
+              self._attr[name] = value
             end
           end
 
           def get_attr(name)
-            @@_attr[name] if @@_attr.key? name
+            self.class._attr[name] if self.class._attr.key? name
           end
+        end
 
+        # AWS helpers
+        no_commands do
           def cf_client
             @cf_client ||= Aws::CloudFormation::Client.new(
               credentials: Aws::Credentials.new(
@@ -98,20 +74,19 @@ module Shelter
             )
           end
 
-          def public_ip
-            target_stack = cf_client.describe_stacks(
-              stack_name: get_attr(:stack_name)
-            ).stacks.first
-
-            resources = cf_client.describe_stack_resources(
-              stack_name: target_stack.stack_name
-            )
-
-            eip = resources.stack_resources.select do |r|
-              r.resource_type == 'AWS::EC2::EIP'
-            end.first
+          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
 
-            eip.physical_resource_id
+          def stack_meta
+            [
+              { key: 'client', value: get_attr(:meta)[:client] },
+              { key: 'type', value: get_attr(:meta)[:type] },
+              { key: 'application', value: get_attr(:meta)[:application] }
+            ]
           end
         end
       end

data/lib/shelter.rb

@@ -17,7 +17,9 @@ class String
              else
                string.sub(/^(?:(?=\b|[A-Z_])|\w)/) { $&.downcase }
              end
-    string.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{Regexp.last_match(1)}#{Regexp.last_match(2).capitalize}" }.gsub('/', '::')
+    string.gsub(%r{(?:_|(/))([a-z\d]*)}) do
+      "#{Regexp.last_match(1)}#{Regexp.last_match(2).capitalize}"
+    end.gsub('/', '::')
   end
 end
 

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelter
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Balazs Nadasdi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2017-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk