gorilla-capistrano-recipes 0.1.5 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/gorilla-capistrano-recipes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorilla-capistrano-recipes}
-  s.version = "0.1.5"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Benny Degezelle"]
-  s.date = %q{2009-12-15}
+  s.date = %q{2010-08-24}
   s.description = %q{This gem allows for a clean Capfile by setting up common capistrano stuff such as Git preferences, Radiant specifics, db dump helpers, passenger or lighty restart, ...}
   s.email = %q{benny@gorilla-webdesign.be}
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "gorilla-capistrano-recipes.gemspec",
      "lib/gorilla-capistrano-recipes.rb",
+     "lib/gorilla-capistrano-recipes/deepmodules.rb",
      "lib/gorilla-capistrano-recipes/deploy.rb",
      "lib/gorilla-capistrano-recipes/lighttpd.rb",
      "lib/gorilla-capistrano-recipes/mysql.rb",
@@ -37,7 +38,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jomz/gorilla-capistrano-recipes}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Common capistrano recipes for Gorilla sites}
   s.test_files = [
     "test/helper.rb",
@@ -48,7 +49,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])

data/lib/gorilla-capistrano-recipes/deepmodules.rb

@@ -0,0 +1,68 @@
+require 'capistrano/recipes/deploy/scm/git'
+require 'capistrano/recipes/deploy/strategy/remote_cache'
+
+unless Capistrano::Configuration.respond_to?(:instance)
+  abort "capistrano/deepmodules requires Capistrano 2"
+end
+
+module Capistrano
+  module Deploy
+    
+    module SCM
+      class Git < Base
+
+        # Simple interface to submodule commands
+        def submodule(subcmd)
+          "#{command} submodule #{subcmd}"
+        end
+    
+      end
+    end
+
+
+    module Strategy
+
+      class RemoteCache < Remote
+        # Executes the SCM command for this strategy and writes the REVISION
+        # mark file to each host.
+        # We're overriding default deploy! method to inject a call to deep
+        # update the nested modules
+        def deploy!
+          update_repository_cache
+          update_submodules(repository_cache)
+          copy_repository_cache
+        end
+
+        private
+
+          # Inits and updates submodules in the repository at the path given 
+          # via the argument, then recursively descends into all found 
+          # submodule and updated them and all their down-levels, too
+          def update_submodules(dir)
+            logger.trace "updating submodule at #{dir}"
+
+            submodules = Array.new
+            run("cd #{dir} && #{source.submodule('status')}") do |state, stream, text|
+              # parsing the output of "git submodule status" command
+              # and collecting paths of all submodules into an array
+              submodules += text.split(/\n/).collect do |submodule|
+                $~[1] if submodule.rstrip =~ /.\w{40} ([^()]+)($| \(.*\)$)/
+              end
+            end
+
+            if submodules.size > 0 then
+              # init and update submodules if they were found
+              scm_run("cd #{dir} && "+
+                "#{source.submodule('init')} && "+
+                "#{source.submodule('update')} "
+              )
+              # and descend into them to repeat the process recursively
+              submodules.each { |submodule| update_submodules("#{dir}/#{submodule}") }
+            end
+
+          end
+      end
+
+    end
+  end
+end

data/lib/gorilla-capistrano-recipes/deploy.rb

@@ -1,8 +1,7 @@
 configuration = Capistrano::Configuration.respond_to?(:instance) ? Capistrano::Configuration.instance(:must_exist) : Capistrano.configuration(:must_exist)
 
 configuration.load do
-  require "capistrano/deepmodules"
-  
+  require "gorilla-capistrano-recipes/deepmodules"  
   default_run_options[:pty] = true
   set :ssh_options, { :forward_agent => true}
   set(:deploy_to) { "/home/#{user}/apps/#{application}" }

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gorilla-capistrano-recipes
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  hash: 23
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Benny Degezelle
@@ -9,19 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-15 00:00:00 +01:00
+date: 2010-08-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 description: This gem allows for a clean Capfile by setting up common capistrano stuff such as Git preferences, Radiant specifics, db dump helpers, passenger or lighty restart, ...
 email: benny@gorilla-webdesign.be
 executables: []
@@ -40,6 +50,7 @@ files:
 - VERSION
 - gorilla-capistrano-recipes.gemspec
 - lib/gorilla-capistrano-recipes.rb
+- lib/gorilla-capistrano-recipes/deepmodules.rb
 - lib/gorilla-capistrano-recipes/deploy.rb
 - lib/gorilla-capistrano-recipes/lighttpd.rb
 - lib/gorilla-capistrano-recipes/mysql.rb
@@ -58,21 +69,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Common capistrano recipes for Gorilla sites