Merge pull request #678 from travis-ci/sf-fix-file-encryption-var-names

Make sure encrypted file env variable names are unique per filename

Author: svenfuchs

.travis.yml

@@ -6,8 +6,10 @@ os:
 
 rvm:
   - jruby
-  - 1.9.2
   - 1.9.3
+  - 2.2.7
+  - 2.3.8
+  - 2.4.5
   - 2.5.5
   - 2.6.3
 

lib/travis/cli/encrypt_file.rb

@@ -37,7 +37,7 @@ def run(input_path, output_path = nil)
 
           error "requires --decrypt-to option when reading from stdin" unless decrypt_to?
 
-          set_env_vars
+          set_env_vars(input_path)
 
           command = decrypt_command(output_path)
           stage ? store_command(command) : print_command(command)
@@ -70,14 +70,14 @@ def decrypt_command(path)
         "openssl aes-256-cbc -K $#{env_name(:key)} -iv $#{env_name(:iv)} -in #{escape_path(path)} -out #{escape_path(decrypt_to)} -d"
       end
 
-      def set_env_vars
+      def set_env_vars(input_path)
         say "storing secure env variables for decryption"
-        repository.env_vars.upsert env_name(:key), key, :public => false
-        repository.env_vars.upsert env_name(:iv),  iv,  :public => false
+        repository.env_vars.upsert env_name(input_path, :key), key, :public => false
+        repository.env_vars.upsert env_name(input_path, :iv),  iv,  :public => false
       end
 
-      def env_name(name)
-        @env_prefix ||= "encrypted_#{Digest.hexencode(Digest::SHA1.digest(Dir.pwd)[0..5])}"
+      def env_name(input_path, name)
+        @env_prefix ||= "encrypted_#{Digest.hexencode(Digest::SHA1.digest(input_path)[0..5])}"
         "#{@env_prefix}_#{name}"
       end
 

spec/cli/init_spec.rb

@@ -21,10 +21,10 @@
 
   shared_examples_for 'travis init' do |language|
     example "travis init #{language} (empty directory)" do
-      File.exist?('.travis.yml').should be_false
+      File.exist?('.travis.yml').should be false
       run_cli('init', language, '--skip-enable', '-r', 'travis-ci/travis.rb').should be_success
       stdout.should be == ".travis.yml file created!\n"
-      File.exist?('.travis.yml').should be_true
+      File.exist?('.travis.yml').should be true
       File.read('.travis.yml').should include("language: #{language}")
     end
 

spec/client/user_spec.rb

@@ -8,7 +8,7 @@
   its(:email) { should be == '[email protected]' }
   its(:gravatar_id) { should be == '5c2b452f6eea4a6d84c105ebd971d2a4' }
   its(:locale) { should be == 'en' }
-  its(:is_syncing) { should be_false }
+  its(:is_syncing) { should be false }
   its(:synced_at) { should be_a(Time) }
 
   it { should_not be_syncing }

spec/spec_helper.rb

@@ -6,6 +6,7 @@
 require 'travis'
 require 'highline'
 require 'tmpdir'
+require 'rspec/its'
 
 temp_dir = nil
 

travis.gemspec

@@ -359,6 +359,7 @@ Gem::Specification.new do |s|
   s.add_dependency "json",                  "~> 1.8" if RUBY_VERSION < "2.0"
   s.add_dependency "pusher-client",         "~> 0.4"
   s.add_development_dependency "rspec",     "~> 2.12"
+  s.add_development_dependency "rspec-its"
   s.add_development_dependency "sinatra",   "~> 1.3"
   s.add_development_dependency "rack-test", "~> 0.6"