travis 1.8.12.travis.1125.9 → 1.8.12.travis.1135.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46da2f47073efe7f97baa622a6f49f1cf18ae1c325e5433cedd23bc91a0dbd0f
-  data.tar.gz: e1cc53b23012e2cf3a25b0800bab224a6e18590f814aa079a2868429c7fef5ad
+  metadata.gz: 98ff67975fb9af7a0957bebd3ee9733f885cd0242d369e4ff64c3583704dc565
+  data.tar.gz: e1cce3560b3909aa43f0d39c8aa3dc4508748b745c5eefae2b518c4ec70d5e4a
 SHA512:
-  metadata.gz: 3080b3e12226a25c2accffd27f7cad781a3a2389c4eb9ba3d743c20445ce4656d6cfc89e77c639c348f548b040fb304534cee3b374d064e5517e06ccb74ae058
-  data.tar.gz: 27775514be80ff713dc056468853923aaf98d23edc53d8d82b10c5912f72595c77715cff82df6f02823bd6da390fa82c963f4bb4e684db88fe9227442b5f3708
+  metadata.gz: 35d92350223b69aa6bd9bdcbe49a3e8401f70607bb20e215a80349f8ebcd488a35371d8759fd4e5161df09abececbf67a1bdc246d0dcaec254af9f7a80219268
+  data.tar.gz: 24c09e191559256014c7ec83e4739e8638acf1ee721dcd7f2ec353c7f4b0641f9ebb2df387f4573c9d1a01d66f50a2875e972a6f5f497e98423560b798c15705

data/README.md

@@ -705,16 +705,23 @@ If you don't want the sync to be triggered, use `--skip-sync`.
 
 #### `encrypt`
 
-    Usage: travis encrypt [args..] [options]
+    Encrypts values for the .travis.yml.
+    Usage: travis encrypt [ARGS..] [OPTIONS]
         -h, --help                       Display help
         -i, --[no-]interactive           be interactive and colorful
         -E, --[no-]explode               don't rescue exceptions
             --skip-version-check         don't check if travis client is up to date
+            --skip-completion-check      don't check if auto-completion is set up
         -e, --api-endpoint URL           Travis API server to talk to
+        -I, --[no-]insecure              do not verify SSL certificate of API endpoint
+            --pro                        short-cut for --api-endpoint 'https://api.travis-ci.com/'
             --com                        short-cut for --api-endpoint 'https://api.travis-ci.com/'
             --org                        short-cut for --api-endpoint 'https://api.travis-ci.org/'
+            --staging                    talks to staging system
         -t, --token [ACCESS_TOKEN]       access token to use
             --debug                      show API requests
+            --debug-http                 show HTTP(S) exchange
+        -X, --enterprise [NAME]          use enterprise setup (optionally takes name for multiple setups)
             --adapter ADAPTER            Faraday adapter to use for HTTP requests
         -r, --repo SLUG                  repository to use (will try to detect from current git clone)
         -R, --store-repo SLUG            like --repo, but remembers value for current directory
@@ -780,11 +787,15 @@ There are two ways the client can treat existing values:
             --skip-completion-check      don't check if auto-completion is set up
         -e, --api-endpoint URL           Travis API server to talk to
         -I, --[no-]insecure              do not verify SSL certificate of API endpoint
+            --pro                        short-cut for --api-endpoint 'https://api.travis-ci.com/'
             --com                        short-cut for --api-endpoint 'https://api.travis-ci.com/'
             --org                        short-cut for --api-endpoint 'https://api.travis-ci.org/'
+            --staging                    talks to staging system
         -t, --token [ACCESS_TOKEN]       access token to use
             --debug                      show API requests
+            --debug-http                 show HTTP(S) exchange
         -X, --enterprise [NAME]          use enterprise setup (optionally takes name for multiple setups)
+            --adapter ADAPTER            Faraday adapter to use for HTTP requests
         -r, --repo SLUG                  repository to use (will try to detect from current git clone)
         -R, --store-repo SLUG            like --repo, but remembers value for current directory
         -K, --key KEY                    encryption key to be used (randomly generated otherwise)

data/lib/travis/cli/encrypt.rb

@@ -16,6 +16,7 @@ module Travis
       on('-x', '--override',   "override existing value")
 
       def run(*args)
+        confirm = force_interactive.nil? || force_interactive
         error "cannot combine --override and --append"   if append?   and override?
         error "--append without --add makes no sense"    if append?   and not add?
         error "--override without --add makes no sense"  if override? and not add?
@@ -41,7 +42,7 @@ module Travis
 
         if config_key
           set_config encrypted.map { |e| { 'secure' => e } }
-          save_travis_config
+          confirm_and_save_travis_config confirm
         else
           list = encrypted.map { |data| format(data.inspect, "  secure: %s") }
           say(list.join("\n"), template(__FILE__), :none)

data/lib/travis/cli/encrypt_file.rb

@@ -23,6 +23,8 @@ module Travis
       end
 
       def run(input_path, output_path = nil)
+        confirm = force_interactive.nil? || force_interactive
+
         self.decrypt_to ||= decrypt_to_for(input_path)
         output_path     ||= File.basename(output_path_for(input_path))
         self.output       = $stdout.tty? ? StringIO.new : $stderr if output_path == '-'
@@ -40,7 +42,7 @@ module Travis
           set_env_vars(input_path)
 
           command = decrypt_command(output_path)
-          stage ? store_command(command) : print_command(command)
+          stage ? store_command(command, confirm) : print_command(command)
 
           notes(input_path, output_path)
         end
@@ -59,11 +61,11 @@ module Travis
         say command, template(__FILE__)
       end
 
-      def store_command(command)
+      def store_command(command, confirm)
         travis_config[stage] = Array(travis_config[stage])
         travis_config[stage].delete(command)
         travis_config[stage].unshift(command)
-        save_travis_config
+        confirm_and_save_travis_config confirm
       end
 
       def decrypt_command(path)

data/lib/travis/cli/repo_command.rb

@@ -143,6 +143,21 @@ module Travis
           end
         end
 
+        def confirm_and_save_travis_config(confirm = true, file = travis_yaml)
+          if confirm
+            ans = ask [
+              nil,
+              color("Overwrite the config file #{travis_yaml} with the content below?", [:info, :yellow]),
+              color("This reformats the existing file.", [:info, :red]),
+              travis_config.to_yaml,
+              color("(y/N)", [:info, :yellow])
+            ].join("\n\n")
+            confirm = ans =~ /^y/i
+          end
+
+          save_travis_config if confirm
+        end
+
         def save_travis_config(file = travis_yaml)
           yaml = travis_config.to_yaml
           yaml.gsub! /^(\s+)('on'|true):/, "\\1on:"

data/spec/cli/encrypt_file_spec.rb

@@ -17,4 +17,10 @@ describe Travis::CLI::EncryptFile do
     run_cli('encrypt-file', CMD_TARGET).should be_success
     File.exists?("#{CMD_TARGET}.enc").should be true
   end
+
+  example "travis encrypt-file #{CMD_TARGET} -a" do
+    run_cli('encrypt-file', CMD_TARGET, '-a') { |i| i.puts "n" }.should be_success
+    stdout.should match /Overwrite the config file/
+    File.exists?("#{CMD_TARGET}.enc").should be true
+  end
 end

data/spec/cli/encrypt_spec.rb

@@ -43,7 +43,25 @@ describe Travis::CLI::Encrypt do
 
   example "travis encrypt FOO bar -a" do
     described_class.any_instance.stub(:save_travis_config)
-    run_cli("encrypt", "FOO", "bar", "-a").should be_success
+    run_cli("encrypt", "FOO", "bar", "-a") { |i| i.puts "foo" }.should be_success
     stderr.should match(/Environment variables in env\.global should be formatted as FOO=bar/)
   end
+
+  example "travis encrypt FOO bar -a foo" do
+    described_class.any_instance.stub(:save_travis_config)
+    run_cli("encrypt", "FOO", "bar", "-a", "foo") { |i| i.puts "foo" }.should be_success
+    stdout.should match(/Overwrite the config file/)
+  end
+
+  example "travis encrypt FOO bar -a --no-interactive" do
+    described_class.any_instance.stub(:save_travis_config)
+    run_cli("encrypt", "FOO", "bar", "-a", "--no-interactive").should be_success
+    stderr.should match(/Environment variables in env\.global should be formatted as FOO=bar/)
+  end
+
+  example "travis encrypt FOO bar -a foo --no-interactive" do
+    described_class.any_instance.stub(:save_travis_config)
+    run_cli("encrypt", "FOO", "bar", "-a", "foo", "--no-interactive").should be_success
+    stdout.should be_empty
+  end
 end

data/travis.gemspec

@@ -36,14 +36,12 @@ Gem::Specification.new do |s|
     "Joep van Delft",
     "Stefan Nordhausen",
     "Tobias Bieniek",
-    "Basarat Ali Syed",
     "Dominic Jodoin",
     "Harald Nordgren",
     "HaraldNordgren",
     "Igor",
     "Jacob Atzen",
     "James Nylen",
-    "Joe Rafaniello",
     "Jonas Chromik",
     "Matteo Sumberaz",
     "Michael S. Fischer",
@@ -80,14 +78,12 @@ Gem::Specification.new do |s|
     "igor@travis-ci.org",
     "stefan.nordhausen@immobilienscout24.de",
     "tobias.bieniek@gmail.com",
-    "basaratali@gmail.com",
     "dominic@travis-ci.com",
     "haraldnordgren@gmail.com",
     "haraldnordgren@gmail.com",
     "igorwwwwwwwwwwwwwwwwwwww@users.noreply.github.com",
     "jatzen@gmail.com",
     "jnylen@gmail.com",
-    "jrafanie@users.noreply.github.com",
     "joep@travis-ci.org",
     "joepvd@users.noreply.github.com",
     "Jonas.Chromik@student.hpi.uni-potsdam.de",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.8.12.travis.1125.9
+  version: 1.8.12.travis.1135.9
 platform: ruby
 authors:
 - Hiro Asari
@@ -29,14 +29,12 @@ authors:
 - Joep van Delft
 - Stefan Nordhausen
 - Tobias Bieniek
-- Basarat Ali Syed
 - Dominic Jodoin
 - Harald Nordgren
 - HaraldNordgren
 - Igor
 - Jacob Atzen
 - James Nylen
-- Joe Rafaniello
 - Jonas Chromik
 - Matteo Sumberaz
 - Michael S. Fischer
@@ -47,7 +45,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -256,14 +254,12 @@ email:
 - igor@travis-ci.org
 - stefan.nordhausen@immobilienscout24.de
 - tobias.bieniek@gmail.com
-- basaratali@gmail.com
 - dominic@travis-ci.com
 - haraldnordgren@gmail.com
 - haraldnordgren@gmail.com
 - igorwwwwwwwwwwwwwwwwwwww@users.noreply.github.com
 - jatzen@gmail.com
 - jnylen@gmail.com
-- jrafanie@users.noreply.github.com
 - joep@travis-ci.org
 - joepvd@users.noreply.github.com
 - Jonas.Chromik@student.hpi.uni-potsdam.de