Merge branch 'dmitri-gb-master'

[resolves #176]

Author: nebhale

config/jrebel_agent.yml

@@ -16,4 +16,4 @@
 # Configuration for the JRebel framework
 ---
 version: 6.+
-repository_root: "{default.repository.root}/jrebel"
+repository_root: "http://dl.zeroturnaround.com/jrebel"

docs/framework-jrebel_agent.md

@@ -1,10 +1,11 @@
 # JRebel Agent Framework
-The JRebel Agent Framework causes an application to be automatically configured to work with an IDE using [JRebel][].
+
+The JRebel Agent Framework causes an application to be automatically configured to work with [JRebel][]. Pushing any [JRebel Cloud/Remote][] enabled application (containing `rebel-remote.xml`) will automatically download the latest version of [JRebel][] and set it up for use.
 
 <table>
   <tr>
     <td><strong>Detection Criterion</strong></td>
-    <td>Existence of the `rebel.xml` and `rebel-remote.xml` files in either the root or `WEB-INF/classes` directory or the application.</td>
+    <td>Existence of a <tt>rebel-remote.xml</tt> file inside the application archive. This file is present in every application that is configured to use <a href="http://manuals.zeroturnaround.com/jrebel/remoting/index.html" target="_blank">JRebel Cloud/Remote</a>.</td>
   </tr>
   <tr>
     <td><strong>Tags</strong></td>
@@ -13,6 +14,8 @@ The JRebel Agent Framework causes an application to be automatically configured
 </table>
 Tags are printed to standard output by the buildpack detect script
 
+For more information regarding setup and configuration, please refer to the [JRebel with Pivotal Cloud Foundry tutorial][pivotal].
+
 ## Configuration
 For general information on configuring the buildpack, refer to [Configuration and Extension][].
 
@@ -21,11 +24,13 @@ The framework can be configured by modifying the [`config/jrebel_agent.yml`][] f
 | Name | Description
 | ---- | -----------
 | `repository_root` | The URL of the JRebel repository index ([details][repositories]).
-| `version` | The version of Jrebel to use. Candidate versions can be found in [this listing][].
+| `version` | The version of JRebel to use. Candidate versions can be found in [this listing][].
 
 [Configuration and Extension]: ../README.md#configuration-and-extension
 [`config/jrebel_agent.yml`]: ../config/jrebel_agent.yml
+[JRebel Cloud/Remote]: http://manuals.zeroturnaround.com/jrebel/remoting/index.html
 [JRebel]: http://zeroturnaround.com/software/jrebel/
+[pivotal]: http://manuals.zeroturnaround.com/jrebel/remoting/pivotal.html
 [repositories]: extending-repositories.md
-[this listing]: http://download.pivotal.io.s3.amazonaws.com/jrebel/index.yml
+[this listing]: http://dl.zeroturnaround.com/jrebel/index.yml
 [version syntax]: extending-repositories.md#version-syntax-and-ordering

lib/java_buildpack/component/java_opts.rb

@@ -43,6 +43,16 @@ def add_javaagent(path)
         self
       end
 
+      # Adds an +agentpath+ entry to the +JAVA_OPTS+. Prepends +$PWD+ to the path (relative to the droplet root) to
+      # ensure that the path is always accurate.
+      #
+      # @param [Pathname] path the path to the +native+ +agent+
+      # @return [JavaOpts]     +self+ for chaining
+      def add_agentpath(path)
+        self << "-agentpath:#{qualify_path path}"
+        self
+      end
+
       # Adds a +bootclasspath/p+ entry to the +JAVA_OPTS+. Prepends +$PWD+ to the path (relative to the droplet root) to
       # ensure that the path is always accurate.
       #

lib/java_buildpack/framework/jrebel_agent.rb

@@ -24,36 +24,49 @@ module Framework
     # Encapsulates the functionality for enabling zero-touch JRebel support.
     class JrebelAgent < JavaBuildpack::Component::VersionedDependencyComponent
 
+      def initialize(context, &version_validator)
+        super(context, &version_validator)
+        @component_name = 'JRebel Agent'
+      end
+
       # (see JavaBuildpack::Component::BaseComponent#compile)
       def compile
-        download_zip false
-        FileUtils.mv(download_location + 'jrebel.jar', @droplet.sandbox + jar_name)
-        FileUtils.remove_dir(download_location, true)
+        download_zip
       end
 
       # (see JavaBuildpack::Component::BaseComponent#release)
       def release
         @droplet.java_opts
-          .add_javaagent(@droplet.sandbox + jar_name)
-          .add_bootclasspath_p(@droplet.sandbox + jar_name)
+          .add_agentpath(@droplet.sandbox + ('lib/' + lib_name))
           .add_system_property('rebel.remoting_plugin', true)
+          .add_system_property('rebel.log', true)
+          .add_system_property('rebel.cloud.platform', 'cloudfoundry/java-buildpack')
       end
 
       protected
 
       # (see JavaBuildpack::Component::VersionedDependencyComponent#supports?)
       def supports?
-        jrebel_configured?(@application.root) || jrebel_configured?(@application.root + 'WEB-INF/classes')
+        jrebel_configured?(@application.root) || jrebel_configured?(@application.root + 'WEB-INF/classes') ||
+          jars_with_jrebel_configured?(@application.root)
       end
 
       private
 
       def jrebel_configured?(root_path)
-        (root_path + 'rebel.xml').exist? && (root_path + 'rebel-remote.xml').exist?
+        (root_path + 'rebel-remote.xml').exist?
+      end
+
+      def jars_with_jrebel_configured?(root_path)
+        (root_path + '**/*.jar').glob.any? { |jar| ! `unzip -l "#{jar}" | grep "rebel-remote\\.xml$"`.strip.empty? }
+      end
+
+      def lib_name
+        architecture == 'x86_64' || architecture == 'i686' ? 'libjrebel64.so' : 'libjrebel32.so'
       end
 
-      def download_location
-        @droplet.sandbox + 'jrebel'
+      def architecture
+        `uname -m`.strip
       end
 
     end

…es/framework_jrebel_app/rebel-remote.xml …ework_jrebel_app_simple/rebel-remote.xmlspec/fixtures/framework_jrebel_app/rebel-remote.xml renamed to spec/fixtures/framework_jrebel_app_simple/rebel-remote.xml spec/fixtures/framework_jrebel_app/rebel-remote.xml renamed to spec/fixtures/framework_jrebel_app_simple/rebel-remote.xml

@@ -21,35 +21,48 @@
 describe JavaBuildpack::Framework::JrebelAgent do
   include_context 'component_helper'
 
-  it 'does not detect without JRebel config files present' do
+  it 'does not detect when rebel-remote.xml is not present' do
     expect(component.detect).to be_nil
   end
 
-  it 'detects with JRebel config files are present',
-     app_fixture: 'framework_jrebel_app',
-     cache_fixture: 'stub-jrebel-archive.zip' do
+  it 'detects when rebel-remote.xml is present in the top-level directory',
+     app_fixture: 'framework_jrebel_app_simple' do
+    expect(component.detect).to eq("jrebel-agent=#{version}")
+  end
+
+  it 'detects when rebel-remote.xml is present in WEB-INF/classes',
+     app_fixture: 'framework_jrebel_app_war' do
     expect(component.detect).to eq("jrebel-agent=#{version}")
   end
 
-  it 'downloads JRebel agent JAR',
-     app_fixture: 'framework_jrebel_app',
+  it 'detects when rebel-remote.xml is present inside an embedded JAR',
+     app_fixture: 'framework_jrebel_app_war_with_jar' do
+    expect(component.detect).to eq("jrebel-agent=#{version}")
+  end
+
+  it 'downloads the JRebel JAR and the native agent',
+     app_fixture: 'framework_jrebel_app_simple',
      cache_fixture: 'stub-jrebel-archive.zip' do
 
     component.compile
 
-    expect(sandbox + "jrebel_agent-#{version}.jar").to exist
+    expect(sandbox + 'lib/jrebel.jar').to exist
+    expect(sandbox + 'lib/libjrebel64.so').to exist
+    expect(sandbox + 'lib/libjrebel32.so').to exist
   end
 
-  it 'updates JAVA_OPTS',
-     app_fixture: 'framework_jrebel_app',
+  it 'adds correct arguments to JAVA_OPTS',
+     app_fixture: 'framework_jrebel_app_simple',
      cache_fixture: 'stub-jrebel-archive.zip' do
-    allow(services).to receive(:find_service).and_return('credentials' => { 'licenseKey' => 'test-license-key' })
+
+    allow(component).to receive(:architecture).and_return('x86_64')
 
     component.release
 
-    expect(java_opts).to include("-javaagent:$PWD/.java-buildpack/jrebel_agent/jrebel_agent-#{version}.jar")
+    expect(java_opts).to include('-agentpath:$PWD/.java-buildpack/jrebel_agent/lib/libjrebel64.so')
     expect(java_opts).to include('-Drebel.remoting_plugin=true')
-    expect(java_opts).to include("-Xbootclasspath/p:$PWD/.java-buildpack/jrebel_agent/jrebel_agent-#{version}.jar")
+    expect(java_opts).to include('-Drebel.log=true')
+    expect(java_opts).to include('-Drebel.cloud.platform=cloudfoundry/java-buildpack')
   end
 
 end