vx-builder 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27ce162a3982b2cbce95a68d6b1829cc346c851e
-  data.tar.gz: 08c7e3704304f0e14ed59632209089bc1b468e26
+  metadata.gz: 2d33b75d7dad8e9a9fd0e959b939b7d72c41fc92
+  data.tar.gz: 5666100d3833bc64c8991ac1eb17455d82a9511e
 SHA512:
-  metadata.gz: 3d6e1ae7836096a14dec61d2a7b028a3cdaea69e9a01a4f88a34836a49888aea05f67aaa05a3ad0857a2f57fcc5fffeeb91a9e699252321b386b536c4371dd4c
-  data.tar.gz: c89dff17cae258e6c463e8d6b1866395d257d37efb0594ee9ec669b4dc10ca51be862dbb05b0a3877b8fa97a8cf262ccea2186193b6c14b685435fe856eda857
+  metadata.gz: 2a7054d5bcb3d3898565c25c217afc445b5b02a4afb9886f2542507373e61e885a6b5ce23f6c2f5044afc91ba487fe94178c44979011f56a9415a2b301d9c02d
+  data.tar.gz: 43e5caa852f72420cd4dc8fb2a5322c48d9cdbbbd1ff7c0d5cecbb983d6d5fc71fd6b34523ef0671a48055f84392166caf0074336c7f7471f9f45339a4c62183

data/lib/vx/builder/build_configuration/artifacts.rb

@@ -9,26 +9,56 @@ module Vx
           normalize_attributes(new_env)
         end
 
-        def artifacts
+        def attributes
           @attributes
         end
 
+        def files
+          @files
+        end
+
+        def prefix
+          @options[:prefix]
+        end
+
         private
 
           def normalize_attributes(new_env)
-
-            @attributes =
+            attrs =
               case new_env
               when Array
-                new_env.map(&:to_s)
+                new_env
+              else
+                Array(new_env)
+              end
+
+            extract_options_and_normalize_items(attrs)
+          end
+
+          def extract_options_and_normalize_items(new_env)
+            opts = {}
+            @attributes = []
+            @files      = []
+            env = new_env.inject([]) do |a, e|
+              if e.is_a?(Hash)
+                opts = e
+                @attributes.push e
               else
-                Array(new_env).map(&:to_s)
+                a.push e.to_s.gsub(/^\.*(\/)/, '')
+                @attributes.push a.last
+                @files.push a.last
               end
+              a
+            end
 
-            @attributes.map! do |attr|
-              attr.gsub(/^\.*(\/)/, '')
+            if opts && opts["prefix"]
+              @options = { prefix: opts["prefix"] }
+            else
+              @options = {}
             end
 
+            [opts, env]
+
           end
 
       end

data/lib/vx/builder/script/artifacts.rb

@@ -13,13 +13,15 @@ module Vx
 
           if enabled?(env)
             env.after_script << "echo"
-            env.source.artifacts.attributes.map{|a| compile(a) }.each do |artifact|
+            env.source.artifacts.files.map{|a| compile(a) }.each do |artifact|
               find = FIND % artifact
-              prefix = env.task.artifacts_url_prefix
+              url = env.task.artifacts_url_prefix
+              prefix = env.source.artifacts.prefix
+              name = prefix ? "#{prefix}$i" : "$i"
               cmd = %{
                 for i in $(#{find}) ; do
-                  echo "upload artifact $i"
-                  curl -s -S -X PUT -T $i #{prefix}/$i > /dev/null
+                  echo "upload artifact #{name}"
+                  curl -s -S -X PUT -T $i #{url}/#{name} > /dev/null
                 done
               }
               env.after_script << cmd
@@ -42,7 +44,7 @@ module Vx
           end
 
           def enabled?(env)
-            !env.source.artifacts.attributes.empty? &&
+            !env.source.artifacts.files.empty? &&
               env.task.artifacts_url_prefix
           end
 

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/spec/fixtures/travis.yml

@@ -34,3 +34,4 @@ artifacts:
   - ../app/foo.txt
   - /app/*.txt
   - app/
+  - prefix: $CI_JOB_ID/

data/spec/lib/builder/build_configuration_spec.rb

@@ -43,7 +43,7 @@ describe Vx::Builder::BuildConfiguration do
        "scala"          => ['2.10.3'],
        "script"         => ["RAILS_ENV=test ls -1 && echo DONE!"],
        "services"       => ['rabbitmq'],
-       "artifacts"      => ["app/foo.txt", "app/*.txt", "app/"]
+       "artifacts"      => ["app/foo.txt", "app/*.txt", "app/", {"prefix"=>"$CI_JOB_ID/"}]
       }
     ) }
   end
@@ -100,8 +100,13 @@ describe Vx::Builder::BuildConfiguration do
   context "artifacts" do
     subject { config.artifacts }
 
+    its(:prefix) { should eq "$CI_JOB_ID/" }
+    its(:files)  { should eq ["app/foo.txt", "app/*.txt", "app/"] }
+
     context "when is empty" do
       let(:content) { {} }
+      its(:files)      { should eq [] }
+      its(:prefix)     { should be_nil }
       its(:attributes) { should eq [] }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dmitry Galinsky