obbistrano 1.1.55 → 1.1.56

data/lib/obbistrano_tasks.rb

@@ -351,7 +351,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         puts "*** Operating System could not be detected or is not supported" if !defined? "#{os_ver}"
         exit if !defined? "#{os_ver}"
       end
-      "#{os_ver}".testos
+      eval "#{os_ver}".testos
     end
     
     
@@ -461,11 +461,12 @@ 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 = get_top_level_directories("#{build_to}/public/stylesheets") | get_top_level_directories("#{build_to}/plugins/cms/resources/public/stylesheets")    
       paths << "#{build_to}/public/stylesheets/"
       Dir.mkdir("#{build_to}/public/stylesheets/build") rescue ""
       paths.each do |bundle_directory|
-        bundle_name = bundle_directory.gsub("#{build_to}/public/stylesheets/", "")
+        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'
@@ -480,11 +481,12 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     task :js , :roles => [:web] do
-      paths = get_top_level_directories("#{build_to}/public/javascripts")
+      paths = get_top_level_directories("#{build_to}/public/javascripts") | get_top_level_directories("#{build_to}/plugins/cms/resources/public/javascripts")
       paths << "#{build_to}/public/javascripts/"
       Dir.mkdir("#{build_to}/public/javascripts/build") rescue ""
       paths.each do |bundle_directory|
-        bundle_name = bundle_directory.gsub("#{build_to}/public/javascripts/", "")
+        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'
@@ -526,6 +528,5 @@ Capistrano::Configuration.instance(:must_exist).load do
 
 
 
-
 end
 

data/obbistrano.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{obbistrano}
-  s.version = "1.1.55"
+  s.version = "1.1.56"
   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,13 @@
 --- !ruby/object:Gem::Specification 
 name: obbistrano
 version: !ruby/object:Gem::Version 
-  hash: 125
+  hash: 99
   prerelease: false
   segments: 
   - 1
   - 1
-  - 55
-  version: 1.1.55
+  - 56
+  version: 1.1.56
 platform: ruby
 authors: 
 - Ross Riley
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 +00:00
+date: 2011-02-18 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency