shelter 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6e01fa6f3c4c557007039ec6a00801fe964e56e
-  data.tar.gz: e836545cd87009fcc5c14c4a2f5051df4430a244
+  metadata.gz: a4af3e0a261fda7eac0a113a58b69e2584709775
+  data.tar.gz: 231b3b5e68efab28aced80863dde26ce4325f8ed
 SHA512:
-  metadata.gz: 3623a12c17917629240e4afc16f1bbd5b6377346bfe3f34c1c0ae867a76d782c79b0e06cc81528016a88d1039f6ea9abc84cc02c5492efd33498acbabda19555
-  data.tar.gz: 6f935734fdabcc64abb92e1eac449cdcefc58e1a1e55cd3a6ba2fd4ae9e291f5e9cda0ab6937e431e8c99f05373e1372604861180cddd7b9a15fe08e65cc7e64
+  metadata.gz: 3b202c423bd81af7ea1a143d7ee790b3c615809ff1b1a159f28a2bf1cacc9e319ac7da0a404952e7d87934607ccbad5bae80866594a6c9c762b556dfd58dc281
+  data.tar.gz: d680464d08151bb0e0c8c6d2f65d45cdf5b438a6925b5cce6971212712557f8ded5d6e63ff63980b92c521f8958f4a9a22d43afe670f91be627a1e724447ba2b

data/LICENSE

@@ -0,0 +1,22 @@
+The MIT License
+
+Copyright (C) 2017 by Balazs Nadasdi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+

data/README.md

@@ -17,6 +17,7 @@ end
 Create a ruby file under your inventory directory:
 
 ```
+# inventory/my_inventory.rb
 module Inventory
   class MyInventory
     def load(inventory)
@@ -32,9 +33,8 @@ end
 Create a directory under your `stack` directory (eg: `random`)
 and create your template there. `cli.rb` will be loaded.
 
-
-cli.rb:
 ```
+# stack/random_stack/cli.rb:
 module Stack
   class RandomStack < Shelter::CLI::Stack::CloudFormation
     set_attr :stack_name, 'random'

data/bin/shelter

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 $LOAD_PATH.push File.expand_path('../../lib', __FILE__)
 require 'shelter'

data/bin/shelter-inventory

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 $LOAD_PATH.push File.expand_path('../../lib', __FILE__)
 
@@ -9,16 +10,16 @@ inventory = Shelter::Ansible::Inventory.new
 Shelter::CLI::App.config.inventory.each do |script|
   begin
     require File.join(Shelter::CLI::App.config.project_root, script)
-    class_name = "Inventory::#{File.basename(script, File.extname(script)).camelize}"
-    inv = Object.const_get(class_name).new()
+    class_name = File.basename(script, File.extname(script)).camelize
+    class_name = "Inventory::#{class_name}"
+    inv = Object.const_get(class_name).new
     inv.load(inventory)
   rescue Exception => e
-    $stderr.puts "[x] Error with #{script}"
-    $stderr.puts e.message
+    warn "[x] Error with #{script}"
+    warn e.message
   end
 end
 
 puts inventory.to_json
 
 # vim: set filetype=ruby:
-

data/lib/ansible/inventory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Shelter
   module Ansible
     # Ansible Inventory representation
@@ -15,7 +17,7 @@ module Shelter
         @inv[group] ||= { hosts: [], vars: {} }
 
         @inv[group][:hosts] << ip
-        #@inv[group][:vars] = { ansible_host: ip }.merge(vars)
+        @inv[group][:vars].merge!(vars)
       end
 
       def to_json

data/lib/cli/ansible_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Shelter
   module CLI
     # Mixin module for Ansible
@@ -42,11 +44,9 @@ module Shelter
         command += optional_params(tags: tags, skip: skip, limit: limit)
         command << "#{App.config.ansible_directory}/#{playbook}.yaml"
 
-        full_command = "#{command.join(' ')}"
-        $stdout.puts full_command
+        full_command = command.join(' ')
         system full_command
       end
     end
   end
 end
-

data/lib/cli/app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 
 require_all(File.join(File.dirname(__FILE__), 'command'))
@@ -25,9 +27,9 @@ module Shelter
       )
 
       # Register server managers
-      path = File.join(App.config.stack_directory, '*')
-      Dir.glob(path).each do |path|
-        next unless File.exists? "#{path}/cli.rb"
+      base_path = File.join(App.config.stack_directory, '*')
+      Dir.glob(base_path).each do |path|
+        next unless File.exist? "#{path}/cli.rb"
         require File.join(App.config.project_root, path, 'cli.rb')
 
         stack_name = File.basename(path)
@@ -40,12 +42,11 @@ module Shelter
       end
 
       # Register server managers
-      path = File.join(App.config.plugin_directory, '*')
-      Dir.glob(path).each do |path|
-        next unless File.exists? "#{path}/main.rb"
+      base_path = File.join(App.config.plugin_directory, '*')
+      Dir.glob(base_path).each do |path|
+        next unless File.exist? "#{path}/main.rb"
         require File.join(App.config.project_root, path, 'main.rb')
       end
     end
   end
 end
-

data/lib/cli/command/ansible.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 
 module Shelter
@@ -36,4 +38,3 @@ module Shelter
     end
   end
 end
-

data/lib/cli/stack/cloud_formation.rb

@@ -1,13 +1,18 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'aws-sdk'
 
 module Shelter
   module CLI
     module Stack
+      # CloudFormation based stack base
       class CloudFormation < Thor
         desc 'status', 'Stack status'
         def status
-          target_stack = cf_client.describe_stacks(stack_name: get_attr(:stack_name)).stacks.first
+          target_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}"
@@ -16,13 +21,13 @@ module Shelter
             stack_name: target_stack.stack_name
           )
           resources.stack_resources.each do |r|
-            puts ' __________________________________________________________________________________________'
-            puts '| Stack Name | Resource ID              | Resource Type                  | Resource Status |'
-            puts "| #{r.stack_name} | #{r.physical_resource_id} | #{r.resource_type} | #{r.resource_status}  |"
-            puts ' ------------------------------------------------------------------------------------------'
+            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
-          fail Thor::Error, e.message
+          raise Thor::Error, e.message
         end
 
         desc 'create', 'Create stack'
@@ -38,14 +43,17 @@ module Shelter
             ]
           )
           i = 0
-          cf_client.wait_until(:stack_create_complete, stack_name: get_attr(:stack_name)) do |w|
+          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
-          fail Thor::Error, e.message
+          raise Thor::Error, e.message
         end
 
         desc 'update', 'Update stack'
@@ -56,18 +64,19 @@ module Shelter
             capabilities: ['CAPABILITY_IAM']
           )
           i = 0
-          cf_client.wait_until(:stack_update_complete, stack_name: get_attr(:stack_name)) do |w|
+          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
-          fail Thor::Error, e.message
+          raise Thor::Error, e.message
         end
 
-
-
         no_commands do
           class << self
             def set_attr(name, value)
@@ -89,16 +98,18 @@ module Shelter
             )
           end
 
-          def get_public_ip
-            target_stack = cf_client.describe_stacks(stack_name: get_attr(:stack_name)).stacks.first
+          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 { |r|
+            eip = resources.stack_resources.select do |r|
               r.resource_type == 'AWS::EC2::EIP'
-            }.first
+            end.first
 
             eip.physical_resource_id
           end
@@ -107,5 +118,3 @@ module Shelter
     end
   end
 end
-
-

data/lib/configuration.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Shelter
+  # Read and manage configuration
   class Configuration
     attr_accessor :ansible_directory,
                   :stack_directory,
@@ -13,7 +16,10 @@ module Shelter
       @ansible_directory = 'ansible'
       @stack_directory = 'stacks'
       @secure_root = ENV.fetch('SECURE', 'secure')
-      @inventory_script = File.join(File.dirname($PROGRAM_NAME), 'shelter-inventory')
+      @inventory_script = File.join(
+        File.dirname($PROGRAM_NAME),
+        'shelter-inventory'
+      )
       @inventory_directory = 'inventory'
       @plugin_directory = 'plugin'
     end
@@ -28,6 +34,7 @@ module Shelter
     end
 
     private
+
     def shelterfile
       @shelterfile ||= File.join(find_project_root, 'Shelterfile.rb')
     end
@@ -38,7 +45,7 @@ module Shelter
       dir = Dir.pwd
       loop do
         break if File.exist?('Shelterfile.rb')
-        fail 'No Shelterfile.rb found' if Dir.pwd == '/'
+        raise 'No Shelterfile.rb found' if Dir.pwd == '/'
         Dir.chdir('..')
       end
       @project_root = Dir.pwd
@@ -47,4 +54,3 @@ module Shelter
     end
   end
 end
-

data/lib/shelter.rb

@@ -1,20 +1,23 @@
+# frozen_string_literal: true
+
 require 'version'
 require 'configuration'
 
-directories = %w(
+directories = %w[
   ansible
   cli
-)
+]
 
+# Extend String class with camelize
 class String
   def camelize(uppercase_first_letter = true)
     string = self
-    if uppercase_first_letter
-      string = string.sub(/^[a-z\d]*/) { $&.capitalize }
-    else
-      string = string.sub(/^(?:(?=\b|[A-Z_])|\w)/) { $&.downcase }
-    end
-    string.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }.gsub('/', '::')
+    string = if uppercase_first_letter
+               string.sub(/^[a-z\d]*/) { $&.capitalize }
+             else
+               string.sub(/^(?:(?=\b|[A-Z_])|\w)/) { $&.downcase }
+             end
+    string.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{Regexp.last_match(1)}#{Regexp.last_match(2).capitalize}" }.gsub('/', '::')
   end
 end
 
@@ -31,4 +34,3 @@ end
 directories.each do |dir|
   require_all(File.join(File.dirname(__FILE__), dir))
 end
-

data/lib/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Shelter
   # Current version to publish
   # Gemspec also uses this constant
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Balazs Nadasdi
@@ -38,6 +38,48 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.20.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.48'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.48'
 description: Shelter tries to be a framework to manage internal infrastructure
 email: balazs.nadasdi@cheppers.com
 executables:
@@ -46,6 +88,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
 - bin/shelter
 - bin/shelter-inventory