org.torquebox.rake-support 1.0.0.Beta22 → 1.0.0.Beta23

data/lib/torquebox/tasks/archive.rb

@@ -1,48 +1,44 @@
-if ( rails?( Dir.pwd ) )
-  namespace :torquebox do
-
-    desc "Create a self-contained application archive"
-    task :archive do 
-      puts "Creating archive of #{RAILS_ROOT}"
-      bundle_name = File.basename( RAILS_ROOT ) + '.rails'
-      FileUtils.rm_rf( bundle_name )
-    
-      skip_files = [
-        'log',
-        'tmp',
-      ]
-      include_files = []
-      Dir[ "#{RAILS_ROOT}/*" ].each do |entry|
-        entry = File.basename( entry )
-        unless ( skip_files.include?( entry ) )
-          include_files << entry
-        end
+
+def get_archive_name root=Dir.pwd
+  File.basename(root) + (rails?(root) ? '.rails' : '.rack')
+end
+
+namespace :torquebox do
+
+  desc "Create a self-contained application archive"
+  task :archive do 
+    skip_files = %w{ ^log$ ^tmp$ \.rails$ \.rack$ }
+
+    include_files = []
+    Dir[ "*", ".bundle" ].each do |entry|
+      entry = File.basename( entry )
+      unless ( skip_files.any?{ |regex| entry.match(regex)} )
+        include_files << entry
       end
-    
-      puts "Creating archive: #{bundle_name}"
-    
-      Dir.chdir( RAILS_ROOT ) do
-        cmd = "jar cf #{bundle_name} #{include_files.join(' ')}"
-        Open3.popen3( cmd ) do |stdin, stdout, stderr|
-          stdin.close
-          stdout_thr = Thread.new(stdout) {|stdout_io|
-            stdout_io.readlines.each do |l|
-              puts l
-            end
-            stdout_io.close
-          }
-          stderr_thr = Thread.new(stderr) {|stderr_io|
-            stderr_io.readlines.each do |l|
-              puts l
-            end
-          }
-          stdout_thr.join
-          stderr_thr.join
+    end
+
+    archive_name = get_archive_name
+    puts "Creating archive: #{archive_name}"
+    cmd = "jar cvf #{archive_name} #{include_files.join(' ')}"
+    Open3.popen3( cmd ) do |stdin, stdout, stderr|
+      stdin.close
+      stdout_thr = Thread.new(stdout) {|stdout_io|
+        stdout_io.readlines.each do |l|
+          puts l
         end
-      end
-      puts "Created archive: #{bundle_name}"
+        stdout_io.close
+      }
+      stderr_thr = Thread.new(stderr) {|stderr_io|
+        stderr_io.readlines.each do |l|
+          puts l
+        end
+      }
+      stdout_thr.join
+      stderr_thr.join
     end
+    puts "Created archive: #{Dir.pwd}/#{archive_name}"
   end
 
 end
 
+

data/lib/torquebox/tasks/deployment.rb

@@ -11,7 +11,7 @@ def rails_deployment(app_name, root, context_path)
   deployment_descriptor = {
     'application' => {
       'RAILS_ROOT'=>root,
-      'RAILS_ENV'=>( defined?( RAILS_ENV ) ? RAILS_ENV : 'development' ),
+      'RAILS_ENV'=>( defined?( RAILS_ENV ) ? RAILS_ENV : 'development' ).to_s,
     },
     'web' => {
       'context'=> context_path[0,1] != '/'? %Q(/#{context_path}) : context_path
@@ -22,10 +22,11 @@ def rails_deployment(app_name, root, context_path)
 end
 
 def rack_deployment(app_name, root, context_path)
+  env = defined?(RACK_ENV) ? RACK_ENV : ENV['RACK_ENV']
   deployment_descriptor = { 
     'application' => {
       'RACK_ROOT'=>root,
-      'RACK_ENV'=>( defined?( RACK_ENV ) ? RACK_ENV : 'development' ),
+      'RACK_ENV'=>( env || 'development' ).to_s,
     },
     'web' => {
       'context'=> context_path[0,1] != '/'? %Q(/#{context_path}) : context_path
@@ -35,12 +36,12 @@ def rack_deployment(app_name, root, context_path)
   [ rack_deployment_name( app_name ), deployment_descriptor ]
 end
 
-def rails?(root)
+def rails?(root = Dir.pwd)
   File.exist?( File.join( root, 'config', 'environment.rb' ) )
 end
 
-def rack?(root)
-  File.exist?( File.join( root, 'config.ru' ) )
+def rack?(root = Dir.pwd)
+  not rails?(root)
 end
 
 def deployment(app_name, root, context_path)
@@ -78,22 +79,20 @@ namespace :torquebox do
     puts "Undeployed #{deployment_name}"
   end
 
-  if ( rails?( Dir.pwd ) )
-    desc "Create (if needed) and deploy as application archive"
-    namespace :deploy do
-      task :archive=>[ 'torquebox:archive' ] do
-        archive_name = File.basename( Dir.pwd ) + '.rails'
-        src = "#{Dir.pwd}/#{archive_name}"
-        FileUtils.cp( src, TorqueBox::RakeUtils.deploy_dir )
-        puts "Deployed #{archive_name}"
-      end
+  desc "Create (if needed) and deploy as application archive"
+  namespace :deploy do
+    task :archive=>[ 'torquebox:archive' ] do
+      archive_name = get_archive_name
+      src = "#{Dir.pwd}/#{archive_name}"
+      FileUtils.cp( src, TorqueBox::RakeUtils.deploy_dir )
+      puts "Deployed #{archive_name}"
     end
-    namespace :undeploy do
-      task :archive do
-        archive_name = File.basename( Dir.pwd ) + '.rails'
-        FileUtils.rm_f( File.join( TorqueBox::RakeUtils.deploy_dir, archive_name ) )
-        puts "Undeployed #{archive_name}"
-      end
+  end
+  namespace :undeploy do
+    task :archive do
+      archive_name = get_archive_name
+      FileUtils.rm_f( File.join( TorqueBox::RakeUtils.deploy_dir, archive_name ) )
+      puts "Undeployed #{archive_name}"
     end
   end
  

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
     - 1
     - 0
     - 0
-    - Beta22
-  version: 1.0.0.Beta22
+    - Beta23
+  version: 1.0.0.Beta23
 platform: ruby
 authors: []
 
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 -05:00
+date: 2010-12-06 00:00:00 -06:00
 default_executable: 
 dependencies: []