Fix rbenv/rvm and capistrano-db-tasks #99
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Oops, this PR includes the commit from my other PR. I can remove it if for any reason you can't / doesn't want to merge the previous PR. |
numbata
reviewed
Nov 2, 2016
| config_content = dirty_config_content.match(/#{DBCONFIG_BEGIN_FLAG}(.*?)#{DBCONFIG_END_FLAG}/m)[1] | ||
| @config = YAML.load(config_content).inject({}) { |h, (k, v)| h[k.to_s] = v; h } | ||
| puts "Loading local database config" | ||
| @config = YAML.load(ERB.new(File.read(File.join('config', 'database.yml'))).result)[fetch(:local_rails_env).to_s] |
|
I've reverted to using |
|
ping @numbata |
numbata
reviewed
Nov 13, 2016
| end | ||
| # Remove all warnings, errors and artefacts produced by bunlder, rails and other useful tools | ||
| config_content = dirty_config_content.match(/#{DBCONFIG_BEGIN_FLAG}(.*?)#{DBCONFIG_END_FLAG}/m)[1] | ||
| puts "Loading local database config" |
| @@ -6,8 +6,11 @@ def remote_to_local(cap) | |||
| server = servers.detect { |s| s.roles.include?(:app) } | |||
There was a problem hiding this comment.
Please, remove commit from other PR.
|
|
||
| command = "#{Dir.pwd}/bin/rails runner \"puts '#{DBCONFIG_BEGIN_FLAG}' + ActiveRecord::Base.connection.instance_variable_get(:@config).to_yaml + '#{DBCONFIG_END_FLAG}'\"" | ||
| stdout, status = Open3.capture2(command) | ||
| raise "Error running command (status=#{status}): #{cmd}" if status != 0 |
There was a problem hiding this comment.
Please, fix variable name: #{cmd} should be #{command}.
|
ping @elthariel |
|
@elthariel is it actual for you? I want to push new version with this fix. |
|
@numbata Sorry for the delay. I fixed what your comments sugested and re-tested in the project I use it, we're good to go |
|
@elthariel thanks a lot! 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As mentionned here: capistrano/sshkit#153 (comment) and capistrano/sshkit#24 (comment) by one of Capistrano's maintainer, the
run_locallyfeature is not a very good idea and shouldn't be used.This PR removes the use of it in Initializing Database::Local, which is broken when used in conjunction with capistrano-rvm/rbenv (it'll use the sshkit configs for the rails command which are set up to use the remote rbenv/rvm config)