sumodev_deploy 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b5ddd502fbeeef7326947954381f0461e43cbe5
-  data.tar.gz: 26b03263fe07da67d603bdcda1bc1e76de023024
+  metadata.gz: ab652bf83156b26445a928ddaa0195f631422458
+  data.tar.gz: 62a199b85cb9a5f0f3c3caddd7076a5290d0da15
 SHA512:
-  metadata.gz: 92d6da8c23800de9f1159c3be8a9c568633784d39d4bab199da21ef8c03b1d74f05ffb936e620a29fd98f16b6749e0368e56513fa5dba3e4b9472539d94c153f
-  data.tar.gz: e7d9fa944c5d54fdf23e3e8a2588fc90e71916c9c25dbfa8f2103ef79fcdf7858b942b3f5f5671512523b49d22be31e8ca6201698bfd4edd909a5735ccca46d2
+  metadata.gz: 4d302aff0c3018e4c3cca23e0d0ab8ae16f8888c26c5fb5afcd3abb0aa4c86b220f3fb3d46f3f7ce3e5a35e9d8db2800264c18c78ad590b29bbcde946d9bd2af
+  data.tar.gz: ebf8a37ac3749b85d722fe48d32230e7438f09787018d1a3cea69f261934007899c39fcc85fce81ae6fe101f99e8dffd533294b4a5cb57b3915e3faa39716fe4

data/lib/sumodev_deploy/tasks/assets.rb

@@ -4,6 +4,13 @@ Capistrano::Configuration.instance.load do
     task :precompile do
       require 'compass'
 
+      compass = fetch(:compass_command) do
+        if File.exists?("Gemfile.lock")
+          "bundle exec compass"
+        else
+          "compass"
+        end
+      end
       compass_folders = fetch(:compass_folders, Dir.glob('**/config.rb'))
       asset_path      = fetch(:asset_cache_dir, Dir.pwd + "/cache/cached_assets")
       output_style   = fetch(:compass_output, :compressed)
@@ -13,13 +20,17 @@ Capistrano::Configuration.instance.load do
         Compass.add_project_configuration(config)
 
         run_locally "rm -rf #{asset_path} && mkdir -p #{asset_path}" # Cleanup
-        run_locally "cd #{path} && compass clean --css-dir #{asset_path}/#{Compass.configuration.css_dir} && compass compile -s #{output_style} --css-dir #{asset_path}/#{Compass.configuration.css_dir}"
+        run_locally "cd #{path} && #{compass} clean --css-dir #{asset_path}/#{Compass.configuration.css_dir} && #{compass} compile -s #{output_style} --css-dir #{asset_path}/#{Compass.configuration.css_dir}"
 
-        assets  = Dir.glob(asset_path + '/*/*').map {|f| [f, f.gsub(asset_path, '')] }
+        assets  = Dir.glob(asset_path + '/**/*').map {|f| [f, f.gsub(asset_path, '')] }
         sprites = Dir.glob(path + "/images/**/*").grep(/-[0-9a-z]{11}.(png|jpg)/).map {|f| [f, f.gsub(path, '')] }
 
         (assets + sprites).each do |file, filepath|
-          upload file, "#{latest_release.shellescape}/#{path}#{filepath}"
+          if File.directory?(file)
+            run "mkdir -p #{latest_release.shellescape}/#{path}/#{filepath}"
+          else
+            upload file, "#{latest_release.shellescape}/#{path}#{filepath}"
+          end
         end
 
         run_locally "rm -rf #{asset_path}"

data/sumodev_deploy.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sumodev_deploy"
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.authors = ["Jan De Poorter"]
   s.date = "2012-04-18"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sumodev_deploy
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Jan De Poorter