vx-builder 0.0.16 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfae9b83553783debfe9e133de54e6c9652d1594
-  data.tar.gz: 30c0a656fce693006a41a9b9ecca1c62da6624b9
+  metadata.gz: 595e992a1dd450009a45d6b454d8c373ca9f0343
+  data.tar.gz: 5e57530da8bbce538e77996df2d88d4916077cc8
 SHA512:
-  metadata.gz: 6d877d0e999d0da739d5bc47d1e2203d4e86f47afec273e9f9d4962e1be63ed0758a3124603d3e4892474647dc80ccbeeb93d56a3f3371642e55165f79b4b3c1
-  data.tar.gz: 184dd94bba0a975e359bfa49663257a1d8088e39084764cd7a4fde7bc111975cfb916efce241067f4a3619aa3f5717032d57d255ba12350f56c1328acd1161cf
+  metadata.gz: 9fc0af12b7aacfc32d4c4f14d32277742445afa624008ae4b93c0de815ca375f78d60ca81c785c21ae0dc4c4d3846f02b6d6f4e57baacadaf776f96e0b4e7192
+  data.tar.gz: 356cce5b8ea9fbbbcc07c107b8edabe98cdaa6f8a2406184ca68409c56f97aa7d3e55ce81f68f47c519b942b5f04ad33f698fb995142c161373c9d55b525b959

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

@@ -53,7 +53,7 @@ module Vx
               if env.cache_key.empty?
                 "cache"
               else
-                env.cache_key.join("-").gsub(/[^a-z0-9_\-.]/, '-')
+                env.cache_key.join("-").downcase.gsub(/[^a-z0-9_\-.]/, '-')
               end
 
             "#{env.task.cache_url_prefix}/#{name}/#{key}.tgz"

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

@@ -31,6 +31,7 @@ module Vx
             if deploy_key
               i << upload_sh_command(key_file, deploy_key)
               i << "chmod 0600 #{key_file}"
+              i << "export VX_PRIVATE_KEY=#{key_file}"
             end
 
             i << upload_sh_command(git_ssh_file, git_ssh)

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

@@ -6,9 +6,12 @@ module Vx
 
         include Helper::TraceShCommand
 
+        DEFAULT_RUBY = '1.9.3'
+
         def call(env)
-          if rvm env
-            env.cache_key << "rvm-#{rvm env}"
+          if enabled?(env)
+            env.cache_key << "rvm-#{ruby env}"
+            env.cache_key << gemfile(env)
 
             env.before_install.tap do |i|
               i << "source /etc/profile.d/rbenv.sh"
@@ -39,8 +42,12 @@ module Vx
 
         private
 
-          def rvm(env)
-            env.source.rvm.first
+          def enabled?(env)
+            env.source.rvm.first || env.source.language == 'ruby'
+          end
+
+          def ruby(env)
+            env.source.rvm.first || DEFAULT_RUBY
           end
 
           def gemfile(env)
@@ -57,7 +64,7 @@ module Vx
                 sed -e 's/^\*/ /' |
                 awk '{print $1}' |
                 grep -v 'system' |
-                grep '#{rvm env}' |
+                grep '#{ruby env}' |
                 tail -n1)
             }.gsub(/\n/, ' ').gsub(/ +/, ' ').strip
           end

data/lib/vx/builder/source.rb

@@ -60,6 +60,10 @@ module Vx
         end
       end
 
+      def language
+        attributes["language"]
+      end
+
       AS_ARRAY.each do |m|
         define_method m do
           @attributes[m] || []

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.0.16"
+    VERSION = "0.0.18"
   end
 end

data/spec/fixtures/travis.yml

@@ -17,3 +17,5 @@ cache:
 image:
   - one
   - two
+
+language: ruby

data/spec/lib/builder/source_spec.rb

@@ -11,6 +11,7 @@ describe Vx::Builder::Source do
   its(:gemfile)       { should eq %w{ Gemfile } }
   its(:before_script) { should eq ["echo before_script"] }
   its(:script)        { should eq ["RAILS_ENV=test ls -1 && echo DONE!"] }
+  its(:language)      { should eq 'ruby' }
 
   context "merge" do
     let(:new_attrs) { { rvm: "replaced" } }
@@ -58,6 +59,7 @@ describe Vx::Builder::Source do
         "cache"          => {
           "directories"=>["~/.cache"]
         },
+        "language"       => "ruby",
         "before_install" => ["echo before_install"],
         "script"         => ["RAILS_ENV=test ls -1 && echo DONE!"],
         "env" => {
@@ -83,6 +85,7 @@ describe Vx::Builder::Source do
           gemfile:       "Gemfile",
           before_script: "echo before_script",
           after_success:  "echo after success",
+          language:       "ruby",
           before_install: "echo before_install",
           script:        "RAILS_ENV=test ls -1 && echo DONE!",
           cache: {

metadata

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