capifony 2.8.3 → 2.8.4

data/CHANGELOG.md

@@ -1,8 +1,15 @@
+### 2.8.4 / April 13, 2015
+
+* Fixed: update_assets_version by date of last modified file
+* Fixed: replace latest_release with current_path and write tests
+
+*Important:* http://williamdurand.fr/2015/04/11/on-capifony-and-its-future/
+
 ### 2.8.3 / December 17, 2014
 
-Fixed: rollback using the sudo context if available.
-Fixed: support for hosts other then localhost when using `database:copy:to_local`
-Fixed: revert "Recreated composer autoload after `deploy:rollback`
+* Fixed: rollback using the sudo context if available.
+* Fixed: support for hosts other then localhost when using `database:copy:to_local`
+* Fixed: revert "Recreated composer autoload after `deploy:rollback`
 
 ### 2.8.2 / October 7, 2014
 

data/README.md

@@ -1,3 +1,15 @@
+#### Hi! This is your captain speaking.
+
+#### **Capifony** is based on *Capistrano v2.x* and will stick to this version (i.e. Capifony is feature-frozen, and will only accept bug fixes).
+
+#### At the time of writing, [*Capistrano v3*](http://capistranorb.com/) is the current major version, and *Capifony is not compatible* with it.
+
+#### Don't worry, there is a plugin for that! Using *Capistrano v3* + [*capistrano/symfony*](https://github.com/capistrano/symfony) (heavily inspired by *Capifony*) may be the way to go for new projects! You can [read more on capifony and its future](http://williamdurand.fr/2015/04/11/on-capifony-and-its-future/).
+
+#### Cheers!
+
+---
+
 Capifony
 ========
 

data/bin/capifony

@@ -5,7 +5,7 @@ require 'fileutils'
 
 symfony_version  = nil
 symfony_app_path = 'app'
-capifony_version = '2.8.3'
+capifony_version = '2.8.4'
 
 OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename($0)} [path]"

data/lib/capifony_symfony2.rb

@@ -95,9 +95,12 @@ module Capifony
         set :assets_relative,       false
         set :assets_install_path,   web_path
 
-        # Whether to update `assets_version` in `config.yml`
+        # Whether to update `assets_version` parameter in `assets_version.yml`
         set :update_assets_version, false
 
+        # Whether to normalize assets timestamps
+        set :normalize_asset_timestamps, false
+
         # Need to clear *_dev controllers
         set :clear_controllers,     true
 
@@ -282,7 +285,11 @@ module Capifony
 
         after "deploy:finalize_update" do
           if update_assets_version
-            symfony.assets.update_version   # Update `assets_version`
+            symfony.assets.update_version
+          end
+
+          if normalize_asset_timestamps
+            symfony.assets.normalize_timestamps
           end
 
           if use_composer && !use_composer_tmp

data/lib/symfony2/deploy.rb

@@ -105,20 +105,6 @@ namespace :deploy do
     capifony_puts_ok
 
     share_childs
-
-    if fetch(:normalize_asset_timestamps, true)
-      stamp = Time.now.utc.strftime("%Y%m%d%H%M.%S")
-      asset_paths = asset_children.map { |p| "#{latest_release}/#{p}" }.join(" ")
-
-      if asset_paths.chomp.empty?
-        puts "    No asset paths found, skipped".yellow
-      else
-        capifony_pretty_print "--> Normalizing asset timestamps"
-
-        run "#{try_sudo} find #{asset_paths} -exec touch -t #{stamp} {} ';' &> /dev/null || true", :env => { "TZ" => "UTC" }
-        capifony_puts_ok
-      end
-    end
   end
 
   desc <<-DESC

data/lib/symfony2/symfony.rb

@@ -25,12 +25,38 @@ namespace :symfony do
   end
 
   namespace :assets do
-    desc "Updates assets version (in config.yml)"
+    desc "Creates a config file (assets_version.yml) withe latest asset version"
     task :update_version, :roles => :app, :except => { :no_release => true } do
-      capifony_pretty_print "--> Updating assets version (in config.yml)"
+      capifony_pretty_print "--> Updating `assets_version`"
+      asset_paths = asset_children.map { |p| "#{latest_release}/#{p}" }.join(" ")
 
-      run "#{try_sudo} sed -i 's/\\(assets_version:[ ]*\\)\\([a-zA-Z0-9_~]*\\)\\(.*\\)$/\\1#{real_revision.to_s[0,7]}\\3/g' #{latest_release}/#{app_config_path}/config.yml"
-      capifony_puts_ok
+      if asset_paths.chomp.empty?
+        puts "    No asset paths found, skipped".yellow
+      else
+        assets_version = capture("find #{asset_paths} -type f -printf '%Ts\\n' | sort -n | tail -1")
+        assets_version = assets_version.to_i.to_s(36)
+        puts "    Latest assets version: (#{assets_version})"
+
+        file_path = "#{latest_release}/#{app_config_path}/assets_version.yml"
+        file_content = "parameters:\\n    assets_version: #{assets_version}"
+        run "echo '#{file_content}' | #{try_sudo} tee #{file_path}"
+        capifony_puts_ok
+      end
+    end
+
+    desc "Normalizes assets timestamps"
+    task :normalize_timestamps, :roles => :app, :except => { :no_release => true } do
+      stamp = Time.now.utc.strftime("%Y%m%d%H%M.%S")
+      asset_paths = asset_children.map { |p| "#{latest_release}/#{p}" }.join(" ")
+
+      if asset_paths.chomp.empty?
+        puts "    No asset paths found, skipped".yellow
+      else
+        capifony_pretty_print "--> Normalizing asset timestamps"
+
+        run "#{try_sudo} find #{asset_paths} -exec touch -t #{stamp} {} ';' &> /dev/null || true", :env => { "TZ" => "UTC" }
+        capifony_puts_ok
+      end
     end
 
     desc "Installs bundle's assets"

data/lib/symfony2/web.rb

@@ -1,5 +1,6 @@
 namespace :deploy do
   namespace :web do
+
     desc <<-DESC
       Present a maintenance page to visitors. Disables your application's web \
       interface by writing a "#{maintenance_basename}.html" file to each web server. The \
@@ -43,14 +44,18 @@ namespace :deploy do
     DESC
     task :disable, :roles => :web, :except => { :no_release => true } do
       require 'erb'
-      on_rollback { run "rm #{latest_release}/#{web_path}/#{maintenance_basename}.html" }
+      maintenance_file_path = "#{current_path}/#{web_path}/#{maintenance_basename}.html"
+      on_rollback { run "rm #{maintenance_file_path}" }
 
       reason   = ENV['REASON']
       deadline = ENV['UNTIL']
       template = File.read(maintenance_template_path)
       result   = ERB.new(template).result(binding)
 
-      put result, "#{latest_release}/#{web_path}/#{maintenance_basename}.html", :mode => 0644
+      file = File.new(maintenance_file_path, "w")
+      file.syswrite(result)
+      file.chmod(0644)
+      file.close
     end
 
     desc <<-DESC
@@ -60,7 +65,8 @@ namespace :deploy do
       web-accessible again.
     DESC
     task :enable, :roles => :web, :except => { :no_release => true } do
-      run "#{try_sudo} rm -f #{latest_release}/#{web_path}/#{maintenance_basename}.html"
+      maintenance_file_path = "#{current_path}/#{web_path}/#{maintenance_basename}.html"
+      run "#{try_sudo} rm -f #{maintenance_file_path}"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capifony
 version: !ruby/object:Gem::Version
-  version: 2.8.3
+  version: 2.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano