Merge upstream changes.

Author: mattmanning

CHANGELOG.md

@@ -1,3 +1,54 @@
+## v40 (10/14/2012)
+
+Features:
+
+* Cache version of the buildpack we used to deploy
+* Purge cache when v38 is detected
+
+## v39 (10/14/2012)
+
+Bugfixes:
+
+* Don't display cache clearing message for new apps
+* Actually clear bundler cache on ruby version change
+
+## v38 (10/14/2012)
+
+Bugfixes:
+
+* Stop bundle cache from continually growing
+
+## v37 (10/12/2012)
+
+Bugfixes:
+
+* Remove temporary workaround from v36.
+* Clear bundler cache upon Ruby version change
+
+## v36 (10/12/2012)
+
+Bugfixes:
+
+* Always clear the cache for ruby 1.9.3 as a temporary workaround due to the security upgrade
+
+## v35 (9/19/2012)
+
+Features:
+
+* Upgrade to Bundler 1.2.1
+* Display bundle clean output
+* More resilent to rubygems.org API outages
+
+Bugfixes:
+
+* `bundle clean` works again
+
+## v34 (8/30/2012)
+
+Features:
+
+* Upgrade to Bundler 1.2.0
+
 ## v33 (8/9/2012)
 
 Features:

Rakefile

@@ -57,15 +57,15 @@ def build_ruby_command(name, output, prefix, usr_dir, tmpdir, rubygems = nil)
   build_command = [
     # need to move libyaml/libffi to dirs we can see
     "mv #{usr_dir} /tmp",
-    "./configure --disable-install-doc --prefix #{prefix}",
+    "./configure --enable-load-relative --disable-install-doc --prefix #{prefix}",
     "env CPATH=/tmp/#{usr_dir}/include:\\$CPATH CPPATH=/tmp/#{usr_dir}/include:\\$CPPATH LIBRARY_PATH=/tmp/#{usr_dir}/lib:\\$LIBRARY_PATH make",
     "make install"
   ]
-  build_command << "#{prefix}/bin/ruby /tmp/#{usr_dir}/rubygems-#{rubygems}/setup.rb"
-  build_command << "mv #{prefix} /app/vendor/#{name}" if name != output
+  build_command << "#{prefix}/bin/ruby /tmp/#{usr_dir}/rubygems-#{rubygems}/setup.rb" if rubygems
+  build_command << "mv #{prefix} /app/vendor/#{output}" if prefix != "/app/vendor/#{output}"
   build_command = build_command.join(" && ")
 
-  sh "vulcan build -v -o #{output}.tgz --source #{name} --command=\"#{build_command}\""
+  sh "vulcan build -v -o #{output}.tgz --prefix #{prefix} --source #{name} --command=\"#{build_command}\""
   s3_upload(tmpdir, output)
 end
 
@@ -106,16 +106,17 @@ task "libyaml:install", :version do |t, args|
   Dir.mktmpdir("libyaml-") do |tmpdir|
     Dir.chdir(tmpdir) do |dir|
       FileUtils.rm_rf("#{tmpdir}/*")
+      prefix = "/app/vendor/yaml-#{version}"
 
       sh "curl http://pyyaml.org/download/libyaml/yaml-#{version}.tar.gz -s -o - | tar vzxf -"
 
       build_command = [
-        "env CFLAGS=-fPIC ./configure --enable-static --disable-shared --prefix=/app/vendor/yaml-#{version}",
+        "env CFLAGS=-fPIC ./configure --enable-static --disable-shared --prefix=#{prefix}",
         "make",
         "make install"
       ].join(" && ")
 
-      sh "vulcan build -v -o #{name}.tgz --source yaml-#{version} --command=\"#{build_command}\""
+      sh "vulcan build -v -o #{name}.tgz --source yaml-#{version} --prefix=#{prefix} --command=\"#{build_command}\""
       s3_upload(tmpdir, name)
     end
   end
@@ -175,9 +176,11 @@ task "ruby:install", :version do |t, args|
       build_ruby_command(full_name, name, prefix, usr_dir, tmpdir, rubygems)
 
       # build ruby
-      output  = "ruby-build-#{version}"
-      prefix  = "/tmp/#{name}"
-      build_ruby_command(full_name, output, prefix, usr_dir, tmpdir, rubygems)
+      if major_ruby == "1.8"
+        output  = "ruby-build-#{version}"
+        prefix  = "/app/vendor/ruby-build-#{version}"
+        build_ruby_command(full_name, output, prefix, usr_dir, tmpdir, rubygems)
+      end
     end
   end
 end
@@ -246,7 +249,6 @@ task "jruby:install", :version, :ruby_version do |t, args|
   launcher     = "launcher"
 
   Dir.mktmpdir("jruby-") do |tmpdir|
-  tmpdir = Dir.mktmpdir("jruby-")
     Dir.chdir(tmpdir) do
       sh "curl http://jruby.org.s3.amazonaws.com/downloads/#{version}/#{name}.tar.gz -s -o - | tar vzxf -"
       sh "rm -rf test"
@@ -336,7 +338,7 @@ task "libffi:install", :version do |t, args|
         "rm -rf #{prefix}/lib/#{name}"
       ].join(" && ")
 
-      sh "vulcan build -v -o #{name}.tgz --source #{name} --command=\"#{build_command}\""
+      sh "vulcan build -v -o #{name}.tgz --source #{name} --prefix=#{prefix} --command=\"#{build_command}\""
       s3_upload(tmpdir, name)
     end
   end

lib/language_pack/base.rb

@@ -153,7 +153,7 @@ def run_stdout(command)
     %x{ #{command} 2>/dev/null }
   end
 
-  # run a shell command and stream the ouput
+  # run a shell command and stream the output
   # @param [String] command to be run
   def pipe(command)
     output = ""
@@ -222,5 +222,11 @@ def cache_copy(from, to)
     system("cp -a #{from}/. #{to}")
   end
 
+  # check if the cache content exists
+  # @param [String] relative path of the cache contents
+  # @param [Boolean] true if the path exists in the cache and false if otherwise
+  def cache_exists?(path)
+    File.exists?(cache_base + path)
+  end
 end
 

lib/language_pack/ruby.rb

@@ -5,9 +5,10 @@
 
 # base Ruby Language Pack. This is for any base ruby app.
 class LanguagePack::Ruby < LanguagePack::Base
+  BUILDPACK_VERSION   = "v40"
   LIBYAML_VERSION     = "0.1.4"
   LIBYAML_PATH        = "libyaml-#{LIBYAML_VERSION}"
-  BUNDLER_VERSION     = "1.2.0.rc.2"
+  BUNDLER_VERSION     = "1.2.1"
   BUNDLER_GEM_PATH    = "bundler-#{BUNDLER_VERSION}"
   NODE_VERSION        = "0.4.7"
   NODE_JS_BINARY_PATH = "node-#{NODE_VERSION}"
@@ -380,7 +381,7 @@ def build_bundler
       version = run("env RUBYOPT=\"#{syck_hack}\" bundle version").strip
       topic("Installing dependencies using #{version}")
 
-      cache_load "vendor/bundle"
+      load_bundler_cache
 
       bundler_output = ""
       Dir.mktmpdir("libyaml-") do |tmpdir|
@@ -402,7 +403,7 @@ def build_bundler
       if $?.success?
         log "bundle", :status => "success"
         puts "Cleaning up the bundler cache."
-        run "bundle clean"
+        pipe "bundle clean"
         cache_store ".bundle"
         cache_store "vendor/bundle"
 
@@ -582,4 +583,48 @@ def generate_jekyll_site
       error "Failed to generate site with jekyll."
     end
   end
+
+  def bundler_cache
+    "vendor/bundle"
+  end
+
+  def load_bundler_cache
+    cache_load "vendor"
+
+    full_ruby_version       = run(%q(ruby -v)).chomp
+    heroku_metadata         = "vendor/heroku"
+    ruby_version_cache      = "#{heroku_metadata}/ruby_version"
+    buildpack_version_cache = "vendor/heroku/buildpack_version"
+
+    # fix bug from v37 deploy
+    if File.exists?("vendor/ruby_version")
+      puts "Broken cache detected. Purging build cache."
+      cache_clear("vendor")
+      FileUtils.rm_rf("vendor/ruby_version")
+      purge_bundler_cache
+    # fix bug introduced in v38
+    elsif !File.exists?(buildpack_version_cache) && File.exists?(ruby_version_cache)
+      puts "Broken cache detected. Purging build cache."
+      purge_bundler_cache
+    elsif cache_exists?(bundler_cache) && !(File.exists?(ruby_version_cache) && full_ruby_version == File.read(ruby_version_cache).chomp)
+      puts "Ruby version change detected. Clearing bundler cache."
+      purge_bundler_cache
+    end
+
+    FileUtils.mkdir_p(heroku_metadata)
+    File.open(ruby_version_cache, 'w') do |file|
+      file.puts full_ruby_version
+    end
+    File.open(buildpack_version_cache, 'w') do |file|
+      file.puts BUILDPACK_VERSION
+    end
+    cache_store heroku_metadata
+  end
+
+  def purge_bundler_cache
+    FileUtils.rm_rf(bundler_cache)
+    cache_clear bundler_cache
+    # need to reinstall language pack gems
+    install_language_pack_gems
+  end
 end