torquebox-rake-support 2.0.0 → 2.0.1

data/lib/torquebox/deploy_utils.rb

@@ -183,7 +183,7 @@ module TorqueBox
           end
 
           cmd = "jar cvf #{archive_path} #{include_files.join(' ')}"
-          exec_command( cmd )
+          run_command( cmd )
         end
 
         archive_path
@@ -193,8 +193,8 @@ module TorqueBox
         Dir.chdir( app_dir ) do
           jruby = File.join( RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'] )
           jruby << " --1.9" if RUBY_VERSION =~ /^1\.9\./
-          exec_command( "#{jruby} -S bundle package" )
-          exec_command( "#{jruby} -S bundle install --local --path vendor/bundle" )
+          run_command( "#{jruby} -S bundle package" )
+          run_command( "#{jruby} -S bundle install --local --path vendor/bundle" )
         end
       end
 
@@ -288,29 +288,61 @@ module TorqueBox
         success
       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.
+      #
+      # This is mainly so CTRL+C, STDIN, STDOUT, and STDERR work as
+      # expected across all operating systems.
       def exec_command(cmd)
-        IO.popen4( cmd ) do |pid, stdin, stdout, stderr|
+        windows? ? exec(cmd) : run_command(cmd)
+      end
+
+      # Used to run a command as a subprocess
+      def run_command(cmd)
+        exiting = false
+        IO.popen4(cmd) do |pid, stdin, stdout, stderr|
+          stdout.sync = true
+          stderr.sync = true
           trap("INT") do
+            exiting = true
+            stdin.close
             puts "caught SIGINT, shutting down"
             `taskkill /F /T /PID #{pid}` if windows?
           end
-          stdin.close
-          [
-           Thread.new(stdout) {|stdout_io|
-             stdout_io.each_line do |l|
-               STDOUT.puts l
-               STDOUT.flush
-             end
-             stdout_io.close
-           },
-
-           Thread.new(stderr) {|stderr_io|
-             stderr_io.each_line do |l|
-               STDERR.puts l
-               STDERR.flush
-             end
-           }
-          ].each( &:join )
+
+          # Don't join on stdin since interrupting a blocking read on
+          # JRuby is pretty tricky
+          Thread.new(stdin) { |stdin_io|
+            begin
+              until exiting
+                stdin_io.write(STDIN.readpartial(1024))
+                stdin_io.flush
+              end
+            rescue Errno::EBADF, IOError
+            end
+          }
+
+          # Join on stdout/stderr since they'll be closed
+          # automatically once TorqueBox exits
+          [ Thread.new(stdout) { |stdout_io|
+              begin
+                while true
+                  STDOUT.write(stdout_io.readpartial(1024))
+                end
+              rescue EOFError
+              end
+            },
+
+            Thread.new(stderr) { |stderr_io|
+              begin
+                while true
+                  STDERR.write(stderr_io.readpartial(1024))
+                end
+              rescue EOFError
+              end
+            }
+          ].each( &:join)
         end
 
       end

data/lib/torquebox/launchd.rb

@@ -74,7 +74,7 @@ module TorqueBox
           end
         end
         puts "Created launchd plist #{plist_file}, loading now."
-        TorqueBox::DeployUtils.exec_command "launchctl load #{plist_file}"
+        TorqueBox::DeployUtils.run_command "launchctl load #{plist_file}"
         check_install
         FileUtils.mkdir_p log_dir, :mode => 0755 unless File.exists? log_dir
       end

data/lib/torquebox/rake/tasks/server.rb

@@ -48,18 +48,18 @@ namespace :torquebox do
 
     desc "Start TorqueBox when running as a launchd daemon"
     task :start=>[ :check ] do
-      TorqueBox::DeployUtils.exec_command( 'launchctl start org.torquebox.TorqueBox' )
+      TorqueBox::DeployUtils.run_command( 'launchctl start org.torquebox.TorqueBox' )
     end
 
     desc "Stop TorqueBox when running as an launchd daemon"
     task :stop=>[ :check ] do
-      TorqueBox::DeployUtils.exec_command( 'launchctl stop org.torquebox.TorqueBox' )
+      TorqueBox::DeployUtils.run_command( 'launchctl stop org.torquebox.TorqueBox' )
     end
 
     desc "Restart TorqueBox when running as an launchd daemon"
     task :restart=>[ :check ] do
-      TorqueBox::DeployUtils.exec_command( 'launchctl stop org.torquebox.TorqueBox' )
-      TorqueBox::DeployUtils.exec_command( 'launchctl start org.torquebox.TorqueBox' )
+      TorqueBox::DeployUtils.run_command( 'launchctl stop org.torquebox.TorqueBox' )
+      TorqueBox::DeployUtils.run_command( 'launchctl start org.torquebox.TorqueBox' )
     end
 
   end
@@ -80,17 +80,17 @@ namespace :torquebox do
 
     desc "Start TorqueBox when running as an upstart service"
     task :start=>[ :check ] do
-      TorqueBox::DeployUtils.exec_command( 'start torquebox' )
+      TorqueBox::DeployUtils.run_command( 'start torquebox' )
     end
 
     desc "Stop TorqueBox when running as an upstart service"
     task :stop=>[ :check ] do
-      TorqueBox::DeployUtils.exec_command( 'stop torquebox' )
+      TorqueBox::DeployUtils.run_command( 'stop torquebox' )
     end
 
     desc "Restart TorqueBox when running as an upstart service"
     task :restart=>[ :check ] do
-      TorqueBox::DeployUtils.exec_command( 'restart torquebox' )
+      TorqueBox::DeployUtils.run_command( 'restart torquebox' )
     end
 
   end

data/spec/deploy_utils_spec.rb

@@ -350,7 +350,7 @@ describe TorqueBox::DeployUtils do
 
   describe '.create_archive' do
     it 'should not include excluded dirs and files' do
-      @util.should_receive(:exec_command) do |arg|
+      @util.should_receive(:run_command) do |arg|
         ["config.ru", "app"].permutation.map {|p|
           "jar cvf /tmp/simpleapp.knob #{p.join(" ")}"
         }.should include(arg)
@@ -366,7 +366,7 @@ describe TorqueBox::DeployUtils do
     end
 
     it 'should exclude based on patterns' do
-      @util.should_receive(:exec_command) do |arg|
+      @util.should_receive(:run_command) do |arg|
         ["puppet", "config.ru", "app"].permutation.map {|p|
           "jar cvf /tmp/simpleapp.knob #{p.join(" ")}"
         }.should include(arg)
@@ -382,7 +382,7 @@ describe TorqueBox::DeployUtils do
     end
 
     it 'should include all dirs and files except default' do
-      @util.should_receive(:exec_command) do |arg|
+      @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)

metadata

@@ -2,7 +2,7 @@
 name: torquebox-rake-support
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-31 00:00:00 Z
+date: 2012-04-16 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rake
@@ -50,25 +50,25 @@ files:
   - licenses/lgpl-2.1.txt
   - lib/org.torquebox.rake-support.rb
   - lib/torquebox-rake-support.rb
-  - lib/torquebox/rails.rb
   - lib/torquebox/deploy_utils.rb
-  - lib/torquebox/launchd.rb
-  - lib/torquebox/server.rb
+  - lib/torquebox/rails.rb
   - lib/torquebox/upstart.rb
+  - lib/torquebox/server.rb
+  - lib/torquebox/launchd.rb
   - lib/torquebox/rake/tasks.rb
+  - lib/torquebox/rake/tasks/archive.rb
   - lib/torquebox/rake/tasks/server.rb
   - lib/torquebox/rake/tasks/deployment.rb
-  - lib/torquebox/rake/tasks/archive.rb
-  - generators/torquebox_queue_generator.rb
   - generators/USAGE
+  - generators/torquebox_queue_generator.rb
   - generators/templates/queue.rb
+  - spec/spec_helper.rb
   - spec/rails_spec.rb
+  - spec/server_spec.rb
   - spec/deploy_utils_spec.rb
   - spec/upstart_spec.rb
-  - spec/spec_helper.rb
-  - spec/server_spec.rb
-  - spec/fixtures/simpleapp/simpleapp.box
   - spec/fixtures/simpleapp/config.ru
+  - spec/fixtures/simpleapp/simpleapp.box
 homepage: http://torquebox.org/
 licenses: 
   - lgpl
@@ -98,6 +98,6 @@ specification_version: 3
 summary: TorqueBox Rake Support
 test_files: 
   - spec/rails_spec.rb
+  - spec/server_spec.rb
   - spec/deploy_utils_spec.rb
   - spec/upstart_spec.rb
-  - spec/server_spec.rb