Polishing

This change includes some minor polishing to match project conventions

[#472]

Author: nebhale

.idea/dictionaries/bhale.xml

@@ -18,4 +18,4 @@
 version: 4.+
 repository_root: http://get.takipi.com/cloudfoundry
 node_name_prefix: node
-application_name:
+application_name: 

config/takipi_agent.yml

@@ -34,12 +34,18 @@ def compile
 
       # (see JavaBuildpack::Component::BaseComponent#release)
       def release
-        java_opts = @droplet.java_opts
-        java_opts.add_agentpath(@droplet.sandbox + 'lib/libTakipiAgent.so')
-        application_name java_opts
-        default_env_vars
-        credentials = @application.services.find_service(FILTER)['credentials']
-        config_env_vars credentials
+        @droplet.java_opts
+                .add_agentpath(agent)
+                .add_system_property('takipi.name', application_name)
+
+        @droplet.environment_variables
+                .add_environment_variable('LD_LIBRARY_PATH',
+                                          "$LD_LIBRARY_PATH:#{qualify_path(lib, @droplet.root)}")
+                .add_environment_variable('JVM_LIB_FILE', libjvm)
+                .add_environment_variable('TAKIPI_HOME', @droplet.sandbox)
+                .add_environment_variable('TAKIPI_MACHINE_NAME', node_name)
+
+        config_env_vars @application.services.find_service(FILTER)['credentials']
       end
 
       protected
@@ -51,29 +57,20 @@ def supports?
 
       private
 
+      COLLECTOR_HOST = 'collector_host'.freeze
+
       FILTER = /takipi/
 
       SECRET_KEY = 'secret_key'.freeze
 
-      COLLECTOR_HOST = 'collector_host'.freeze
+      private_constant :COLLECTOR_HOST, :FILTER, :SECRET_KEY
 
-      private_constant :FILTER
-
-      def jvm_lib_file
-        @droplet.java_home.root + 'lib/amd64/server/libjvm.so'
+      def agent
+        @droplet.sandbox + 'lib/libTakipiAgent.so'
       end
 
-      def default_env_vars
-        env = @droplet.environment_variables
-        sandbox = @droplet.sandbox
-
-        env.add_environment_variable(
-          'LD_LIBRARY_PATH',
-          "$LD_LIBRARY_PATH:#{qualify_path(sandbox + 'lib', @droplet.root)}"
-        )
-        env.add_environment_variable('JVM_LIB_FILE', jvm_lib_file)
-        env.add_environment_variable('TAKIPI_HOME', sandbox)
-        env.add_environment_variable('TAKIPI_MACHINE_NAME', node_name)
+      def application_name
+        @configuration['application_name'] || @application.details['application_name']
       end
 
       def config_env_vars(credentials)
@@ -89,9 +86,12 @@ def config_env_vars(credentials)
         env.add_environment_variable 'TAKIPI_MASTER_PORT', collector_port if collector_port
       end
 
-      def application_name(java_opts)
-        app_name = @configuration['application_name'] || @application.details['application_name']
-        java_opts.add_system_property('takipi.name', app_name)
+      def lib
+        @droplet.sandbox + 'lib'
+      end
+
+      def libjvm
+        @droplet.java_home.root + 'lib/amd64/server/libjvm.so'
       end
 
       def node_name

lib/java_buildpack/framework/takipi_agent.rb

@@ -81,6 +81,7 @@ def initialize
       'redis_store'                         => 'Redis Session Store',
       'spring_auto_reconfiguration'         => 'Spring Auto-reconfiguration',
       'spring_boot_cli'                     => 'Spring Boot CLI',
+      'takipi_agent'                        => 'Takipi Agent',
       'tomcat'                              => 'Tomcat',
       'your_kit_profiler'                   => 'YourKit Profiler'
     }.freeze

rakelib/versions_task.rb

@@ -16,16 +16,11 @@
 require 'spec_helper'
 require 'component_helper'
 require 'java_buildpack/framework/takipi_agent'
-require 'java_buildpack/util/find_single_directory'
 
 describe JavaBuildpack::Framework::TakipiAgent do
   include_context 'component_helper'
 
-  let(:configuration) do
-    {
-      'node_name_prefix' => nil
-    }
-  end
+  let(:configuration) { { 'node_name_prefix' => nil } }
 
   it 'does not detect without takipi-n/a service' do
     expect(component.detect).to be_nil
@@ -40,6 +35,10 @@
       allow(services).to receive(:find_service).and_return('credentials' => credentials)
     end
 
+    it 'detects with takipi service' do
+      expect(component.detect).to eq("takipi-agent=#{version}")
+    end
+
     it 'expands Takipi agent tarball',
        cache_fixture: 'stub-takipi-agent.tar.gz' do
 
@@ -48,14 +47,6 @@
       expect(sandbox + 'lib/libTakipiAgent.so').to exist
     end
 
-    it 'preserves find_single_directory results',
-       cache_fixture: 'stub-takipi-agent.tar.gz',
-       app_fixture: 'container_play_2.1_dist' do
-      component.compile
-      component.send(:extend, JavaBuildpack::Util)
-      expect(component.send(:find_single_directory)).not_to be_nil
-    end
-
     context do
       let(:credentials) { { 'collector_host' => 'test-host' } }
 
@@ -86,10 +77,7 @@
 
       context 'configuration overrides' do
 
-        let(:configuration) do
-          { 'node_name_prefix' => 'test-name',
-            'application_name' => 'test-name' }
-        end
+        let(:configuration) { { 'node_name_prefix' => 'test-name', 'application_name' => 'test-name' } }
 
         it 'update application name' do
           component.release