obbistrano 1.1.15 → 1.1.17

data/lib/obbistrano_tasks.rb

@@ -113,8 +113,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       deploy_check
       php_wax_deploy if defined? "#{phpwax}"
       cms_deploy if defined? "#{cms}"
-      css_build
-      js_build
+      bundle.css
+      bundle.js
     end
   
     task :deploy_check do 
@@ -286,28 +286,22 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "Restarts the web server."
     task :restart do
-      detect_os
-      s_namespace = eval(server_type)
-      s_namespace.restart
+      fedora.restart
     end
     
     desc "Creates a new Apache VHost."
     task :vhost do
       config_check
       needs_root
-      detect_os
-      s_namespace = eval(server_type)
-      s_namespace.vhost
-      s_namespace.restart
+      fedora.vhost
+      fedora.restart
     end
     
     desc "Sets up a new user."
     task :setup_user do
       config_check
       needs_root
-      detect_os
-      s_namespace = eval(server_type)
-      s_namespace.setup_user
+      fedora.setup_user
     end
     
     desc "Creates or gets an ssh key for the application"
@@ -376,20 +370,6 @@ Capistrano::Configuration.instance(:must_exist).load do
         setup_user
       end
     end
-  
-    task :detect_os do
-      logger.level = -1
-      with_user("root", "#{root_pass}") do
-        begin 
-          run "cat /etc/fedora-release"
-          set :server_type, "fedora"
-        rescue 
-          run "cat /etc/debian_version"
-          set :server_type, "ubuntu"
-        end
-      end
-      logger.level = 2
-    end
     
   end
   
@@ -457,7 +437,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     task :restart do
       with_user("root", "#{root_pass}") do 
-        run "/etc/rc.d/init.d/httpd restart"
+        run "/etc/init.d/httpd restart"
       end
     end
 
@@ -484,5 +464,68 @@ Capistrano::Configuration.instance(:must_exist).load do
 end
 
 
+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"
+      end
+      target = "#{deploy_to}/public/stylesheets/build/#{bundle_name}_combined.css"
+      File.open(target, 'w') { |f| f.write(bundle) }
+    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"
+      end
+      target = "#{deploy_to}/public/javascripts/build/#{bundle_name}_combined.css"
+      File.open(target, 'w') { |f| f.write(bundle) }
+    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
+        end
+      end
+      files << path if File.extname(path) == ext
+    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.15"
+  s.version = "1.1.17"
   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.15
+  version: 1.1.17
 platform: ruby
 authors: 
 - Ross Riley
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-12 00:00:00 +00:00
+date: 2009-12-15 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency