]> cat aescling's git repositories - mastodon.git/commitdiff
Use casecmp() instead of casecmp?() for now (#4832)
authorJoseph Mingrone <Jehops@users.noreply.github.com>
Thu, 7 Sep 2017 01:55:06 +0000 (22:55 -0300)
committerEugen Rochko <eugen@zeonfederated.com>
Thu, 7 Sep 2017 01:55:06 +0000 (03:55 +0200)
* Use casecmp() instead of casecmp?() for now

casecmp?() is only available in ruby 2.4.0.  Users running earlier ruby versions
would see errors, e.g., running
RAILS_ENV=production rails mastodon:maintenance:remove_deprecated_preview_cards.

* Correctly check whether casecmp() returns 0

lib/tasks/mastodon.rake

index 307bc240db64d52cddaebcd67a0cd1fff9900406..3c65ece4bea2d34277d5f67f23a0174b9c75a305 100644 (file)
@@ -47,7 +47,7 @@ namespace :mastodon do
     confirm = STDIN.gets.chomp
     puts
 
-    if confirm.casecmp?('y')
+    if confirm.casecmp('y').zero?
       password = SecureRandom.hex
       user = User.new(email: email, password: password, account_attributes: { username: username })
       if user.save
@@ -289,13 +289,13 @@ namespace :mastodon do
       puts 'Delete records and associated files from deprecated preview cards? [y/N]: '
       confirm = STDIN.gets.chomp
 
-      if confirm.casecmp?('y')
+      if confirm.casecmp('y').zero?
         DeprecatedPreviewCard.in_batches.destroy_all
 
         puts 'Drop deprecated preview cards table? [y/N]: '
         confirm = STDIN.gets.chomp
 
-        if confirm.casecmp?('y')
+        if confirm.casecmp('y').zero?
           ActiveRecord::Migration.drop_table :deprecated_preview_cards
         end
       end