vx-builder 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed4202898a00a69bd2f499a568f8caec71977d66
-  data.tar.gz: 992ff2819ab8e68872fbde5c5c14d78cfe360505
+  metadata.gz: c4de00411572ac7ab2b707e90b4aad89eb7cd4f1
+  data.tar.gz: 9c46eb763946c96bc5419ab6472404934ff2cf6a
 SHA512:
-  metadata.gz: a7c911962c18960fc2b26a07ba3fdbc338a5970527cc8eb833f0837874b305374d7f7fb19e53f2ddc6b6dbf46096d4e970595fed22a36b6a6c0b3a5923acd9b9
-  data.tar.gz: 34eb9d1f94e16abab9ac897ed67729ff2385e7bdfd90073241a342662ed6b0ad3aba1f6c7092e26b494241edf3006f8dcf56efdfd4487ac43d7cb22d8456c275
+  metadata.gz: 11681345019e7cdcaca8d653a555002f768170242921ae59b64d38df09e4c2b42cf56334dd41f96348fa5fcfe7aed391f9130898b333748956d89595e66648de
+  data.tar.gz: 9b1cfcf769202916faecec9270aea22df29fbbd302972d833abb525f36515bdf8a803119f424bff3837e1e2623e68d052046f2025281b9b8d80297c00d4fc210

data/lib/vx/builder/build_configuration.rb

@@ -13,9 +13,11 @@ module Vx
         scala
         jdk
         go
+        node_js
+        rust
+
         language
         script
-        node_js
       }
 
       ATTRIBUTES = %w{
@@ -24,8 +26,9 @@ module Vx
         jdk
         go
         node_js
-        language
+        rust
 
+        language
         gemfile
         services
         image

data/lib/vx/builder/script_builder/rust.rb

@@ -0,0 +1,48 @@
+module Vx
+  module Builder
+    class ScriptBuilder
+
+      class Rust < Base
+
+        DEFAULT_RUST = '0.11.0'
+
+        def call(env)
+          if enabled?(env)
+
+            vxvm_install(env, 'rust', rust_version(env))
+
+            do_cache_key(env) do |i|
+              i << "rust-#{rust_version env}"
+            end
+
+            do_install(env) do |i|
+              i << trace_sh_command("git submodule init")
+              i << trace_sh_command("git submodule update")
+            end
+
+            do_announce(env) do |i|
+              i << trace_sh_command("rustc --version")
+            end
+
+            do_script(env) do |i|
+              i << trace_sh_command("if [ -f Makefile ] ; then make ; fi", trace: "make")
+            end
+          end
+
+          app.call(env)
+        end
+
+        private
+
+          def enabled?(env)
+            env.source.rust.first || env.source.language == 'rust'
+          end
+
+          def rust_version(env)
+            env.source.rust.first || DEFAULT_RUST
+          end
+
+      end
+    end
+  end
+end

data/lib/vx/builder/script_builder.rb

@@ -12,6 +12,7 @@ module Vx
       autoload :Java,         File.expand_path("../script_builder/java",      __FILE__)
       autoload :Scala,        File.expand_path("../script_builder/scala",     __FILE__)
       autoload :Clojure,      File.expand_path("../script_builder/clojure",   __FILE__)
+      autoload :Rust,         File.expand_path("../script_builder/rust",      __FILE__)
       autoload :Prepare,      File.expand_path("../script_builder/prepare",   __FILE__)
       autoload :Databases,    File.expand_path("../script_builder/databases", __FILE__)
       autoload :Cache,        File.expand_path("../script_builder/cache",     __FILE__)
@@ -35,6 +36,7 @@ module Vx
         use Builder::ScriptBuilder::Ruby
         use Builder::ScriptBuilder::Go
         use Builder::ScriptBuilder::Nodejs
+        use Builder::ScriptBuilder::Rust
 
         use Builder::ScriptBuilder::Deploy
         use Builder::ScriptBuilder::Defaults

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.5.3"
+    VERSION = "0.5.4"
   end
 end

data/spec/fixtures/travis.yml

@@ -22,6 +22,8 @@ go: '1.2.2'
 
 node_js: "0.10"
 
+rust: "0.11.0"
+
 image:
   - one
   - two

data/spec/integration/rust_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'yaml'
+require 'tmpdir'
+require 'fileutils'
+
+describe "(integration) rust" do
+  let(:path) { Dir.tmpdir + "/vx-builder-test" }
+
+  before do
+    FileUtils.rm_rf(path)
+    FileUtils.mkdir_p(path)
+  end
+  after { FileUtils.rm_rf(path) }
+
+  def build(file, options = {})
+    config = Vx::Builder::BuildConfiguration.from_yaml(file)
+    matrix = Vx::Builder.matrix config
+    options[:task] ||= create(:task)
+    script = Vx::Builder.script(options[:task], matrix.build.first)
+    OpenStruct.new script: script, matrix: matrix
+  end
+
+  it "should succesfuly run lang/rust", real: true do
+    file = {"language" => "rust"}.to_yaml
+    task = create(
+      :task,
+      sha: "HEAD",
+      branch: "lang/rust"
+    )
+
+    b = build(file, task: task)
+    Dir.chdir(path) do
+      File.open("script.sh", "w") do |io|
+        io.write "set -e\n"
+        io.write b.script.to_before_script
+        io.write b.script.to_script
+      end
+      system("env", "-", "USER=$USER", "HOME=#{path}", "bash", "script.sh" )
+      expect($?.to_i).to eq 0
+    end
+  end
+end

data/spec/lib/builder/build_configuration_spec.rb

@@ -40,6 +40,7 @@ describe Vx::Builder::BuildConfiguration do
        "image"          => ["one", "two"],
        "jdk"            => ['openjdk7'],
        "language"       => ["ruby"],
+       "rust"           => ['0.11.0'],
        "go"             => ['1.2.2'],
        "node_js"        => ['0.10'],
        "rvm"            => ["2.0.0"],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Dmitry Galinsky
@@ -148,6 +148,7 @@ files:
 - lib/vx/builder/script_builder/nodejs.rb
 - lib/vx/builder/script_builder/prepare.rb
 - lib/vx/builder/script_builder/ruby.rb
+- lib/vx/builder/script_builder/rust.rb
 - lib/vx/builder/script_builder/scala.rb
 - lib/vx/builder/script_builder/services.rb
 - lib/vx/builder/script_builder/timeouts.rb
@@ -187,6 +188,7 @@ files:
 - spec/integration/go_spec.rb
 - spec/integration/nodejs_spec.rb
 - spec/integration/ruby_spec.rb
+- spec/integration/rust_spec.rb
 - spec/lib/builder/build_configuration/cache_spec.rb
 - spec/lib/builder/build_configuration/deploy/base_spec.rb
 - spec/lib/builder/build_configuration/deploy/shell_spec.rb
@@ -270,6 +272,7 @@ test_files:
 - spec/integration/go_spec.rb
 - spec/integration/nodejs_spec.rb
 - spec/integration/ruby_spec.rb
+- spec/integration/rust_spec.rb
 - spec/lib/builder/build_configuration/cache_spec.rb
 - spec/lib/builder/build_configuration/deploy/base_spec.rb
 - spec/lib/builder/build_configuration/deploy/shell_spec.rb