travis-chef 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3151dd532832b2272bb4c53228a5ba9661e6142
-  data.tar.gz: ba6db4d25af83e003c5e78e196f5b578bf6f91dc
+  metadata.gz: 05da5e96a87a53845ffe425ad609efc05649c4d8
+  data.tar.gz: c6fffae51168da325c73e2cb72d2b574512d725c
 SHA512:
-  metadata.gz: 26054e430ad34d040bf182ef883738cc69668fe9fe46a5e83ad9bc5d9df5ef9403c9f719d88ed21207d708d45c9cf897ee14a3909b49ed5f6b1545f071a29f5c
-  data.tar.gz: 6904919f7efae7264cd9b62647e7c1d37f1b3c9fd337aafc6a9e6e1ff98184ffd9143cfd553391333c57fcef74fc901abfd6b80f632f9112167cc38b44e18fab
+  metadata.gz: 9f3c6737fedceb1a9fb235bc200aa8f80f513e86291c3c8495b1a3f48909dd2ecfced3e21f761e3602d3dd8cf1b9012e0e383a829a259fee4d20cf71c2e5c888
+  data.tar.gz: 85bf198ad3e0e68fa91aa38b28c90cdc27ad2c48bb34c2dc074c9b0c2e193d33d8c011c8579848ad9275e67d0adff6d9837ff689f616e74f192d20bf1e485249

data/script/travis-chef

@@ -2,7 +2,9 @@
 
 set -x
 
-if [ -f "${PWD%/}/.travis-envs" ]; then
+if [ -n "${CHEF_ENVIRONMENTS}" ]; then
+  environments=( ${CHEF_ENVIRONMENTS} )
+elif [ -f "${PWD%/}/.travis-envs" ]; then
   environments=( $(<"${PWD%/}/.travis-envs") )
 fi
 
@@ -24,6 +26,14 @@ load_ssh_key() {
 }
 
 setup_chef() {
+  if [ -n "${CHEF_ENVIRONMENTS}" ]; then
+    setup_chef_from_env
+  else
+    setup_chef_from_files
+  fi
+}
+
+setup_chef_from_files() {
   # Install chef gem to get knife
   gem install chef -v '~> 11.0' --no-rdoc --no-ri || exit $?
 
@@ -79,6 +89,59 @@ EOF
   decrypt ${CHEF_VALIDATOR} "${PWD%/}/.chef/${CHEF_ORG}-validator.pem" || exit $?
 }
 
+setup_chef_from_env() {
+  # Install chef gem to get knife
+  gem install chef -v '~> 11.0' --no-rdoc --no-ri || exit $?
+
+  # Redefine CHEF_SERVER if possible using environment
+  if [ -n "${environment}" ]; then
+    chef_server_variable_name="CHEF_SERVER_${environment^^}"
+    if [ -n "${!chef_server_variable_name}" ]; then
+      CHEF_SERVER="${!chef_server_variable_name}"
+    fi
+  fi
+
+  # Determine Chef organization name from CHEF_SERVER
+  CHEF_ORG="${CHEF_SERVER##*/}"
+
+  # Redefine CHEF_USER if possible using environment
+  if [ -n "${environment}" ]; then
+    chef_user_variable_name="CHEF_USER_${environment^^}"
+    if [ -n "${!chef_user_variable_name}" ]; then
+      CHEF_USER="${!chef_user_variable_name}"
+    fi
+  fi
+
+  # Redefine CHEF_CLIENT if possible using environment
+  if [ -n "${environment}" ]; then
+    chef_client_variable_name="CHEF_CLIENT_${environment^^}"
+    if [ -n "${!chef_client_variable_name}" ]; then
+      CHEF_CLIENT="${!chef_client_variable_name}"
+    fi
+  fi
+
+  # Write client key
+  if [ -n "${CHEF_CLIENT}" ]; then
+    echo -e "${CHEF_CLIENT}" >"${PWD%/}/.chef/${CHEF_USER}.pem"
+  fi
+
+  # Configure knife
+  [ -d "${PWD%/}/.chef" ] && rm -rf "${PWD%/}/.chef"
+  mkdir "${PWD%/}/.chef" || exit $?
+  cat >"${PWD%/}/.chef/knife.rb" <<EOF
+current_dir = File.dirname(__FILE__)
+
+log_level :info
+log_location STDOUT
+
+node_name '${CHEF_USER}'
+client_key "#{current_dir}/${CHEF_USER}.pem"
+chef_server_url '${CHEF_SERVER}'
+
+knife[:ssh_user] = '${CHEF_USER}'
+EOF
+}
+
 if [ -n "${1}" -a "${1}" = "prepare" ]; then
   load_ssh_key
   exit $?

data/travis-chef.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name = 'travis-chef'
-  gem.version = '0.0.5'
+  gem.version = '0.0.6'
   gem.authors = ['Matt Kasa']
   gem.email = ['mattk@granicus.com']
   gem.description = 'Script to automate Chef deployments from Travis'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis-chef
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Matt Kasa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2016-05-28 00:00:00.000000000 Z
 dependencies: []
 description: Script to automate Chef deployments from Travis
 email:
@@ -48,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Travis/Chef deployment script