travis_bundle_cache 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7439995a443d4ffd1574a246b62b34f30bd9d506
-  data.tar.gz: ee3d3104641f3740629b15d20bf1b6a6afbc6ee0
+  metadata.gz: ae4a071831d3e9f5a65da82641068289a54d081a
+  data.tar.gz: 21aa7726e58acc03270027e9f8c29d8ba0460a39
 SHA512:
-  metadata.gz: 5cfbcd7b6d401c8d0451aaa2d1c159b5576555c7e095582639fdfdb37927fc513961ac945f694f8e776db32af83edeada0d541ef63e4d48f028be4b9a7607a89
-  data.tar.gz: 1654a9719ecd4967354e0bc855dab6df357796bf5bd9c3923e05d49ea3f28cf72801e3e30730b5164dc295c85022de1f63566acec7e96d04795748cb43d0891d
+  metadata.gz: b5ea24f3d147d636595ca603f99437c9e18d8db395c4221f2055c50867d64bbf7b5bae3c409508eb9c36d7473d7ae8eeef6407bda0bacaa5335010d2d76e854f
+  data.tar.gz: ff9639729f79513d780d215f46e78ee20ddfad46e5465a6d5c662fbb40d00eb2443dec9075ed99aa045d81e86e84493755ed34f19c525009d4a4c7ff6116ffdd

data/README.md

@@ -23,8 +23,8 @@ Usage
     ```yaml
     env:
       global:
-      - BUNDLE_ARCHIVE="your-bundle-name"
-      - AWS_S3_REGION="us-east-1"
+      - BUNDLE_ARCHIVE="your-bundle-name" # Default: "owner_name-repo_name"
+      - AWS_S3_REGION="us-east-1"         # Default: "us-east-1" (recommended)
       - AWS_S3_BUCKET="your-bucket-name"
 
     before_install:
@@ -33,8 +33,11 @@ Usage
 
     install: travis_bundle_install
 
+    before_script:
+    - "travis_bundle_cache > ~/travis_bundle_cache.log &"
+
     after_script:
-    - travis_bundle_cache
+    - wait && cat ~/travis_bundle_cache.log
     ```
 
 3. Install the travis gem (not the travis_bundle_cache gem)

data/lib/travis_bundle_cache.rb

@@ -1,4 +1,4 @@
-require "travis_bundle_cache/version"
+require "travis_bundle_cache/cache"
 
 module TravisBundleCache
   # Your code goes here...

data/lib/travis_bundle_cache/cache.rb

@@ -1,12 +1,12 @@
 require "digest"
-require "fog"
+require "aws/s3"
 
 module TravisBundleCache
   class Cache
     def initialize
-      @bucket_name         = ENV["AWS_S3_BUCKET"]
       @architecture        = `uname -m`.strip
-      @file_name           = "#{ENV['BUNDLE_ARCHIVE']}-#{@architecture}.tgz"
+      @bundle_archive      = ENV['BUNDLE_ARCHIVE'] || ENV['TRAVIS_REPO_SLUG'].gsub(/\//, '-')
+      @file_name           = "#{@bundle_archive}-#{@architecture}.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"
@@ -14,8 +14,8 @@ module TravisBundleCache
     end
 
     def install
-      run_command %(cd ~ && wget -O "remote_#{@file_name}" "https://#{@bucket_name}.s3.amazonaws.com/#{@file_name}" && tar -xf "remote_#{@file_name}")
-      run_command %(cd ~ && wget -O "remote_#{@file_name}.sha2" "https://#{@bucket_name}.s3.amazonaws.com/#{@file_name}.sha2")
+      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)
     end
 
@@ -48,41 +48,13 @@ module TravisBundleCache
       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
+      `cd ~ && tar -cjf "#{@file_name}" .bundle`
 
       puts "=> Uploading the bundle"
-      puts "  => Beginning multipart upload"
-      response  = storage.initiate_multipart_upload(@bucket_name, @file_name, { "x-amz-acl" => "public-read" })
-      upload_id = response.body['UploadId']
-      puts "    => Upload ID: #{upload_id}"
-
-      part_ids = []
-
-      puts "  => Uploading #{parts.length} parts"
-      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)
-          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[@file_name].write(Pathname.new(@file_path), :reduced_redundancy => true)
 
       puts "=> Uploading the digest file"
-      bucket = storage.directories.new(key: @bucket_name)
-      bucket.files.create({
-        :body         => @bundle_digest,
-        :key          => @digest_filename,
-        :public       => true,
-        :content_type => "text/plain"
-      })
+      storage[@digest_filename].write(@bundle_digest, :content_type => "text/plain", :reduced_redundancy => true)
 
       puts "All done now."
     end
@@ -100,12 +72,11 @@ module TravisBundleCache
     end
 
     def storage
-      @storage ||= Fog::Storage.new({
-        :provider              => "AWS",
-        :aws_access_key_id     => ENV["AWS_S3_KEY"],
-        :aws_secret_access_key => ENV["AWS_S3_SECRET"],
-        :region                => ENV["AWS_S3_REGION"] || "us-east-1"
-      })
+      @storage ||= AWS::S3.new({
+        :access_key_id     => ENV["AWS_S3_KEY"],
+        :secret_access_key => ENV["AWS_S3_SECRET"],
+        :region            => ENV["AWS_S3_REGION"] || "us-east-1"
+      }).buckets[ENV["AWS_S3_BUCKET"]].objects
     end
   end
 end

data/lib/travis_bundle_cache/version.rb

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

data/travis_bundle_cache.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
   spec.executables   = ["travis_bundle_cache", "travis_bundle_install"]
 
   spec.add_dependency "bundler", "~> 1.3"
-  spec.add_dependency "fog"
+  spec.add_dependency "aws-sdk"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis_bundle_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - David Genord II
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='