arkrb 0.3.0 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/arkrb.rb +4 -2
- data/lib/arkrb/install.rb +6 -1
- data/lib/arkrb/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5f89caa0d9553e01f410477c841adba4a032e1b967a378a275c5cf5e5ad214c3
|
|
4
|
+
data.tar.gz: 181a4e4cd5907594ca00556daf13330db18075160cc5df0f953ef790ed54fab7
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: bca63d3a181aba21dab33ff4415a9e1867dbb727b8d9735dfc96c3e10af5a7d84ad521e04512c91d2e16e8501eb4ea8aad5b7fca1828ad988397b66cd56ebe77
|
|
7
|
+
data.tar.gz: cb9da4afb9ece8f489613b893fb24dd176ef49d4be87b2006609f233c36a830af6da74ce680245ff4f58ab0f156b8f9e40abb08571acc4c29f368d1824b2a8b7
|
data/Gemfile.lock
CHANGED
data/lib/arkrb.rb
CHANGED
|
@@ -13,7 +13,10 @@ module Arkrb
|
|
|
13
13
|
|
|
14
14
|
# @return [String]
|
|
15
15
|
def self.executable(path = "#{USER_HOME}/bin")
|
|
16
|
-
|
|
16
|
+
old_mkmf_log = MakeMakefile::Logging.instance_variable_get(:@logfile)
|
|
17
|
+
MakeMakefile::Logging.instance_variable_set(:@logfile, '/dev/null')
|
|
18
|
+
arkmanager_exec = find_executable0('arkmanager', path)
|
|
19
|
+
MakeMakefile::Logging.instance_variable_set(:@logfile, old_mkmf_log)
|
|
17
20
|
raise Arkrb::Error::ArkManagerExecutableNotFound, 'We could not find the ark_rb binary! Please install it by running Arkrb.install.server_tools or executing the command `ark_rb install tools``' if arkmanager_exec.nil?
|
|
18
21
|
arkmanager_exec
|
|
19
22
|
end
|
|
@@ -21,7 +24,6 @@ module Arkrb
|
|
|
21
24
|
# @return [Integer, String]
|
|
22
25
|
def self.execute(command, command_opts = '', instance = 'main', sanitize = false)
|
|
23
26
|
exec_this = format('%s %s %s @%s', executable, command.to_s.tr('_', ''), command_opts, instance)
|
|
24
|
-
pp exec_this
|
|
25
27
|
stdin, stdout, stderr = Open3.popen3(exec_this)
|
|
26
28
|
output = stdout.read.chomp
|
|
27
29
|
errors = stderr.read.chomp
|
data/lib/arkrb/install.rb
CHANGED
|
@@ -18,7 +18,12 @@ module Arkrb
|
|
|
18
18
|
|
|
19
19
|
`#{BASH_EXEC} #{server_tools_install_sh_path} --me --perform-user-install`
|
|
20
20
|
|
|
21
|
-
|
|
21
|
+
old_mkmf_log = MakeMakefile::Logging.instance_variable_get(:@logfile)
|
|
22
|
+
MakeMakefile::Logging.instance_variable_set(:@logfile, '/dev/null')
|
|
23
|
+
ark_manager_exec = find_executable0('arkmanager', "#{Arkrb::USER_HOME}/bin")
|
|
24
|
+
MakeMakefile::Logging.instance_variable_set(:@logfile, old_mkmf_log)
|
|
25
|
+
|
|
26
|
+
unless ark_manager_exec
|
|
22
27
|
File.open("#{Arkrb::USER_HOME}/.bashrc", 'a') do |file|
|
|
23
28
|
file.write "export PATH=$PATH:#{File.expand_path(Arkrb::USER_HOME + '/bin')}"
|
|
24
29
|
end
|
data/lib/arkrb/version.rb
CHANGED