travis_bundle_cache 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9823ea826bf7435fac84b37130e2bf5a2f4d918e
-  data.tar.gz: 0d3d8c0ac9d1993a046ae5121da984de30f1659a
+  metadata.gz: 374d7e23fb21ddfe9099926e721ad8d3ed3f0f5f
+  data.tar.gz: 5b809278f019f2b62efac0907f51582aca08477c
 SHA512:
-  metadata.gz: 9664aad420c15f9175d93ea2807881bb14b333dc64154dda8ad49cf6b6258bbbb5f98179ad7557fb9e468ad91bc9aa614e83e71d72da13954575d05a6da5a1bb
-  data.tar.gz: 49539468671d40cc88ea6fa8b838614abfd73abd2c1dd5a332ea6b2dfe768a0d82f4d5601115f47e2ecd6f3fc46c91152d4221c037732875c24774cbdc04c034
+  metadata.gz: 7ebb827324e9a4ed1dbad4ec5f8559e7e91f4b62300dc99b8dd45d91d113699f1e494ae9605951e7e0b0a11a2948ad58abaf23cb2d387b78bd06c35d6a70748f
+  data.tar.gz: 21de6b95f8e58c952a6d2d700e9ed9e46f2ff6cd84c177b9418edad7468cc9188da616a191aca7426295a062784b4167683c225a1b9f7e7bfbdd871c3fb157fe

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-���EL�ّC@-�$�|�=�����L��@0�Z E�Œ_I!�#�C��ub�'"խ��փC�*��T�(��q�vӢ�䓖�9A�)���1a�Z����o�����#�uy�sQ��eR{4�B810u��Z��ds9g|S����~؉/9��Pf���l
+5|�o$��k9��$\�X�;I�{+�Ϙ#!���u�h��)X�_Etڹ	��R�ؔ,M7�G��&�`R�_5�̮�B�rk��jt��.�I�%b�q�*�)�t�a$�'�ѳv!��5r�|�3�B0��$�	;�&��
+�G��P��Ye���e�k�r��-�j��Ͻfs�D�����8AvBCF�u�O���(��������hĚ5���UhьK��vek��ih��d�g�`#�Eo
���Yw17J��=u�

data/lib/travis_bundle_cache/cache.rb

@@ -6,7 +6,7 @@ module TravisBundleCache
     def initialize
       @architecture        = `uname -m`.strip
       @bundle_archive      = ENV['BUNDLE_ARCHIVE'] || ENV['TRAVIS_REPO_SLUG'].gsub(/\//, '-')
-      @file_name           = "#{@bundle_archive}-#{@architecture}.tgz"
+      @file_name           = "#{@bundle_archive}-#{@architecture}-#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}.tgz"
       @file_path           = File.expand_path("~/#{@file_name}")
       @lock_file           = File.join(File.expand_path(ENV["TRAVIS_BUILD_DIR"]), "Gemfile.lock")
       @digest_filename     = "#{@file_name}.sha2"

data/lib/travis_bundle_cache/version.rb

@@ -1,3 +1,3 @@
 module TravisBundleCache
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/travis_bundle_cache_spec.rb

@@ -9,6 +9,7 @@ describe TravisBundleCache::Cache do
     ENV["AWS_S3_BUCKET"]       = "a-bucket-name"
 
     @uname = `uname -m`.strip
+    @ruby_version = "#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}"
     @cache = TravisBundleCache::Cache.new
   end
 
@@ -18,13 +19,13 @@ describe TravisBundleCache::Cache do
     end
 
     it 'tries to download an available bundle archive' do
-      expect(@cache).to receive(:run_command).once.with(/\Acd ~ && wget -O "remote_owner-repo-#{@uname}\.tgz" "https:\/\/a-bucket-name\.s3\.amazonaws\.com\/owner-repo-#{@uname}.tgz\?AWSAccessKeyId=AN_ACCESS_KEY_ID&Expires=[0-9]+&Signature=[^"]+" && tar -xf "remote_owner-repo-#{@uname}\.tgz"\Z/)
+      expect(@cache).to receive(:run_command).once.with(/\Acd ~ && wget -O "remote_owner-repo-#{@uname}-#{@ruby_version}\.tgz" "https:\/\/a-bucket-name\.s3\.amazonaws\.com\/owner-repo-#{@uname}-#{@ruby_version}.tgz\?AWSAccessKeyId=AN_ACCESS_KEY_ID&Expires=[0-9]+&Signature=[^"]+" && tar -xf "remote_owner-repo-#{@uname}-#{@ruby_version}\.tgz"\Z/)
 
       @cache.install
     end
 
     it 'tries to download an available bundle archive signature' do
-      expect(@cache).to receive(:run_command).once.with(/\Acd ~ && wget -O "remote_owner-repo-#{@uname}\.tgz.sha2" "https:\/\/a-bucket-name\.s3\.amazonaws\.com\/owner-repo-#{@uname}.tgz.sha2\?AWSAccessKeyId=AN_ACCESS_KEY_ID&Expires=[0-9]+&Signature=[^"]+"\Z/)
+      expect(@cache).to receive(:run_command).once.with(/\Acd ~ && wget -O "remote_owner-repo-#{@uname}-#{@ruby_version}\.tgz.sha2" "https:\/\/a-bucket-name\.s3\.amazonaws\.com\/owner-repo-#{@uname}-#{@ruby_version}.tgz.sha2\?AWSAccessKeyId=AN_ACCESS_KEY_ID&Expires=[0-9]+&Signature=[^"]+"\Z/)
 
       @cache.install
     end
@@ -57,7 +58,7 @@ describe TravisBundleCache::Cache do
 
     it 'builds a new archive if the sha has changed' do
       FileUtils.mkdir_p("~/")
-      File.open(File.expand_path("~/remote_owner-repo-#{@uname}.tgz.sha2"), 'w') {|f| f.print "old sha hash" }
+      File.open(File.expand_path("~/remote_owner-repo-#{@uname}-#{@ruby_version}.tgz.sha2"), 'w') {|f| f.print "old sha hash" }
       expect(@cache).to receive(:archive_and_upload_bundle).once.with(no_args)
 
       @cache.cache_bundle
@@ -65,7 +66,7 @@ describe TravisBundleCache::Cache do
 
     it 'does not build a new archive if the sha matches' do
       FileUtils.mkdir_p("~/")
-      File.open(File.expand_path("~/remote_owner-repo-#{@uname}.tgz.sha2"), 'w') {|f| f.print "be7b966bd555fffd27c11f2557484501ad2ed482f1b6164457433800e163ae29" }
+      File.open(File.expand_path("~/remote_owner-repo-#{@uname}-#{@ruby_version}.tgz.sha2"), 'w') {|f| f.print "be7b966bd555fffd27c11f2557484501ad2ed482f1b6164457433800e163ae29" }
       expect(@cache).to receive(:archive_and_upload_bundle).never
       expect(@cache).to receive(:puts).with("=> There were no changes, doing nothing")
 
@@ -106,20 +107,20 @@ describe TravisBundleCache::Cache do
     end
 
     it 'archives the current bundle directory' do
-      expect(@cache).to receive(:run_command).with(%{cd ~ && tar -cjf "owner-repo-#{@uname}.tgz" .bundle}, exit_on_error: true)
+      expect(@cache).to receive(:run_command).with(%{cd ~ && tar -cjf "owner-repo-#{@uname}-#{@ruby_version}.tgz" .bundle}, exit_on_error: true)
 
       @cache.archive_and_upload_bundle
     end
 
     it 'sends the correct files to S3' do
       storage = {
-        "owner-repo-#{@uname}.tgz"      => double(AWS::S3::S3Object),
-        "owner-repo-#{@uname}.tgz.sha2" => double(AWS::S3::S3Object)
+        "owner-repo-#{@uname}-#{@ruby_version}.tgz"      => double(AWS::S3::S3Object),
+        "owner-repo-#{@uname}-#{@ruby_version}.tgz.sha2" => double(AWS::S3::S3Object)
       }
       @cache.stub(:storage).and_return(storage)
 
-      expect(storage["owner-repo-#{@uname}.tgz"]).to receive(:write).with(Pathname.new(File.expand_path("~/owner-repo-#{@uname}.tgz")), reduced_redundancy: true)
-      expect(storage["owner-repo-#{@uname}.tgz.sha2"]).to receive(:write).with("be7b966bd555fffd27c11f2557484501ad2ed482f1b6164457433800e163ae29", content_type: 'text/plain', reduced_redundancy: true)
+      expect(storage["owner-repo-#{@uname}-#{@ruby_version}.tgz"]).to receive(:write).with(Pathname.new(File.expand_path("~/owner-repo-#{@uname}-#{@ruby_version}.tgz")), reduced_redundancy: true)
+      expect(storage["owner-repo-#{@uname}-#{@ruby_version}.tgz.sha2"]).to receive(:write).with("be7b966bd555fffd27c11f2557484501ad2ed482f1b6164457433800e163ae29", content_type: 'text/plain', reduced_redundancy: true)
 
       @cache.archive_and_upload_bundle
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis_bundle_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - David Genord II
@@ -30,7 +30,7 @@ cert_chain:
   FJkL4MD3SK4X13qDUlr6YzTkvc8MMfaECuzUIM6KqSGQnyZ16D2zLdZTtr0GPzJZ
   SdQ0gsTaFvafp6C7hh//UHFI92FnVtzpV01oGPDikn3a2qc8eUPvULa2NlJRFQ==
   -----END CERTIFICATE-----
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler