foreplay 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3f9aff01fa7dd340b29e6b571e3bfddf438b4b3
-  data.tar.gz: 778ea56a90bf7a857ae6b295c82908f73024cc2a
+  metadata.gz: 3f1b2bda404690e119118753cd5f3e2a88210b56
+  data.tar.gz: 2b9c918dfe45e9fc3d007cfe2dd9552ab9459b17
 SHA512:
-  metadata.gz: 2a217030959dfa535ce15c68f54093047e58e1538bafb75d32bbff8fb5ad427c4aa819220726a048d1455a0acf48aaf9e1f4ae00dbd91c6c261b1c33170978e1
-  data.tar.gz: bd00d25bf9f1116a6d475e82bc02a09eb48df104bdb682e3976e3f0c4b82b40baec1c76e501863eca51dd0c7226e12340750f8600660bbff0bbee87a75321a48
+  metadata.gz: 566c13c8fa3f06b6ac3782f660e8e4a8c8168fd052df67dc58794ffdb9aa0463e1cbf7b2e176059d5ddc4a64c187437858bd35db89124580928c7e366ce3445b
+  data.tar.gz: 89dfa127721b6fa80b90773a7f2d3adbba6b68d3ebec483cb3cae3c91839d43d5358c21c0fe8f2a2b4b72364b3d1b9ee267ae8012c92d9953041a8d52b09b20b

data/.hound.yml

@@ -33,7 +33,7 @@ CyclomaticComplexity:
 ClassLength:
   Description: 'Avoid classes longer than 100 lines of code.'
   CountComments: false  # count full line comments?
-  Max: 283
+  Max: 290
 
 Output:
   Description: 'Checks for calls to puts, print, etc.'

data/lib/foreplay/deploy.rb

@@ -157,6 +157,9 @@ module Foreplay
 
       # Commands to execute on remote server
       steps = [
+        {  command:      "echo Foreplay version #{VERSION} running from #{`hostname -f`}" \
+                         "#{`which foreman`}",
+           commentary:   'Announcing myself' },
         {  command:      "mkdir -p #{path} && cd #{path} && rm -rf #{current_port} "\
                          "&& git clone -b #{branch} #{repository} #{current_port}",
            commentary:   "Cloning #{branch} branch of repository #{repository}" },
@@ -192,14 +195,18 @@ module Foreplay
            commentary:   'Building config/resque.yml',
            before:       environment,
            path:         'config/' },
-        {  command:      'if [ -d ../cache/vendor/bundle ] ; then cp -rf ../cache/vendor/bundle vendor/bundle'\
-                         ' ; else echo No bundle to restore ; fi',
+        {  command:      'if [ -d ../cache/vendor/bundle/bundle ] ; then rm -rf ../cache/vendor/bundle/bundle'\
+                         ' ; else echo No evidence of legacy copy bug ; fi',
+           commentary:   'Fixing legacy copy bug' },
+        {  command:      'if [ -d ../cache/vendor/bundle ] ; then rsync -avW --no-compress --delete'\
+                         ' ../cache/vendor/bundle/ vendor/bundle ; else echo No bundle to restore ; fi',
            commentary:   'Attempting to restore bundle from cache' },
         {  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:      '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 && cp -rf vendor/bundle ../cache/vendor/bundle',
+        {  command:      'mkdir -p ../cache/vendor && rsync -avW --no-compress --delete'\
+                         ' 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",

data/lib/foreplay/version.rb

@@ -1,3 +1,3 @@
 module Foreplay
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/spec/lib/foreplay/deploy_spec.rb

@@ -111,11 +111,13 @@ describe Foreplay::Deploy do
       'echo "  host: TODO Put here the database host name" >> config/database.yml',
       'echo "  username: TODO Put here the database user" >> config/database.yml',
       'echo "  password: TODO Put here the database user\'s password" >> config/database.yml',
-      'if [ -d ../cache/vendor/bundle ] ; then cp -rf ../cache/vendor/bundle vendor/bundle'\
+      'if [ -d ../cache/vendor/bundle/bundle ] ; then rm -rf ../cache/vendor/bundle/bundle'\
+      ' ; else echo No evidence of legacy copy bug ; fi',
+      'if [ -d ../cache/vendor/bundle ] ; then rsync -avW --no-compress --delete ../cache/vendor/bundle/ vendor/bundle'\
       ' ; else echo No bundle to restore ; fi',
       'sudo ln -f `which bundle` /usr/bin/bundle || echo Using default version of bundle',
       'bundle install --deployment --clean --jobs 2 --without development test',
-      'mkdir -p ../cache/vendor && cp -rf vendor/bundle ../cache/vendor/bundle',
+      'mkdir -p ../cache/vendor && rsync -avW --no-compress --delete 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',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreplay
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Xenapto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport