foreplay 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 890c4c0d5051375ad322d3de7434723c50f8c547
-  data.tar.gz: 012197386d009fae9f671ec6dcfbc5ab1325f041
+  metadata.gz: 33731b365e619f93a9a5f950b59bbeec1c1f6bde
+  data.tar.gz: ba47694849c84746f1cd75d9bdcb3ac51403bccc
 SHA512:
-  metadata.gz: 9291d32cb558210be93527cd3c04e442f842ee23e6971b2160bf7a8caab8697d79e6c33472bd4d05684061d42f056e74f228bb720578ae8b4149a51be469635a
-  data.tar.gz: b333b86d8fc828e3161913b57f0dd1e6a945c08757d45bff0543cb21e20835e2b7f48f0c6816724ec6c76b2bacbc81082fb3c7f9b3afcc15d35e654f5b7e3aad
+  metadata.gz: 2f87782c848542519af918f6e46e55f05260bca250f1eda2db647b9c7c245d13e872cddbf789b7f317e1f07fcddd1fb8de1edc15c24178439d0632dd29782625
+  data.tar.gz: 101180a567f815cd9033a2f464e0b277662214e6d84883ff87d045ccf022b3a72340d69c7c61cef47032ba2d8e1648a51d27877f5b66300774e5d9ed4f25662a

data/lib/foreplay/engine/secrets.rb

@@ -1,5 +1,3 @@
-require 'pp' # debug
-
 class Foreplay::Engine::Secrets
   attr_reader :environment, :secret_locations
 
@@ -17,7 +15,6 @@ class Foreplay::Engine::Secrets
       secrets.merge! fetch_from(secret_location) || {}
     end
 
-pp secrets # debug
     secrets
   end
 
@@ -27,7 +24,6 @@ pp secrets # debug
     headers       = secret_location['headers']
     header_string = headers.map { |k, v| " -H \"#{k}: #{v}\"" }.join if headers.is_a? Hash
     command       = "curl -k -L#{header_string} #{url}".fake_erb
-puts command.magenta # debug
     secrets_all   = YAML.load(`#{command}`)
     secrets       = secrets_all[environment]
 

data/lib/foreplay/engine/steps.yml

@@ -44,17 +44,17 @@
   path:         'config/'
 - command:      'if [ -d ../cache/vendor/bundle ] ; then rsync -aW --no-compress --delete --info=STATS1 ../cache/vendor/bundle/ vendor/bundle ; else echo No bundle to restore ; fi'
   commentary:   'Attempting to restore bundle from cache'
+- command:      'gem install bundler -v "> 1.8"'
+  commentary:   'Updating the bundler version'
 - command:      'sudo ln -f `which bundle` /usr/bin/bundle || echo Using default version of bundle'
   commentary:   'Setting the current version of bundle to be the default'
-- command:      "gem install bundler -v '> 1.8'"
-  commentary:   'Updating the bundler version'
-- command:      'bundle install --deployment --clean --jobs 2 --without development test'
+- command:      '/usr/bin/bundle install --deployment --clean --jobs 2 --without development test'
   commentary:   'Using bundler to install the required gems in deployment mode'
 - command:      'mkdir -p ../cache/vendor && rsync -aW --no-compress --delete --info=STATS1 vendor/bundle/ ../cache/vendor/bundle'
   commentary:   'Caching bundle'
-- command:      'if [ -f public/assets/manifest.yml ] ; then echo "Not precompiling assets" ; else RAILS_ENV=<%= environment %> bundle exec foreman run rake assets:precompile ; fi'
+- command:      'if [ -f public/assets/manifest.yml ] ; then echo "Not precompiling assets" ; else RAILS_ENV=<%= environment %> /usr/bin/bundle exec foreman run rake assets:precompile ; fi'
   commentary:   'Precompiling assets unless they were supplied'
-- command:      'sudo bundle exec foreman export upstart /etc/init'
+- command:      'sudo /usr/bin/bundle exec foreman export upstart /etc/init'
   commentary:   "Converting <%= current_service %> to an upstart service"
 - command:      "sudo start <%= current_service %> || sudo restart <%= current_service %>"
   commentary:   'Starting the service'

data/lib/foreplay/engine.rb

@@ -1,7 +1,6 @@
 require 'yaml'
 require 'string'
 require 'hash'
-require 'pp' # debug
 
 class Foreplay::Engine
   include Foreplay
@@ -89,7 +88,6 @@ class Foreplay::Engine
 
     @defaults['env'].merge! secrets
     @defaults['application'] = secrets
-pp @defaults # debug
     @defaults = @defaults.supermerge(roles_all[DEFAULTS_KEY]) if roles_all.key? DEFAULTS_KEY
     @defaults = @defaults.supermerge(roles[DEFAULTS_KEY])     if roles.key? DEFAULTS_KEY
     @defaults

data/lib/foreplay/version.rb

@@ -1,3 +1,3 @@
 module Foreplay
-  VERSION = '0.9.10'
+  VERSION = '0.9.11'
 end

data/spec/lib/foreplay/deploy_spec.rb

@@ -135,6 +135,7 @@ describe Foreplay::Launcher do
       'git clone -b master git@github.com:Xenapto/foreplay.git 50000',
       'rvm rvmrc trust 50000',
       'rvm rvmrc warning ignore 50000',
+      'gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys D39DC0E3',
       'cd 50000 && mkdir -p tmp doc log config',
       'if [ -f .ruby-version ] ; then rvm install `cat .ruby-version` ; else echo "No .ruby-version file found" ; fi',
       'echo "RAILS_ENV=production" > .env',
@@ -153,13 +154,14 @@ describe Foreplay::Launcher do
       'if [ -d ../cache/vendor/bundle ] ; then '\
       'rsync -aW --no-compress --delete --info=STATS1 ../cache/vendor/bundle/ vendor/bundle'\
       ' ; else echo No bundle to restore ; fi',
+      'gem install bundler -v "> 1.8"',
       'sudo ln -f `which bundle` /usr/bin/bundle || echo Using default version of bundle',
-      'bundle install --deployment --clean --jobs 2 --without development test',
+      '/usr/bin/bundle install --deployment --clean --jobs 2 --without development test',
       'mkdir -p ../cache/vendor && '\
       'rsync -aW --no-compress --delete --info=STATS1 vendor/bundle/ ../cache/vendor/bundle',
       'if [ -f public/assets/manifest.yml ] ; then echo "Not precompiling assets"'\
-      ' ; else RAILS_ENV=production bundle exec foreman run rake assets:precompile ; fi',
-      'sudo bundle exec foreman export upstart /etc/init',
+      ' ; else RAILS_ENV=production /usr/bin/bundle exec foreman run rake assets:precompile ; fi',
+      'sudo /usr/bin/bundle exec foreman export upstart /etc/init',
       'sudo start foreplay-50000 || sudo restart foreplay-50000',
       'mkdir -p .foreplay/foreplay && touch .foreplay/foreplay/current_port && cat .foreplay/foreplay/current_port',
       'echo 50000 > $HOME/.foreplay/foreplay/current_port',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreplay
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Xenapto