travis-artifacts 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6f1e65f3bfb2d7b4a648352fd2ea57c6320d8ee1
+  data.tar.gz: f5e6ef0dc3118f5a47bd4816d35fb66b48212c83
+SHA512:
+  metadata.gz: da865e2b1fb54254ddf5ba80b1c1e38f9a55e6adfae5e64bd1d8a11fe8c7f654bca2c3bcea81c701b088a673b417657a8f2a5534fe29b6dc395e579dd694f0ad
+  data.tar.gz: d80ba3a8d339b3ba3de30e7c21ecca50ba5600eca933f27cf054b058da17078cf0072cb2e61f4c35f03fd05282fd1a0ce86d2475cffd532d771c6302d1bf0f37

data/.gitignore

@@ -1,2 +1,4 @@
 vendor/bundle
 /log/
+/Gemfile.lock
+*.gem

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -6,3 +6,29 @@ easily upload them to Amazon S3.
 See the Travis blog for more:
 
 http://about.travis-ci.org/blog/2012-12-18-travis-artifacts/
+
+## The minimum AWS policy needed for the gem to work
+
+    {
+      "Statement": [
+        {
+          "Action": [
+            "s3:ListBucket"
+          ],
+          "Effect": "Allow",
+          "Resource": [
+            "arn:aws:s3:::your-bucket"
+          ]
+        },
+        {
+          "Action": [
+            "s3:PutObject",
+            "s3:PutObjectAcl"
+          ],
+          "Effect": "Allow",
+          "Resource": [
+            "arn:aws:s3:::your-bucket/*"
+          ]
+        }
+      ]
+    }

data/bin/travis-artifacts

@@ -1,7 +1,4 @@
 #!/usr/bin/env ruby
-
 $: << File.expand_path('../../lib', __FILE__)
-
 require 'travis/artifacts'
-
-Travis::Artifacts::Cli.new(ARGV).start
+exit Travis::Artifacts::Cli.new(ARGV).start

data/lib/travis/artifacts/cli.rb

@@ -37,9 +37,10 @@ module Travis::Artifacts
     def execute_command
       if VALID_COMMANDS.include? command
         send(command)
+        return 0
       else
         STDERR.puts 'Could not find command'
-        exit 1
+        return 1
       end
     end
 
@@ -79,6 +80,10 @@ module Travis::Artifacts
             options[:target_path] = target_path
           end
 
+          opt.on('--clone-path CLONE_PATH', 'path to clone uploaded files to') do |clone_path|
+            options[:clone_path] = clone_path
+          end
+
           opt.on('--root ROOT', 'root directory for relative paths') do |root|
             options[:root] = root
           end

data/lib/travis/artifacts/uploader.rb

@@ -5,13 +5,14 @@ module Travis::Artifacts
   class Uploader
     include Travis::Artifacts::Logger
 
-    attr_reader :paths, :target_path
+    attr_reader :paths, :target_path, :clone_path
 
     def initialize(paths, options = {})
       @paths  = paths
       @test   = Test.new
       @public = ! (options[:private]||false)
       @target_path = options[:target_path] || "artifacts/#{@test.build_number}/#{@test.job_number}"
+      @clone_path = options[:clone_path]
       @cache_control = !@public ? 'private' : options[:cache_control] || 'public, max-age=315360000'
     end
 
@@ -76,9 +77,21 @@ module Travis::Artifacts
       end
     end
 
-    def _upload(file)
-      destination = File.join(target_path, file.destination)
+    def _clone(s3_source_path, filename)
+      clone_destination = File.join(clone_path, filename).sub(/^\//, '')
+      logger.info "Cloning to #{clone_destination}, public: #{@public}"
+
+      bucket.files.create({
+          :key => clone_destination,
+          :public => @public,
+          :body => '',
+          :metadata => { 'etag'=>'', 'x-amz-copy-source' => "#{Travis::Artifacts.bucket_name}/#{s3_source_path}" }
+        })
+    end
+
 
+    def _upload(file)
+      destination = File.join(target_path, file.destination).sub(/^\//, '')
       logger.info "Uploading file #{file.source} to #{destination}, public: #{@public}"
 
       bucket.files.create({
@@ -88,6 +101,7 @@ module Travis::Artifacts
         :content_type => file.content_type,
         :metadata => { "Cache-Control" => @cache_control }
       })
+      _clone(destination, file.destination) unless clone_path.nil?
     end
 
     private

data/spec/travis/artifacts/cli_spec.rb

@@ -26,7 +26,7 @@ module Travis::Artifacts
       end
 
       it 'calls Uploader with given paths, target_path, and cache_control' do
-        uploader = mock('uploader')
+        uploader = double('uploader')
         Uploader.should_receive(:new).with([Path.new('foo', nil, Dir.pwd)], \
                                           {:paths=>["foo"], :private=>false, :target_path=>"bar",
                                            :cache_control=>'public, max-age=3600'}\
@@ -35,6 +35,19 @@ module Travis::Artifacts
 
         cli.start
       end
+
+      context 'with clone path specified' do
+        let(:argv) do
+          ['upload', '--path', 'foo', '--target-path', 'bar', '--cache-control', 'public, max-age=3600', "--clone-path", 'baz']
+        end
+
+        it "calls Uploader with the clone-path in addition to other parameters" do
+          Uploader.should_receive(:new).with(anything, hash_including(:clone_path => 'baz')).and_return double('uploader').as_null_object
+
+          cli.start
+        end
+      end
+
     end
 
     describe '#root' do
@@ -67,5 +80,40 @@ module Travis::Artifacts
         cli.command.should == 'upload'
       end
     end
+
+    context 'with a valid command' do
+      let(:argv) { ['upload'] }
+      let(:retcode) { cli.start }
+      before { cli.stub(:upload) }
+
+      it 'returns 0' do
+        retcode.should == 0
+      end
+    end
+
+    context 'with an invalid command' do
+      let(:argv) { ['derf'] }
+      let(:retcode) { cli.start }
+
+      it 'returns 1' do
+        STDERR.stub(:puts)
+        retcode.should == 1
+      end
+
+      it 'tells us about it' do
+        STDERR.should_receive(:puts).with(/Could not find command/)
+        cli.start
+      end
+    end
+
+    context 'with an internal error' do
+      let(:argv) { ['upload'] }
+      let(:custom_error) { Class.new(Exception) }
+      before { cli.stub(:upload) { raise custom_error } }
+
+      it 'allows it to bubble up' do
+        expect { cli.start }.to raise_error(custom_error)
+      end
+    end
   end
 end

data/spec/travis/artifacts/uploader_spec.rb

@@ -9,13 +9,21 @@ module Travis::Artifacts
       let(:uploader) { Uploader.new(paths) }
 
       it 'sets a default' do
-        test = mock('test', :job_number => "10.1", :build_number => "10")
+        test = double('test', :job_number => "10.1", :build_number => "10")
         Test.stub(:new => test)
 
         uploader.target_path.should == 'artifacts/10/10.1'
       end
     end
 
+    context 'when given an empty string as target_path' do
+      let(:uploader) { Uploader.new(paths, {:target_path => ''}) }
+
+      it 'leaves it alone' do
+        uploader.target_path.should == ''
+      end
+    end
+
     describe '#upload_file' do
       it 'retries 3 times before giving up' do
         file = Artifact.new('source/file.png', 'destination/file.png')
@@ -31,7 +39,7 @@ module Travis::Artifacts
         file = Artifact.new('source/file.png', 'destination/file.png')
 
         request  = { :expects => 200 }
-        response = mock('response', :status => 500)
+        response = double('response', :status => 500)
         error_class = Class.new(Excon::Errors::HTTPStatusError)
         my_error = error_class.new('message', request, response)
         uploader.should_receive(:_upload).exactly(3).times.and_raise(my_error)
@@ -45,13 +53,11 @@ module Travis::Artifacts
     end
 
     describe '#upload' do
-      let(:bucket) { mock('bucket') }
-      let(:bucket_files) { mock('bucket_files') }
+      let(:bucket) { double('bucket') }
+      let(:bucket_files) { double('bucket_files') }
+      let(:files) { [Artifact.new('source/path.png', 'destination/path.png')] }
 
       before do
-        files = [
-          Artifact.new('source/path.png', 'destination/path.png')
-        ]
         files[0].stub(:read => 'contents')
         uploader.stub(:files => files)
 
@@ -72,6 +78,23 @@ module Travis::Artifacts
         uploader.upload
       end
 
+      context 'with a top-level destination and empty string as target_path' do
+        let(:uploader) { Uploader.new(paths, {:target_path => ''}) }
+        let(:files) { [Artifact.new('source/path.png', 'path.png')] }
+
+        it 'uploads file to the root of the S3 bucket' do
+          bucket_files.should_receive(:create).with({
+            :key => 'path.png',
+            :public => true,
+            :body => 'contents',
+            :content_type => 'image/png',
+            :metadata => {'Cache-Control' => 'public, max-age=315360000'}
+          })
+
+          uploader.upload
+        end
+      end
+
       context 'with private set to true' do
         let(:uploader) do
           Uploader.new(paths, {
@@ -95,6 +118,35 @@ module Travis::Artifacts
         end
       end
 
+      context 'with a clone path specified' do
+        let(:uploader) do
+          Uploader.new(paths, {
+            :target_path =>'artifacts/1',
+            :clone_path => 'artifacts/latest'
+          }) 
+        end
+        
+        it 'uploads file to S3 and clones it to a second remote location' do
+
+          bucket_files.should_receive(:create).with({
+            :key => 'artifacts/1/destination/path.png',
+            :public => true,
+            :body => 'contents',
+            :content_type => 'image/png',
+            :metadata => {'Cache-Control' => 'public, max-age=315360000'}
+          })
+          
+          bucket_files.should_receive(:create).with({
+            :key => 'artifacts/latest/destination/path.png',
+            :public => true,
+            :body => '',
+            :metadata => { 'etag'=>'', 'x-amz-copy-source' => '/artifacts/1/destination/path.png' }
+          })
+
+          uploader.upload
+        end
+      end
+
       context 'with a custom cache control option' do
         let(:custom_cache_control) do
           [
@@ -118,8 +170,8 @@ module Travis::Artifacts
           files[0].stub(:read => 'contents')
           uploader.stub(:files => files)
 
-          bucket       = mock('bucket')
-          bucket_files = mock('bucket_files')
+          bucket       = double('bucket')
+          bucket_files = double('bucket_files')
           uploader.stub(:bucket => bucket)
           bucket.stub(:files => bucket_files)
 

data/travis-artifacts.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'travis-artifacts'
-  s.version     = '0.1.0'
+  s.version     = '0.2.0'
 
   s.description = 'Travis build artifacts tools'
   s.summary     = s.description
@@ -9,9 +9,10 @@ Gem::Specification.new do |s|
   s.authors     = ['admin@travis-ci.org']
   s.email       = 'admin@travis-ci.org'
 
-  s.add_dependency 'fog'
-  s.add_dependency 'faraday'
-  s.add_dependency 'faraday_middleware'
+  s.add_dependency 'nokogiri', '1.5.10'
+  s.add_dependency 'fog', '~> 1.7'
+  s.add_dependency 'faraday', '~> 0.8'
+  s.add_dependency 'faraday_middleware', '~> 0.9'
 
   s.add_development_dependency 'rspec'
 

metadata

@@ -1,78 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: travis-artifacts
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - admin@travis-ci.org
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.10
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Travis build artifacts tools
@@ -86,7 +91,6 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - README.md
 - bin/travis-artifacts
 - lib/travis/artifacts.rb
@@ -110,27 +114,26 @@ files:
 - travis-artifacts.gemspec
 homepage: https://github.com/travis-ci/travis-artifacts
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Travis build artifacts tools
 test_files:
 - spec/fixtures/files/foo/bar/baz.txt

data/Gemfile.lock

@@ -1,52 +0,0 @@
-PATH
-  remote: .
-  specs:
-    travis-artifacts (0.1.0)
-      faraday
-      faraday_middleware
-      fog
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    builder (3.1.4)
-    diff-lcs (1.1.3)
-    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.7.0)
-      builder
-      excon (~> 0.14)
-      formatador (~> 0.2.0)
-      mime-types
-      multi_json (~> 1.0)
-      net-scp (~> 1.0.4)
-      net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5.0)
-      ruby-hmac
-    formatador (0.2.4)
-    mime-types (1.19)
-    multi_json (1.3.7)
-    multipart-post (1.1.5)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-ssh (2.6.1)
-    nokogiri (1.5.5)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.0)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
-    ruby-hmac (0.4.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rspec
-  travis-artifacts!