travis-artifacts 0.0.3 → 0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    travis-artifacts (0.0.2)
+    travis-artifacts (0.1.0)
       faraday
       faraday_middleware
       fog
@@ -11,12 +11,12 @@ GEM
   specs:
     builder (3.1.4)
     diff-lcs (1.1.3)
-    excon (0.16.10)
+    excon (0.16.8)
     faraday (0.8.4)
       multipart-post (~> 1.1)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
-    fog (1.8.0)
+    fog (1.7.0)
       builder
       excon (~> 0.14)
       formatador (~> 0.2.0)
@@ -28,12 +28,12 @@ GEM
       ruby-hmac
     formatador (0.2.4)
     mime-types (1.19)
-    multi_json (1.5.0)
+    multi_json (1.3.7)
     multipart-post (1.1.5)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.6.2)
-    nokogiri (1.5.6)
+    net-ssh (2.6.1)
+    nokogiri (1.5.5)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)

data/README.md

@@ -0,0 +1,8 @@
+# Travis Artifacts
+
+If your tests produce files, for example stack traces or logs, you can
+easily upload them to Amazon S3.
+
+See the Travis blog for more:
+
+http://about.travis-ci.org/blog/2012-12-18-travis-artifacts/

data/lib/travis/artifacts/cli.rb

@@ -87,6 +87,11 @@ module Travis::Artifacts
             options[:private] = true
           end
 
+          opt.on('--cache-control CACHE_CONTROL_VALUE',
+                 'set custom cache control metadata value') do |value|
+            options[:cache_control] = value
+          end
+
           opt.on('-h','--help','help') do
             puts @opt_parser
           end

data/lib/travis/artifacts/uploader.rb

@@ -12,6 +12,7 @@ module Travis::Artifacts
       @test   = Test.new
       @public = ! (options[:private]||false)
       @target_path = options[:target_path] || "artifacts/#{@test.build_number}/#{@test.job_number}"
+      @cache_control = !@public ? 'private' : options[:cache_control] || 'public, max-age=315360000'
     end
 
     def upload
@@ -85,7 +86,7 @@ module Travis::Artifacts
         :public => @public,
         :body => file.read,
         :content_type => file.content_type,
-        :metadata => { "Cache-Control" => 'public, max-age=315360000'}
+        :metadata => { "Cache-Control" => @cache_control }
       })
     end
 

data/spec/travis/artifacts/cli_spec.rb

@@ -21,11 +21,15 @@ module Travis::Artifacts
     end
 
     describe 'upload' do
-      let(:argv) { ['upload', '--path', 'foo', '--target-path', 'bar'] }
-      it 'calls Uploader with given paths and target_path' do
+      let(:argv) do
+        ['upload', '--path', 'foo', '--target-path', 'bar', '--cache-control', 'public, max-age=3600']
+      end
+
+      it 'calls Uploader with given paths, target_path, and cache_control' do
         uploader = mock('uploader')
         Uploader.should_receive(:new).with([Path.new('foo', nil, Dir.pwd)], \
-                                          {:paths=>["foo"], :private=>false, :target_path=>"bar"}\
+                                          {:paths=>["foo"], :private=>false, :target_path=>"bar",
+                                           :cache_control=>'public, max-age=3600'}\
                                           ).and_return(uploader)
         uploader.should_receive(:upload)
 

data/spec/travis/artifacts/uploader_spec.rb

@@ -45,18 +45,21 @@ module Travis::Artifacts
     end
 
     describe '#upload' do
-      it 'uploads file to S3' do
+      let(:bucket) { mock('bucket') }
+      let(:bucket_files) { mock('bucket_files') }
+
+      before do
         files = [
           Artifact.new('source/path.png', 'destination/path.png')
         ]
         files[0].stub(:read => 'contents')
         uploader.stub(:files => files)
 
-        bucket       = mock('bucker')
-        bucket_files = mock('bucket_files')
         uploader.stub(:bucket => bucket)
         bucket.stub(:files => bucket_files)
+      end
 
+      it 'uploads file to S3' do
         bucket_files.should_receive(:create).with({
           :key => 'artifacts/1/destination/path.png',
           :public => true,
@@ -68,6 +71,70 @@ module Travis::Artifacts
 
         uploader.upload
       end
+
+      context 'with private set to true' do
+        let(:uploader) do
+          Uploader.new(paths, {
+            :target_path =>'artifacts/1',
+            :private => true,
+            :cache_control => 'public, but really ignored'
+          })
+        end
+
+        it 'sets cache control metadata to private' do
+          bucket_files.should_receive(:create).with({
+            :key => 'artifacts/1/destination/path.png',
+            :public => false,
+            :body => 'contents',
+            :content_type => 'image/png',
+            :metadata => {'Cache-Control' => 'private'}
+
+          })
+
+          uploader.upload
+        end
+      end
+
+      context 'with a custom cache control option' do
+        let(:custom_cache_control) do
+          [
+            'private',
+            'public, max-age=3600',
+            'public',
+          ].send(RUBY_VERSION >= '1.9' ? :sample : :choice)
+        end
+
+        let(:uploader) do
+          Uploader.new(paths, {
+            :target_path =>'artifacts/1',
+            :cache_control => custom_cache_control
+          })
+        end
+
+        it 'uploads file to S3 with custom cache control header metadata' do
+          files = [
+            Artifact.new('source/path.png', 'destination/path.png')
+          ]
+          files[0].stub(:read => 'contents')
+          uploader.stub(:files => files)
+
+          bucket       = mock('bucket')
+          bucket_files = mock('bucket_files')
+          uploader.stub(:bucket => bucket)
+          bucket.stub(:files => bucket_files)
+
+          bucket_files.should_receive(:create).with({
+            :key => 'artifacts/1/destination/path.png',
+            :public => true,
+            :body => 'contents',
+            :content_type => 'image/png',
+            :metadata => {'Cache-Control' => custom_cache_control}
+
+          })
+
+          uploader.upload
+        end
+      end
     end
 
     describe '#files' do

data/travis-artifacts.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'travis-artifacts'
-  s.version     = '0.0.3'
+  s.version     = '0.1.0'
 
   s.description = 'Travis build artifacts tools'
   s.summary     = s.description

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis-artifacts
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -87,6 +87,7 @@ files:
 - .travis.yml
 - Gemfile
 - Gemfile.lock
+- README.md
 - bin/travis-artifacts
 - lib/travis/artifacts.rb
 - lib/travis/artifacts/artifact.rb
@@ -127,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Travis build artifacts tools
@@ -140,3 +141,4 @@ test_files:
 - spec/travis/artifacts/artifact_spec.rb
 - spec/travis/artifacts/cli_spec.rb
 - spec/travis/artifacts/uploader_spec.rb
+has_rdoc: