puppet-autostager 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjkyOGVkNjgyNWNmMWZmZTgyYjFlYmFjZDA3Yzg0ODllNWMzNDEzMw==
+    NzU0ZTkxMjMwYzUyNDRiNjg3ZTdiNmY1YTc3MjUyYjkwZGYwMjczMQ==
   data.tar.gz: !binary |-
-    YjkxODcwZWZmNjY3YjYyYTFlZTNmN2VjZDVkNzlmMTkxMDcyNjUwMw==
+    ZGU1ZjkzYTAzZTU4NDY5YWYyY2VmMThkMTYxMjQ5YjhhODQxOTY0ZA==
 SHA512:
   metadata.gz: !binary |-
-    MTg5OGIyZTJlNGVjNDIxNWJmMmNkMjhhOWNjYzc0MjMwN2VlMGI5NjUzZGUx
-    NjFmMWRhMThmYmZmNzU0N2FhMGUzYjllNmM1YzI2Yjg3Y2U5NmRhNDdkZGZj
-    YmViNTI0MDMxZWY4N2ZiMzUzOTk2M2M1YmI1ZjI0NjIwMDM2ZTA=
+    YWI5MWIxOWZmMDhhYjU5OWUyNTkwYzM4ZGRlY2Y0ZjM0YmQ4N2RmMDU3M2Uy
+    ZDUxODNiNmNiYzQ2ZTg1Nzk1Yzk3NmFhMzkxNWFhYjFkYzE3OGFlNjBmMzcy
+    NjEyMjFmMjk2ZWZjYmRiNzcxZTIzOWI3NjcwMGI1MWUzMzE2YjE=
   data.tar.gz: !binary |-
-    YmRhMGQ2M2IxMTMyMmFiYzNkMzk5NWFmYzllYTI5NGI2MDNlMjdjZTE5MWQ0
-    ZjUwNDBiMWVmMWRlNTVmYmExODljZTliYWU0N2FjMzk2NmQ4MDVmNjFlZWVi
-    OGNjNjZiOGQwNTQ5MmEyMWFmYTM4NTVhMGJkODhkNzQ3MGRkMjg=
+    YjEyOTg3ZjdjM2ViNzUzMWE0NzI2ODE2ZjliZjhkNTgxZWIyZDY0MzA2ZjE2
+    NzE3YjNlYzMxYzgwZTkzYjIxNDJhMWJjZDFhYWQyNzUxODA5NjE2NmY1YjVl
+    YWUzNmFjZDhlZTk2M2FhZWRiNzY0YTI1NWI4ZTkzZmM2ZmJmY2Y=

data/README.md

@@ -35,6 +35,9 @@ export access_token=<your 40-char token>
 export base_dir=/tmp/puppet/environments
 export debug=anything
 
+# Set a timeout for git operations (default 120 seconds).
+export timeout=180
+
 # Override the default 30 second interval.
 export sleep_interval=60
 

data/circle.yml

@@ -1,7 +1,7 @@
 machine:
   environment:
     # If you change this, you need to change lib/autostager/version.rb
-    VERSION: 0.0.8
+    VERSION: 0.0.9
 
 test:
   post:
@@ -14,7 +14,4 @@ deployment:
     branch: master
     owner: jumanjihouse
     commands:
-      - cp -f templates/credentials ~/.gem/
-      - chmod 0600 ~/.gem/credentials
-      - sed -i "s/API_KEY/${API_KEY}/" ~/.gem/credentials
-      - gem push puppet-autostager-${VERSION}.gem
+      - script/push.sh

data/lib/autostager.rb

@@ -126,6 +126,12 @@ module Autostager
     @client ||= Octokit::Client.new(access_token: access_token)
   end
 
+  def timeout_seconds
+    ENV['timeout'].to_i || 120
+  rescue
+    120
+  end
+
   # A list of directories we never discard.
   def safe_dirs
     [
@@ -161,7 +167,7 @@ module Autostager
     end
 
     # Process current PRs.
-    Autostager::Timeout.timeout(120, GitTimeout) do
+    Autostager::Timeout.timeout(timeout_seconds, GitTimeout) do
       prs.each { |pr| process_pull pr }
     end
   rescue Octokit::Unauthorized => e

data/lib/autostager/version.rb

@@ -3,5 +3,5 @@
 #
 # If you change this, you need to also change circle.yaml
 module Autostager
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/script/push.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+cp -f templates/credentials ~/.gem/
+chmod 0600 ~/.gem/credentials
+sed -i "s/API_KEY/${API_KEY}/" ~/.gem/credentials
+
+gem search --remote -a puppet-autostager | grep ${VERSION}
+if [[ $? -eq 0 ]]; then
+  # Be informative, but don't fail.
+  # This enables to merge changes to non-gem files, such as README.
+  echo "puppet-autostager ${VERSION} has already been published."
+else
+  gem push puppet-autostager-${VERSION}.gem
+fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-autostager
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Paul Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -227,6 +227,7 @@ files:
 - lib/autostager/version.rb
 - script/bootstrap
 - script/functions
+- script/push.sh
 - script/test
 - spec/functional/placeholder_spec.rb
 - spec/spec_helper.rb