Favor a normal conditional over a modifier clause in a multiline statement

Author: sferik

lib/t/cli.rb

@@ -796,18 +796,20 @@ def trends(woe_id = 1)
     method_option 'unsorted', aliases: '-u', type: :boolean, desc: 'Output is not sorted.'
     def trend_locations
       places = client.trend_locations
-      places = case options['sort']
-      when 'country'
-        places.sort_by { |place| place.country.downcase }
-      when 'parent'
-        places.sort_by { |place| place.parent_id.to_i }
-      when 'type'
-        places.sort_by { |place| place.place_type.downcase }
-      when 'woeid'
-        places.sort_by { |place| place.woeid.to_i }
-      else
-        places.sort_by { |place| place.name.downcase }
-      end unless options['unsorted']
+      unless options['unsorted']
+        places = case options['sort']
+        when 'country'
+          places.sort_by { |place| place.country.downcase }
+        when 'parent'
+          places.sort_by { |place| place.parent_id.to_i }
+        when 'type'
+          places.sort_by { |place| place.place_type.downcase }
+        when 'woeid'
+          places.sort_by { |place| place.woeid.to_i }
+        else
+          places.sort_by { |place| place.name.downcase }
+        end
+      end
       places.reverse! if options['reverse']
       if options['csv']
         require 'csv'

lib/t/printable.rb

@@ -53,18 +53,20 @@ def print_csv_user(user)
     end
 
     def print_lists(lists)
-      lists = case options['sort']
-      when 'members'
-        lists.sort_by(&:member_count)
-      when 'mode'
-        lists.sort_by(&:mode)
-      when 'since'
-        lists.sort_by(&:created_at)
-      when 'subscribers'
-        lists.sort_by(&:subscriber_count)
-      else
-        lists.sort_by { |list| list.slug.downcase }
-      end unless options['unsorted']
+      unless options['unsorted']
+        lists = case options['sort']
+        when 'members'
+          lists.sort_by(&:member_count)
+        when 'mode'
+          lists.sort_by(&:mode)
+        when 'since'
+          lists.sort_by(&:created_at)
+        when 'subscribers'
+          lists.sort_by(&:subscriber_count)
+        else
+          lists.sort_by { |list| list.slug.downcase }
+        end
+      end
       lists.reverse! if options['reverse']
       if options['csv']
         require 'csv'
@@ -181,24 +183,26 @@ def print_tweets(tweets)
     end
 
     def print_users(users) # rubocop:disable CyclomaticComplexity
-      users = case options['sort']
-      when 'favorites'
-        users.sort_by { |user| user.favorites_count.to_i }
-      when 'followers'
-        users.sort_by { |user| user.followers_count.to_i }
-      when 'friends'
-        users.sort_by { |user| user.friends_count.to_i }
-      when 'listed'
-        users.sort_by { |user| user.listed_count.to_i }
-      when 'since'
-        users.sort_by(&:created_at)
-      when 'tweets'
-        users.sort_by { |user| user.statuses_count.to_i }
-      when 'tweeted'
-        users.sort_by { |user| user.status? ? user.status.created_at : Time.at(0) } # rubocop:disable BlockNesting
-      else
-        users.sort_by { |user| user.screen_name.downcase }
-      end unless options['unsorted']
+      unless options['unsorted']
+        users = case options['sort']
+        when 'favorites'
+          users.sort_by { |user| user.favorites_count.to_i }
+        when 'followers'
+          users.sort_by { |user| user.followers_count.to_i }
+        when 'friends'
+          users.sort_by { |user| user.friends_count.to_i }
+        when 'listed'
+          users.sort_by { |user| user.listed_count.to_i }
+        when 'since'
+          users.sort_by(&:created_at)
+        when 'tweets'
+          users.sort_by { |user| user.statuses_count.to_i }
+        when 'tweeted'
+          users.sort_by { |user| user.status? ? user.status.created_at : Time.at(0) } # rubocop:disable BlockNesting
+        else
+          users.sort_by { |user| user.screen_name.downcase }
+        end
+      end
       users.reverse! if options['reverse']
       if options['csv']
         require 'csv'

tasks/bash.rake

@@ -56,8 +56,10 @@ module BashCompletion
 
         opts_args = cmd.options.collect do |_, opt|
           cases = opt.enum
-          %[#{option_str(opt).tr(' ', '|')})
-             completions='#{cases.join(' ')}' ;;] if cases
+          if cases
+            %[#{option_str(opt).tr(' ', '|')})
+               completions='#{cases.join(' ')}' ;;]
+          end
         end.compact
 
         if subcmds.empty?