torquebox-rake-support 2.1.0 → 2.1.1

data/lib/torquebox/deploy_utils.rb

@@ -70,8 +70,17 @@ module TorqueBox
         File.join("#{server_dir}","configuration")
       end
 
+      def standalone_config_file
+        eap? ? "standalone-full.xml" : "standalone.xml"
+      end
+
       def cluster_config_file
-        "standalone-ha.xml"
+        eap? ? "standalone-full-ha.xml" : "standalone-ha.xml"
+      end
+
+      def eap?
+        index_html = File.join( jboss_home, 'welcome-content', 'index.html' )
+        File.exists?( index_html ) && File.read( index_html ) =~ /EAP 6/
       end
 
       def properties_dir
@@ -79,11 +88,6 @@ module TorqueBox
       end
 
       def deploy_dir
-        d = File.join( torquebox_home, 'apps' )
-        if ( File.exists?( d ) && File.directory?( d ) )
-          return d
-        end
-
         File.join( "#{server_dir}", "deployments" )
       end
 
@@ -123,7 +127,8 @@ module TorqueBox
 
       def run_command_line(opts={})
         options = ENV['JBOSS_OPTS'] || ''
-        options = "#{options} --server-config=#{cluster_config_file}" if opts[:clustered]
+        config_file = opts[:clustered] ? cluster_config_file : standalone_config_file
+        options = "#{options} --server-config=#{config_file}"
         options = "#{options} -Dorg.torquebox.web.http.maxThreads=#{opts[:max_threads]}" if opts[:max_threads]
         options = "#{options} -b #{opts[:bind_address]}" if opts[:bind_address]
         options = "#{options} -Djboss.socket.binding.port-offset=#{opts[:port_offset]}" if opts[:port_offset]
@@ -157,6 +162,7 @@ module TorqueBox
           ENV.delete('RUBYOPT') 
 
           set_java_opts("#{options[:jvm_options]} #{jruby_opts_properties}")
+          print_server_config(options[:clustered])
           exec_command(run_command_line(options).join(' '))
         end
       end
@@ -179,7 +185,7 @@ module TorqueBox
           include_files = []
           Dir[ "**/**", ".bundle/**/**" ].each do |entry|
             unless File.directory?(entry) || skip_files.any? {|regex| entry.match(regex)}
-              include_files << entry 
+              include_files << '"' + entry.to_s + '"'
             end
           end
 
@@ -431,6 +437,12 @@ module TorqueBox
         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)
+        puts "Booting AS7 from configuration #{config_path}"
+      end
+
     end
   end
 end

data/lib/torquebox/server.rb

@@ -29,7 +29,6 @@ module TorqueBox
       end
       home.full_gem_path if home
     rescue Exception => e
-      puts "Cannot find torquebox-server: #{e}"
       nil
     end
 
@@ -50,7 +49,7 @@ module TorqueBox
       ENV['JBOSS_HOME'] ||= "#{ENV['TORQUEBOX_HOME']}/jboss"
       ENV['JRUBY_HOME'] ||= jruby_home
       ENV['JBOSS_OPTS'] ||= "-Djruby.home=#{jruby_home}"
-      %w(TORQUEBOX_HOME JBOSS_HOME JRUBY_HOME).each { |key| puts "[ERROR] #{key} is not set. Install torquebox-server gem or manually set #{key}" unless ENV[key] }
+      %w(JBOSS_HOME JRUBY_HOME).each { |key| puts "[ERROR] #{key} is not set. Install torquebox-server gem or manually set #{key}" unless ENV[key] }
     end
 
   end

data/spec/deploy_utils_spec.rb

@@ -293,11 +293,6 @@ describe TorqueBox::DeployUtils do
   end
 
   describe '.run_command_line' do
-    it 'should not add --server-config when not clustered' do
-      command, options = @util.run_command_line(:clustered => false)
-      options.should_not include('--server-config=')
-    end
-
     it 'should add --server-config when clustered' do
       command, options = @util.run_command_line(:clustered => true)
       options.should include('--server-config=')
@@ -362,14 +357,14 @@ describe TorqueBox::DeployUtils do
 
   describe '.create_archive' 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}
+    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|
@@ -379,7 +374,7 @@ describe TorqueBox::DeployUtils do
     end
     
     it 'should not include excluded dirs and files' do
-      mock_run_command(ALL_EXPECTED_FILES - %w{puppet/puppet.rb simpleapp.box})
+      mock_run_command(ALL_EXPECTED_FILES - %w{"puppet/puppet.rb" "simpleapp.box"})
 
       path = @util.create_archive(
           :name => "simpleapp",
@@ -391,7 +386,7 @@ describe TorqueBox::DeployUtils do
     end
 
     it 'should exclude based on patterns' do
-      mock_run_command(ALL_EXPECTED_FILES - %w{simpleapp.box})
+      mock_run_command(ALL_EXPECTED_FILES - %w{"simpleapp.box"})
 
       path = @util.create_archive(
           :name => "simpleapp",

metadata

@@ -2,7 +2,7 @@
 name: torquebox-rake-support
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-26 00:00:00 Z
+date: 2012-08-27 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rake
@@ -51,29 +51,29 @@ files:
   - lib/torquebox-rake-support.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/deploy_utils.rb
+  - lib/torquebox/rails.rb
+  - lib/torquebox/upstart.rb
   - lib/torquebox/rake/tasks.rb
-  - lib/torquebox/rake/tasks/deployment.rb
-  - lib/torquebox/rake/tasks/archive.rb
   - lib/torquebox/rake/tasks/server.rb
-  - generators/USAGE
+  - lib/torquebox/rake/tasks/archive.rb
+  - lib/torquebox/rake/tasks/deployment.rb
   - generators/torquebox_queue_generator.rb
+  - generators/USAGE
   - generators/templates/queue.rb
+  - spec/deploy_utils_spec.rb
+  - spec/upstart_spec.rb
   - spec/rails_spec.rb
   - spec/server_spec.rb
   - spec/spec_helper.rb
-  - spec/upstart_spec.rb
-  - spec/deploy_utils_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.rb
   - spec/fixtures/simpleapp/app/app.box
+  - spec/fixtures/simpleapp/vendor/vendor.rb
   - spec/fixtures/simpleapp/puppet/puppet.rb
 homepage: http://torquebox.org/
 licenses: 
@@ -103,7 +103,7 @@ signing_key:
 specification_version: 3
 summary: TorqueBox Rake Support
 test_files: 
+  - spec/deploy_utils_spec.rb
+  - spec/upstart_spec.rb
   - spec/rails_spec.rb
   - spec/server_spec.rb
-  - spec/upstart_spec.rb
-  - spec/deploy_utils_spec.rb