torquebox-rake-support 2.0.3 → 2.1.0

data/lib/torquebox/deploy_utils.rb

@@ -1,15 +1,15 @@
 # Copyright 2008-2012 Red Hat, Inc, and individual contributors.
-# 
+#
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2.1 of
 # the License, or (at your option) any later version.
-# 
+#
 # This software is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this software; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
@@ -17,6 +17,7 @@
 
 require 'tmpdir'
 require 'rbconfig'
+require 'tempfile'
 require 'yaml'
 require 'rake'
 require 'torquebox/server'
@@ -151,8 +152,11 @@ module TorqueBox
           # app. Otherwise, they'll end up sharing this Gemfile, which
           # is probably not what we want.
           ENV.delete('BUNDLE_GEMFILE')
+          # If called from rake within a rails app, bundler will try
+          # to init itself via RUBYOPT, which we don't want
+          ENV.delete('RUBYOPT') 
 
-          set_java_opts(options[:jvm_options])
+          set_java_opts("#{options[:jvm_options]} #{jruby_opts_properties}")
           exec_command(run_command_line(options).join(' '))
         end
       end
@@ -163,27 +167,30 @@ module TorqueBox
         app_dir = find_option( opts, 'app_dir') || Dir.pwd
         dest_dir = find_option( opts, 'dest_dir') || Dir.pwd
 
-        default_skip_files = %w{ ^log$ ^tmp$ ^test$ ^spec$ \.knob$ vendor }
-        opts_skip_files = (find_option(opts, 'exclude') || "").split(/,/)
+        default_skip_files = %w{ ^log/ ^tmp/ ^test/ ^spec/ ^[^/]*\.knob$ vendor/.*cache/.*\.gem$ }
+        opts_skip_files = (find_option(opts, 'exclude') || "").
+          split(/,/).
+          map { |r| "^[^/]*#{r}"}
         skip_files = default_skip_files + opts_skip_files
 
         archive_path = File.join(dest_dir, archive)
-        
+
         Dir.chdir( app_dir ) do
           include_files = []
-          Dir[ "*", ".bundle" ].each do |entry|
-            entry = File.basename( entry )
-            unless ( skip_files.any?{ |regex| entry.match(regex)} )
-              include_files << entry
+          Dir[ "**/**", ".bundle/**/**" ].each do |entry|
+            unless File.directory?(entry) || skip_files.any? {|regex| entry.match(regex)}
+              include_files << entry 
             end
           end
 
-          Dir[ 'vendor/*' ].each do |entry|
-            include_files << entry unless ( entry == 'vendor/cache' )
-          end
+          includes = Tempfile.new("include-files")
+          includes.write(include_files.join("\n"))
+          includes.flush
+
+          cmd = "jar cvf '#{archive_path}' @#{includes.path}"
 
-          cmd = "jar cvf #{archive_path} #{include_files.join(' ')}"
           run_command( cmd )
+          includes.close( true )
         end
 
         archive_path
@@ -205,7 +212,7 @@ module TorqueBox
 
         root = options[:root] || options['root'] || Dir.pwd
         context_path = options[:context_path] || options['context_path']
-        
+
         d = {}
         d['application'] = {}
         d['application']['root'] = root
@@ -248,11 +255,11 @@ module TorqueBox
       def deployed_file(name)
         File.join( DeployUtils.deploy_dir, "#{name}" ) + ".deployed"
       end
-      
+
       def undeploy_archive(opts = {})
         undeploy( normalize_archive_name( find_option( opts, 'name' ) || archive_name( opts[:root] ) ), opts )
-      end 
-      
+      end
+
       def undeploy_yaml(opts = {})
         undeploy( normalize_yaml_name( find_option( opts, 'name' ) || deployment_name( opts[:root] ) ), opts )
       end
@@ -282,18 +289,22 @@ module TorqueBox
         success
       end
 
+      def run_command(cmd)
+        puts `#{cmd} 2>&1`
+      end
+
       # Used when we want to effectively replace this process with the
       # given command. On Windows this does call Kernel#exec but on
-      # everything else we just delegate to run_command.
+      # everything else we just delegate to fake_exec.
       #
       # This is mainly so CTRL+C, STDIN, STDOUT, and STDERR work as
       # expected across all operating systems.
       def exec_command(cmd)
-        windows? ? exec(cmd) : run_command(cmd)
+        windows? ? exec(cmd) : fake_exec(cmd)
       end
 
       # Used to run a command as a subprocess
-      def run_command(cmd)
+      def fake_exec(cmd)
         exiting = false
         IO.popen4(cmd) do |pid, stdin, stdout, stderr|
           stdout.sync = true
@@ -310,7 +321,7 @@ module TorqueBox
           Thread.new(stdin) { |stdin_io|
             begin
               until exiting
-                stdin_io.write(STDIN.readpartial(1024))
+                stdin_io.write(readpartial(STDIN))
                 stdin_io.flush
               end
             rescue Errno::EBADF, IOError
@@ -322,7 +333,7 @@ module TorqueBox
           [ Thread.new(stdout) { |stdout_io|
               begin
                 while true
-                  STDOUT.write(stdout_io.readpartial(1024))
+                  STDOUT.write(readpartial(stdout_io))
                 end
               rescue EOFError
               end
@@ -331,7 +342,7 @@ module TorqueBox
             Thread.new(stderr) { |stderr_io|
               begin
                 while true
-                  STDERR.write(stderr_io.readpartial(1024))
+                  STDERR.write(readpartial(stderr_io))
                 end
               rescue EOFError
               end
@@ -341,18 +352,22 @@ module TorqueBox
 
       end
 
+      def readpartial(stream)
+        windows? ? stream.read(1) : stream.readpartial(1024)
+      end
+
       def windows?
-        Config::CONFIG['host_os'] =~ /mswin/
+        RbConfig::CONFIG['host_os'] =~ /mswin/
       end
-      
+
       def find_option(opt, key)
         opt[key.to_sym] || opt[key] || ENV[key] || ENV[key.upcase]
       end
-      
+
       def normalize_yaml_name(name)
         name[-9..-1] == '-knob.yml' ? name : name + '-knob.yml'
       end
-      
+
       def normalize_archive_name(name)
         name[-5..-1] == '.knob' ? name : name + '.knob'
       end
@@ -365,10 +380,10 @@ module TorqueBox
         applications = {}
         deployment_descriptors.each do | descriptor |
           descriptor_path = File.join( deploy_dir, descriptor )
-          appname = descriptor.sub( /\-knob.yml/, '' ) 
+          appname = descriptor.sub( /\-knob.yml/, '' )
           applications[appname] = {}
           applications[appname][:descriptor] = descriptor_path
-          applications[appname][:status] = case 
+          applications[appname][:status] = case
                                            when File.exists?("#{descriptor_path}.dodeploy")
                                              "awaiting deployment"
                                            when File.exists?("#{descriptor_path}.deployed")
@@ -380,8 +395,8 @@ module TorqueBox
         end
         applications
       end
-      
-      private 
+
+      private
 
       def undeploy(name, opts = {})
         puts "Attempting to undeploy #{name}"
@@ -408,6 +423,14 @@ 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
+
     end
   end
 end

data/lib/torquebox/rails.rb

@@ -43,6 +43,7 @@ module TorqueBox
       require_generators
       if using_rails3?
         generator = ::Rails::Generators::AppGenerator.new( [root], {}, :destination_root => root )
+        Dir.chdir(root)
         generator.apply TorqueBox::Rails.template
       else
         ::Rails::TemplateRunner.new( TorqueBox::Rails.template )

data/spec/deploy_utils_spec.rb

@@ -210,11 +210,11 @@ describe TorqueBox::DeployUtils do
   end
 
   describe '.check_server' do
-    context "when it can't find the modules" do 
+    context "when it can't find the modules" do
       before(:each) do
         File.stub(:exist?).and_return(false)
       end
-      
+
       it "should raise if it can't find the torquebox modules" do
         lambda { @util.check_server }.should raise_error
       end
@@ -251,7 +251,19 @@ describe TorqueBox::DeployUtils do
     end
 
     it 'should set java options' do
-      @util.should_receive(:set_java_opts).with('java options')
+      @util.should_receive(:set_java_opts).with('java options ')
+      @util.run_server(:jvm_options => 'java options')
+    end
+
+    it 'should pass JRUBY_OPTS properties' do
+      ENV['JRUBY_OPTS'] = '--1.9 -Xjit.logging=true -Xthread.pool.enabled=true -X+C'
+      @util.should_receive(:set_java_opts).with(' -Djruby.jit.logging=true -Djruby.thread.pool.enabled=true')
+      @util.run_server
+    end
+
+    it 'should set java options and pass JRUBY_OPTS properties' do
+      ENV['JRUBY_OPTS'] = '-X-C -Xjit.logging=true --ng'
+      @util.should_receive(:set_java_opts).with('java options -Djruby.jit.logging=true')
       @util.run_server(:jvm_options => 'java options')
     end
   end
@@ -349,12 +361,25 @@ describe TorqueBox::DeployUtils do
   end
 
   describe '.create_archive' do
-    it 'should not include excluded dirs and files' do
+
+    ALL_EXPECTED_FILES = %w{config.ru
+                            app/app.rb
+                            app/puppet-master.rb
+                            app/app.box
+                            app/a-non-cached.gem
+                            vendor/vendor.rb
+                            puppet/puppet.rb
+                            simpleapp.box}
+    
+    def mock_run_command(expected_includes)
       @util.should_receive(:run_command) do |arg|
-        ["config.ru", "app"].permutation.map {|p|
-          "jar cvf /tmp/simpleapp.knob #{p.join(" ")}"
-        }.should include(arg)
+        included_files = arg =~ /@(.*)/ ? File.new($1).readlines.map(&:strip) : []
+        expected_includes.permutation.to_a.should include(included_files)
       end
+    end
+    
+    it 'should not include excluded dirs and files' do
+      mock_run_command(ALL_EXPECTED_FILES - %w{puppet/puppet.rb simpleapp.box})
 
       path = @util.create_archive(
           :name => "simpleapp",
@@ -366,11 +391,7 @@ describe TorqueBox::DeployUtils do
     end
 
     it 'should exclude based on patterns' do
-      @util.should_receive(:run_command) do |arg|
-        ["puppet", "config.ru", "app"].permutation.map {|p|
-          "jar cvf /tmp/simpleapp.knob #{p.join(" ")}"
-        }.should include(arg)
-      end
+      mock_run_command(ALL_EXPECTED_FILES - %w{simpleapp.box})
 
       path = @util.create_archive(
           :name => "simpleapp",
@@ -382,12 +403,8 @@ describe TorqueBox::DeployUtils do
     end
 
     it 'should include all dirs and files except default' do
-      @util.should_receive(:run_command) do |arg|
-        ["config.ru", "app", "puppet", "simpleapp.box"].permutation.map {|p|
-          "jar cvf /tmp/simpleapp.knob #{p.join(" ")}"
-        }.should include(arg)
-      end
-
+      mock_run_command ALL_EXPECTED_FILES
+      
       path = @util.create_archive(
           :name => "simpleapp",
           :app_dir => File.join(File.dirname(__FILE__), 'fixtures/simpleapp'),

data/spec/rails_spec.rb

@@ -47,7 +47,7 @@ describe TorqueBox::Rails do
         generator = mock('generator')
         ::Rails::Generators::AppGenerator.stub(:new).and_return(generator)
         generator.should_receive(:apply).with(TorqueBox::Rails.template)
-        TorqueBox::Rails.apply_template('root')
+        TorqueBox::Rails.apply_template(File.expand_path("../fixtures/simpleapp", __FILE__))
       end
     end
 

data/spec/server_spec.rb

@@ -8,7 +8,19 @@ describe TorqueBox::Server do
   end
 
   it "should return nil if torquebox-server is not installed" do
+    # if you have torquebox-server installed, this will actually return a 
+    # value instead of nil.  so reseting gem paths.
+    old_gem_home = ENV['GEM_HOME']
+    old_gem_path = ENV['GEM_PATH']
+    ENV['GEM_PATH'] = ""
+    ENV['GEM_HOME'] = ""
+    Gem.clear_paths
+
     TorqueBox::Server.torquebox_home.should == nil
+
+    Gem.clear_paths
+    ENV['GEM_HOME'] = old_gem_home
+    ENV['GEM_PATH'] = old_gem_path
   end
 
   describe ".setup_environment" do

metadata

@@ -2,7 +2,7 @@
 name: torquebox-rake-support
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-04 00:00:00 Z
+date: 2012-07-26 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rake
@@ -48,12 +48,12 @@ extra_rdoc_files: []
 
 files: 
   - licenses/lgpl-2.1.txt
-  - lib/org.torquebox.rake-support.rb
   - lib/torquebox-rake-support.rb
-  - lib/torquebox/upstart.rb
-  - lib/torquebox/deploy_utils.rb
+  - lib/org.torquebox.rake-support.rb
   - lib/torquebox/launchd.rb
+  - lib/torquebox/upstart.rb
   - lib/torquebox/rails.rb
+  - lib/torquebox/deploy_utils.rb
   - lib/torquebox/server.rb
   - lib/torquebox/rake/tasks.rb
   - lib/torquebox/rake/tasks/deployment.rb
@@ -63,12 +63,18 @@ files:
   - generators/torquebox_queue_generator.rb
   - generators/templates/queue.rb
   - spec/rails_spec.rb
+  - spec/server_spec.rb
   - spec/spec_helper.rb
   - spec/upstart_spec.rb
   - spec/deploy_utils_spec.rb
-  - spec/server_spec.rb
   - spec/fixtures/simpleapp/config.ru
   - spec/fixtures/simpleapp/simpleapp.box
+  - spec/fixtures/simpleapp/vendor/vendor.rb
+  - spec/fixtures/simpleapp/app/puppet-master.rb
+  - spec/fixtures/simpleapp/app/app.rb
+  - spec/fixtures/simpleapp/app/a-non-cached.gem
+  - spec/fixtures/simpleapp/app/app.box
+  - spec/fixtures/simpleapp/puppet/puppet.rb
 homepage: http://torquebox.org/
 licenses: 
   - lgpl
@@ -98,6 +104,6 @@ specification_version: 3
 summary: TorqueBox Rake Support
 test_files: 
   - spec/rails_spec.rb
+  - spec/server_spec.rb
   - spec/upstart_spec.rb
   - spec/deploy_utils_spec.rb
-  - spec/server_spec.rb