capistrano-conditional 0.0.2 → 0.0.3

data/README.md

@@ -83,7 +83,7 @@ I've got <code>cap deploy</code> in muscle memory, and I used to find myself for
       end  
     end
 
-Since I use it on ever project, I've wrapped that logic up in a single command:
+Since I use it on every project, I've wrapped that logic up in a single command:
 
     ConditionalDeploy.monitor_migrations(self)
   

data/lib/capistrano-conditional/integration.rb

@@ -5,12 +5,25 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :conditional do
     desc "Initializes the conditional deployment functionality"
     task :apply do
-      log = capture("cd #{current_path} && git log --format=oneline -n 1", :pty => false)
-      ConditionalDeploy.apply_conditions!( log.split[0] )
+      deployed_hash = capture("cd #{current_path} && git log --format=oneline -n 1", :pty => false).split[0]
+      ConditionalDeploy.apply_conditions!( deployed_hash )
+    end
+    
+    desc "Tests to be sure that the newest local and remote git commits match"
+    task :ensure_latest_git do
+      remote = capture("cd #{shared_path}/cached-copy && git log --format=oneline -n 1", :pty => false)
+      local = run_locally("git log --format=oneline -n 1")
+      
+      unless local == remote
+        abort("\nLocal and remote git repositories have different HEADs:\n    Local: #{local}    Remote: #{remote}\n    Make sure you've committed your latest changes, or else pull down the remote updates and try again\n")
+      end
     end
   end
 
   # Ensure deploys apply conditional elements before running the rest of the tasks
   before 'deploy', 'conditional:apply'
   before 'deploy:migrations', 'conditional:apply'
+  
+  # Abort deployment if mismatch between local and remote git repositories
+  after 'deploy:update_code', 'conditional:ensure_latest_git'
 end

data/lib/capistrano-conditional/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Conditional
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,60 +1,46 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: capistrano-conditional
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Kali Donovan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-01 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: git
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70332715168240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: capistrano
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70332715168240
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: &70332715294620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: Allows making tasks for git-based projects conditional based on the specific files to be deployed.
-email: 
+  prerelease: false
+  version_requirements: *70332715294620
+description: Allows making tasks for git-based projects conditional based on the specific
+  files to be deployed.
+email:
 - kali@deviantech.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -65,38 +51,28 @@ files:
 - lib/capistrano-conditional/integration.rb
 - lib/capistrano-conditional/unit.rb
 - lib/capistrano-conditional/version.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: capistrano-conditional
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Adds support for conditional deployment tasks in capistrano
 test_files: []
-