obbistrano 1.1.70 → 1.1.71

data/lib/obbistrano_tasks.rb

@@ -266,6 +266,7 @@ Capistrano::Configuration.instance(:must_exist).load do
           run "rm -f /etc/apache2/sites-enabled/#{user_to_config}.conf; ln -s /home/#{user_to_config}/#{deploy_to}/app/platform/apache.conf /etc/apache2/sites-enabled/#{user_to_config}.conf"
         end
         user_cron_tasks = capture("cat #{deploy_to}/app/platform/crontab")
+        logger.info "Writing User Cron File"
         write_crontab(user_cron_tasks)
       rescue
         
@@ -513,48 +514,60 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :bundle do 
 
-    task :css, :roles => [:web] do
-      paths = get_top_level_directories("#{build_to}/public/stylesheets")
-      paths = paths | get_top_level_directories("#{build_to}/plugins/cms/resources/public/stylesheets") if defined? "#{cms}"
-      paths << "#{build_to}/public/stylesheets/"
-      Dir.mkdir("#{build_to}/public/stylesheets/build") rescue ""
-      paths.each do |bundle_directory|
-        bundle_name = if bundle_directory.index("plugins") then bundle_directory.gsub("#{build_to}/plugins/cms/resources/public/stylesheets", "") else bundle_directory.gsub("#{build_to}/public/stylesheets/", "") end
-        bundle_name = if bundle_name.index("/") then bundle_name[0..bundle_name.index("/")-1] else bundle_name end
-        next if bundle_name.empty?
-        files = recursive_file_list(bundle_directory, ".css")
-        next if files.empty? || bundle_name == 'dev'
-        bundle = ''
-        files.each do |file_path|
-          bundle << File.read(file_path) << "\n"
-        end
-        target = "#{build_to}/public/stylesheets/build/#{bundle_name}_combined.css"
-        File.open(target, 'w') { |f| f.write(bundle) }
+   task :css, :roles => [:web] do
+    paths = get_top_level_directories("#{build_to}/public/stylesheets")
+    paths = paths | get_top_level_directories("#{build_to}/plugins/cms/resources/public/stylesheets") if defined? "#{cms}"
+    paths << "#{build_to}/public/stylesheets/"
+    if defined? "#{plugins}"
+      plugins.each do |plugin|
+        paths << "#{build_to}/plugins/#{plugin}/resources/public/stylesheets"
       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")
-      paths = paths | get_top_level_directories("#{build_to}/plugins/cms/resources/public/javascripts") if defined? "#{cms}"
-      paths << "#{build_to}/public/javascripts/"
-      Dir.mkdir("#{build_to}/public/javascripts/build") rescue ""
-      paths.each do |bundle_directory|
-        bundle_name = if bundle_directory.index("plugins") then bundle_directory.gsub("#{build_to}/plugins/cms/resources/public/javascripts", "") else bundle_directory.gsub("#{build_to}/public/javascripts/", "") end
-        bundle_name = if bundle_name.index("/") then bundle_name[0..bundle_name.index("/")-1] else bundle_name end
-        next if bundle_name.empty?
-        files = recursive_file_list(bundle_directory, ".js")
-        next if files.empty? || bundle_name == 'dev'
-        bundle = ''
-        files.each do |file_path|
-          bundle << File.read(file_path) << "\n"
-        end
-        target = "#{build_to}/public/javascripts/build/#{bundle_name}_combined.js"
-        File.open(target, 'w') { |f| f.write(bundle) }
+    Dir.mkdir("#{build_to}/public/stylesheets/build") rescue ""
+    paths.each do |bundle_directory|      
+      bundle_name = bundle_directory.gsub(/(cms)|(\/plugins)|(resources)|(public)|(stylesheets)|(\/)/i, "")
+      bundle_name = if(bundle_name.index(".") == 0) then bundle_name[1..bundle_name.length] else bundle_name end
+      next if bundle_name.empty?
+      files = recursive_file_list(bundle_directory, ".css")
+      next if files.empty? || bundle_name == 'dev'
+      bundle = ''
+      files.each do |file_path|
+        bundle << File.read(file_path) << "\n"
       end
-      upload "#{build_to}/public/javascripts/build", "#{deploy_to}/public/javascripts/", :via => :scp, :recursive=>true
+      target = "#{build_to}/public/stylesheets/build/#{bundle_name}_combined.css"
+      File.open(target, 'w') { |f| f.write(bundle) }
+    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")
+    paths = paths | get_top_level_directories("#{build_to}/plugins/cms/resources/public/javascripts") if defined? "#{cms}"
+    paths << "#{build_to}/public/javascripts/"
+    if defined? "#{plugins}"
+      plugins.each do |plugin|
+        paths << "#{build_to}/plugins/#{plugin}/resources/public/javascripts"
+      end
     end
+    Dir.mkdir("#{build_to}/public/javascripts/build") rescue ""
+    paths.each do |bundle_directory|
+      puts bundle_directory
+      bundle_name = bundle_directory.gsub(/(cms)|(\/plugins)|(resources)|(public)|(javascripts)|(\/)/i, "")
+      bundle_name = if(bundle_name.index(".") == 0) then bundle_name[1..bundle_name.length] else bundle_name end
+      next if bundle_name.empty?
+      files = recursive_file_list(bundle_directory, ".js")
+      next if files.empty? || bundle_name == 'dev'
+      bundle = ''
+      files.each do |file_path|
+        bundle << File.read(file_path) << "\n"
+      end
+      target = "#{build_to}/public/javascripts/build/#{bundle_name}_combined.js"
+      File.open(target, 'w') { |f| f.write(bundle) }
+    end
+    upload "#{build_to}/public/javascripts/build", "#{deploy_to}/public/javascripts/", :via => :scp, :recursive=>true
+
+  end
+  
 
     require 'find'
     def recursive_file_list(basedir, ext)

data/obbistrano.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{obbistrano}
-  s.version = "1.1.70"
+  s.version = "1.1.71"
   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

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: obbistrano
 version: !ruby/object:Gem::Version 
-  hash: 159
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
   - 1
-  - 70
-  version: 1.1.70
+  - 71
+  version: 1.1.71
 platform: ruby
 authors: 
 - Ross Riley
@@ -16,17 +15,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-29 00:00:00 Z
+date: 2012-02-22 00:00:00 +00:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 2
         - 5
@@ -37,11 +35,9 @@ dependencies:
   name: activeresource
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
         version: "2"
@@ -51,11 +47,9 @@ dependencies:
   name: httparty
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 0
         - 4
@@ -79,6 +73,7 @@ files:
 - lib/slicehost.rb
 - lib/obbistrano_tasks.rb
 - lib/templates/apache_vhost.erb
+has_rdoc: true
 homepage: http://github.com/oneblackbear/obbistrano
 licenses: []
 
@@ -88,27 +83,23 @@ 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"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Adds extra namespaces to Capistrano to allow simple setup, deploys and maintenance.