travis_bundle_cache 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae4a071831d3e9f5a65da82641068289a54d081a
-  data.tar.gz: 21aa7726e58acc03270027e9f8c29d8ba0460a39
+  metadata.gz: 9823ea826bf7435fac84b37130e2bf5a2f4d918e
+  data.tar.gz: 0d3d8c0ac9d1993a046ae5121da984de30f1659a
 SHA512:
-  metadata.gz: b5ea24f3d147d636595ca603f99437c9e18d8db395c4221f2055c50867d64bbf7b5bae3c409508eb9c36d7473d7ae8eeef6407bda0bacaa5335010d2d76e854f
-  data.tar.gz: ff9639729f79513d780d215f46e78ee20ddfad46e5465a6d5c662fbb40d00eb2443dec9075ed99aa045d81e86e84493755ed34f19c525009d4a4c7ff6116ffdd
+  metadata.gz: 9664aad420c15f9175d93ea2807881bb14b333dc64154dda8ad49cf6b6258bbbb5f98179ad7557fb9e468ad91bc9aa614e83e71d72da13954575d05a6da5a1bb
+  data.tar.gz: 49539468671d40cc88ea6fa8b838614abfd73abd2c1dd5a332ea6b2dfe768a0d82f4d5601115f47e2ecd6f3fc46c91152d4221c037732875c24774cbdc04c034

checksums.yaml.gz.sig

@@ -0,0 +1 @@
+���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

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+- 2.0.0
+- 1.9.3
+before_install:
+- "mkdir ~/.gemcert && cd ~/.gemcert && gem cert --build test@example.com && cp gem-public_cert.pem $TRAVIS_BUILD_DIR/"
+- "cd $TRAVIS_BUILD_DIR"
+install: bundle install
+script: rspec

data/Gemfile

@@ -4,3 +4,9 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
+
+group :test do
+  gem "coveralls", "~> 0.6.7", require: false
+  gem "rspec",     "~> 2.14"
+  gem "fakefs",                require: "fakefs/safe"
+end

data/README.md

@@ -1,7 +1,9 @@
 Travis Bundle Cache
 ===================
 [![Gem Version](https://badge.fury.io/rb/travis_bundle_cache.png)](http://badge.fury.io/rb/travis_bundle_cache)
+[![Build Status](https://travis-ci.org/collectiveidea/travis_bundle_cache.png?branch=master)](https://travis-ci.org/collectiveidea/travis_bundle_cache)
 [![Code Climate](https://codeclimate.com/github/collectiveidea/travis_bundle_cache.png)](https://codeclimate.com/github/collectiveidea/travis_bundle_cache)
+[![Coverage Status](https://coveralls.io/repos/collectiveidea/travis_bundle_cache/badge.png?branch=master)](https://coveralls.io/r/collectiveidea/travis_bundle_cache?branch=master)
 [![Dependency Status](https://gemnasium.com/collectiveidea/travis_bundle_cache.png)](https://gemnasium.com/collectiveidea/travis_bundle_cache)
 
 The primary purpose of this gem is to make [this](http://randomerrata.com/post/45827813818/travis-s3) easier and slightly more maintainable.
@@ -29,7 +31,13 @@ Usage
 
     before_install:
     - 'echo ''gem: --no-ri --no-rdoc'' > ~/.gemrc'
-    - gem install travis_bundle_cache
+    # Better security (If only we could get Amazon to sign their gem)
+    - wget https://raw.github.com/collectiveidea/travis_bundle_cache/4753620b8f2bcfd0c5af85ccd68888c1f593a023/gem-public_cert.pem
+    - gem cert --add gem-public_cert.pem
+    - gem install aws-sdk
+    - gem install travis_bundle_cache -P HighSecurity
+    # Low security option
+    # - gem install travis_bundle_cache
 
     install: travis_bundle_install
 

data/gem-public_cert.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDijCCAnKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQ4wDAYDVQQDDAVkYXZp
+ZDEeMBwGCgmSJomT8ixkARkWDmNvbGxlY3RpdmVpZGVhMRMwEQYKCZImiZPyLGQB
+GRYDY29tMB4XDTEzMDgwMjE0MjAwN1oXDTE0MDgwMjE0MjAwN1owRTEOMAwGA1UE
+AwwFZGF2aWQxHjAcBgoJkiaJk/IsZAEZFg5jb2xsZWN0aXZlaWRlYTETMBEGCgmS
+JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO+X
+lpzbJojxB0O/2nTxK2NdfgOd2EsnOZaezBZsGDZq0Vbnjec/tNrnsHdUM12LvP1h
+ZuIx/IrAZj4wlsyZgUsKAQs9GXQCDzmKuwo3kmYtUDv55TQJKwDhtdwliTD82FOT
+IkTUEcRZNhtb7ymzpK17p5iHaHL+4BgNs1fbciTxqI1xhh9TGyDOht++9dCjJVDV
+I5nU8VMV8gkAkxA8AlTXNf3hWQNN3tBuvY5EMaG3beN52v+YYDW8Ko4GL16M+aOA
+PShN16CdA5Jjc/hwe6gK175Ma9UTHwIoWDX2WBztM+cU0E27vxFxbe+il9mHk9wG
+BzedoP1o5yNUovdOhIsCAwEAAaOBhDCBgTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+sDAdBgNVHQ4EFgQUozKz5aO8wO2w0VHWEbPR7x0nBlQwIwYDVR0RBBwwGoEYZGF2
+aWRAY29sbGVjdGl2ZWlkZWEuY29tMCMGA1UdEgQcMBqBGGRhdmlkQGNvbGxlY3Rp
+dmVpZGVhLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEANGHG41mjDpWNsdtjMq7lp5Dw
+xgnf3D3Bz1/t2e4QimdTqniwudSE/P/HD/8HkEn9JMI39xQFyXpfWCFwS5kwsGle
+qr/LzRfLXV3B11TciP10uMYmHQ+46AJ4mL2iyvmRsIKFU45gBpU1/2zJ44GGzYU1
+cSKuuZ0obmZRTI0Vn54e2ofKnWZtylW0SYa9uQplEJK/Ttu88DL99WgwOyNdMlqg
+FJkL4MD3SK4X13qDUlr6YzTkvc8MMfaECuzUIM6KqSGQnyZ16D2zLdZTtr0GPzJZ
+SdQ0gsTaFvafp6C7hh//UHFI92FnVtzpV01oGPDikn3a2qc8eUPvULa2NlJRFQ==
+-----END CERTIFICATE-----

data/lib/travis_bundle_cache/cache.rb

@@ -16,7 +16,7 @@ module TravisBundleCache
     def install
       run_command %(cd ~ && wget -O "remote_#{@file_name}" "#{storage[@file_name].url_for(:read)}" && tar -xf "remote_#{@file_name}")
       run_command %(cd ~ && wget -O "remote_#{@file_name}.sha2" "#{storage[@digest_filename].url_for(:read)}")
-      run_command %(bundle install --without #{ENV['BUNDLE_WITHOUT'] || "development production"} --path=~/.bundle)
+      run_command %(bundle install --without #{ENV['BUNDLE_WITHOUT'] || "development production"} --path=~/.bundle), retry: true
     end
 
     def cache_bundle
@@ -48,7 +48,7 @@ module TravisBundleCache
       end
 
       puts "=> Preparing bundle archive"
-      `cd ~ && tar -cjf "#{@file_name}" .bundle`
+      run_command %(cd ~ && tar -cjf "#{@file_name}" .bundle), exit_on_error: true
 
       puts "=> Uploading the bundle"
       storage[@file_name].write(Pathname.new(@file_path), :reduced_redundancy => true)
@@ -61,12 +61,26 @@ module TravisBundleCache
 
     protected
 
-    def run_command(cmd)
+    def run_command(cmd, opts = {})
+      tries = 1
       puts "Running: #{cmd}"
-      IO.popen(cmd) do |f|
-        begin
-          print f.readchar while true
-        rescue EOFError
+      while true
+        IO.popen(cmd) do |f|
+          begin
+            print f.readchar while true
+          rescue EOFError
+          end
+        end
+
+        if $?.exitstatus == 0
+          break
+        elsif opts[:retry] && tries < 3
+          tries += 1
+          puts "Retrying attempt #{tries} of 3"
+        elsif opts[:exit_on_error] || opts[:retry]
+          exit($?.exitstatus)
+        else
+          break
         end
       end
     end

data/lib/travis_bundle_cache/version.rb

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

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+require "coveralls"
+Coveralls.wear!
+
+require "travis_bundle_cache"
+
+require "fakefs/spec_helpers"
+
+RSpec.configure do |config|
+  config.order = "random"
+  config.expect_with(:rspec) {|c| c.syntax = :expect }
+  config.include FakeFS::SpecHelpers
+end

data/spec/travis_bundle_cache_spec.rb

@@ -0,0 +1,127 @@
+require "spec_helper"
+
+describe TravisBundleCache::Cache do
+  before(:each) do
+    ENV["TRAVIS_REPO_SLUG"]    = "owner/repo"
+    ENV["TRAVIS_BUILD_DIR"]    = "/home/travis/owner/repo"
+    ENV["AWS_S3_KEY"]          = "AN_ACCESS_KEY_ID"
+    ENV["AWS_S3_SECRET"]       = "AN_SECRET_ACCESS_KEY"
+    ENV["AWS_S3_BUCKET"]       = "a-bucket-name"
+
+    @uname = `uname -m`.strip
+    @cache = TravisBundleCache::Cache.new
+  end
+
+  describe 'install' do
+    before(:each) do
+      @cache.stub(:run_command)
+    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/)
+
+      @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/)
+
+      @cache.install
+    end
+
+    it 'installs the bundle' do
+      expect(@cache).to receive(:run_command).once.with("bundle install --without development production --path=~\/.bundle", retry: true)
+
+      @cache.install
+    end
+  end
+
+  describe 'cache_bundle' do
+    before(:each) do
+      ENV['TRAVIS_PULL_REQUEST'] = 'false'
+      ENV['TRAVIS_BRANCH']       = 'master'
+
+      @cache.stub(:puts)
+      @cache.stub(:run_command)
+      AWS::S3::S3Object.any_instance.stub(:write)
+
+      FileUtils.mkdir_p(ENV["TRAVIS_BUILD_DIR"])
+      File.open(File.join(ENV["TRAVIS_BUILD_DIR"], 'Gemfile.lock'), 'w') {|f| f.puts "Some lock contents" }
+    end
+
+    it 'builds a new archive if one does not already exist' do
+      expect(@cache).to receive(:archive_and_upload_bundle).once.with(no_args)
+
+      @cache.cache_bundle
+    end
+
+    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" }
+      expect(@cache).to receive(:archive_and_upload_bundle).once.with(no_args)
+
+      @cache.cache_bundle
+    end
+
+    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" }
+      expect(@cache).to receive(:archive_and_upload_bundle).never
+      expect(@cache).to receive(:puts).with("=> There were no changes, doing nothing")
+
+      @cache.cache_bundle
+    end
+
+    it 'does not build a new archive for pull requests' do
+      ENV['TRAVIS_PULL_REQUEST'] = '1'
+      expect(@cache).to receive(:archive_and_upload_bundle).never
+      expect(@cache).to receive(:puts).with("=> This is a pull request, doing nothing")
+
+      @cache.cache_bundle
+    end
+
+    it 'does not build a new archive for a non master brnach' do
+      ENV['TRAVIS_BRANCH'] = 'not-master'
+      expect(@cache).to receive(:archive_and_upload_bundle).never
+      expect(@cache).to receive(:puts).with("=> This is not the master branch, doing nothing")
+
+      @cache.cache_bundle
+    end
+  end
+
+  describe 'archive_and_upload_bundle' do
+    before(:each) do
+      @cache.stub(:puts)
+      @cache.stub(:run_command)
+      AWS::S3::S3Object.any_instance.stub(:write)
+
+      @cache.instance_variable_set(:@bundle_digest, 'be7b966bd555fffd27c11f2557484501ad2ed482f1b6164457433800e163ae29')
+    end
+
+    it 'runs bundle clean if there was an old archive' do
+      @cache.instance_variable_set(:@old_digest, 'non-empty-string')
+      expect(@cache).to receive(:run_command).with("bundle clean")
+
+      @cache.archive_and_upload_bundle
+    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)
+
+      @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)
+      }
+      @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)
+
+      @cache.archive_and_upload_bundle
+    end
+  end
+end

data/travis_bundle_cache.gemspec

@@ -19,6 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.executables   = ["travis_bundle_cache", "travis_bundle_install"]
 
+  spec.signing_key   = File.expand_path("~/.gemcert/gem-private_key.pem")
+  spec.cert_chain    = ['gem-public_cert.pem']
+
   spec.add_dependency "bundler", "~> 1.3"
   spec.add_dependency "aws-sdk"
 end

metadata

@@ -1,13 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: travis_bundle_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - David Genord II
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDijCCAnKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQ4wDAYDVQQDDAVkYXZp
+  ZDEeMBwGCgmSJomT8ixkARkWDmNvbGxlY3RpdmVpZGVhMRMwEQYKCZImiZPyLGQB
+  GRYDY29tMB4XDTEzMDgwMjE0MjAwN1oXDTE0MDgwMjE0MjAwN1owRTEOMAwGA1UE
+  AwwFZGF2aWQxHjAcBgoJkiaJk/IsZAEZFg5jb2xsZWN0aXZlaWRlYTETMBEGCgmS
+  JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO+X
+  lpzbJojxB0O/2nTxK2NdfgOd2EsnOZaezBZsGDZq0Vbnjec/tNrnsHdUM12LvP1h
+  ZuIx/IrAZj4wlsyZgUsKAQs9GXQCDzmKuwo3kmYtUDv55TQJKwDhtdwliTD82FOT
+  IkTUEcRZNhtb7ymzpK17p5iHaHL+4BgNs1fbciTxqI1xhh9TGyDOht++9dCjJVDV
+  I5nU8VMV8gkAkxA8AlTXNf3hWQNN3tBuvY5EMaG3beN52v+YYDW8Ko4GL16M+aOA
+  PShN16CdA5Jjc/hwe6gK175Ma9UTHwIoWDX2WBztM+cU0E27vxFxbe+il9mHk9wG
+  BzedoP1o5yNUovdOhIsCAwEAAaOBhDCBgTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+  sDAdBgNVHQ4EFgQUozKz5aO8wO2w0VHWEbPR7x0nBlQwIwYDVR0RBBwwGoEYZGF2
+  aWRAY29sbGVjdGl2ZWlkZWEuY29tMCMGA1UdEgQcMBqBGGRhdmlkQGNvbGxlY3Rp
+  dmVpZGVhLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEANGHG41mjDpWNsdtjMq7lp5Dw
+  xgnf3D3Bz1/t2e4QimdTqniwudSE/P/HD/8HkEn9JMI39xQFyXpfWCFwS5kwsGle
+  qr/LzRfLXV3B11TciP10uMYmHQ+46AJ4mL2iyvmRsIKFU45gBpU1/2zJ44GGzYU1
+  cSKuuZ0obmZRTI0Vn54e2ofKnWZtylW0SYa9uQplEJK/Ttu88DL99WgwOyNdMlqg
+  FJkL4MD3SK4X13qDUlr6YzTkvc8MMfaECuzUIM6KqSGQnyZ16D2zLdZTtr0GPzJZ
+  SdQ0gsTaFvafp6C7hh//UHFI92FnVtzpV01oGPDikn3a2qc8eUPvULa2NlJRFQ==
+  -----END CERTIFICATE-----
 date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -48,15 +70,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/travis_bundle_cache
 - bin/travis_bundle_install
+- gem-public_cert.pem
 - lib/travis_bundle_cache.rb
 - lib/travis_bundle_cache/cache.rb
 - lib/travis_bundle_cache/version.rb
+- spec/spec_helper.rb
+- spec/travis_bundle_cache_spec.rb
 - travis_bundle_cache.gemspec
 homepage: https://github.com/collectiveidea/travis_bundle_cache
 licenses:
@@ -82,4 +108,6 @@ rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Cache the gem bundle for speedy travis builds
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/travis_bundle_cache_spec.rb