factorylabs-fdlcap 0.3.18 → 0.3.19

data/VERSION

@@ -1 +1 @@
-0.3.18
+0.3.19

data/fdlcap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fdlcap}
-  s.version = "0.3.18"
+  s.version = "0.3.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Factory Design Labs"]
-  s.date = %q{2009-09-01}
+  s.date = %q{2009-09-09}
   s.default_executable = %q{fdlcap}
   s.email = %q{interactive@factorylabs.com}
   s.executables = ["fdlcap"]
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
      "lib/fdlcap/extensions/recipe_definition.rb",
      "lib/fdlcap/recipes.rb",
      "lib/fdlcap/recipes/autotagger.rb",
+     "lib/fdlcap/recipes/check_revision.rb",
      "lib/fdlcap/recipes/craken.rb",
      "lib/fdlcap/recipes/database.rb",
      "lib/fdlcap/recipes/delayed_job.rb",

data/lib/fdlcap/recipes/check_revision.rb

@@ -0,0 +1,22 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  
+  define_recipe :check_revision do
+    before "deploy:update_code", "deploy:check_revision"
+ 
+    namespace :deploy do
+      desc "Make sure there is something to deploy"
+      task :check_revision, :roles => [:web] do
+        unless `git rev-parse HEAD` == `git rev-parse origin/master`
+          puts ""
+          puts "  \033[1;33m**************************************************\033[0m"
+          puts "  \033[1;33m* WARNING: HEAD is not the same as origin/master *\033[0m"
+          puts "  \033[1;33m**************************************************\033[0m"
+          puts ""
+ 
+          exit
+        end
+      end
+    end
+    
+  end
+end

data/lib/fdlcap/recipes/slice.rb

@@ -1,15 +1,6 @@
 Capistrano::Configuration.instance(:must_exist).load do
   
   namespace :slice do
-
-    desc "Tail the Rails import log for this environment"
-    task :tail_import_logs, :roles => :utility do
-      run "tail -f #{shared_path}/log/import-#{rails_env}.log" do |channel, stream, data|
-        puts # for an extra line break before the host name
-        puts "#{channel[:server]} -> #{data}"
-        break if stream == :err
-      end
-    end
     
     desc "Tail the Rails log for this environment"
     task :tail_logs, :roles => :app do

data/lib/fdlcap/recipes/ssh.rb

@@ -3,9 +3,10 @@ Capistrano::Configuration.instance(:must_exist).load do
     role = (ENV['ROLE'] || :app).to_sym
     servers = find_servers :roles => role
     server = servers.first
+    ssh_cmd = (File.exists?('/usr/bin/ssh-forever') ? '/usr/bin/ssh-forever' : '/usr/bin/ssh')
     if server
       `echo '#{password}' | /usr/bin/pbcopy`
-      exec "/usr/bin/ssh #{user}@#{server.host} -p #{server.port || 22} "
+      exec "#{ssh_cmd} #{user}@#{server.host} -p #{server.port || 22} "
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: factorylabs-fdlcap
 version: !ruby/object:Gem::Version 
-  version: 0.3.18
+  version: 0.3.19
 platform: ruby
 authors: 
 - Factory Design Labs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-01 00:00:00 -07:00
+date: 2009-09-09 00:00:00 -07:00
 default_executable: fdlcap
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,6 +78,7 @@ files:
 - lib/fdlcap/extensions/recipe_definition.rb
 - lib/fdlcap/recipes.rb
 - lib/fdlcap/recipes/autotagger.rb
+- lib/fdlcap/recipes/check_revision.rb
 - lib/fdlcap/recipes/craken.rb
 - lib/fdlcap/recipes/database.rb
 - lib/fdlcap/recipes/delayed_job.rb