Merge pull request #156 from boxen/bump-base-ruby-build-min

Use a more recent `ruby-build` version

data/common.yaml

@@ -29,7 +29,7 @@ ruby::prefix: '/opt'
 ruby::provider: 'rbenv'
 ruby::user: "%{::id}"
 
-ruby::build::ensure: 'v20161225'
+ruby::build::ensure: 'v20170914'
 ruby::build::prefix: "%{hiera('ruby::prefix')}/ruby-build"
 ruby::build::user: "%{hiera('ruby::user')}"
 

lib/puppet/provider/ruby/rubybuild.rb

@@ -42,25 +42,17 @@ def create
         raise Puppet::Error, "Can't install ruby because we're offline and the tarball isn't cached"
       end
     else
-      try_to_download_precompiled_ruby || build_ruby
+      build_ruby
     end
   rescue => e
-    raise Puppet::Error, "install failed with a crazy error: #{e.message} #{e.backtrace}"
+    raise Puppet::Error, "install failed with an error: #{e.message} #{e.backtrace}"
   end
 
   def destroy
     FileUtils.rm_rf prefix
   end
 
 private
-  def try_to_download_precompiled_ruby
-    Puppet.debug("Trying to download precompiled ruby for #{version}")
-    output = execute "curl --silent --fail #{precompiled_url} >#{tmp} && tar xjf #{tmp} -C /opt/rubies", command_options.merge(:failonfail => false)
-
-    output.exitstatus == 0
-  ensure
-    FileUtils.rm_f tmp
-  end
 
   def build_ruby
     execute "#{ruby_build} #{version} #{prefix}", command_options.merge(:failonfail => true)
@@ -81,24 +73,6 @@ def s3_cellar
     end
   end
 
-  def precompiled_url
-    base = Facter.value(:boxen_download_url_base) ||
-      "https://#{Facter.value(:boxen_s3_host)}/#{Facter.value(:boxen_s3_bucket)}"
-
-    %W(
-      #{base}
-      /
-      rubies
-      /
-      #{Facter.value(:operatingsystem)}
-      /
-      #{s3_cellar}
-      #{os_release}
-      /
-      #{CGI.escape(version)}.tar.bz2
-    ).join("")
-  end
-
   def os_release
     case Facter.value(:operatingsystem)
     when "Darwin"

manifests/build.pp

@@ -10,7 +10,7 @@
   repository { $prefix:
     ensure => $ensure,
     force  => true,
-    source => 'sstephenson/ruby-build',
+    source => 'rbenv/ruby-build',
     user   => $user,
   }
 

manifests/rbenv.pp

@@ -19,7 +19,7 @@
   repository { $prefix:
     ensure => $ensure,
     force  => true,
-    source => 'sstephenson/rbenv',
+    source => 'rbenv/rbenv',
     user   => $user
   }
 

spec/classes/ruby_rbenv_spec.rb

@@ -22,7 +22,7 @@
         should contain_repository('/test/boxen/rbenv').with({
           :ensure => 'v0.4.0',
           :force  => true,
-          :source => 'sstephenson/rbenv',
+          :source => 'rbenv/rbenv',
           :user   => 'testuser'
         })