Use Pod::UI for consistency

segiddins · segiddins · commit e617bb66b8b3 · 2015-05-16T00:21:45.000-07:00
diff --git a/lib/key_master.rb b/lib/key_master.rb
@@ -40,7 +40,7 @@ def generate_data
               @indexed_keys[key][char_index] = index
               break
             else
-              index = rand data.length
+              index = SecureRandom.random_number data.length
               unless @used_indexes.include?(index)
                 data[index] = char
 
diff --git a/lib/name_whisperer.rb b/lib/name_whisperer.rb
@@ -25,12 +25,12 @@ def self.search_folders_for_xcodeproj
         Pathname(xcodeprojects.first).basename
       else
         error_message = (xcodeprojects.length > 1) ? 'found too many' : "couldn't find any"
-        puts 'CocoaPods-Keys ' + error_message + ' Xcode projects. Please give a name for this project.'
+        UI.puts 'CocoaPods-Keys ' + error_message + ' Xcode projects. Please give a name for this project.'
 
         answer = ''
         loop do
-          print ' > '
-          answer = STDIN.gets.chomp
+          UI.print ' > '
+          answer = UI.gets.strip
           break if answer.length > 0
         end
         answer
diff --git a/lib/plugin.rb b/lib/plugin.rb
@@ -42,7 +42,7 @@ def setup
         if target
           target.store_pod 'Keys', :path => keys_path.to_path
         else
-          puts "Could not find a target named '#{user_options['target']}' in your Podfile. Stopping Keys.".red
+          Pod::UI.puts "Could not find a target named '#{user_options['target']}' in your Podfile. Stopping Keys.".red
         end
 
       else
diff --git a/lib/pod/command/keys/get.rb b/lib/pod/command/keys/get.rb
@@ -31,15 +31,14 @@ def validate!
         def run
           keyring = get_current_keyring
           unless keyring
-            $stderr.puts 'Could not find a project for this folder'
-            return
+            raise Informative, 'Could not find a project for this folder'
           end
 
           if keyring.keys.include? @key_name
             data = keyring.keychain_data
-            puts data[@key_name]
+            UI.puts data[@key_name]
           else
-            $stderr.puts 'Could not find value'
+            raise Informative, 'Could not find value'
           end
         end
 
diff --git a/lib/pod/command/keys/list.rb b/lib/pod/command/keys/list.rb
@@ -28,23 +28,23 @@ def run
         end
 
         def display_current_keyring(keyring)
-          puts "Keys for #{keyring.name}"
+          UI.puts "Keys for #{keyring.name}"
           data = keyring.keychain_data
           data.each_with_index do |(key, value), index|
             prefix = (index == data.length - 1) ? ' └ ' : ' ├ '
-            puts prefix + " #{key} - #{ value}"
+            UI.puts prefix + " #{key} - #{ value}"
           end
-          puts ''
+          UI.puts ''
         end
 
         def display_keyring(keyring)
-          puts "#{keyring.name} - #{keyring.path}"
+          UI.puts "#{keyring.name} - #{keyring.path}"
           if keyring.keys.length == 1
-            puts ' └ ' + keyring.keys[0]
+            UI.puts ' └ ' + keyring.keys[0]
           else
-            puts ' └ ' + keyring.keys[0...-1].join(' ') + ' & ' + keyring.keys[-1]
+            UI.puts ' └ ' + keyring.keys[0...-1].join(' ') + ' & ' + keyring.keys[-1]
           end
-          puts ''
+          UI.puts ''
         end
       end
     end
diff --git a/lib/pod/command/keys/rm.rb b/lib/pod/command/keys/rm.rb
@@ -32,8 +32,7 @@ def validate!
         def run
           keyring = get_current_keyring
           unless keyring
-            $stderr.puts 'Could not find a project to remove the key from.'
-            return
+            raise Informative, 'Could not find a project to remove the key from.'
           end
 
           if keyring.keys.include? @key_name
@@ -46,14 +45,14 @@ def run
             delete_generic = `security delete-generic-password -a #{@key_name.shellescape} -l #{login.shellescape} 2>&1`
 
             if delete_generic.include? 'security: SecKeychainSearchCopyNext: The specified item could not be found in the keychain.'
-              $stderr.puts "Removed value for #{@key_name}, but could not delete from Keychain."
+              raise Informative, "Removed value for #{@key_name}, but could not delete from Keychain."
             elsif delete_generic.include? 'password has been deleted.'
-              $stderr.puts "Removed value for #{@key_name}, and deleted associated key in Keychain."
+              raise Informative, "Removed value for #{@key_name}, and deleted associated key in Keychain."
             else
-              $stderr.puts "Removed value for #{@key_name}."
+              raise Informative, "Removed value for #{@key_name}."
             end
           else
-            $stderr.puts "Could not find key named #{@key_name}."
+            raise Informative, "Could not find key named #{@key_name}."
           end
         end
 
diff --git a/lib/pod/command/keys/set.rb b/lib/pod/command/keys/set.rb
@@ -44,7 +44,7 @@ def run
 
           keyring.save @key_name, @key_value
 
-          puts "Saved #{@key_name} to #{keyring.name}." unless config.silent?
+          UI.puts "Saved #{@key_name} to #{keyring.name}." unless config.silent?
         end
 
         def current_keyring
diff --git a/lib/preinstaller.rb b/lib/preinstaller.rb
@@ -8,6 +8,9 @@ def setup
       require 'key_master'
       require 'keyring_liberator'
       require 'pod/command/keys/set'
+      require 'cocoapods/user_interface'
+
+      ui = Pod::UserInterface
 
       options = @user_options || {}
       current_dir = Pathname.pwd
@@ -23,19 +26,19 @@ def setup
         unless data.keys.include? key
 
           unless has_shown_intro
-            puts "\n CocoaPods-Keys has detected a keys mismatch for your setup."
+            ui.puts "\n CocoaPods-Keys has detected a keys mismatch for your setup."
             has_shown_intro = true
           end
 
-          puts ' What is the key for ' + key.green
+          ui.puts ' What is the key for ' + key.green
           answer = ''
           loop do
-            print ' > '
-            answer = STDIN.gets.chomp
+            ui.print ' > '
+            answer = ui.gets.strip
             break if answer.length > 0
           end
 
-          puts ''
+          ui.puts ''
           args = CLAide::ARGV.new([key, answer, keyring.name])
           setter = Pod::Command::Keys::Set.new(args)
           setter.run
