pupistry 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb015d29aead0f609e5cab660c3a6e8438565bd6
-  data.tar.gz: 7ac9aa4a7cd18d7bc3ea1fa6431d0636a8599c59
+  metadata.gz: b79b3dc39752440bd81aafabb9dd460c550ddf86
+  data.tar.gz: f7307271db6cde5388db0c241fa220c44f60659b
 SHA512:
-  metadata.gz: d1a9b7489858b33f69aa23dd10521cda71a721f428f00a97808dafab95f6c59c697cd250c1dbad27e2f44645fbdb97cfd72aca61f29e9176326d12fb96e62a4f
-  data.tar.gz: 50701a9b7a46b610353d809e16926e3526362a7408858c08f76e4793122bbc2a509e8898d9cea1ee531692fce8316db596dc85ff299b0ce63dac8dd1ead11f57
+  metadata.gz: f0d8168a17152895c342e4bca7e0b9b80111b1e32437abb6457666951fbc8f716734b8cea7b24ee6773a056aadd1827b4fcdae11c0f238e8a6df487d7ecbacae
+  data.tar.gz: 06ffa5171f0f98d60f83d8505594db730f18e52d2b24687b02347783c4f885e426dc09939c3fe359ff73fcd436777967eb90e2238bd9de459362a07997fb1198

data/README.md

@@ -115,11 +115,10 @@ site-by-site (and you can still do it that way if you want), but if you want a
 nice easy life, Pupistry can generate you a bootstrap script for your platform.
 
     $ pupistry bootstrap
-    - rhel-7
+    - centos-7
     - ubuntu-14.04
 
-    $ pupistry boostrap --template rhel-7
-    # Bootstrap for Red Hat Enterprise Linux Platform
+    $ pupistry boostrap --template centos-7
     # Compatible with RHEL 7, CentOS 7 and maybe other variations.
     
     rpm -ivh https://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm
@@ -355,19 +354,23 @@ is working nicely.
 
 ## Bootstrap Functionality
 
-Currently Pupistry only supports generation of bootstrap for CentOS 7 & Ubuntu
-14.04. Other distributions will be added, but it may take time to get to your
-particular favourite distribution.
+Currently Pupistry only supports generation of bootstrap for select popular
+distributions and platforms. Other distributions will be added, but it may take
+time to get to your particular favourite distribution.
 
 Note that it isn't a show stopper if support for your platform of choice
 doesn't yet exist -  you can use pupistry with pretty much any nix platform,
 you'll just not have the handy advantage of automatically generated bootstrap
-for your servers.
+for your servers. And in many cases, one of the existing ones can easily be
+adapted to your platform of choice.
 
 If you do customise it for a different platform, pull requests are VERY
 welcome, I'll add pretty much any OS if you write a decent bootstrap template
 for it.
 
+Please see resources/bootstrap/BOOTSTRAP_NOTES.md for more details on how to
+write and debug bootstrap templates.
+
 
 ## Continious Deployment
 

data/bin/pupistry

@@ -267,7 +267,8 @@ class CLI < Thor
 
 
   desc "bootstrap", "Generate a user-data bootstrap script for a node"
-  method_option :template, :type => :string
+  method_option :template, :type => :string, :desc => 'The template you want to generate'
+  method_option :base64, :type => :boolean, :desc => 'Output in base64 format'
   def bootstrap
 
     # Thor seems to force class options to be defined repeatedly? :-/
@@ -289,6 +290,12 @@ class CLI < Thor
 
       templates = Pupistry::Bootstrap.new
       templates.build options[:template]
+
+      if options[:base64]
+        templates.output_base64
+      else
+        templates.output_plain
+      end
     else
       templates = Pupistry::Bootstrap.new
       templates.list

data/lib/pupistry/bootstrap.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require "base64"
 require 'erubis'
 
 module Pupistry
@@ -6,6 +7,7 @@ module Pupistry
 
   class Bootstrap
     attr_accessor :template_dir
+    attr_accessor :contents
 
     def initialize
 
@@ -49,7 +51,9 @@ module Pupistry
 
 
     def build template
-      # Build a template with the configured parameters already to go
+      # Build a template with the configured parameters already to go and save
+      # into the object, so it can be outputted in the desired format.
+
       $logger.debug "Generating a bootstrap script for #{template}"
 
       unless File.exists?("#{@template_dir}/#{template}.erb")
@@ -72,17 +76,30 @@ module Pupistry
 
       # Generate template using ERB
       begin
-        template_contents = Erubis::Eruby.new(File.read("#{@template_dir}/#{template}.erb")).result(template_values)
+        @contents = Erubis::Eruby.new(File.read("#{@template_dir}/#{template}.erb")).result(template_values)
       rescue Exception => e
         $logger.error "An unexpected error occured when trying to generate the bootstrap template"
         raise e
       end
 
-      # Output template
+    end
+
+    def output_plain
+      # Do nothing clever, just output the template data.
+      puts "-- Bootstrap Start --"
+      puts @contents
+      puts "-- Bootstrap End --"
+    end
+
+    def output_base64
+      # Some providers like AWS can accept the data in Base64 version which is
+      # smaller and less likely to get messed up by copy and paste or weird
+      # formatting issues.
       puts "-- Bootstrap Start --"
-      puts template_contents
+      puts Base64.encode64(@contents)
       puts "-- Bootstrap End --"
     end
+
   end
 end
 

data/lib/pupistry/config.rb

@@ -69,6 +69,9 @@ module Pupistry
       elsif File.exists?( File.expand_path "~/.pupistry/settings.yaml" )
         config = File.expand_path "~/.pupistry/settings.yaml"
 
+      elsif File.exists?("/usr/local/etc/pupistry/settings.yaml")
+        config = "/usr/local/etc/pupistry/settings.yaml"
+
       elsif File.exists?("/etc/pupistry/settings.yaml")
         config = "/etc/pupistry/settings.yaml"
 

data/settings.example.yaml

@@ -36,7 +36,9 @@ general:
 # machines so we can popular bootstrap templates for you and automatically
 # check stuff like IAM permissions before you roll your hosts.
 agent:
-  puppetcode: /etc/puppet/environents/
+  # Puppet3 doesn't care what this is, but if using Puppet4, you need to set it
+  # to /etc/puppetlabs/code/environments otherwise it blows up.
+  puppetcode: /etc/puppetlabs/code/environments
 
   # The AWS credentials with READ permission to the S3 bucket for downloading
   # artifact files. If unset, we try to figure it out from any AWS creds

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pupistry
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Jethro Carr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1