GemSpec: Fix Ruby < 2 support (fixes #1)

zuazo · Apr 2, 2015 · 12bfcb0 · 12bfcb0
1 parent 9f6eea4
commit 12bfcb0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/chef-encrypted-attributes.gemspec b/chef-encrypted-attributes.gemspec
@@ -34,7 +34,12 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'ffi-yajl', '~> 1.0'
   s.add_dependency 'chef', chef_version
+  # Support old deprecated Ruby versions:
   s.add_dependency 'mixlib-shellout', '< 1.6.1' if RUBY_VERSION < '1.9.3'
+  if RUBY_VERSION < '2'
+    s.add_dependency 'highline', '< 1.7'
+    s.add_dependency 'ohai', '< 8'
+  end
 
   s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'chef-zero', '~> 3.2'

diff --git a/spec/unit/encrypted_attribute/encrypted_mash/version1.rb b/spec/unit/encrypted_attribute/encrypted_mash/version1.rb
@@ -182,7 +182,8 @@ class EncryptedMashVersionBadCipher <
         )
     end
 
-    it 'throws an error if the hmac generation fails' do
+    it 'throws an error if the hmac generation fails',
+       unless: RUBY_VERSION < '2' do
       body = encrypted_mash_version1_class.new
       expect(OpenSSL::HMAC).to receive(:digest).and_raise(OpenSSL::HMACError)
       expect { body.encrypt('value1', key1) }
@@ -285,7 +286,8 @@ class EncryptedMashVersionBadCipher <
         )
     end
 
-    it 'throws an error if the hmac generation for checking fails' do
+    it 'throws an error if the hmac generation for checking fails',
+       unless: RUBY_VERSION < '2' do
       body = encrypted_mash_version1_class.new
       body.encrypt('value1', key1.public_key)
       expect(OpenSSL::HMAC).to receive(:digest).and_raise(OpenSSL::HMACError)