pupistry 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b194966f9998c32e6272e2d31c7cecded4d58c95
-  data.tar.gz: 824e9e3d6e695ede6524c805e12d3b8376521815
+  metadata.gz: 365e155d4398495ffc9b79178244a48c2772114b
+  data.tar.gz: fbb179ef527112d00b9a8d0abc800ae155f9a7b6
 SHA512:
-  metadata.gz: e17bd516928ec6db3ddca4e65dc515a3273ddce0dd021622efa574244dd7721d27d3040961d885499b3760112729ed05f088e4c43c4ad700b3958c07514b639e
-  data.tar.gz: 0a0f8384d7260a0b1123c094a32cf49f35658361acc7eeb92e57905e7001bf9c033ebcd5553a7af7926eb7738c6b7eeafef171ff170a5117a70eacb8324fb966
+  metadata.gz: 965e106b6a27a882a630ba5c7c9eccafc7237c34079e387c7df5fa82e6a1896c75f31cc97a90b68bb0a790690d502003b47976e22e0b3e37408155e95c7e1081
+  data.tar.gz: b6b3a81e24e7130e63177f6f1f82948efaac836e690cf25d8e21549308f40cdf81e9bb8ac8c711a0e08e5e1bca3a4f7eaf6051f86dec71623810219c32f86fc6

data/exe/pupistry

@@ -182,6 +182,7 @@ class CLI < Thor
   desc 'bootstrap', 'Generate a user-data bootstrap script for a node'
   method_option :template, type: :string, desc: 'The template you want to generate'
   method_option :base64, type: :boolean, desc: 'Output in base64 format'
+  method_option :environment, type: :string, desc: 'Environment to run puppet in'
   def bootstrap
     # Thor seems to force class options to be defined repeatedly? :-/
     if options[:verbose]
@@ -197,10 +198,11 @@ class CLI < Thor
     end
 
     if options[:template]
-      $logger.info "Generating bootstrap template #{options[:template]}"
+      $logger.debug "Generating bootstrap template #{options[:template]}"
 
+      environment = options[:environment] || 'master'
       templates = Pupistry::Bootstrap.new
-      templates.build options[:template]
+      templates.build options[:template], environment
 
       if options[:base64]
         templates.output_base64

data/lib/pupistry/agent.rb

@@ -121,12 +121,10 @@ module Pupistry
 
       end
 
-      # Check if the requested environment/branch actually exists
-      if options[:environment]
-        environment = options[:environment]
-      else
-        environment = 'master'
-      end
+      # If the environment has been specified, use it.
+      environment = $config['agent']['environment'] || 'master'
+      # override if environment is supplied on CLI
+      environment = options["environment"] || environment
 
       unless Dir.exist?("#{$config['agent']['puppetcode']}/#{environment}")
         $logger.fatal "The requested branch/environment of #{environment} does not exist, unable to run Puppet"

data/lib/pupistry/bootstrap.rb

@@ -47,11 +47,11 @@ module Pupistry
       end
     end
 
-    def build(template)
+    def build(template, environment)
       # 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}"
+      $logger.info "Generating a bootstrap script for #{template} with environment #{environment}"
 
       unless File.exist?("#{@template_dir}/#{template}.erb")
         $logger.error 'The requested template does not exist, unable to build'
@@ -70,7 +70,8 @@ module Pupistry
         region: $config['agent']['region'],
         proxy_uri: $config['agent']['proxy_uri'],
         daemon_frequency: $config['agent']['daemon_frequency'],
-        daemon_minimal: $config['agent']['daemon_minimal']
+        daemon_minimal: $config['agent']['daemon_minimal'],
+        environment: environment
       }
 
       # Generate template using ERB

data/lib/pupistry/version.rb

@@ -1,3 +1,3 @@
 module Pupistry
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 end

data/resources/bootstrap/amazon-any.erb

@@ -16,9 +16,9 @@ yum install --assumeyes puppet3 ruby-devel rubygems gcc zlib-devel libxml2-devel
 
 # Not sure why this doesn't get pulled down properly, maybe it's core and
 # Amazon didn't package it properly? Need it for Thor which is used by Pupistry
-gem install io-console
+gem install io-console --no-ri --no-rdoc
 
-gem install pupistry
+gem install pupistry --no-ri --no-rdoc
 mkdir -p /etc/pupistry
 mkdir -p <%= puppetcode %>
 cat > /etc/pupistry/settings.yaml << "EOF"
@@ -36,6 +36,7 @@ agent:
   proxy_uri: <%= proxy_uri %>
   daemon_frequency: <%= daemon_frequency %>
   daemon_minimal: <%= daemon_minimal %>
+  environment: <%= environment %>
 EOF
 chmod 700 /etc/pupistry/settings.yaml
 chmod 700 <%= puppetcode %>

data/resources/bootstrap/centos-7.erb

@@ -14,7 +14,7 @@ rpm -ivh https://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm
 yum update --assumeyes
 yum install --assumeyes puppet ruby-devel rubygems gcc zlib-devel libxml2-devel patch gnupg2
 
-gem install pupistry
+gem install pupistry --no-ri --no-rdoc
 mkdir -p /etc/pupistry
 mkdir -p <%= puppetcode %>
 cat > /etc/pupistry/settings.yaml << "EOF"
@@ -32,6 +32,7 @@ agent:
   proxy_uri: <%= proxy_uri %>
   daemon_frequency: <%= daemon_frequency %>
   daemon_minimal: <%= daemon_minimal %>
+  environment: <%= environment %>
 EOF
 chmod 700 /etc/pupistry/settings.yaml
 chmod 700 <%= puppetcode %>

data/resources/bootstrap/debian-7.erb

@@ -15,7 +15,7 @@ apt-get -y upgrade
 
 apt-get install -y puppet ruby ruby-dev zlib1g-dev libxml2-dev gcc make patch gnupg2
 
-gem install pupistry
+gem install pupistry --no-ri --no-rdoc
 mkdir -p /etc/pupistry
 mkdir -p <%= puppetcode %>
 cat > /etc/pupistry/settings.yaml << "EOF"
@@ -33,6 +33,7 @@ agent:
   proxy_uri: <%= proxy_uri %>
   daemon_frequency: <%= daemon_frequency %>
   daemon_minimal: <%= daemon_minimal %>
+  environment: <%= environment %>
 EOF
 chmod 700 /etc/pupistry/settings.yaml
 chmod 700 <%= puppetcode %>

data/resources/bootstrap/debian-8.erb

@@ -15,7 +15,7 @@ apt-get -y upgrade
 
 apt-get install -y puppet ruby ruby-dev zlib1g-dev libxml2-dev gcc make patch gnupg2
 
-gem install pupistry
+gem install pupistry --no-ri --no-rdoc
 mkdir -p /etc/pupistry
 mkdir -p <%= puppetcode %>
 cat > /etc/pupistry/settings.yaml << "EOF"
@@ -33,6 +33,7 @@ agent:
   proxy_uri: <%= proxy_uri %>
   daemon_frequency: <%= daemon_frequency %>
   daemon_minimal: <%= daemon_minimal %>
+  environment: <%= environment %>
 EOF
 chmod 700 /etc/pupistry/settings.yaml
 chmod 700 <%= puppetcode %>

data/resources/bootstrap/fedora-any.erb

@@ -16,7 +16,7 @@ rpm -ivh https://yum.puppetlabs.com/puppetlabs-release-fedora-`lsb_release -sr`.
 yum update --assumeyes
 yum install --assumeyes puppet ruby-devel rubygems gcc zlib-devel libxml2-devel patch gnupg
 
-gem install pupistry
+gem install pupistry --no-ri --no-rdoc
 mkdir -p /etc/pupistry
 mkdir -p <%= puppetcode %>
 cat > /etc/pupistry/settings.yaml << "EOF"
@@ -34,6 +34,7 @@ agent:
   proxy_uri: <%= proxy_uri %>
   daemon_frequency: <%= daemon_frequency %>
   daemon_minimal: <%= daemon_minimal %>
+  environment: <%= environment %>
 EOF
 chmod 700 /etc/pupistry/settings.yaml
 chmod 700 <%= puppetcode %>

data/resources/bootstrap/freebsd-10.erb

@@ -27,7 +27,7 @@ make reinstall BATCH=yes
 cd /usr/ports/sysutils/puppet4
 make install BATCH=yes
 
-/usr/local/bin/gem install pupistry
+/usr/local/bin/gem install pupistry --no-ri --no-rdoc
 mkdir -p /usr/local/etc/pupistry
 mkdir -p /usr/local/etc/puppetlabs/code/environments
 cat > /usr/local/etc/pupistry/settings.yaml << EOF
@@ -45,6 +45,7 @@ agent:
   proxy_uri: <%= proxy_uri %>
   daemon_frequency: <%= daemon_frequency %>
   daemon_minimal: <%= daemon_minimal %>
+  environment: <%= environment %>
 EOF
 chmod 700 /usr/local/etc/pupistry
 chmod 700 /usr/local/etc/puppetlabs/code/environments

data/resources/bootstrap/ubuntu-14.04.erb

@@ -15,7 +15,7 @@ apt-get -y upgrade
 
 apt-get install -y puppet ruby ruby-dev zlib1g-dev libxml2-dev gcc make patch gnupg2
 
-gem install pupistry
+gem install pupistry --no-ri --no-rdoc
 mkdir -p /etc/pupistry
 mkdir -p <%= puppetcode %>
 cat > /etc/pupistry/settings.yaml << "EOF"
@@ -33,6 +33,7 @@ agent:
   proxy_uri: <%= proxy_uri %>
   daemon_frequency: <%= daemon_frequency %>
   daemon_minimal: <%= daemon_minimal %>
+  environment: <%= environment %>
 EOF
 chmod 700 /etc/pupistry/settings.yaml
 chmod 700 <%= puppetcode %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pupistry
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Jethro Carr