obbistrano 1.1.73 → 1.1.74

data/lib/obbistrano_tasks.rb

@@ -514,20 +514,26 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :bundle do
 
-   task :css, :roles => [:web] do
+
+  task :css, :roles => [:web] do
     paths = get_top_level_directories("#{build_to}/public/stylesheets")
     if defined? "#{newdeploy}" then
-      paths << "#{build_to}/public/stylesheets/"
       if defined? "#{plugins}"
         plugins.each do |plugin|
-          print "#{plugin}"
+          print "plugin: #{plugin}\n"
           paths << "#{build_to}/plugins/#{plugin}/resources/public/stylesheets"
         end
       end
+      puts "--"
+      paths.each do |path|
+        puts "folders: #{path}\n"
+      end
       Dir.mkdir("#{build_to}/public/stylesheets/build") rescue ""
       paths.each do |bundle_directory|
-        bundle_name = bundle_directory.gsub("#{build_to}/", "").gsub("plugins/", "").gsub("/resources/public/stylesheets", "")
-        puts "  #{bundle_name}"
+        puts "--"
+        puts "directory: #{bundle_directory}"
+        bundle_name = bundle_directory.gsub("#{build_to}/", "").gsub("plugins/", "").gsub("/resources/public/stylesheets", "").gsub("public/stylesheets/", "")
+        puts " bundle name: #{bundle_name}"
         next if bundle_name.empty?
         files = recursive_file_list(bundle_directory, ".css")
         next if files.empty? || bundle_name == 'dev'
@@ -559,21 +565,25 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
     upload "#{build_to}/public/stylesheets/build", "#{deploy_to}/public/stylesheets/", :via => :scp, :recursive=>true
   end
-
   task :js , :roles => [:web] do
     paths = get_top_level_directories("#{build_to}/public/javascripts")
     if defined? "#{newdeploy}" then
-      paths << "#{build_to}/public/javascripts/"
       if defined? "#{plugins}"
         plugins.each do |plugin|
+          print "plugin: #{plugin}\n"
           paths << "#{build_to}/plugins/#{plugin}/resources/public/javascripts"
         end
       end
+      puts "--"
+      paths.each do |path|
+        puts "folders: #{path}\n"
+      end
       Dir.mkdir("#{build_to}/public/javascripts/build") rescue ""
       paths.each do |bundle_directory|
-        puts bundle_directory
-        bundle_name = bundle_directory.gsub("#{build_to}/", "").gsub("plugins/", "").gsub("/resources/public/javascripts", "")
-        puts "  #{bundle_name}"
+        puts "--"
+        puts "directory: #{bundle_directory}"
+        bundle_name = bundle_directory.gsub("#{build_to}/", "").gsub("plugins/", "").gsub("/resources/public/javascripts", "").gsub("public/javascripts/", "")
+        puts " bundle name: #{bundle_name}"
         next if bundle_name.empty?
         files = recursive_file_list(bundle_directory, ".js")
         next if files.empty? || bundle_name == 'dev'
@@ -603,10 +613,10 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
     upload "#{build_to}/public/javascripts/build", "#{deploy_to}/public/javascripts/", :via => :scp, :recursive=>true
-
   end
 
 
+
     require 'find'
     def recursive_file_list(basedir, ext)
       files = []

data/obbistrano.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{obbistrano}
-  s.version = "1.1.73"
+  s.version = "1.1.74"
   s.authors = ["Ross Riley", "One Black Bear"]
   s.date = Time.now
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 73
-  version: 1.1.73
+  - 74
+  version: 1.1.74
 platform: ruby
 authors: 
 - Ross Riley