Merge 68677262-missing-indexes to master

nebhale · nebhale · commit 55c384748511 · 2014-04-02T13:27:58.000+01:00
[Completes #68677262]
diff --git a/lib/java_buildpack/framework/spring_insight.rb b/lib/java_buildpack/framework/spring_insight.rb
@@ -156,7 +156,7 @@ def find_insight_agent
         uri         = credentials['dashboard_url']
         id          = credentials['agent_username']
         pass        = credentials['agent_password']
-        return version, uri, id, pass # rubocop:disable RedundantReturn
+        [version, uri, id, pass]
       end
 
       def insight_directory
diff --git a/lib/java_buildpack/jre/memory/weight_balancing_memory_heuristic.rb b/lib/java_buildpack/jre/memory/weight_balancing_memory_heuristic.rb
@@ -109,7 +109,7 @@ def normalise_stack_bucket(stack_bucket, buckets)
         stack_memory      = weighted_proportion(stack_bucket, buckets)
         num_threads       = [stack_memory / stack_bucket.default_size, 1].max
         normalised_bucket = MemoryBucket.new('normalised stack', stack_bucket.weighting, stack_bucket.range * num_threads)
-        return normalised_bucket, num_threads # rubocop:disable RedundantReturn
+        [normalised_bucket, num_threads]
       end
 
       def balance_buckets(buckets)
@@ -138,7 +138,7 @@ def balance_remainder(remaining_buckets, remaining_memory)
         end
         remaining_memory -= allocated_memory
         fail "Total memory #{@memory_limit} exceeded by configured memory #{@sizes}" if remaining_memory < 0
-        return remaining_memory, deleted # rubocop:disable RedundantReturn
+        [remaining_memory, deleted]
       end
 
       def constrain_bucket_size(allocated_memory, bucket, size)
diff --git a/lib/java_buildpack/repository/repository_index.rb b/lib/java_buildpack/repository/repository_index.rb
@@ -17,8 +17,9 @@
 require 'java_buildpack/logging/logger_factory'
 require 'java_buildpack/repository'
 require 'java_buildpack/repository/version_resolver'
-require 'java_buildpack/util/configuration_utils'
+require 'java_buildpack/util/cache'
 require 'java_buildpack/util/cache/download_cache'
+require 'java_buildpack/util/configuration_utils'
 require 'rbconfig'
 require 'yaml'
 
@@ -37,7 +38,7 @@ def initialize(repository_root)
         @default_repository_root = JavaBuildpack::Util::ConfigurationUtils.load('repository')['default_repository_root']
         .chomp('/')
 
-        JavaBuildpack::Util::Cache::DownloadCache.new.get("#{canonical repository_root}#{INDEX_PATH}") do |file|
+        cache.get("#{canonical repository_root}#{INDEX_PATH}") do |file|
           @index = YAML.load_file(file)
           @logger.debug { @index }
         end
@@ -51,7 +52,7 @@ def initialize(repository_root)
       def find_item(version)
         version = VersionResolver.resolve(version, @index.keys)
         uri     = @index[version.to_s]
-        return version, uri # rubocop:disable RedundantReturn
+        [version, uri]
       end
 
       private
@@ -62,6 +63,11 @@ def architecture
         `uname -m`.strip
       end
 
+      def cache
+        JavaBuildpack::Util::Cache::DownloadCache.new(Pathname.new(Dir.tmpdir),
+                                                      JavaBuildpack::Util::Cache::CACHED_RESOURCES_DIRECTORY)
+      end
+
       def canonical(raw)
         cooked = raw
         .gsub(/\{default.repository.root\}/, @default_repository_root)
diff --git a/lib/java_buildpack/util/cache.rb b/lib/java_buildpack/util/cache.rb
@@ -15,12 +15,17 @@
 # limitations under the License.
 
 require 'java_buildpack/util'
+require 'pathname'
 
 module JavaBuildpack
   module Util
 
     # A module encapsulating all of the utility components for caching
     module Cache
+
+      # The location to find cached resources in the buildpack
+      CACHED_RESOURCES_DIRECTORY = Pathname.new(File.expand_path('../../../../resources/cache', __FILE__))
+
     end
 
   end
diff --git a/lib/java_buildpack/util/cache/application_cache.rb b/lib/java_buildpack/util/cache/application_cache.rb
@@ -31,13 +31,9 @@ class ApplicationCache < DownloadCache
         def initialize
           application_cache_directory = ARGV[1]
           fail 'Application cache directory is undefined' if application_cache_directory.nil?
-          super(Pathname.new(application_cache_directory), RESOURCES_DIRECTORY)
+          super(Pathname.new(application_cache_directory), CACHED_RESOURCES_DIRECTORY)
         end
 
-        private
-
-        RESOURCES_DIRECTORY = Pathname.new(File.expand_path('../../../../../resources/cache', __FILE__))
-
       end
 
     end
diff --git a/lib/java_buildpack/util/tokenized_version.rb b/lib/java_buildpack/util/tokenized_version.rb
@@ -60,7 +60,7 @@ def <=>(other)
       # Convert this to a string
       #
       # @return [String] a string representation of this tokenized version
-      def to_s # rubocop:disable TrivialAccessors
+      def to_s
         @version
       end
 
@@ -93,7 +93,7 @@ def major_or_minor_and_tail(s)
           fail "Invalid major or minor version '#{major_or_minor}'" unless valid_major_minor_or_micro major_or_minor
         end
 
-        return major_or_minor, tail # rubocop:disable RedundantReturn
+        [major_or_minor, tail]
       end
 
       def micro_and_qualifier(s)
@@ -109,7 +109,7 @@ def micro_and_qualifier(s)
           fail "Invalid qualifier '#{qualifier}'" unless valid_qualifier qualifier
         end
 
-        return micro, qualifier # rubocop:disable RedundantReturn
+        [micro, qualifier]
       end
 
       def minimum_qualifier_length(a, b)
diff --git a/rakelib/dependency_cache_task.rb b/rakelib/dependency_cache_task.rb
@@ -137,6 +137,8 @@ def uris(configurations)
 
       configurations.each do |configuration|
         index_uris(configuration).each do |index_uri|
+          multitask PACKAGE_NAME => [cache_task(index_uri)]
+
           @cache.get(index_uri) do |f|
             index = YAML.load f
             uris << index[version(configuration, index).to_s]
