recap 1.0.5 → 1.0.6

data/Vagrantfile

@@ -7,11 +7,11 @@ Vagrant::Config.run do |config|
   # please see the online documentation at vagrantup.com.
 
   # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "lucid64"
+  config.vm.box = "precise64"
 
   # The url from where the 'config.vm.box' box will be fetched if it
   # doesn't already exist on the user's system.
-  config.vm.box_url = "http://files.vagrantup.com/lucid64.box"
+  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
 
   # Boot with a GUI so you can see the screen. (Default is headless)
   # config.vm.boot_mode = :gui

data/lib/recap/support/capistrano_extensions.rb

@@ -4,19 +4,9 @@ require 'tempfile'
 # as part of a deployments
 
 module Recap::Support::CapistranoExtensions
-  # Run a command as the given user
-  def as_user(user, command, pwd = deploy_to)
-    sudo "su - #{user} -c 'cd #{pwd} && #{command}'"
-  end
-
-  # Run a command as root
-  def as_root(command, pwd = deploy_to)
-    as_user 'root', command, pwd
-  end
-
   # Run a command as the application user
   def as_app(command, pwd = deploy_to)
-    as_user application_user, command, pwd
+    sudo "su - #{application_user} -c 'cd #{pwd} && #{command}'"
   end
 
   # Put a string into a file as the application user
@@ -65,8 +55,8 @@ module Recap::Support::CapistranoExtensions
   # Find the latest tag from the repository.  As `git tag` returns tags in order, and our release
   # tags are timestamps, the latest tag will always be the last in the list.
   def latest_tag_from_repository
-    result = capture_git("tag | tail -n1").strip
-    result.empty? ? nil : result
+    tags = capture_git("tag").strip.split
+    tags.grep(/^[0-9]{17}/).last
   end
 
   # Does the given file exist within the deployment directory?

data/lib/recap/tasks/deploy.rb

@@ -33,9 +33,8 @@ module Recap::Tasks::Deploy
     # directory.  The default is `/home/#{application_user}/app`.
     set(:deploy_to)   { "/home/#{application_user}/app" }
 
-    # Each release is marked by a unique tag, generated with the current timestamp.  While this can be
-    # changed, it's not recommended, as the sort order of the tag names is important; later tags must
-    # be listed after earlier tags.
+    # Each release is marked by a unique tag, generated with the current timestamp.  This should
+    # not be changed, as the format is matched in the list of tags to find deploy tags.
     set(:release_tag) { Time.now.utc.strftime("%Y%m%d%H%M%S") }
 
     # On tagging a release, a message is also recorded alongside the tag.  This message can contain

data/lib/recap/tasks/env.rb

@@ -1,6 +1,6 @@
 # Recap encourages the storage of application configuration (such as database passwords, S3 keys and
 # other things that change between deploys) in environment variables.
-# [12factor.net](http://www.12factor.net) has [http://www.12factor.net/config](a good set of reasons
+# [12factor.net](http://www.12factor.net) has [a good set of reasons](http://www.12factor.net/config)
 # why this is desirable).
 #
 # To enable this, [recap](https://github.com/freerange/recap) stores these configuration variables

data/lib/recap/tasks/foreman.rb

@@ -35,6 +35,7 @@ module Recap::Tasks::Foreman
       desc 'Export foreman configuration'
       task :default do
         if deployed_file_exists?(procfile)
+          sudo "mkdir -p #{deploy_to}/log"
           sudo "chown #{application_user}: #{deploy_to}/log"
           as_app foreman_export_command
           sudo "rm -f #{foreman_export_location}/#{application}*"

data/lib/recap/tasks/rails.rb

@@ -23,7 +23,7 @@ module Recap::Tasks::Rails
       end
 
       task :migrate do
-        if deployed_file_changed?("db/schema.rb")
+        if deployed_file_exists?("db/schema.rb") && deployed_file_changed?("db/schema.rb")
           as_app './bin/rake db:migrate'
         end
       end

data/lib/recap/version.rb

@@ -1,3 +1,3 @@
 module Recap
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

data/spec/tasks/foreman_spec.rb

@@ -100,6 +100,7 @@ describe Recap::Tasks::Foreman do
     describe 'foreman:export' do
       it 'runs the foreman export command, then moves the exported files to the export location' do
         namespace.stubs(:deployed_file_exists?).with(config.procfile).returns(true)
+        namespace.expects(:sudo).with("mkdir -p #{config.deploy_to}/log").in_sequence(commands)
         namespace.expects(:sudo).with("chown #{config.application_user}: #{config.deploy_to}/log").in_sequence(commands)
         namespace.expects(:as_app).with(config.foreman_export_command).in_sequence(commands)
         namespace.expects(:sudo).with("rm -f #{config.foreman_export_location}/#{config.application}*").in_sequence(commands)

data/spec/tasks/rails_spec.rb

@@ -37,15 +37,25 @@ describe Recap::Tasks::Rails do
 
     describe 'rails:db:migrate' do
       it 'runs migrations if the schema has changed' do
+        namespace.stubs(:deployed_file_exists?).with('db/schema.rb').returns(true)
         namespace.stubs(:deployed_file_changed?).with('db/schema.rb').returns(true)
         namespace.expects(:as_app).with('./bin/rake db:migrate')
         config.find_and_execute_task('rails:db:migrate')
       end
+
       it 'does nothing if the schema has not changed' do
+        namespace.stubs(:deployed_file_exists?).with('db/schema.rb').returns(true)
         namespace.stubs(:deployed_file_changed?).with('db/schema.rb').returns(false)
         namespace.expects(:as_app).never
         config.find_and_execute_task('rails:db:migrate')
       end
+
+      it 'does nothing if the schema does not exist' do
+        namespace.stubs(:deployed_file_exists?).with('db/schema.rb').returns(false)
+        namespace.stubs(:deployed_file_changed?).with('db/schema.rb').returns(true)
+        namespace.expects(:as_app).never
+        config.find_and_execute_task('rails:db:migrate')
+      end
     end
 
     describe 'assets:precompile' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recap
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -266,7 +266,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3430921790514361122
+      hash: -2984683490822306722
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -275,10 +275,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3430921790514361122
+      hash: -2984683490822306722
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: GIT based deployment recipes for Capistrano