vx-builder 0.5.54 → 0.5.55

data/spec/integration/script_builder_v2/nodejs_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+require 'yaml'
+require 'tmpdir'
+require 'fileutils'
+
+describe "(integration v2) nodejs" 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_v2(options[:task], matrix.build.first)
+    OpenStruct.new script: script, matrix: matrix
+  end
+
+  it "should succesfuly run lang/nodejs", real: true do
+    file = {"language" => "node_js"}.to_yaml
+    task = create(
+      :task,
+      sha: "HEAD",
+      branch: "lang/nodejs"
+    )
+
+    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_script
+      end
+      system("env", "-", "USER=$USER", "HOME=#{path}", "bash", "script.sh" )
+      expect($?.to_i).to eq 0
+    end
+  end
+
+  it "should succesfuly run lang/nodejs witn npm", real: true do
+    file = {
+      "language" => "node_js",
+      'before_script' => "sudo npm install -g bower",
+      'script' => 'bower --version' }.to_yaml
+    task = create(
+      :task,
+      sha: "HEAD",
+      branch: "lang/nodejs"
+    )
+
+    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_script
+      end
+      system("env", "-", "USER=$USER", "HOME=#{path}", "bash", "script.sh" )
+      expect($?.to_i).to eq 0
+    end
+  end
+end

data/spec/integration/script_builder_v2/python_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'yaml'
+require 'tmpdir'
+require 'fileutils'
+
+describe "(integration v2) python" do
+  let(:path) { Dir.tmpdir + "/vx-builder-test" }
+
+  before do
+    FileUtils.rm_rf(path)
+    FileUtils.mkdir_p(path)
+  end
+  after do
+    system "sudo rm -rf #{path}"
+  end
+
+  def build(file, options = {})
+    config = Vx::Builder::BuildConfiguration.from_yaml(file)
+    matrix = Vx::Builder.matrix config
+    options[:task] ||= create(:task)
+    script = Vx::Builder.script_v2(options[:task], matrix.build.first)
+    OpenStruct.new script: script, matrix: matrix
+  end
+
+  it "should succesfuly run lang/python", real: true do
+    file = {"language" => "python"}.to_yaml
+    task = create(
+      :task,
+      sha: "HEAD",
+      branch: "lang/python"
+    )
+
+    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_script
+      end
+      system("env", "-", "USER=$USER", "HOME=#{path}", "bash", "script.sh" )
+      expect($?.to_i).to eq 0
+    end
+  end
+end

data/spec/integration/script_builder_v2/ruby_spec.rb

@@ -0,0 +1,141 @@
+require 'spec_helper'
+require 'fileutils'
+require 'tempfile'
+require 'yaml'
+
+describe "(integration v2) ruby" 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 = file ? Vx::Builder::BuildConfiguration.from_yaml(file) : Vx::Builder::BuildConfiguration.new(nil)
+    matrix = Vx::Builder.matrix config
+    options[:task] ||= create(:task)
+    rs = OpenStruct.new matrix: matrix, scripts: []
+    matrix.build.each do |b|
+      rs.scripts << Vx::Builder.script_v2(options[:task], b)
+    end
+    rs
+  end
+
+  it "should succesfuly run lang/ruby", real: true do
+    file = {"language" => "ruby"}.to_yaml
+    task = create(
+      :task,
+      sha: "HEAD",
+      branch: "lang/ruby"
+    )
+
+    b = build(file, task: task)
+    Dir.chdir(path) do
+      File.open("script.sh", "w") do |io|
+        io.write "set -e\n"
+        io.write b.scripts[0].to_script
+      end
+      system("env", "-", "USER=$USER", "HOME=#{path}", "bash", "script.sh" )
+      expect($?.to_i).to eq 0
+    end
+  end
+
+  it "should fail to run lang/ruby", real: true do
+    file = {"language" => "ruby", "script" => "false"}.to_yaml
+    task = create(
+      :task,
+      sha: "HEAD",
+      branch: "lang/ruby"
+    )
+
+    b = build(file, task: task)
+    Dir.chdir(path) do
+      File.open("script.sh", "w") do |io|
+        io.write "set -e\n"
+        io.write b.scripts[0].to_script
+      end
+      system("env", "-", "USER=$USER", "HOME=#{path}", "bash", "script.sh" )
+      expect($?.to_i).to_not eq 0
+    end
+  end
+
+  it "should succesfuly run lang/ruby with rvm key", real: true do
+    file = {"rvm" => "2.1"}.to_yaml
+    task = create(
+      :task,
+      sha: "HEAD",
+      branch: "lang/ruby"
+    )
+
+    b = build(file, task: task)
+    Dir.chdir(path) do
+      File.open("script.sh", "w") do |io|
+        io.write "set -e\n"
+        io.write b.scripts[0].to_script
+      end
+      system("env", "-", "USER=$USER", "HOME=#{path}", "bash", "script.sh" )
+      expect($?.to_i).to eq 0
+    end
+  end
+
+  it "should succesfuly run lang/ruby with parallel_rspec", real: true do
+    file = {"language" => "ruby", "parallel" => 3, "script" => "parallel_rspec"}.to_yaml
+    task = create(
+      :task,
+      sha: "HEAD",
+      branch: "lang/ruby"
+    )
+
+    b = build(file, task: task)
+    Dir.chdir(path) do
+      File.open("script.sh", "w") do |io|
+        io.write "set -e\n"
+        io.write b.scripts[0].to_script
+      end
+      system("env", "-", "USER=$USER", "HOME=#{path}", "bash", "script.sh" )
+      expect($?.to_i).to eq 0
+    end
+  end
+
+  it "should succesfuly run lang/ruby-rails-pg", real: true do
+    file = {"language" => "ruby"}.to_yaml
+    task = create(
+      :task,
+      sha: "HEAD",
+      branch: "lang/ruby-rails-pg"
+    )
+
+    b = build(file, task: task)
+    Dir.chdir(path) do
+      File.open("script.sh", "w") do |io|
+        io.write "set -e\n"
+        io.write b.scripts[0].to_script
+      end
+      system("env", "-", "USER=$USER", "HOME=#{path}", "bash", "script.sh" )
+      expect($?.to_i).to eq 0
+    end
+  end
+
+  it "should succesfuly run lang/ruby-rails-mysql", real: true do
+    file = {"language" => "ruby"}.to_yaml
+    task = create(
+      :task,
+      sha: "HEAD",
+      branch: "lang/ruby-rails-mysql"
+    )
+
+    b = build(file, task: task)
+    Dir.chdir(path) do
+      File.open("script.sh", "w") do |io|
+        io.write "set -e\n"
+        io.write b.scripts[0].to_script
+      end
+      system("env", "-", "USER=$USER", "HOME=#{path}", "bash", "script.sh" )
+      expect($?.to_i).to eq 0
+    end
+  end
+end
+

data/spec/integration/script_builder_v2/rust_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+require 'yaml'
+require 'tmpdir'
+require 'fileutils'
+
+describe "(integration v2) 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_v2(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_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

@@ -28,6 +28,7 @@ describe Vx::Builder::BuildConfiguration do
        "before_install" => ["echo before_install"],
        "install"        => ["echo install"],
        "before_script"  => ["echo before_script"],
+       "database"       => [],
        "cache" => {
          "directories"  => ["~/.cache"],
          "enabled"      => true

data/spec/lib/builder/script_builder_v2_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe Vx::Builder::ScriptBuilderV2 do
+  let(:task)   { create :task }
+  let(:source) { create :source }
+  let(:script) { described_class.new task, source }
+  subject { script }
+
+  context "just created" do
+    its(:source) { should eq source }
+    its(:task)   { should eq task  }
+  end
+
+  it "should avaialble timeout and read_timeout attributes" do
+    expect(script.vexor.timeout).to eq 10
+    expect(script.vexor.read_timeout).to eq 20
+
+    simple_source = create :source, name: "simple.yml"
+    simple_script = described_class.new task, simple_source
+    expect(simple_script.vexor.timeout).to be_nil
+    expect(simple_script.vexor.read_timeout).to be_nil
+  end
+
+  it "should create parallel jobs" do
+    matrix = Vx::Builder::MatrixBuilder.new(source)
+    configurations = matrix.build
+    configuration = configurations[1]
+    expect(configuration.parallel).to eq 3
+    expect(configuration.parallel_job_number).to eq 1
+    parallel_script = described_class.new task, configuration
+
+    parallel_script.to_hash # call
+    stage = parallel_script.stage("init")
+    expect(stage.environment["CI_PARALLEL_JOBS"]).to eq 3
+    expect(stage.environment["CI_PARALLEL_JOB_NUMBER"]).to eq 1
+  end
+
+  it "should able to convert to yaml" do
+    yml = script.to_yaml
+    fixture = "spec/fixtures/script_builder_v2/simple.yml"
+    File.open(fixture, 'w') { |io| io.write yml }
+    expect(script.to_yaml).to eq File.read(fixture)
+  end
+
+  it "should able to convert to script" do
+    sh = script.to_script
+    fixture = "spec/fixtures/script_builder_v2/simple.sh"
+    File.open(fixture, 'w') { |io| io.write sh }
+    expect(script.to_script).to be
+  end
+
+end

data/spec/lib/builder/task_spec.rb

@@ -9,7 +9,7 @@ describe Vx::Builder::Task do
     its(:name)            { should eq 'vexor/vx-test-repo' }
     its(:sha)             { should eq '8f53c077072674972e21c82a286acc07fada91f5' }
     its(:deploy_key)      { should be }
-    its(:cache_url_prefix){ should eq 'http://example.com' }
+    its(:cache_url_prefix){ should eq 'http://localhost:3001' }
     its(:job_id)          { should eq 1 }
     its(:build_id)        { should eq 12 }
     its(:pull_request_id) { should eq 1 }

data/spec/support/create.rb

@@ -12,7 +12,7 @@ def create(name, options = {})
       sha:              options[:sha] || "8f53c077072674972e21c82a286acc07fada91f5",
       deploy_key:       fixture("vx_test_repo_insecure_key"),
       branch:           options[:branch] || "test/pull-request",
-      cache_url_prefix: "http://example.com",
+      cache_url_prefix: "http://localhost:3001",
       pull_request_id:  options[:pull_request_id],
       job_number:       100,
       build_number:     101,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.5.54
+  version: 0.5.55
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-29 00:00:00.000000000 Z
+date: 2014-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vx-common
@@ -163,7 +163,24 @@ files:
 - lib/vx/builder/script_builder/scala.rb
 - lib/vx/builder/script_builder/services.rb
 - lib/vx/builder/script_builder/timeouts.rb
+- lib/vx/builder/script_builder_v2.rb
+- lib/vx/builder/script_builder_v2/base.rb
+- lib/vx/builder/script_builder_v2/cache.rb
+- lib/vx/builder/script_builder_v2/clojure.rb
+- lib/vx/builder/script_builder_v2/clone.rb
+- lib/vx/builder/script_builder_v2/defaults.rb
+- lib/vx/builder/script_builder_v2/deploy.rb
+- lib/vx/builder/script_builder_v2/env.rb
+- lib/vx/builder/script_builder_v2/go.rb
+- lib/vx/builder/script_builder_v2/java.rb
+- lib/vx/builder/script_builder_v2/nodejs.rb
+- lib/vx/builder/script_builder_v2/python.rb
+- lib/vx/builder/script_builder_v2/ruby.rb
+- lib/vx/builder/script_builder_v2/rust.rb
+- lib/vx/builder/script_builder_v2/scala.rb
+- lib/vx/builder/script_builder_v2/services.rb
 - lib/vx/builder/task.rb
+- lib/vx/builder/templates/script_builder_v2/to_script.erb
 - lib/vx/builder/version.rb
 - spec/fixtures/clojure.yml
 - spec/fixtures/integration/go/language/after_script.sh
@@ -190,6 +207,8 @@ files:
 - spec/fixtures/integration/ruby/matrix/d.script.sh
 - spec/fixtures/python.yml
 - spec/fixtures/scala.yml
+- spec/fixtures/script_builder_v2/simple.sh
+- spec/fixtures/script_builder_v2/simple.yml
 - spec/fixtures/simple.yml
 - spec/fixtures/travis.yml
 - spec/fixtures/travis_bug_1.yml
@@ -202,6 +221,12 @@ files:
 - spec/integration/python_spec.rb
 - spec/integration/ruby_spec.rb
 - spec/integration/rust_spec.rb
+- spec/integration/script_builder_v2/clojure_spec.rb
+- spec/integration/script_builder_v2/go_spec.rb
+- spec/integration/script_builder_v2/nodejs_spec.rb
+- spec/integration/script_builder_v2/python_spec.rb
+- spec/integration/script_builder_v2/ruby_spec.rb
+- spec/integration/script_builder_v2/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
@@ -222,6 +247,7 @@ files:
 - spec/lib/builder/script_builder/ruby_spec.rb
 - spec/lib/builder/script_builder/scala_spec.rb
 - spec/lib/builder/script_builder_spec.rb
+- spec/lib/builder/script_builder_v2_spec.rb
 - spec/lib/builder/task_spec.rb
 - spec/lib/builder_spec.rb
 - spec/spec_helper.rb
@@ -278,6 +304,8 @@ test_files:
 - spec/fixtures/integration/ruby/matrix/d.script.sh
 - spec/fixtures/python.yml
 - spec/fixtures/scala.yml
+- spec/fixtures/script_builder_v2/simple.sh
+- spec/fixtures/script_builder_v2/simple.yml
 - spec/fixtures/simple.yml
 - spec/fixtures/travis.yml
 - spec/fixtures/travis_bug_1.yml
@@ -290,6 +318,12 @@ test_files:
 - spec/integration/python_spec.rb
 - spec/integration/ruby_spec.rb
 - spec/integration/rust_spec.rb
+- spec/integration/script_builder_v2/clojure_spec.rb
+- spec/integration/script_builder_v2/go_spec.rb
+- spec/integration/script_builder_v2/nodejs_spec.rb
+- spec/integration/script_builder_v2/python_spec.rb
+- spec/integration/script_builder_v2/ruby_spec.rb
+- spec/integration/script_builder_v2/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
@@ -310,6 +344,7 @@ test_files:
 - spec/lib/builder/script_builder/ruby_spec.rb
 - spec/lib/builder/script_builder/scala_spec.rb
 - spec/lib/builder/script_builder_spec.rb
+- spec/lib/builder/script_builder_v2_spec.rb
 - spec/lib/builder/task_spec.rb
 - spec/lib/builder_spec.rb
 - spec/spec_helper.rb