travis-artifacts 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    travis-artifacts (0.0.1)
+    travis-artifacts (0.0.2)
       faraday
       faraday_middleware
       fog
@@ -11,12 +11,12 @@ GEM
   specs:
     builder (3.1.4)
     diff-lcs (1.1.3)
-    excon (0.16.8)
+    excon (0.16.10)
     faraday (0.8.4)
       multipart-post (~> 1.1)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
-    fog (1.7.0)
+    fog (1.8.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.3.7)
+    multi_json (1.5.0)
     multipart-post (1.1.5)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.6.1)
-    nokogiri (1.5.5)
+    net-ssh (2.6.2)
+    nokogiri (1.5.6)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)

data/bin/travis-artifacts

@@ -2,7 +2,6 @@
 
 $: << File.expand_path('../../lib', __FILE__)
 
-require 'bundler/setup'
 require 'travis/artifacts'
 
 Travis::Artifacts::Cli.new(ARGV).start

data/lib/travis/artifacts/cli.rb

@@ -9,7 +9,7 @@ module Travis::Artifacts
 
     def initialize(argv = nil)
       @argv    = argv || ARGV
-      @options = { :paths => [] }
+      @options = { :paths => [], :private => false }
       @paths   = []
       @client  = Travis::Client.new
     end
@@ -29,7 +29,7 @@ module Travis::Artifacts
     end
 
     def upload
-      Uploader.new(paths, options[:target_path]).upload
+      Uploader.new(paths, options).upload
     end
 
     private
@@ -83,6 +83,10 @@ module Travis::Artifacts
             options[:root] = root
           end
 
+          opt.on('--private', 'make artifacts non-public') do |root|
+            options[:private] = true
+          end
+
           opt.on('-h','--help','help') do
             puts @opt_parser
           end

data/lib/travis/artifacts/uploader.rb

@@ -7,10 +7,11 @@ module Travis::Artifacts
 
     attr_reader :paths, :target_path
 
-    def initialize(paths, target_path = nil)
+    def initialize(paths, options = {})
       @paths  = paths
       @test   = Test.new
-      @target_path = target_path || "artifacts/#{@test.build_number}/#{@test.job_number}"
+      @public = ! (options[:private]||false)
+      @target_path = options[:target_path] || "artifacts/#{@test.build_number}/#{@test.job_number}"
     end
 
     def upload
@@ -77,11 +78,11 @@ module Travis::Artifacts
     def _upload(file)
       destination = File.join(target_path, file.destination)
 
-      logger.info "Uploading file #{file.source} to #{destination}"
+      logger.info "Uploading file #{file.source} to #{destination}, public: #{@public}"
 
       bucket.files.create({
         :key => destination,
-        :public => true,
+        :public => @public,
         :body => file.read,
         :content_type => file.content_type,
         :metadata => { "Cache-Control" => 'public, max-age=315360000'}

data/spec/travis/artifacts/cli_spec.rb

@@ -24,7 +24,9 @@ module Travis::Artifacts
       let(:argv) { ['upload', '--path', 'foo', '--target-path', 'bar'] }
       it 'calls Uploader with given paths and target_path' do
         uploader = mock('uploader')
-        Uploader.should_receive(:new).with([Path.new('foo', nil, Dir.pwd)], 'bar').and_return(uploader)
+        Uploader.should_receive(:new).with([Path.new('foo', nil, Dir.pwd)], \
+                                          {:paths=>["foo"], :private=>false, :target_path=>"bar"}\
+                                          ).and_return(uploader)
         uploader.should_receive(:upload)
 
         cli.start

data/spec/travis/artifacts/uploader_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 module Travis::Artifacts
   describe Uploader do
-    let(:uploader) { Uploader.new(paths, 'artifacts/1') }
+    let(:uploader) { Uploader.new(paths, {:target_path =>'artifacts/1'}) }
     let(:paths)    { [] }
 
     context 'without given target_path' do
-      let(:uploader) { Uploader.new(paths, nil) }
+      let(:uploader) { Uploader.new(paths) }
 
       it 'sets a default' do
         test = mock('test', :job_number => "10.1", :build_number => "10")

data/travis-artifacts.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'travis-artifacts'
-  s.version     = '0.0.2'
+  s.version     = '0.0.3'
 
   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.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog