Merge pull request #110 from srclab/master

Allow rvm to mount a Ruby

.gitignore

@@ -27,6 +27,9 @@ vendor/
 .rvmrc*
 .ruby-*
 
+# IntelliJ/RubyMine
+.idea/*
+
 ## rspec
 spec/fixtures/manifests/
 spec/fixtures/modules/

lib/puppet/provider/rvm_system_ruby/rvm_system_ruby.rb

@@ -6,19 +6,10 @@
   end
 
   def create
-    unless resource[:proxy_url].nil?
-      ENV['http_proxy'] = resource[:proxy_url]
-      ENV['https_proxy'] = resource[:proxy_url]
-      unless resource[:no_proxy].nil?
-        ENV['no_proxy'] = resource[:no_proxy]
-      end
-    end
-    set_autolib_mode if resource.value(:autolib_mode)
-    options = Array(resource[:build_opts])
-    if resource[:proxy_url] and !resource[:proxy_url].empty?
-      rvmcmd "install", resource[:name], "--proxy", resource[:proxy_url], *options
+    if resource[:mount_from]
+      mount
     else
-      rvmcmd "install", resource[:name], *options
+      install
     end
     set_default if resource.value(:default_use)
   end
@@ -63,4 +54,27 @@ def set_autolib_mode
       raise Puppet::Error, "Could not set autolib mode: #{detail}"
     end
   end
+
+  private
+
+  def install
+    unless resource[:proxy_url].nil?
+      ENV['http_proxy']  = resource[:proxy_url]
+      ENV['https_proxy'] = resource[:proxy_url]
+      unless resource[:no_proxy].nil?
+        ENV['no_proxy'] = resource[:no_proxy]
+      end
+    end
+    set_autolib_mode if resource.value(:autolib_mode)
+    options = Array(resource[:build_opts])
+    if resource[:proxy_url] and !resource[:proxy_url].empty?
+      rvmcmd "install", resource[:name], "--proxy", resource[:proxy_url], *options
+    else
+      rvmcmd "install", resource[:name], *options
+    end
+  end
+
+  def mount
+    rvmcmd "mount", resource[:mount_from]
+  end
 end

lib/puppet/type/rvm_system_ruby.rb

@@ -32,4 +32,8 @@
     desc "Set RVM autolib mode"
   end
 
+  newparam(:mount_from) do
+    desc 'If you wish to specify a Ruby archive to mount'
+  end
+
 end

manifests/init.pp

@@ -1,6 +1,7 @@
 # Install RVM, create system user a install system level rubies
 class rvm(
   $version=undef,
+  $install_from=undef,
   $install_rvm=true,
   $install_dependencies=false,
   $manage_rvmrc=$rvm::params::manage_rvmrc,
@@ -31,6 +32,7 @@
       no_proxy     => $no_proxy,
       key_server   => $key_server,
       gnupg_key_id => $gnupg_key_id,
+      install_from => $install_from,
     }
   }
 

manifests/system.pp

@@ -1,6 +1,7 @@
 # Install the RVM system
 class rvm::system(
   $version=undef,
+  $install_from=undef,
   $proxy_url=undef,
   $no_proxy=undef,
   $key_server=undef,
@@ -20,7 +21,7 @@
         ensure_packages(['curl'])
         Package['curl'] -> Exec['system-rvm']
       }
-      default: {}
+      default: { }
     }
   }
 
@@ -44,11 +45,34 @@
     }
   }
 
-  exec { 'system-rvm':
-    path        => '/usr/bin:/usr/sbin:/bin:/usr/local/bin',
-    command     => "curl -fsSL https://get.rvm.io | bash -s -- --version ${actual_version}",
-    creates     => '/usr/local/rvm/bin/rvm',
-    environment => $environment,
+  if $install_from {
+
+    file { '/tmp/rvm':
+      ensure => directory,
+    }
+
+    exec { 'unpack-rvm':
+      path    => '/usr/bin:/usr/sbin:/bin:/usr/local/bin',
+      command => "tar --strip-components=1 -xzf ${install_from}",
+      cwd     => '/tmp/rvm',
+    }
+
+    exec { 'system-rvm':
+      path        => '/usr/bin:/usr/sbin:/bin:/usr/local/bin',
+      command     => './install --auto-dotfiles',
+      cwd         => '/tmp/rvm',
+      creates     => '/usr/local/rvm/bin/rvm',
+      environment => $environment,
+    }
+
+  }
+  else {
+    exec { 'system-rvm':
+      path        => '/usr/bin:/usr/sbin:/bin:/usr/local/bin',
+      command     => "curl -fsSL https://get.rvm.io | bash -s -- --version ${actual_version}",
+      creates     => '/usr/local/rvm/bin/rvm',
+      environment => $environment,
+    }
   }
 
   # the fact won't work until rvm is installed before puppet starts