travis 1.8.14.travis.1195.9 → 1.8.14.travis.1197.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 771452c7b510fbfae503ade3f4ec52605b453cc7818aab23113db62ac9d89b1b
-  data.tar.gz: 34e50020d48749958a1b216832d860572c961db49c61bc568c46cd241d238237
+  metadata.gz: f7838b20273870db6e467f340dfb931bf04e9049efa6fe212b648c4d220edf4e
+  data.tar.gz: 7a6fafbd1a95c9155742286ff786d1ac0752d7571462e536069a9b3770ae40a4
 SHA512:
-  metadata.gz: 9c4fff3659c7dd5c942a2caef77ffdc7148337c4e9e54b73578891ae63baab1214258a515824904651c1067b0a9e94215a06d07265cc4866abb356f451f3de11
-  data.tar.gz: 62a2a0e6b897729e2ebe5d205f2afd8fbfbf99aaaeadfda283479afb14464211fbc2bdc1465e7dab052dfdf3dc706786340de3943e1ebb427a826e5380eea124
+  metadata.gz: 30a66f17a080b4c94cec4ae5f221bc3c707e90a5d3f9c877de16a3ff7c4eae6177a778da4afafd271d73c4a19728051de88e39ad90bf246a362b20c00908cd51
+  data.tar.gz: 8f013a79cd23ed3658ef4130617760dbe7d5c9cfdca9c0e7d0c12b90d73ae19657adca1749e8ba89cbdd27d429adf970c2dfffcf970626786b4acfa56569c3a3

data/lib/travis/cli/setup/service.rb

@@ -63,6 +63,8 @@ module Travis
               on("#{verb.capitalize} only from #{repository.slug}? ", config, 'repo' => repository.slug)
               on("#{verb.capitalize} from #{branch} branch? ", config, 'branch' => branch) if branch != 'master' and branch != 'HEAD'
 
+              config['skip_cleanup'] = 'true' if not ( config.has_key?('skip_cleanup') or config.fetch('edge', 'false') != 'false' )
+
               encrypt(config, 'password') if config['password'] and agree("Encrypt Password? ") { |q| q.default = 'yes' }
               encrypt(config, 'api_key')  if config['api_key']  and agree("Encrypt API key? ") { |q| q.default = 'yes' }
             end

data/spec/cli/setup/service_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe Travis::CLI::Setup::Service do
+  subject :service do
+    repository = double('repository',{:slug => 'test_slug'})
+    setup = double('Setup', :repository => repository)
+    described_class.new(setup)
+  end
+  
+  describe '#deploy' do
+  
+    subject :deploy_config do
+      {'provider' => 'dummy'}
+    end
+    
+    before do
+      allow(service).to receive(:configure).and_yield(deploy_config)
+      allow(service).to receive(:on).and_return(nil)
+    end
+  
+    context 'with no existing deploy section' do
+    
+      it 'creates section contents without optional items' do
+        service.send(:deploy, 'dummy') { |_| }
+        expect(deploy_config).to include(
+            'provider'      => 'dummy',
+            'skip_cleanup'   => 'true'
+        )
+      end
+    end
+    
+    context 'with existing deploy section' do
+      it 'doesn\'t overwrite existing skip_cleanup' do
+        deploy_config['skip_cleanup']='false'
+        service.send(:deploy, 'dummy') { |_| }
+        expect(deploy_config).to include('skip_cleanup'   => 'false')
+      end
+
+      it 'doesn\'t set skip_cleanup for v2' do
+        deploy_config['edge']='true'
+        service.send(:deploy, 'dummy') { |_| }
+        expect(deploy_config).not_to include('skip_cleanup')
+      end
+      
+      it 'sets skip_cleanup for explicit v1' do
+        deploy_config['edge']='false'
+        service.send(:deploy, 'dummy') { |_| }
+        expect(deploy_config).to include('skip_cleanup'   => 'true')
+      end
+    end
+    
+  end
+end

data/spec/client/auto_login_spec.rb

@@ -9,7 +9,7 @@ describe Travis::Client::AutoLogin do
   context "authenticate" do
     context "when user has a token in cli config" do
       it "does not call Tools::Github#with_token" do
-        expect(Travis::Tools::Github.any_instance).to_not receive(:with_token)
+        expect_any_instance_of(Travis::Tools::Github).to_not receive(:with_token)
         auto_login_with_token.authenticate
       end
     end

data/travis.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     "Eugene",
     "Eugene Shubin",
     "Igor Wiedler",
+    "Ivan Pozdeev",
     "Joep van Delft",
     "Stefan Nordhausen",
     "Tobias Bieniek",
@@ -107,6 +108,7 @@ Gem::Specification.new do |s|
     "eugene@travis-ci.org",
     "51701929+eugene-travis@users.noreply.github.com",
     "igor@travis-ci.org",
+    "vano@mail.mipt.ru",
     "stefan.nordhausen@immobilienscout24.de",
     "tobias.bieniek@gmail.com",
     "j@zatigo.com",
@@ -311,6 +313,7 @@ Gem::Specification.new do |s|
     "spec/cli/open_spec.rb",
     "spec/cli/repo_command_spec.rb",
     "spec/cli/restart_spec.rb",
+    "spec/cli/setup/service_spec.rb",
     "spec/cli/setup_spec.rb",
     "spec/cli/show_spec.rb",
     "spec/cli/status_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.8.14.travis.1195.9
+  version: 1.8.14.travis.1197.9
 platform: ruby
 authors:
 - Hiro Asari
@@ -30,6 +30,7 @@ authors:
 - Eugene
 - Eugene Shubin
 - Igor Wiedler
+- Ivan Pozdeev
 - Joep van Delft
 - Stefan Nordhausen
 - Tobias Bieniek
@@ -71,7 +72,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2020-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -276,6 +277,7 @@ email:
 - eugene@travis-ci.org
 - 51701929+eugene-travis@users.noreply.github.com
 - igor@travis-ci.org
+- vano@mail.mipt.ru
 - stefan.nordhausen@immobilienscout24.de
 - tobias.bieniek@gmail.com
 - j@zatigo.com
@@ -481,6 +483,7 @@ files:
 - spec/cli/open_spec.rb
 - spec/cli/repo_command_spec.rb
 - spec/cli/restart_spec.rb
+- spec/cli/setup/service_spec.rb
 - spec/cli/setup_spec.rb
 - spec/cli/show_spec.rb
 - spec/cli/status_spec.rb