travis_bundle_cache 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42adc486f606b44906f28a9dd069aa6d7f045fd4
-  data.tar.gz: a46faff6b54312e2562ceb916658fe79a3dc8917
+  metadata.gz: 7439995a443d4ffd1574a246b62b34f30bd9d506
+  data.tar.gz: ee3d3104641f3740629b15d20bf1b6a6afbc6ee0
 SHA512:
-  metadata.gz: 330f71e824959f68f5f1f2a466ada6cfe13a6bf532b52145f440f397ab675a1e9e24b4bb5328c17af688f35a25c902b0c593e6018de1ea092c2d0dd0ce94d306
-  data.tar.gz: 9d60d535cb835e85477659a74e125b3e81c75a1444efcc2bacfe0d2279a03a53b605005fe08f90f7bb6494d97542480138aeec6535ceb1d9899fa6c6b983f6df
+  metadata.gz: 5cfbcd7b6d401c8d0451aaa2d1c159b5576555c7e095582639fdfdb37927fc513961ac945f694f8e776db32af83edeada0d541ef63e4d48f028be4b9a7607a89
+  data.tar.gz: 1654a9719ecd4967354e0bc855dab6df357796bf5bd9c3923e05d49ea3f28cf72801e3e30730b5164dc295c85022de1f63566acec7e96d04795748cb43d0891d

data/README.md

@@ -1,52 +1,64 @@
-# TravisBundleCache
-
+Travis Bundle Cache
+===================
 [![Gem Version](https://badge.fury.io/rb/travis_bundle_cache.png)](http://badge.fury.io/rb/travis_bundle_cache)
+[![Code Climate](https://codeclimate.com/github/collectiveidea/travis_bundle_cache.png)](https://codeclimate.com/github/collectiveidea/travis_bundle_cache)
+[![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.
 
-Cache the gem bundle for speedy travis builds
+This gem loads, builds, and saves a cache of your bundled gems on S3 by *ONLY* modifying your project's .travis.yml file.
 
-## Usage
+What you will need:
+* A project on Travis CI
+* An AWS account
+* A "bundle install" that takes longer than "gem install nokogiri"
+
+Usage
+=====
 
 1. Set up a bucket on S3 in the US Standard region (us-east-1) (and possibly a new user via IAM)
-2. Install the travis gem
+
+2. Setup your .travis.yml to include the following (NOTE: this must be done before the next steps)
+
+    ```yaml
+    env:
+      global:
+      - BUNDLE_ARCHIVE="your-bundle-name"
+      - AWS_S3_REGION="us-east-1"
+      - AWS_S3_BUCKET="your-bucket-name"
+
+    before_install:
+    - 'echo ''gem: --no-ri --no-rdoc'' > ~/.gemrc'
+    - gem install travis_bundle_cache
+
+    install: travis_bundle_install
+
+    after_script:
+    - travis_bundle_cache
+    ```
+
+3. Install the travis gem (not the travis_bundle_cache gem)
 
     ```bash
     gem install travis
     ```
 
-3. Log into Travis (from inside your project respository directory)
+4. Log into Travis (from inside your project respository directory)
 
     ```bash
     travis login --auto
     ```
 
-4. Encrypt your S3 credentials (be sure to add your actual credentials inside the double quotes)
+5. Encrypt your S3 credentials (be sure to add your actual credentials inside the double quotes)
 
     ```bash
     travis encrypt AWS_S3_KEY="" AWS_S3_SECRET="" --add
     ```
 
-5. Setup your .travis.yml to include the following
-
-    ```yaml
-    env:
-      global:
-        - BUNDLE_ARCHIVE="your-bundle-name"
-        - AWS_S3_REGION="us-east-1"
-        - AWS_S3_BUCKET="your-bucket-name"
-    
-    before_install:
-      - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
-      - "gem install travis_bundle_cache"
-    
-    install: travis_bundle_install
-    
-    after_script:
-      - "travis_bundle_cache"
-    ```
-
 Enjoy faster builds
 
-## Contributions
+Contributions
+=============
 
 TravisBundleCache is open source and contributions from the community are encouraged! No contribution is too small. Please consider:
 
@@ -63,6 +75,7 @@ For the best chance of having your changes merged, please:
 3. Commit your changes and tests (if applicable (they're applicable)).
 4. Submit a pull request with a thorough explanation and at least one animated GIF.
 
-## Thanks
+Thanks
+======
 
 Most of the credit for this gem goes to Random Errata and [this](http://randomerrata.com/post/45827813818/travis-s3) blog post

data/lib/travis_bundle_cache/cache.rb

@@ -24,7 +24,11 @@ module TravisBundleCache
       @bundle_digest = Digest::SHA2.file(@lock_file).hexdigest
       @old_digest    = File.exists?(@old_digest_filename) ? File.read(@old_digest_filename) : ""
 
-      if @bundle_digest == @old_digest
+      if ENV['TRAVIS_PULL_REQUEST'].to_i > 0
+        puts "=> This is a pull request, doing nothing"
+      elsif ENV['TRAVIS_BRANCH'] != "master"
+        puts "=> This is not the master branch, doing nothing"
+      elsif @bundle_digest == @old_digest
         puts "=> There were no changes, doing nothing"
       else
         archive_and_upload_bundle
@@ -38,17 +42,20 @@ module TravisBundleCache
         puts "=> There were changes, uploading a new version of the archive"
         puts "  => Old checksum: #{@old_digest}"
         puts "  => New checksum: #{@bundle_digest}"
+
+        puts "=> Cleaning old gem versions from the bundle"
+        run_command "bundle clean"
       end
 
       puts "=> Preparing bundle archive"
       `cd ~ && tar -cjf "#{@file_name}" .bundle && split -b 5m -a 3 "#{@file_name}" "#{@file_name}."`
 
       parts_pattern = File.expand_path(File.join("~", "#{@file_name}.*"))
-      parts = Dir.glob(parts_pattern).sort
+      parts         = Dir.glob(parts_pattern).sort
 
       puts "=> Uploading the bundle"
       puts "  => Beginning multipart upload"
-      response = storage.initiate_multipart_upload @bucket_name, @file_name, { "x-amz-acl" => "public-read" }
+      response  = storage.initiate_multipart_upload(@bucket_name, @file_name, { "x-amz-acl" => "public-read" })
       upload_id = response.body['UploadId']
       puts "    => Upload ID: #{upload_id}"
 
@@ -58,15 +65,15 @@ module TravisBundleCache
       parts.each_with_index do |part, index|
         part_number = (index + 1).to_s
         puts "    => Uploading #{part}"
-        File.open part do |part_file|
-          response = storage.upload_part @bucket_name, @file_name, upload_id, part_number, part_file
+        File.open(part) do |part_file|
+          response = storage.upload_part(@bucket_name, @file_name, upload_id, part_number, part_file)
           part_ids << response.headers['ETag']
           puts "      => Uploaded"
         end
       end
 
       puts "  => Completing multipart upload"
-      storage.complete_multipart_upload @bucket_name, @file_name, upload_id, part_ids
+      storage.complete_multipart_upload(@bucket_name, @file_name, upload_id, part_ids)
 
       puts "=> Uploading the digest file"
       bucket = storage.directories.new(key: @bucket_name)

data/lib/travis_bundle_cache/version.rb

@@ -1,3 +1,3 @@
 module TravisBundleCache
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis_bundle_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - David Genord II