Skip to content

Commit b87973d

Browse files
author
gdgate
authored
Merge pull request #1738 from sangtm/TMA-1717-remove-erubis
FEATURE:TMA-1717 - replace Erbis by standard ERB Reviewed-by: https://github.com/danh-ung
2 parents b4a10d8 + 582624d commit b87973d

2 files changed

Lines changed: 9 additions & 11 deletions

File tree

gooddata.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ Gem::Specification.new do |s|
6262

6363
s.add_dependency 'aws-sdk-s3', '~> 1.16'
6464
s.add_dependency 'docile', '~> 1.1'
65-
s.add_dependency 'erubis', '~> 2.7'
6665
s.add_dependency 'gli', '~> 2.15'
6766
s.add_dependency 'gooddata_datawarehouse', '~> 0.0.10' if RUBY_PLATFORM == 'java'
6867
s.add_dependency 'highline', '= 2.0.0.pre.develop.14'

lib/gooddata/commands/scaffold.rb

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This source code is licensed under the BSD-style license found in the
55
# LICENSE file in the root directory of this source tree.
66

7-
require 'erubis'
7+
require 'erb'
88
require 'fileutils'
99
require 'pathname'
1010

@@ -18,15 +18,14 @@ class << self
1818
# TODO: Add option for custom output dir
1919
def project(name)
2020
fail ArgumentError, 'No name specified' if name.nil?
21-
2221
FileUtils.mkdir(name)
2322
FileUtils.cd(name) do
2423
FileUtils.mkdir('model')
2524
FileUtils.cd('model') do
2625
input = File.read(TEMPLATES_PATH + 'project/model/model.rb.erb')
27-
eruby = Erubis::Eruby.new(input)
26+
erb = ERB.new(input)
2827
File.open('model.rb', 'w') do |f|
29-
f.write(eruby.result(:name => name))
28+
f.write(erb.result_with_hash(:name => name))
3029
end
3130
end
3231

@@ -36,9 +35,9 @@ def project(name)
3635
end
3736

3837
input = File.read(TEMPLATES_PATH + 'project/Goodfile.erb')
39-
eruby = Erubis::Eruby.new(input)
38+
erb = ERB.new(input)
4039
File.open('Goodfile', 'w') do |f|
41-
f.write(eruby.result)
40+
f.write(erb.result)
4241
end
4342
end
4443
end
@@ -51,15 +50,15 @@ def brick(name)
5150
FileUtils.mkdir(name)
5251
FileUtils.cd(name) do
5352
input = File.read(TEMPLATES_PATH + 'bricks/brick.rb.erb')
54-
eruby = Erubis::Eruby.new(input)
53+
erb = ERB.new(input)
5554
File.open('brick.rb', 'w') do |f|
56-
f.write(eruby.result)
55+
f.write(erb.result)
5756
end
5857

5958
input = File.read(TEMPLATES_PATH + 'bricks/main.rb.erb')
60-
eruby = Erubis::Eruby.new(input)
59+
erb = ERB.new(input)
6160
File.open('main.rb', 'w') do |f|
62-
f.write(eruby.result)
61+
f.write(erb.result)
6362
end
6463
end
6564
end

0 commit comments

Comments
 (0)