This repository has been archived by the owner on Jul 13, 2023. It is now read-only.
Replace cocaine to terrapin #2553
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
houndci-bot
reviewed
Feb 13, 2018
| @@ -189,7 +189,7 @@ | |||
| it "lets us know when a command isn't found versus a processing error" do | |||
| old_path = ENV['PATH'] | |||
| begin | |||
| Cocaine::CommandLine.path = '' | |||
| Terrapin::CommandLine.path = '' | |||
There was a problem hiding this comment.
Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.
| @@ -48,7 +48,7 @@ | |||
| it "lets us know when a command isn't found versus a processing error" do | |||
| old_path = ENV['PATH'] | |||
| begin | |||
| Cocaine::CommandLine.path = '' | |||
| Terrapin::CommandLine.path = '' | |||
There was a problem hiding this comment.
Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.
| Paperclip.options[:log_command] = false | ||
| Cocaine::CommandLine.expects(:new).with("identify", "stuff", {}).returns(stub(:run)) | ||
| Terrapin::CommandLine.expects(:new).with("identify", "stuff", {}).returns(stub(:run)) |
| Paperclip.options[:log_command] = false | ||
| Cocaine::CommandLine.expects(:new).with("convert", "stuff", {}).returns(stub(:run)) | ||
| Terrapin::CommandLine.expects(:new).with("convert", "stuff", {}).returns(stub(:run)) |
| @@ -63,7 +63,7 @@ | |||
| context "Calling Paperclip.run with a logger" do | |||
| it "passes the defined logger if :log_command is set" do | |||
| Paperclip.options[:log_command] = true | |||
| Cocaine::CommandLine.expects(:new).with("convert", "stuff", logger: Paperclip.logger).returns(stub(:run)) | |||
| Terrapin::CommandLine.expects(:new).with("convert", "stuff", logger: Paperclip.logger).returns(stub(:run)) | |||
| if logging? && (options[:log_command] || local_options[:log_command]) | ||
| local_options = local_options.merge(:logger => logger) | ||
| end | ||
| Cocaine::CommandLine.new(cmd, arguments, local_options).run(interpolation_values) | ||
| Terrapin::CommandLine.new(cmd, arguments, local_options).run(interpolation_values) |
| cocaine_path_array = Cocaine::CommandLine.path.try(:split, Cocaine::OS.path_separator) | ||
| Cocaine::CommandLine.path = [cocaine_path_array, command_path].flatten.compact.uniq | ||
| terrapin_path_array = Terrapin::CommandLine.path.try(:split, Terrapin::OS.path_separator) | ||
| Terrapin::CommandLine.path = [terrapin_path_array, command_path].flatten.compact.uniq |
| @@ -27,12 +27,12 @@ def interpolates key, &block | |||
| # | |||
| def run(cmd, arguments = "", interpolation_values = {}, local_options = {}) | |||
| command_path = options[:command_path] | |||
| cocaine_path_array = Cocaine::CommandLine.path.try(:split, Cocaine::OS.path_separator) | |||
| Cocaine::CommandLine.path = [cocaine_path_array, command_path].flatten.compact.uniq | |||
| terrapin_path_array = Terrapin::CommandLine.path.try(:split, Terrapin::OS.path_separator) | |||
| "" | ||
| rescue Cocaine::CommandNotFoundError => e | ||
| rescue Terrapin::CommandNotFoundError => e |
There was a problem hiding this comment.
Useless assignment to variable - e.
| @@ -67,7 +67,7 @@ | |||
| require 'mimemagic' | |||
| require 'mimemagic/overlay' | |||
| require 'logger' | |||
| require 'cocaine' | |||
| require 'terrapin' | |||
There was a problem hiding this comment.
Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.
|
Thanks for the PR 👍 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Cocaine has been renamed to Terrapin (ref thoughtbot/cocaine#99).
This Pull Request replaces
Cocaine::withTerrapin::.