recap 1.0.12 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9482ec0ba9c5c48c52f06b67d8d2bd74e111c82a
-  data.tar.gz: 7c42f98d0ef90594de08e61844ea1e06b5c4d8b9
+  metadata.gz: 83721ec6476d41384eea2d9b1eaf90aa1f85db56
+  data.tar.gz: 45d5968cdcdc68bc37ff9ab3a7ad0213256a6090
 SHA512:
-  metadata.gz: abf13753ada786fc8d52f7e601ef721beb77fd5cc8d5431c6ebe4396bd59756f6db8d941b9a1f833be400f83982cb339740166d7c62ed36b6467309f0b64bce7
-  data.tar.gz: 69cfb461a89e529c68be44c50c2a61b2a5ec1083cc513e7fbe57afc84734d6b6fda2266127603613faf6ea7ae26ed3cdcc986556517004d9a8a09c12ec2983af
+  metadata.gz: 20772b8733768f091517741501fab00f540e7331f2ffc78d17da02dbd0a9cbbc93fc7fb040d144388cd31b70764aaa6a00c775a40ae824415846edc132489119
+  data.tar.gz: 678bd37303fe05e240130e231f813df9e335c70c205a7241ed815f233fdda083ab3915bbf8aa3d2363c3b59f17c5b2cabe21d3dd950a8e50f01100675873d94f

data/lib/recap/tasks/bootstrap.rb

@@ -40,18 +40,18 @@ module Recap::Tasks::Bootstrap
       # `env:edit` tasks).  The script loads the `.env` file in the users home folder, creates
       # a new copy with `export ` prefixed to each line, and sources this new copy.
       put_as_app %{
-if [ -s "$HOME/.env" ]; then
-  sed -e 's/\\r//g' -e 's/^/export /g' $HOME/.env > $HOME/.recap-env-export
-  . $HOME/.recap-env-export
+if [ -s #{application_home}/.env ]; then
+  sed -e 's/\\r//g' -e 's/^/export /g' #{application_home}/.env > #{application_home}/.recap-env-export
+  . #{application_home}/.recap-env-export
 fi
       }, "#{application_home}/.recap"
 
       # Finally, `.profile` needs to source the `.recap` script, so that the configuration environment is
       # available whenever the environment is loaded.
-      as_app "touch .profile", "~"
+      as_app "touch .profile", "#{application_home}"
 
-      if exit_code("grep '\\. $HOME/\\.recap' #{application_home}/.profile") != "0"
-        as_app %{echo ". \\$HOME/.recap" >> .profile}, "~"
+      if exit_code("grep '\\. #{application_home}/\\.recap' #{application_home}/.profile") != "0"
+        as_app %{echo ". #{application_home}/.recap" >> .profile}, "#{application_home}"
       end
     end
 
@@ -67,7 +67,7 @@ fi
       sudo "usermod --append -G #{application_group} #{remote_username}"
 
       if repository.match /github\.com/
-        run "(mkdir -p ~/.ssh && touch ~/.ssh/known_hosts && ssh-keygen -f ~/.ssh/known_hosts -H -F github.com | grep 'github.com') || ssh-keyscan -H github.com > ~/.ssh/known_hosts"
+        run "(mkdir -p #{application_home}/.ssh && touch #{application_home}/.ssh/known_hosts && ssh-keygen -f #{application_home}/.ssh/known_hosts -H -F github.com | grep 'github.com') || ssh-keyscan -H github.com > #{application_home}/.ssh/known_hosts"
       end
     end
 

data/lib/recap/tasks/foreman.rb

@@ -12,6 +12,11 @@ module Recap::Tasks::Foreman
     # Foreman startup scripts are exported in `upstart` format by default.
     set(:foreman_export_format, "upstart")
 
+    # Foreman startup scripts are generated based on the standard templates by default
+    set(:foreman_template, nil)
+
+    set(:foreman_template_option) { foreman_template ? "--template #{foreman_template}" : nil}
+
     # Scripts are exported (as the the application user) to a temporary location first.
     set(:foreman_tmp_location) { "#{deploy_to}/tmp/foreman" }
 
@@ -19,12 +24,12 @@ module Recap::Tasks::Foreman
     set(:foreman_export_location, "/etc/init")
 
     # The standard foreman export.
-    set(:foreman_export_command) { "./bin/foreman export #{foreman_export_format} #{foreman_tmp_location} --procfile #{procfile} --app #{application} --user #{application_user} --log #{deploy_to}/log" }
+    set(:foreman_export_command) { "./bin/foreman export #{foreman_export_format} #{foreman_tmp_location} --procfile #{procfile} --app #{application} --user #{application_user} --log #{deploy_to}/log #{foreman_template_option}" }
 
     namespace :export do
-      # After each deployment, the startup scripts are exported if the `Procfile` has changed.
+      # After each deployment, the startup scripts are exported if either the `Procfile` or any custom Foreman templates have changed.
       task :if_changed do
-        if trigger_update?(procfile)
+        if trigger_update?(procfile) || (foreman_template && trigger_update?(foreman_template))
           top.foreman.export.default
         end
       end
@@ -71,4 +76,4 @@ module Recap::Tasks::Foreman
     after 'deploy:update_code', 'foreman:export:if_changed'
     after 'deploy:restart', 'foreman:restart'
   end
-end
+end

data/lib/recap/tasks/preflight.rb

@@ -69,4 +69,4 @@ Your remote user must be a member of the '#{application_group}' group in order t
       end
     end
   end
-end
+end

data/lib/recap/version.rb

@@ -1,3 +1,3 @@
 module Recap
-  VERSION = '1.0.12'
+  VERSION = '1.1.0'
 end

data/spec/tasks/foreman_spec.rb

@@ -38,6 +38,23 @@ describe Recap::Tasks::Foreman do
       end
     end
 
+    describe '#foreman_template' do
+      it 'defaults to nil' do
+        config.foreman_template.should be_nil
+      end
+    end
+
+    describe '#foreman_template_option' do
+      it 'is nil if foreman_template is unset' do
+        config.foreman_template_option.should be_nil
+      end
+
+      it 'points at the foreman_template if set' do
+        config.set :foreman_template, '/path/to/template'
+        config.foreman_template_option.should eql('--template /path/to/template')
+      end
+    end
+
     describe '#foreman_export_location' do
       it 'defaults to /etc/init' do
         config.foreman_export_location.should eql('/etc/init')
@@ -52,6 +69,7 @@ describe Recap::Tasks::Foreman do
 
     describe '#foreman_export_command' do
       before :each do
+        config.set :foreman_template_option, ''
         config.set :foreman_export_format, '<export-format>'
         config.set :foreman_tmp_location, '<tmp-location>'
       end
@@ -79,11 +97,20 @@ describe Recap::Tasks::Foreman do
         config.set :deploy_to, '/custom/deploy/location'
         config.foreman_export_command.index("--log /custom/deploy/location/log").should_not be_nil
       end
+
+      it 'includes --template option if set' do
+        config.set :foreman_template_option, '--template /path/to/template'
+        config.foreman_export_command.index("--template /path/to/template").should_not be_nil
+      end
     end
   end
 
   describe 'Tasks' do
     describe 'foreman:export:if_changed' do
+      before :each do
+        namespace.stubs(:trigger_update?).with(config.procfile).returns(false)
+      end
+
       it 'calls foreman:export if the Procfile has changed' do
         namespace.stubs(:trigger_update?).with(config.procfile).returns(true)
         namespace.export.expects(:default)
@@ -91,10 +118,22 @@ describe Recap::Tasks::Foreman do
       end
 
       it 'skips foreman:export if the Procfile has not changed' do
-        namespace.stubs(:trigger_update?).with(config.procfile).returns(false)
         namespace.export.expects(:default).never
         config.find_and_execute_task('foreman:export:if_changed')
       end
+
+      describe 'foreman_template is set' do
+        before :each do
+          config.set :foreman_template, 'config/foreman/upstart'
+          namespace.stubs(:trigger_update?).with(config.foreman_template).returns(false)
+        end
+
+        it 'calls foreman:export if any of the templates have changed' do
+          namespace.stubs(:trigger_update?).with(config.foreman_template).returns(true)
+          namespace.export.expects(:default)
+          config.find_and_execute_task('foreman:export:if_changed')
+        end
+      end
     end
 
     describe 'foreman:export' do
@@ -158,4 +197,4 @@ describe Recap::Tasks::Foreman do
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recap
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.1.0
 platform: ruby
 authors:
 - Tom Ward
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano