torquebox-rake-support 2.0.0.beta2 → 2.0.0.beta3

data/lib/torquebox/deploy_utils.rb

@@ -153,7 +153,10 @@ module TorqueBox
         archive = normalize_archive_name( find_option( opts, 'name' ) || archive_name )
         app_dir = find_option( opts, 'app_dir') || Dir.pwd
         dest_dir = find_option( opts, 'dest_dir') || Dir.pwd
-        skip_files = %w{ ^log$ ^tmp$ ^test$ ^spec$ \.knob$ vendor }
+
+        default_skip_files = %w{ ^log$ ^tmp$ ^test$ ^spec$ \.knob$ vendor }
+        opts_skip_files = (find_option(opts, 'exclude') || "").split(/,/)
+        skip_files = default_skip_files + opts_skip_files
 
         archive_path = File.join(dest_dir, archive)
         

data/lib/torquebox/upstart.rb

@@ -17,6 +17,7 @@
 
 # Helpers for upstart rake tasks
 
+require 'erb'
 require 'torquebox/deploy_utils'
 
 module TorqueBox
@@ -35,9 +36,16 @@ module TorqueBox
         File.join( init_dir, 'torquebox.conf' )
       end
 
-      def copy_init_script
+      def copy_init_script(opts={})
         if File.writable?( init_dir )
-          FileUtils.cp( init_script, init_dir )
+          if ( server_opts = TorqueBox::DeployUtils.find_option(opts, 'server_opts') )
+            to_init_file = File.join( init_dir, File.basename(init_script) )
+            File.open( to_init_file, 'w' ) do |f|
+              f.write( process_init_template(server_opts) )
+            end
+          else
+            FileUtils.cp( init_script, init_dir )
+          end
         else
           puts "Cannot write upstart configuration to #{init_dir}. You'll need to copy #{init_script} to #{init_dir} yourself."
         end
@@ -49,6 +57,11 @@ module TorqueBox
         puts "TorqueBox init scripts OK: #{init_torquebox}"
       end
 
+      # param names are important to the template
+      def process_init_template(server_opts)
+        template = ERB.new File.new( "#{init_script}.erb" ).read
+        template.result(binding)
+      end
     end
   end
 end

data/spec/deploy_utils_spec.rb

@@ -306,4 +306,53 @@ describe TorqueBox::DeployUtils do
       options.should include('-b 0.0.0.0')
     end
   end
+
+  describe '.create_archive' do
+    it 'should not include excluded dirs and files' do
+      @util.should_receive(:exec_command) do |arg|
+        ["config.ru", "app"].permutation.map {|p|
+          "jar cvf /tmp/simpleapp.knob #{p.join(" ")}"
+        }.should include(arg)
+      end
+
+      path = @util.create_archive(
+          :name => "simpleapp",
+          :app_dir => File.join(File.dirname(__FILE__), 'fixtures/simpleapp'),
+          :dest_dir => "/tmp",
+          :exclude => "puppet,simpleapp.box"
+      )
+      path.should == "/tmp/simpleapp.knob"
+    end
+
+    it 'should exclude based on patterns' do
+      @util.should_receive(:exec_command) do |arg|
+        ["puppet", "config.ru", "app"].permutation.map {|p|
+          "jar cvf /tmp/simpleapp.knob #{p.join(" ")}"
+        }.should include(arg)
+      end
+
+      path = @util.create_archive(
+          :name => "simpleapp",
+          :app_dir => File.join(File.dirname(__FILE__), 'fixtures/simpleapp'),
+          :dest_dir => "/tmp",
+          :exclude => ".box"
+      )
+      path.should == "/tmp/simpleapp.knob"
+    end
+
+    it 'should include all dirs and files except default' do
+      @util.should_receive(:exec_command) do |arg|
+        ["config.ru", "app", "puppet", "simpleapp.box"].permutation.map {|p|
+          "jar cvf /tmp/simpleapp.knob #{p.join(" ")}"
+        }.should include(arg)
+      end
+
+      path = @util.create_archive(
+          :name => "simpleapp",
+          :app_dir => File.join(File.dirname(__FILE__), 'fixtures/simpleapp'),
+          :dest_dir => "/tmp"
+      )
+      path.should == "/tmp/simpleapp.knob"
+    end
+  end
 end

data/spec/upstart_spec.rb

@@ -0,0 +1,19 @@
+require 'torquebox/upstart'
+
+describe TorqueBox::Upstart do
+
+  describe ".copy_init_script" do
+    it "should not use the template" do
+      pending "need fakefs or similar to properly test copy"
+      # need fakefs or something
+    end
+  end
+
+  describe ".process_init_template" do
+    it "should substitute the values" do
+      ENV["TORQUEBOX_HOME"] = File.expand_path("..", File.dirname(__FILE__))
+      r = TorqueBox::Upstart.process_init_template("--server-config=standalone-ha.xml")
+      r.should include("--server-config=standalone-ha.xml")
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: torquebox-rake-support
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
 platform: ruby
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 Z
+date: 2012-01-24 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rake
@@ -65,6 +65,9 @@ files:
   - spec/deploy_utils_spec.rb
   - spec/server_spec.rb
   - spec/spec_helper.rb
+  - spec/upstart_spec.rb
+  - spec/fixtures/simpleapp/config.ru
+  - spec/fixtures/simpleapp/simpleapp.box
 homepage: http://www.torquebox.org/torquebox-gems-parent/torquebox-rake-support/
 licenses: 
   - lgpl
@@ -95,3 +98,4 @@ summary: TorqueBox Rake Support
 test_files: 
   - spec/deploy_utils_spec.rb
   - spec/server_spec.rb
+  - spec/upstart_spec.rb