encrypt.rb in travis-1.1.0

- old
+ new

@@ -9,29 +9,42 @@
 
       on('--add [KEY]', 'adds it to .travis.yml under KEY (default: env.global)') do |c, value|
         c.config_key = value || 'env.global'
       end
 
+      on('-s', '--[no-]split', 'treat each line as a separate input')
+
       def run(*args)
+        if args.first =~ %r{\w+/\w+}
+          warn "WARNING: The name of the repository is now passed to the command with the -r option:"
+          warn "    #{command("encrypt [...] -r #{args.first}")}"
+          warn "  If you tried to pass the name of the repository as the first argument, you"
+          warn "  probably won't get the results you wanted.\n"
+        end
+
         data = args.join(" ")
 
         if data.empty?
           say color("Reading from stdin, press Ctrl+D when done", :info) if $stdin.tty?
           data = $stdin.read
         end
 
-        encrypted = repository.encrypt(data)
+        data = split? ? data.split("\n") : [data]
+        encrypted = data.map { |data| repository.encrypt(data) }
 
         if config_key
           travis_config = YAML.load_file(travis_yaml)
           keys          = config_key.split('.')
           last_key      = keys.pop
           nested_config = keys.inject(travis_config) { |c,k| c[k] ||= {}}
-          nested_config[last_key] ||= [] << { 'secret' => encrypted }
+          encrypted.each do |encrypted|
+            nested_config[last_key] ||= [] << { 'secure' => encrypted }
+          end
           File.write(travis_yaml, travis_config.to_yaml)
         else
-          say encrypted.inspect, template(__FILE__)
+          list = encrypted.map { |data| format(data.inspect, "  secure: %s") }
+          say(list.join("\n"), template(__FILE__), :none)
         end
       end
 
       private
 
@@ -49,9 +62,9 @@
 end
 
 __END__
 Please add the following to your <[[ color('.travis.yml', :info) ]]> file:
 
-  secure: %s
+%s
 
 Pro Tip<[[ "™" unless Travis::CLI.windows? ]]>: You can add it automatically by running with <[[ color('--add', :info) ]]>.
 