Merge pull request #164 from voxpupuli/modulesync

modulesync 5.1.0

.sync.yml

@@ -0,0 +1,3 @@
+---
+spec/spec_helper.rb:
+  spec_overrides: "require 'spec_helper_methods'"

lib/facter/rvm_installed.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Facter.add(:rvm_installed) do
   rvm_binary = '/usr/local/rvm/bin/rvm'
 

lib/facter/rvm_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Facter.add(:rvm_version) do
   rvm_binary = '/usr/local/rvm/bin/rvm'
 

lib/puppet/provider/rvm_alias/alias.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # RVM gemset support
 Puppet::Type.type(:rvm_alias).provide(:alias) do
   desc 'RVM alias support.'
@@ -24,8 +26,8 @@ def alias_list
     list = []
     begin
       list = execute(command)
-    rescue Puppet::ExecutionFailure => detail
-      Puppet.debug "`rvmcmd` command failed with #{detail}"
+    rescue Puppet::ExecutionFailure => e
+      Puppet.debug "`rvmcmd` command failed with #{e}"
     end
 
     list.to_s

lib/puppet/provider/rvm_gem/gem.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'puppet/provider/package'
 require 'uri'
 
@@ -33,13 +35,11 @@ def gemlist(hash)
                end
 
     if (name = hash[:justme])
-      command << '^' + name + '$'
+      command << ("^#{name}$")
     end
 
     # use proxy if proxy_url is set
-    if resource[:proxy_url] && !resource[:proxy_url].empty?
-      command << '--http-proxy' << resource[:proxy_url]
-    end
+    command << '--http-proxy' << resource[:proxy_url] if resource[:proxy_url] && !resource[:proxy_url].empty?
 
     list = []
     begin
@@ -49,20 +49,21 @@ def gemlist(hash)
           gemhash
         end
       end.compact
-    rescue Puppet::ExecutionFailure => detail
-      Puppet.debug "`rvmcmd` command failed with #{detail}"
+    rescue Puppet::ExecutionFailure => e
+      Puppet.debug "`rvmcmd` command failed with #{e}"
     end
 
     return list.shift if hash[:justme]
+
     list
   end
 
   def self.gemsplit(desc)
     desc = desc.gsub('default: ', '')
 
     case desc
-    when %r{^\*\*\*}, %r{^\s*$}, %r{^\s+} then return nil
-    when %r{gem: not found} then nil
+    when %r{^\*\*\*}, %r{^\s*$}, %r{^\s+} then nil
+    when %r{gem: not found} then nil # rubocop:disable Lint/DuplicateBranch
     when %r{^(\S+)\s+\((\d+.*)\)}
       name = Regexp.last_match(1)
       version = Regexp.last_match(2).split(%r{,\s*})
@@ -76,22 +77,20 @@ def self.gemsplit(desc)
     end
   end
 
-  def install(useversion = true)
+  def install(useversion = true) # rubocop:disable Style/OptionalBooleanParameter
     command = gembinary + ['install']
     command << '-v' << resource[:ensure] if (!resource[:ensure].is_a? Symbol) && useversion
     # Dependencies are now installed by default
     # command << "--include-dependencies"
 
     # use proxy if proxy_url is set
-    if resource[:proxy_url] && !resource[:proxy_url].empty?
-      command << '--http-proxy' << resource[:proxy_url]
-    end
+    command << '--http-proxy' << resource[:proxy_url] if resource[:proxy_url] && !resource[:proxy_url].empty?
 
     if (source = resource[:source])
       begin
         uri = URI.parse(source)
-      rescue => detail
-        raise "Invalid source '#{uri}': #{detail}"
+      rescue StandardError => e
+        raise "Invalid source '#{uri}': #{e}"
       end
 
       case uri.scheme

lib/puppet/provider/rvm_gemset/gemset.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # RVM gemset support
 Puppet::Type.type(:rvm_gemset).provide(:gemset) do
   desc 'RVM gemset support.'
@@ -26,17 +28,15 @@ def gemset_list
     command = gemsetcommand + ['list']
 
     # use proxy if proxy_url is set
-    if resource[:proxy_url] && !resource[:proxy_url].empty?
-      command << '--http-proxy' << resource[:proxy_url]
-    end
+    command << '--http-proxy' << resource[:proxy_url] if resource[:proxy_url] && !resource[:proxy_url].empty?
 
     list = []
     begin
       list = execute(command).split("\n").map do |line|
         line.strip if line =~ %r{^\s+\S+}
       end.compact
-    rescue Puppet::ExecutionFailure => detail
-      Puppet.debug "`rvmcmd` command failed with #{detail}"
+    rescue Puppet::ExecutionFailure => e
+      Puppet.debug "`rvmcmd` command failed with #{e}"
     end
 
     list

lib/puppet/provider/rvm_system_ruby/rvm_system_ruby.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Type.type(:rvm_system_ruby).provide(:rvm) do
   desc 'Ruby RVM support.'
 
@@ -22,16 +24,16 @@ def exists?
     rvmcmd('list', 'strings').split("\n").any? do |line|
       line =~ Regexp.new(Regexp.escape(resource[:name]))
     end
-  rescue Puppet::ExecutionFailure => detail
-    raise Puppet::Error, "Could not list RVMs: #{detail}"
+  rescue Puppet::ExecutionFailure => e
+    raise Puppet::Error, "Could not list RVMs: #{e}"
   end
 
   def default_use
     rvmcmd('list', 'default').split("\n").any? do |line|
       line =~ Regexp.new(Regexp.escape(resource[:name]))
     end
-  rescue Puppet::ExecutionFailure => detail
-    raise Puppet::Error, "Could not list default RVM: #{detail}"
+  rescue Puppet::ExecutionFailure => e
+    raise Puppet::Error, "Could not list default RVM: #{e}"
   end
 
   def default_use=(value)
@@ -51,9 +53,7 @@ def install
       ENV['no_proxy'] = resource[:no_proxy] unless resource[:no_proxy].nil?
     end
     options = Array(resource[:build_opts])
-    if resource[:autolib_mode]
-      options << "--autolibs #{resource[:autolib_mode]}"
-    end
+    options << "--autolibs #{resource[:autolib_mode]}" if resource[:autolib_mode]
     if resource[:proxy_url] && !resource[:proxy_url].empty?
       rvmcmd 'install', resource[:name], '--proxy', resource[:proxy_url], *options
     else

lib/puppet/provider/rvm_wrapper/wrapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # RVM gemset support
 Puppet::Type.type(:rvm_wrapper).provide(:wrapper) do
   desc 'RVM wrapper support.'

lib/puppet/type/rvm_alias.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Type.newtype(:rvm_alias) do
   @doc = 'Manage RVM Aliases.'
 

lib/puppet/type/rvm_gem.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Type.newtype(:rvm_gem) do
   @doc = 'Ruby Gem support using RVM.'
 
@@ -30,8 +32,8 @@ def self.title_patterns
       current = retrieve
       begin
         provider.update
-      rescue => detail
-        raise "Could not update: #{detail}"
+      rescue StandardError => e
+        raise "Could not update: #{e}"
       end
 
       if current == :absent
@@ -44,8 +46,8 @@ def self.title_patterns
     newvalue(%r{.}) do
       begin
         provider.install
-      rescue => detail
-        raise "Could not update: #{detail}"
+      rescue StandardError => e
+        raise "Could not update: #{e}"
       end
 
       if retrieve == :absent
@@ -55,7 +57,7 @@ def self.title_patterns
       end
     end
 
-    def insync?(is)
+    def insync?(is) # rubocop:disable Naming/MethodParameterName
       @should ||= []
 
       @latest ||= nil
@@ -78,9 +80,9 @@ def insync?(is)
             begin
               @latest = provider.latest
               @lateststamp = Time.now.to_i
-            rescue => detail
-              error = Puppet::Error.new("Could not get latest version: #{detail}")
-              error.set_backtrace(detail.backtrace)
+            rescue StandardError => e
+              error = Puppet::Error.new("Could not get latest version: #{e}")
+              error.set_backtrace(e.backtrace)
               raise error
             end
           end

lib/puppet/type/rvm_gemset.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Type.newtype(:rvm_gemset) do
   @doc = 'Manage RVM Gemsets.'
 

lib/puppet/type/rvm_system_ruby.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Type.newtype(:rvm_system_ruby) do
   @doc = 'Manage RVM Ruby installations.'
 

lib/puppet/type/rvm_wrapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Type.newtype(:rvm_wrapper) do
   @doc = 'Manage RVM Wrappers.'
 

manifests/init.pp

@@ -10,8 +10,8 @@
   $rvm_gems= {},
   $proxy_url=$rvm::params::proxy_url,
   $no_proxy=$rvm::params::no_proxy,
-  $key_server=$rvm::params::key_server,
-$gnupg_key_id=$rvm::params::gnupg_key_id) inherits rvm::params {
+  $gnupg_key_id=$rvm::params::gnupg_key_id,
+) inherits rvm::params {
   if $install_rvm {
     # rvm has now autolibs enabled by default so let it manage the dependencies
     if $install_dependencies {
@@ -28,7 +28,6 @@
       version      => $version,
       proxy_url    => $proxy_url,
       no_proxy     => $no_proxy,
-      key_server   => $key_server,
       gnupg_key_id => $gnupg_key_id,
       install_from => $install_from,
     }

manifests/params.pp

@@ -11,14 +11,12 @@
 
   $proxy_url = undef
   $no_proxy = undef
-  $key_server = 'hkp://keys.gnupg.net'
 
-  # install the gpg key if gpg is installed or being installed in this puppet run
-  if defined(Class['gnupg']) or $facts['gnupg_installed'] {
-    $gnupg_key_id = '39499BDB'
-  } else {
-    $gnupg_key_id = false
-  }
+  # sadly the gpg module is ages old and doesn't support long key ids
+  $gnupg_key_id = [
+    { 'id' => 'D39DC0E3', 'source' => 'https://rvm.io/mpapis.asc' },
+    { 'id' => '39499BDB', 'source' => 'https://rvm.io/pkuczynski.asc' },
+  ]
 
   # ignored param, using gnupg module
   $gpg_package = $facts['kernel'] ? {

manifests/system.pp

@@ -4,9 +4,8 @@
   $install_from=undef,
   $proxy_url=undef,
   $no_proxy=undef,
-  $key_server=undef,
   $home=$facts['root_home'],
-  $gnupg_key_id=$rvm::params::gnupg_key_id
+  $gnupg_key_id=$rvm::params::gnupg_key_id,
 ) inherits rvm::params {
   $actual_version = $version ? {
     undef     => 'latest',
@@ -38,10 +37,20 @@
 
   # install the gpg key
   if $gnupg_key_id {
-    class { 'rvm::gnupg_key':
-      key_server => $key_server,
-      key_id     => $gnupg_key_id,
-      before     => Exec['system-rvm'],
+    include gnupg
+
+    # https keys are downloaded with wget
+    ensure_packages(['wget'])
+    $gnupg_key_id.each |Hash[String[1], String[1]] $key| {
+      gnupg_key { $key['id']:
+        ensure     => 'present',
+        user       => 'root',
+        key_id     => $key['id'],
+        key_source => $key['source'],
+        key_type   => public,
+        before     => Exec['system-rvm'],
+        require    => Class['gnupg'],
+      }
     }
   }
 
@@ -76,8 +85,10 @@
   # the fact won't work until rvm is installed before puppet starts
   if $facts['rvm_version'] and !empty($facts['rvm_version']) {
     if ($version != undef) and ($version != present) and ($version != $facts['rvm_version']) {
-      if defined(Class['rvm::gnupg_key']) {
-        Class['rvm::gnupg_key'] -> Exec['system-rvm-get']
+      if $gnupg_key_id {
+        $gnupg_key_id.each |Hash[String[1], String[1]] $key| {
+          Gnupg_key[$key['id']] -> Exec['system-rvm-get']
+        }
       }
 
       # Update the rvm installation to the version specified

metadata.json

@@ -15,7 +15,7 @@
     },
     {
       "name": "golja/gnupg",
-      "version_requirement": ">=1.2.0"
+      "version_requirement": ">= 1.2.0 < 2.0.0"
     }
   ],
   "operatingsystem_support": [