lib/git/multi/settings.rb in git-multi-1.2.1 vs lib/git/multi/settings.rb in git-multi-2.0.0

@@ -9,17 +9,11 @@
       module_function
 
       def setting_status(messages, valid = false, optional = true)
         fields = messages.compact.join(' - ')
         icon = valid ? TICK : optional ? ARROW : CROSS
-        if interactive?
-          print "   #{fields}"
-          sleep 0.66
-          puts "\x0d#{icon}"
-        else
-          puts "#{icon}  #{fields}"
-        end
+        puts "#{icon}  #{fields}"
       end
 
       def file_status(file, message = 'File')
         setting_status(
           [
@@ -44,11 +38,11 @@
         directory_status(
           [
             message,
             File.join(abbreviate(workarea, :workarea), owner),
           ],
-          workarea
+          File.join(workarea, owner)
         )
 
         github_count = Git::Multi.repositories_for(owner).count
         cloned_count = Git::Multi.cloned_repositories_for(owner).count
         missing_count = (github_count - cloned_count)
@@ -79,14 +73,14 @@
         setting_status(['Token', 'valid?'], !token.nil? && !token.empty? && Git::Hub.login, !Git::Hub.connected?)
         setting_status(['Token', "owned by #{Git::Multi::USER}?"], Git::Hub.login == Git::Multi::USER, !Git::Hub.connected?)
       end
 
       def home_status(home)
-        directory_status(['Home', home], home)
+        directory_status(['${HOME}', home], home)
       end
 
       def main_workarea_status(workarea)
-        directory_status(['Workarea (main)', abbreviate(workarea, :home)], workarea)
+        directory_status(['${WORKAREA}', abbreviate(workarea, :home)], workarea)
       end
 
       def user_workarea_status(users)
         users.each do |user|
           workarea_status("Workarea (user: #{user})", Git::Multi::WORKAREA, user)