Skip to content

Commit b33344a

Browse files
committed
(PDK-784) Rename base-rubygem component for consistency
1 parent a643a99 commit b33344a

18 files changed

+35
-18
lines changed

Diff for: configs/components/base-rubygem.rb renamed to configs/components/_base-rubygem.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@
1717
# set RUBYLIB to include puppet and hiera, so that their gemspecs can resolve
1818
# hiera/version and puppet/version requires. Without this the gem install
1919
# will fail by blowing out the stack.
20-
pkg.environment "RUBYLIB", "#{settings[:ruby_vendordir]}:$(RUBYLIB)"
20+
if settings[:ruby_vendordir]
21+
pkg.environment "RUBYLIB", "#{settings[:ruby_vendordir]}:$(RUBYLIB)"
22+
end

Diff for: configs/components/rubygem-deep-merge.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
component "rubygem-deep-merge" do |pkg, settings, platform|
2-
instance_eval File.read('configs/components/base-rubygem.rb')
2+
instance_eval File.read('configs/components/_base-rubygem.rb')
3+
34
pkg.version "1.0.1"
45
pkg.md5sum "6f30bc4727f1833410f6a508304ab3c1"
56
pkg.url "https://rubygems.org/downloads/deep_merge-#{pkg.get_version}.gem"

Diff for: configs/components/rubygem-fast_gettext.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
component "rubygem-fast_gettext" do |pkg, settings, platform|
2-
instance_eval File.read('configs/components/base-rubygem.rb')
2+
instance_eval File.read('configs/components/_base-rubygem.rb')
33

44
version = settings[:rubygem_fast_gettext_version] || '1.1.2'
55
pkg.version version

Diff for: configs/components/rubygem-ffi.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
component "rubygem-ffi" do |pkg, settings, platform|
2-
instance_eval File.read('configs/components/base-rubygem.rb')
2+
instance_eval File.read('configs/components/_base-rubygem.rb')
33

44
version = settings[:rubygem_ffi_version] || '1.9.18'
55
pkg.version version

Diff for: configs/components/rubygem-gettext-setup.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
component "rubygem-gettext-setup" do |pkg, settings, platform|
2-
instance_eval File.read('configs/components/base-rubygem.rb')
2+
instance_eval File.read('configs/components/_base-rubygem.rb')
3+
34
pkg.version "0.30"
45
pkg.md5sum "b7de0e7af0f56ddc55c88435ee95fd47"
56

Diff for: configs/components/rubygem-gettext.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
component "rubygem-gettext" do |pkg, settings, platform|
2-
instance_eval File.read('configs/components/base-rubygem.rb')
2+
instance_eval File.read('configs/components/_base-rubygem.rb')
3+
34
pkg.version "3.2.2"
45
pkg.md5sum "4cbb125f8d8206e9a8f3a90f6488e4da"
56
pkg.url "https://rubygems.org/downloads/gettext-#{pkg.get_version}.gem"

Diff for: configs/components/rubygem-hocon.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
component "rubygem-hocon" do |pkg, settings, platform|
2-
instance_eval File.read('configs/components/base-rubygem.rb')
2+
instance_eval File.read('configs/components/_base-rubygem.rb')
3+
34
pkg.version "1.2.5"
45
pkg.md5sum "e7821d3a731ab617320ccfa4f67f886b"
56
pkg.url "https://rubygems.org/downloads/hocon-#{pkg.get_version}.gem"

Diff for: configs/components/rubygem-locale.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
component "rubygem-locale" do |pkg, settings, platform|
2-
instance_eval File.read('configs/components/base-rubygem.rb')
2+
instance_eval File.read('configs/components/_base-rubygem.rb')
3+
34
pkg.version "2.1.2"
45
pkg.md5sum "def1e89d1d3126a0c684d3b7b20d88d4"
56
pkg.url "https://rubygems.org/downloads/locale-#{pkg.get_version}.gem"

Diff for: configs/components/rubygem-minitar.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
component "rubygem-minitar" do |pkg, settings, platform|
2-
instance_eval File.read('configs/components/base-rubygem.rb')
2+
instance_eval File.read('configs/components/_base-rubygem.rb')
3+
34
pkg.version "0.6.1"
45
pkg.md5sum "ce4ee63a94e80fb4e3e66b54b995beaa"
56
pkg.url "https://rubygems.org/downloads/minitar-#{pkg.get_version}.gem"

Diff for: configs/components/rubygem-multi_json.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
component "rubygem-multi_json" do |pkg, settings, platform|
2-
instance_eval File.read('configs/components/base-rubygem.rb')
2+
instance_eval File.read('configs/components/_base-rubygem.rb')
3+
34
pkg.version '1.13.1'
45
pkg.md5sum 'b7702a827fd011461fbda6b80f2219d5'
56
pkg.url "https://rubygems.org/downloads/multi_json-#{pkg.get_version}.gem"

Diff for: configs/components/rubygem-net-ssh.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
component "rubygem-net-ssh" do |pkg, settings, platform|
2-
instance_eval File.read('configs/components/base-rubygem.rb')
2+
instance_eval File.read('configs/components/_base-rubygem.rb')
3+
34
pkg.version "4.1.0"
45
pkg.md5sum "6af1ff8c42a07b11203058c9b74cbaef"
56
pkg.url "https://rubygems.org/downloads/net-ssh-#{pkg.get_version}.gem"

Diff for: configs/components/rubygem-semantic_puppet.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
component "rubygem-semantic_puppet" do |pkg, settings, platform|
2-
instance_eval File.read('configs/components/base-rubygem.rb')
2+
instance_eval File.read('configs/components/_base-rubygem.rb')
3+
34
pkg.version "0.1.2"
45
pkg.md5sum "192ae7729997cb5d5364f64b99b13121"
56
pkg.url "https://rubygems.org/downloads/semantic_puppet-#{pkg.get_version}.gem"

Diff for: configs/components/rubygem-text.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
component "rubygem-text" do |pkg, settings, platform|
2-
instance_eval File.read('configs/components/base-rubygem.rb')
2+
instance_eval File.read('configs/components/_base-rubygem.rb')
3+
34
pkg.version "1.3.1"
45
pkg.md5sum "514c3d1db7a955fe793fc0cb149c164f"
56
pkg.url "https://rubygems.org/downloads/text-#{pkg.get_version}.gem"

Diff for: configs/components/rubygem-win32-dir.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
component "rubygem-win32-dir" do |pkg, settings, platform|
2-
instance_eval File.read('configs/components/base-rubygem.rb')
2+
instance_eval File.read('configs/components/_base-rubygem.rb')
3+
34
pkg.version "0.4.9"
45
pkg.md5sum "df14aa01bd6011f4b6332a05e15b7fb8"
56
pkg.url "https://rubygems.org/downloads/win32-dir-#{pkg.get_version}.gem"

Diff for: configs/components/rubygem-win32-eventlog.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
component 'rubygem-win32-eventlog' do |pkg, settings, platform|
2-
instance_eval File.read('configs/components/base-rubygem.rb')
2+
instance_eval File.read('configs/components/_base-rubygem.rb')
3+
34
pkg.version '0.6.2'
45
pkg.md5sum '89b2e7dd8cc599168fa444e73c014c3d'
56
pkg.url "https://rubygems.org/downloads/win32-eventlog-#{pkg.get_version}.gem"

Diff for: configs/components/rubygem-win32-process.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
component "rubygem-win32-process" do |pkg, settings, platform|
2-
instance_eval File.read('configs/components/base-rubygem.rb')
2+
instance_eval File.read('configs/components/_base-rubygem.rb')
3+
34
pkg.version "0.7.5"
45
pkg.md5sum "d7ff67c7934b0d6ab93030d2cc2fc4f0"
56
pkg.url "https://rubygems.org/downloads/win32-process-#{pkg.get_version}.gem"

Diff for: configs/components/rubygem-win32-security.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
component "rubygem-win32-security" do |pkg, settings, platform|
2-
instance_eval File.read('configs/components/base-rubygem.rb')
2+
instance_eval File.read('configs/components/_base-rubygem.rb')
3+
34
pkg.version "0.2.5"
45
pkg.md5sum "97c4b971ea19ca48cea7dec1d21d506a"
56
pkg.url "https://rubygems.org/downloads/win32-security-#{pkg.get_version}.gem"

Diff for: configs/components/rubygem-win32-service.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
component "rubygem-win32-service" do |pkg, settings, platform|
2-
instance_eval File.read('configs/components/base-rubygem.rb')
2+
instance_eval File.read('configs/components/_base-rubygem.rb')
3+
34
pkg.version "0.8.8"
45
pkg.md5sum "24cc05fed398eb931e14b8ee22196634"
56
pkg.url "https://rubygems.org/downloads/win32-service-#{pkg.get_version}.gem"

0 commit comments

Comments
 (0)