obbistrano 1.1.19 → 1.1.20

data/lib/obbistrano_tasks.rb

@@ -461,71 +461,75 @@ Capistrano::Configuration.instance(:must_exist).load do
   
   end  
 
-end
 
+  namespace :bundle do 
 
-namespace :bundle do 
-  
-  task :css do
-    paths = get_top_level_directories("#{deploy_to}/public/stylesheets")
-    paths << "#{deploy_to}/public/stylesheets/"
-    Dir.mkdir("#{deploy_to}/public/stylesheets/build") rescue ""
-    paths.each do |bundle_directory|
-      bundle_name = bundle_directory.gsub("#{deploy_to}/public/stylesheets/", "")
-       bundle_name ="common" 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"
+    task :css do
+      paths = get_top_level_directories("#{deploy_to}/public/stylesheets")
+      paths << "#{deploy_to}/public/stylesheets/"
+      Dir.mkdir("#{deploy_to}/public/stylesheets/build") rescue ""
+      paths.each do |bundle_directory|
+        bundle_name = bundle_directory.gsub("#{deploy_to}/public/stylesheets/", "")
+         bundle_name ="common" 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 = "#{deploy_to}/public/stylesheets/build/#{bundle_name}_combined.css"
+        File.open(target, 'w') { |f| f.write(bundle) }
       end
-      target = "#{deploy_to}/public/stylesheets/build/#{bundle_name}_combined.css"
-      File.open(target, 'w') { |f| f.write(bundle) }
+      upload "#{deploy_to}/public/stylesheets/build", "#{deploy_to}/public/stylesheets/build"
     end
-    upload "#{deploy_to}/public/stylesheets/build", "#{deploy_to}/public/stylesheets/build"
-  end
-  
-  task :js do
-    paths = get_top_level_directories("#{deploy_to}/public/javascripts")
-    paths << "#{deploy_to}/public/javascripts/"
-    Dir.mkdir("#{deploy_to}/public/javascripts/build") rescue ""
-    paths.each do |bundle_directory|
-      bundle_name = bundle_directory.gsub("#{deploy_to}/public/javascripts/", "")
-       bundle_name ="common" 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"
+
+    task :js do
+      paths = get_top_level_directories("#{deploy_to}/public/javascripts")
+      paths << "#{deploy_to}/public/javascripts/"
+      Dir.mkdir("#{deploy_to}/public/javascripts/build") rescue ""
+      paths.each do |bundle_directory|
+        bundle_name = bundle_directory.gsub("#{deploy_to}/public/javascripts/", "")
+         bundle_name ="common" 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 = "#{deploy_to}/public/javascripts/build/#{bundle_name}_combined.css"
+        File.open(target, 'w') { |f| f.write(bundle) }
       end
-      target = "#{deploy_to}/public/javascripts/build/#{bundle_name}_combined.css"
-      File.open(target, 'w') { |f| f.write(bundle) }
+      upload "#{deploy_to}/public/javascripts/build", "#{deploy_to}/public/javascripts/build"
+
     end
-    upload "#{deploy_to}/public/javascripts/build", "#{deploy_to}/public/javascripts/build"
-    
-  end
-  
-  require 'find'
-  def recursive_file_list(basedir, ext)
-    files = []
-    Find.find(basedir) do |path|
-      if FileTest.directory?(path)
-        if File.basename(path)[0] == ?. # Skip dot directories
-          Find.prune
-        else
-          next
+
+    require 'find'
+    def recursive_file_list(basedir, ext)
+      files = []
+      Find.find(basedir) do |path|
+        if FileTest.directory?(path)
+          if File.basename(path)[0] == ?. # Skip dot directories
+            Find.prune
+          else
+            next
+          end
         end
+        files << path if File.extname(path) == ext
       end
-      files << path if File.extname(path) == ext
+      files.sort
+    end
+
+    def get_top_level_directories(base_path)
+      Dir.entries(base_path).collect do |path|
+        path = "#{base_path}/#{path}"
+        File.basename(path)[0] == ?. || !File.directory?(path) || File.basename(path)=="build" ? nil : path # not dot directories or files
+      end - [nil]
     end
-    files.sort
-  end
 
-  def get_top_level_directories(base_path)
-    Dir.entries(base_path).collect do |path|
-      path = "#{base_path}/#{path}"
-      File.basename(path)[0] == ?. || !File.directory?(path) || File.basename(path)=="build" ? nil : path # not dot directories or files
-    end - [nil]
   end
-  
+
+
+
+
 end
+

data/obbistrano.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{obbistrano}
-  s.version = "1.1.19"
+  s.version = "1.1.20"
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: obbistrano
 version: !ruby/object:Gem::Version 
-  version: 1.1.19
+  version: 1.1.20
 platform: ruby
 authors: 
 - Ross Riley