mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-21 10:15:12 +03:00
61 lines
2.1 KiB
Diff
61 lines
2.1 KiB
Diff
Created from: https://github.com/tmuxinator/tmuxinator/pull/793
|
|
diff --git a/lib/tmuxinator.rb b/lib/tmuxinator.rb
|
|
index de4837e..6acf290 100644
|
|
--- a/lib/tmuxinator.rb
|
|
+++ b/lib/tmuxinator.rb
|
|
@@ -1,4 +1,4 @@
|
|
-require "erubis"
|
|
+require "erubi"
|
|
require "fileutils"
|
|
require "shellwords"
|
|
require "thor"
|
|
diff --git a/lib/tmuxinator/cli.rb b/lib/tmuxinator/cli.rb
|
|
index e54a9b0..032526c 100644
|
|
--- a/lib/tmuxinator/cli.rb
|
|
+++ b/lib/tmuxinator/cli.rb
|
|
@@ -169,7 +169,8 @@ module Tmuxinator
|
|
def generate_project_file(name, path)
|
|
template = Tmuxinator::Config.default? ? :default : :sample
|
|
content = File.read(Tmuxinator::Config.send(template.to_sym))
|
|
- erb = Erubis::Eruby.new(content).result(binding)
|
|
+ erubi_content = Erubi::Engine.new(content).src
|
|
+ erb = binding.instance_eval(erubi_content)
|
|
File.open(path, "w") { |f| f.write(erb) }
|
|
path
|
|
end
|
|
diff --git a/lib/tmuxinator/project.rb b/lib/tmuxinator/project.rb
|
|
index d8066c9..df4e62a 100644
|
|
--- a/lib/tmuxinator/project.rb
|
|
+++ b/lib/tmuxinator/project.rb
|
|
@@ -47,7 +47,8 @@ module Tmuxinator
|
|
@settings = parse_settings(args)
|
|
@args = args
|
|
|
|
- content = Erubis::Eruby.new(raw_content).result(binding)
|
|
+ erubi_content = Erubi::Engine.new(raw_content).src
|
|
+ content = binding.instance_eval(erubi_content)
|
|
YAML.safe_load(content, aliases: true)
|
|
rescue SyntaxError, StandardError => error
|
|
raise "Failed to parse config file: #{error.message}"
|
|
@@ -103,7 +104,7 @@ module Tmuxinator
|
|
|
|
def self.render_template(template, bndg)
|
|
content = File.read(template)
|
|
- Erubis::Eruby.new(content).result(bndg)
|
|
+ bndg.eval(Erubi::Engine.new(content).src)
|
|
end
|
|
|
|
def windows
|
|
diff --git a/tmuxinator.gemspec b/tmuxinator.gemspec
|
|
index 3fd8b30..1552b49 100644
|
|
--- a/tmuxinator.gemspec
|
|
+++ b/tmuxinator.gemspec
|
|
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
|
|
s.required_rubygems_version = ">= 1.8.23"
|
|
s.required_ruby_version = ">= 2.6.7"
|
|
|
|
- s.add_dependency "erubis", "~> 2.6"
|
|
+ s.add_dependency "erubi", "~> 1.10"
|
|
s.add_dependency "thor", "~> 1.0"
|
|
s.add_dependency "xdg", "~> 2.2", ">= 2.2.5"
|
|
|