pupistry 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb7501db923d47ba8ed8cab9b71641e01500de90
-  data.tar.gz: 3e0adc2be0951b6e14dc63a8b63eeaf88c3cb620
+  metadata.gz: 191ed356e73fb20bf75c7cf3b42a6d39dec77a9e
+  data.tar.gz: 2379cc4af18613e37b14cf9569347c914b7f34e9
 SHA512:
-  metadata.gz: d3ba486d0c710f417e430f39dd88e1ef2ff98c6309e447d220efb3282308f701b494cf2b36a0db751d89f09c4f68090001d96765bbddd3fb11413f921ca60579
-  data.tar.gz: e0d2f479a7efd2c77b95c6d5fc3780c8ca81a1c2f32ad4c7dd4383fc4dce20896c567afbf23191b6afa6c8dc38e46ddd9652d49b281f894c247c0cb0c83cc124
+  metadata.gz: f941399858b331deb102914b56bbb854a52d97bd7c835dcf82253813c6581b00d50ec31caf72c7f69c2adefe983360f0fbb56a5e49ac4fe1ca40e6bd32192ecb
+  data.tar.gz: 9e66e9dc688d9e8b2b2de57ea04cb48953841a369ebba025f2ad257f505d117e3635ee4703d4634c3017e406418367279d9cdbe84caaefcea49118744c1718ae

data/README.md

@@ -387,7 +387,7 @@ Note that the node initialisation process is still susceptable to weaknesses
 such as a bug in a new version of Puppet or Pupistry, or changes to the OS
 packages. If this is a concern/issue for you and you want complete reliability,
 then use the user data to build a host pre-loaded with Puppet and Pupistry and
-then create an image of it using a tool like [Packer](www.packer.io). Doing
+then create an image of it using a tool like [Packer](http://www.packer.io/). Doing
 this, you can make it possible to build all the way to Puppet execution with no
 dependencies on any third parties other than your VM provider and AWS S3.
 

data/lib/pupistry/agent.rb

@@ -136,6 +136,7 @@ module Pupistry
       puppet_cmd = 'puppet apply'
 
       puppet_cmd += ' --noop' if options[:noop]
+      puppet_cmd += ' --show_diff' if options[:verbose]
 
       puppet_cmd += " --environment #{environment}"
       puppet_cmd += " --confdir #{$config['agent']['puppetcode']}"

data/lib/pupistry/artifact.rb

@@ -6,6 +6,7 @@ require 'time'
 require 'digest'
 require 'fileutils'
 require 'base64'
+require 'whichr'
 
 module Pupistry
   # Pupistry::Artifact
@@ -279,10 +280,15 @@ module Pupistry
         # Make sure there is a directory to write artifacts into
         FileUtils.mkdir_p('artifacts')
 
+        # Try to use GNU tar if present to work around weird issues with some
+        # versions of BSD tar when using the tar files with GNU tar subsequently.
+        tar = RubyWhich.new.which('gtar').first || RubyWhich.new.which('gnutar').first || 'tar'
+        $logger.debug "Using tar at #{tar}"
+
         # Build the tar file - we delibertly don't compress in a single step
         # so that we can grab the checksum, since checksum will always differ
         # post-compression.
-        unless system "tar -c --exclude '.git' -f artifacts/artifact.temp.tar puppetcode/*"
+        unless system "#{tar} -c --exclude '.git' -f artifacts/artifact.temp.tar puppetcode/*"
           $logger.error 'Unable to create tarball'
           fail 'An unexpected error occured when executing tar'
         end
@@ -380,7 +386,12 @@ module Pupistry
       # Unpack the archive file
       FileUtils.mkdir_p($config['general']['app_cache'] + "/artifacts/unpacked.#{@checksum}")
       Dir.chdir($config['general']['app_cache'] + "/artifacts/unpacked.#{@checksum}") do
-        if system "tar -xf ../artifact.#{@checksum}.tar.gz"
+        # Try to use GNU tar if present to work around weird issues with some
+        # versions of BSD tar when using the tar files with GNU tar subsequently.
+        tar = RubyWhich.new.which('gtar').first || RubyWhich.new.which('gnutar').first || 'tar'
+        $logger.debug "Using tar at #{tar}"
+
+        if system "#{tar} -xf ../artifact.#{@checksum}.tar.gz"
           $logger.debug "Successfully unpacked artifact #{@checksum}"
         else
           $logger.error "Unable to unpack artifact files to #{Dir.pwd}"

data/lib/pupistry/storage_aws.rb

@@ -119,6 +119,30 @@ module Pupistry
         $logger.fatal "Access to S3 bucket #{$config['general']['s3_bucket']} denied"
         exit 0
 
+      rescue AWS::S3::Errors::InvalidObjectState
+        $logger.warn "Unable to download \"#{src}\", it has been archived off into Glacier and would need to be recovered first."
+
+        # Do we need to restore it?
+        begin
+          if s3_obj.restore_in_progress?
+            $logger.warn "A restore of this file is currently in progress, but can take up to 4 hours - please re-try later."
+          else
+            # Not being restored currently, let's file a request. This allows
+            # us to cater for situations where a bunch of servers need to get
+            # an old manifest/file, however the fastest solution is to simply
+            # do a new `pupistry push` from a workstation to upload a new
+            # manifest file.
+            if s3_obj.restore(:days => 30)
+              $logger.warn "Recover request has been issued, this could take up to 4 hours to complete."
+              $logger.warn "Note that doing a `pupistry push` from the workstation would solve this faster."
+            end
+          end
+        rescue StandardError => e
+          $logger.error "Glacier restore request for #{src} failed. (#{e.class}), best option is to push the latest manifest from a workstation with `pupistry push`."
+        end
+
+        return false
+
       rescue AWS::S3::Errors::PermanentRedirect => e
         $logger.error "The wrong endpoint has been specified (or autodetected) for #{$config['general']['s3_bucket']}."
         raise e

data/lib/pupistry/version.rb

@@ -1,3 +1,3 @@
 module Pupistry
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/resources/aws/README_AWS.md

@@ -34,7 +34,7 @@ Building the stack and setting specific parameter values
     --parameters \
     ParameterKey=S3BucketName,ParameterValue=pupistry-example-bucket \
     ParameterKey=S3BucketArchive,ParameterValue=30 \
-    ParameterKey=S3BucketPurge,ParameterValue=60
+    ParameterKey=S3BucketPurge,ParameterValue=365
 
 
 

data/resources/aws/cfn_pupistry_bucket_and_iam.template

@@ -58,11 +58,7 @@
 	  {
 	    "Status": "Enabled",
 	    "Prefix": "manifest.",
-            "ExpirationInDays": { "Ref" : "S3BucketPurge" },
-            "Transition": {
-              "StorageClass": "Glacier",
-              "TransitionInDays": { "Ref" : "S3BucketArchive" }
-	    }
+            "ExpirationInDays": { "Ref" : "S3BucketPurge" }
 	  }]
         }
       },
@@ -94,7 +90,8 @@
                 {
                    "Effect":"Allow",
                    "Action":[
-                      "s3:GetObject"
+                      "s3:GetObject",
+		      "s3:RestoreObject"
                    ],
                    "Resource": [{ "Fn::Join" : ["", [ "arn:aws:s3:::", { "Ref" : "S3Bucket" } , "/*" ] ] }]
                 }
@@ -137,7 +134,8 @@
                    "Effect":"Allow",
                    "Action":[
                       "s3:PutObject",
-                      "s3:GetObject"
+                      "s3:GetObject",
+		      "s3:RestoreObject"
                    ],
                    "Resource": [{ "Fn::Join" : ["", [ "arn:aws:s3:::", { "Ref" : "S3Bucket" } , "/*" ] ] }]
                 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pupistry
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Jethro Carr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-06 00:00:00.000000000 Z
+date: 2015-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: whichr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement