torquebox-rake-support 2.1.1 → 2.1.2

data/lib/torquebox/deploy_utils.rb

@@ -160,6 +160,10 @@ module TorqueBox
           # If called from rake within a rails app, bundler will try
           # to init itself via RUBYOPT, which we don't want
           ENV.delete('RUBYOPT') 
+          # Match load-path of booted TorqueBox to the load-path of
+          # this process so that we know we can find bundler and our
+          # own gems if used with bundle install --deployment
+          ENV['RUBYLIB'] = "#{ENV['RUBYLIB']}:#{$:.join(':')}"
 
           set_java_opts("#{options[:jvm_options]} #{jruby_opts_properties}")
           print_server_config(options[:clustered])
@@ -240,7 +244,7 @@ module TorqueBox
         File.open( deployment, 'w' ) do |file|
           YAML.dump( deployment_descriptor, file )
         end
-        FileUtils.touch( dodeploy_file( name ) )
+        FileUtils.touch( dodeploy_file( name, dest_dir ) )
         [name, dest_dir]
       end
 
@@ -250,16 +254,16 @@ module TorqueBox
         dest_dir = find_option( opts, 'dest_dir' ) || deploy_dir
         FileUtils.cp( archive_path, dest_dir )
         archive = File.basename( archive_path )
-        FileUtils.touch( dodeploy_file( archive ) )
+        FileUtils.touch( dodeploy_file( archive, dest_dir ) )
         [archive, dest_dir]
       end
 
-      def dodeploy_file(name)
-        File.join( DeployUtils.deploy_dir, "#{name}" ) + ".dodeploy"
+      def dodeploy_file(name, deploy_dir = DeployUtils.deploy_dir)
+        File.join( deploy_dir, "#{name}" ) + ".dodeploy"
       end
 
-      def deployed_file(name)
-        File.join( DeployUtils.deploy_dir, "#{name}" ) + ".deployed"
+      def deployed_file(name, deploy_dir = DeployUtils.deploy_dir)
+        File.join( deploy_dir, "#{name}" ) + ".deployed"
       end
 
       def undeploy_archive(opts = {})
@@ -402,6 +406,14 @@ module TorqueBox
         applications
       end
 
+      def jruby_opts_properties
+        jruby_opts = ENV['JRUBY_OPTS']
+        return "" if jruby_opts.nil?
+        # Only convert -Xa.b, -Xa.b.c, -Xa.b.c.d style options to properties
+        properties = jruby_opts.scan(/-X(\w+\..+?)\s/)
+        properties.map { |matches| "-Djruby.#{matches.first}" }.join(' ')
+      end
+
       private
 
       def undeploy(name, opts = {})
@@ -429,14 +441,6 @@ module TorqueBox
         end
       end
 
-      def jruby_opts_properties
-        jruby_opts = ENV['JRUBY_OPTS']
-        return "" if jruby_opts.nil?
-        # Only convert -Xa.b, -Xa.b.c, -Xa.b.c.d style options to properties
-        properties = jruby_opts.scan(/-X(\w+\..+?)\s/)
-        properties.map { |matches| "-Djruby.#{matches.first}" }.join(' ')
-      end
-
       def print_server_config(clustered)
         config_file = clustered ? cluster_config_file : standalone_config_file
         config_path = File.join(config_dir, config_file)

data/lib/torquebox/rails.rb

@@ -17,6 +17,7 @@
 
 
 begin
+  gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
   require 'rails/version'
 rescue LoadError
 end
@@ -24,10 +25,11 @@ end
 module TorqueBox
   class Rails
 
-    def self.new_app
+    def self.new_app( root )
       print_rails_not_installed_and_exit unless rails_installed?
       require_generators
-      # Assumes ARGV[0] already has the application name
+      # Ensure ARGV[0] has the application path
+      ARGV.unshift( root ) if ARGV.empty?
       ARGV << [ "-m", TorqueBox::Rails.template ]
       ARGV.flatten!
       if using_rails3?

data/spec/rails_spec.rb

@@ -11,7 +11,7 @@ describe TorqueBox::Rails do
       it "should print a warning" do
         $stderr.should_receive(:puts)
         lambda {
-          TorqueBox::Rails.new_app
+          TorqueBox::Rails.new_app('root')
         }.should raise_error SystemExit
       end
     end
@@ -38,7 +38,7 @@ describe TorqueBox::Rails do
     describe "new_app" do
       it "should generate" do
         ::Rails::Generators::AppGenerator.should_receive(:start)
-        TorqueBox::Rails.new_app
+        TorqueBox::Rails.new_app('root')
       end
     end
 
@@ -67,7 +67,7 @@ describe TorqueBox::Rails do
     describe "new_app" do
       it "should generate" do
         ::Rails::Generator::Scripts::Generate.any_instance.should_receive(:run)
-        TorqueBox::Rails.new_app
+        TorqueBox::Rails.new_app('root')
       end
     end
 

metadata

@@ -2,7 +2,7 @@
 name: torquebox-rake-support
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-27 00:00:00 Z
+date: 2012-09-24 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rake
@@ -48,33 +48,33 @@ extra_rdoc_files: []
 
 files: 
   - licenses/lgpl-2.1.txt
-  - lib/torquebox-rake-support.rb
   - lib/org.torquebox.rake-support.rb
-  - lib/torquebox/launchd.rb
+  - lib/torquebox-rake-support.rb
   - lib/torquebox/server.rb
+  - lib/torquebox/upstart.rb
   - lib/torquebox/deploy_utils.rb
   - lib/torquebox/rails.rb
-  - lib/torquebox/upstart.rb
+  - lib/torquebox/launchd.rb
   - lib/torquebox/rake/tasks.rb
+  - lib/torquebox/rake/tasks/deployment.rb
   - lib/torquebox/rake/tasks/server.rb
   - lib/torquebox/rake/tasks/archive.rb
-  - lib/torquebox/rake/tasks/deployment.rb
-  - generators/torquebox_queue_generator.rb
   - generators/USAGE
+  - generators/torquebox_queue_generator.rb
   - generators/templates/queue.rb
+  - spec/spec_helper.rb
+  - spec/server_spec.rb
   - spec/deploy_utils_spec.rb
   - spec/upstart_spec.rb
   - spec/rails_spec.rb
-  - spec/server_spec.rb
-  - spec/spec_helper.rb
-  - spec/fixtures/simpleapp/config.ru
   - spec/fixtures/simpleapp/simpleapp.box
-  - spec/fixtures/simpleapp/app/puppet-master.rb
-  - spec/fixtures/simpleapp/app/a-non-cached.gem
+  - spec/fixtures/simpleapp/config.ru
+  - spec/fixtures/simpleapp/puppet/puppet.rb
   - spec/fixtures/simpleapp/app/app.rb
+  - spec/fixtures/simpleapp/app/a-non-cached.gem
+  - spec/fixtures/simpleapp/app/puppet-master.rb
   - spec/fixtures/simpleapp/app/app.box
   - spec/fixtures/simpleapp/vendor/vendor.rb
-  - spec/fixtures/simpleapp/puppet/puppet.rb
 homepage: http://torquebox.org/
 licenses: 
   - lgpl
@@ -103,7 +103,7 @@ signing_key:
 specification_version: 3
 summary: TorqueBox Rake Support
 test_files: 
+  - spec/server_spec.rb
   - spec/deploy_utils_spec.rb
   - spec/upstart_spec.rb
   - spec/rails_spec.rb
-  - spec/server_spec.rb