capistrano-former03 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f93a0a9ae8a6fe227953f82f4337b97ca0729f6
-  data.tar.gz: c65970a378ae6ddfc6b3044900a0de7041dbe995
+  metadata.gz: 67b7d66c381ef6c78c06b1140493b6fcb76e37a4
+  data.tar.gz: 2b982ebdf4ad4d78b89b2c95d5fa66a6106bb042
 SHA512:
-  metadata.gz: 99d652793b3b066e9c241b069af58c26b194fc88100bceaddeb6ffb187a29a4cf6b2a7706e629d6c5c955a64b33c735e6f3814f97da4d747417d18dcdfffdf97
-  data.tar.gz: 51f44aa275d514356a5485bc7e8a84f55f8d95c440def98e1da79b9354cea2bcdbea5b6059d550a77e04d50f9ce351674ecc5dcf06d60a4e974d74f4b9d61c1e
+  metadata.gz: 659d77f10ccd256f5cc3763adc5a870f7d92e06d56f2a2523fdb0e0f73b55e38374fc15ea843ba645ae37df518a2fcd4786d0d8e86d94795d547500e3ca23e19
+  data.tar.gz: fda656e846548a2a32c77e4a526a0a3e87ea2419dc115e0e4fc144ee7746e303b1cb86cd17da2e9030132408f79a8a5a6e7f1295fb000e41269d6b743208eeb1

data/README.md

@@ -3,6 +3,11 @@ Capistrano extensions for FORMER 03
 
 Adds Features for Capistrano that are needed for FORMER 03's deployment
 
+[![Gem version](https://badge.fury.io/rb/capistrano-former03.png)][gem]
+
+[capistrano]: https://github.com/capistrano/capistrano
+[gem]: https://rubygems.org/gems/capistrano-former03
+
 Implemented features:
 --------------
 
@@ -15,15 +20,13 @@ Implemented features:
 - Deploy own static compiled versions of busybox and rsync if configured / needed
 - Relative symlinking (often needed if ssh or webapp is chrooted)
 - Current directory is no symlink (some hosting provider don't support wwwroot symlinked)
+- Fix rights at local_stage
 
 (Planned) features:
 --------------
 
+-?
 
-[![Gem version](https://badge.fury.io/rb/capistrano-former03)][gem]
-
-[capistrano]: https://github.com/capistrano/capistrano
-[gem]: https://rubygems.org/gems/capistrano-former03
 
 Requirements
 ------------
@@ -83,6 +86,9 @@ deploy_busybox_bin    | false              | deploy a static version of busybox
 deploy_rsync_bin      | nil (Autodetect)   | deploy a static version of rsync
 relative_symlinks     | true               | create all symlinks with relative
 current_path_real_dir | false              | move actual release to current_path to have a real directory instead of symlink 
+ensure_file_mode      | nil                | If given all files are chmoded to that mode
+ensure_dir_mode       | nil                | If given all directories are chmoded to that mode
+ensure_path_mode      | {}                 | Dictionary with path => mode mapping for special files/directories
 
 Overview
 --------
@@ -136,7 +142,7 @@ Author
 - [simonswine][simonswine]
 
 [linyows]: https://github.com/linyows
-[simonswine]: https://github.com/linyows
+[simonswine]: https://github.com/simonswine
 
 License
 -------

data/lib/capistrano/former03/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Former03
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/lib/capistrano/tasks/former03.rake

@@ -19,6 +19,10 @@ namespace :former03 do
   set :relative_symlinks, true
   set :current_path_real_dir, false
 
+  set :ensure_file_mode, nil
+  set :ensure_dir_mode, nil
+  set :ensure_path_mode, {}
+
   set :remote_stage_path, -> {
     Pathname.new(deploy_to).join(fetch(:remote_stage))
   }
@@ -84,9 +88,6 @@ namespace :former03 do
     desc 'Create the local staging directory'
     task :mkdir_stage => :check do
 
-      # Get full path of local stage
-      set :local_stage_path, Pathname.pwd.join(fetch(:local_stage))
-
       # if already exits finish task
       next if File.directory? fetch(:local_stage)
 
@@ -114,10 +115,9 @@ namespace :former03 do
       git_submodule = [:git, :submodule]
 
       run_locally do
-        # Bugfix for git versions < 1.9
-          
         # Check if .gitmodules exist
         if test :test, '-e', '.gitmodules'
+          # Bugfix for git versions < 1.9
           execute(*git_submodule, :init)
           execute(*git_submodule, :sync)
           execute(*git_submodule, :update)
@@ -134,7 +134,7 @@ namespace :former03 do
           if test :test, '-e', '.gitmodules'
             # check out all submodules
             git_submodule = git_prefix + [:submodule]
-            git_submodule_foreach = git_submodule + [:foreach,:git]
+            git_submodule_foreach = git_submodule + [:foreach, :git, '--work-tree', '.']
             execute(*git_submodule, :init)
             execute(*git_submodule, :sync)
             execute(*git_submodule, :update)
@@ -146,6 +146,25 @@ namespace :former03 do
         end
       end
     end
+    desc 'Fix file/dir rights on local stage'
+    task :fix_rights => :stage do
+      run_locally do
+        within fetch(:local_stage_path) do
+          # fix files
+          if fetch(:ensure_file_mode)
+            execute :find, '.', '-type', :f, '-print0', '|', :xargs, '-0', :chmod, fetch(:ensure_file_mode)
+          end
+          # fix directories
+          if fetch(:ensure_dir_mode)
+            execute :find, '.', '-type', :d, '-print0', '|', :xargs, '-0', :chmod, fetch(:ensure_dir_mode)
+          end
+          # fix special paths
+          fetch(:ensure_path_mode).each do |path,mode|
+            execute :chmod, mode, path
+          end
+        end
+      end
+    end
   end
 
   namespace :remote do
@@ -210,7 +229,7 @@ namespace :former03 do
     end
 
     desc 'Sync to deployment hosts from local'
-    task :sync =>  [:check, 'former03:local:stage'] do
+    task :sync =>  [:check, 'former03:local:fix_rights'] do
       roles(:all).each do |role|
         rsync = Capistrano::Former03::Rsync.new(
           :src_path   => fetch(:local_stage_path),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-former03
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Christian Simon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano