vx-builder 0.5.60 → 0.5.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 844421cc9984d1f8585cc4e9d910d8b584dea3b9
-  data.tar.gz: d75f133b2548c4b6a440271e0c810e6b9c69f12f
+  metadata.gz: 76650145ebc75debb2b2ac541e2ee3997a72e844
+  data.tar.gz: 31eddffa0f442106ddcca5c6b7b50403e5b02dcb
 SHA512:
-  metadata.gz: 1590ec881a64403884258e8d67cdaaa24c9c25c3872f5350f13d452e1bbc301877c59fc6d9f696648388cbb3f6b402d7f5d072ebe9fc6372b36f150e21bb3cdc
-  data.tar.gz: 07e709814d992ad8682df55cb107bf4444e65a6778fa08760c6d1c2cba1541f9a075a0fe79912a6de34eef993e0133300b263143c1544a750a0aa6c3fd7b1310
+  metadata.gz: 6022f3b6f5746d4e0afb6786d25f4f273a02b4a5bb66d8f601a922994000bed474d7881c56c71518341245a96f42d0fd0151af2cbb944c406767a67024a6a474
+  data.tar.gz: ada9d2c483b2722c013bd65b5c42c1e02b558ccb86a944804d4b4290d4ba6e93f7323977d78ac084ebcf376ee42b4ae31659863d5d6735ead8f72c3c38d592ad

data/lib/vx/builder/script_builder_v2/go.rb

@@ -17,13 +17,14 @@ module Vx
 
             env.stage("install").tap do |i|
               i.add_env 'GOPATH', '${HOME}/gopath:${GOPATH}'
-              i.add_env 'PATH', '${HOME}/gopath/bin:${PATH}'
+              i.add_env 'PATH',   '${HOME}/gopath/bin:${PATH}'
               i.add_env 'VX_ORIG_CODE_ROOT', '${PWD}'
-              i.add_env "VX_NEW_CODE_ROOT", "${HOME}/gopath/src/#{project_path env}"
+              i.add_env "VX_NEW_CODE_ROOT",  "${HOME}/gopath/src/#{project_path env}"
 
               i.add_task 'shell', 'mkdir -p $VX_NEW_CODE_ROOT'
               i.add_task 'shell', 'rmdir $VX_NEW_CODE_ROOT'
               i.add_task 'shell', 'cp -r $VX_ORIG_CODE_ROOT $VX_NEW_CODE_ROOT'
+              i.add_task 'shell', "sudo chown -R ${USER}:${USER} ${GOROOT}"
               i.add_task 'chdir', '${VX_NEW_CODE_ROOT}'
 
               i.add_task 'shell', 'go version'

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.5.60"
+    VERSION = "0.5.61"
   end
 end

data/spec/integration/script_builder_v2/go_spec.rb

@@ -47,7 +47,7 @@ describe "(integration v2) go" do
         io.write "set -e\n"
         io.write b.script.to_script
       end
-      system("env", "-", "USER=$USER", "HOME=#{path}", "bash", "script.sh" )
+      system("env", "-", "USER=#{ENV['USER']}", "HOME=#{path}", "bash", "script.sh" )
       expect($?.to_i).to eq 0
     end
   end

data/vx-builder.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'vx-common', '0.4.0'
-  spec.add_runtime_dependency 'vx-message'
+  spec.add_runtime_dependency 'vx-common',  '0.4.0'
+  spec.add_runtime_dependency 'vx-message', '0.6.2'
   spec.add_runtime_dependency 'hashr'
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.5.60
+  version: 0.5.61
 platform: ruby
 authors:
 - Dmitry Galinsky
@@ -28,16 +28,16 @@ dependencies:
   name: vx-message
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: hashr
   requirement: !ruby/object:Gem::Requirement
@@ -215,12 +215,6 @@ files:
 - spec/fixtures/travis_bug_2.yml
 - spec/fixtures/vx_test_repo_insecure_key
 - spec/fixtures/vx_test_repo_insecure_key.pub
-- spec/integration/clojure_spec.rb
-- spec/integration/go_spec.rb
-- spec/integration/nodejs_spec.rb
-- 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
@@ -312,12 +306,6 @@ test_files:
 - spec/fixtures/travis_bug_2.yml
 - spec/fixtures/vx_test_repo_insecure_key
 - spec/fixtures/vx_test_repo_insecure_key.pub
-- spec/integration/clojure_spec.rb
-- spec/integration/go_spec.rb
-- spec/integration/nodejs_spec.rb
-- 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

data/spec/integration/clojure_spec.rb

@@ -1,42 +0,0 @@
-require 'spec_helper'
-require 'yaml'
-require 'tmpdir'
-require 'fileutils'
-
-describe "(integration) go" 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/clojure", real: true do
-    file = {"language" => "clojure"}.to_yaml
-    task = create(
-      :task,
-      sha: "HEAD",
-      branch: "lang/clojure"
-    )
-
-    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/integration/go_spec.rb

@@ -1,70 +0,0 @@
-require 'spec_helper'
-require 'yaml'
-require 'tmpdir'
-require 'fileutils'
-
-describe "(integration) go" 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 write_script_to_filter(prefix, script)
-    File.open(fixture_path("integration/go/#{prefix}before_script.sh"), 'w') do |io|
-      io << script.to_before_script
-    end
-    File.open(fixture_path("integration/go/#{prefix}after_script.sh"), 'w') do |io|
-      io << script.to_after_script
-    end
-    File.open(fixture_path("integration/go/#{prefix}script.sh"), 'w') do |io|
-      io << script.to_script
-    end
-  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(options[:task], matrix.build.first)
-    OpenStruct.new script: script, matrix: matrix
-  end
-
-  context "(generation)" do
-    let(:file) { fixture("integration/go/language/config.yml") }
-    let(:b)    { build(file) }
-    before { write_script_to_filter "language/", b.script }
-
-    it "should generate one configuration" do
-      expect(b.matrix.build).to have(1).item
-    end
-
-    it "should generate valid scripts" do
-      expect(b.script.to_before_script).to eq fixture("integration/go/language/before_script.sh")
-      expect(b.script.to_script).to eq fixture("integration/go/language/script.sh")
-      expect(b.script.to_after_script).to eq fixture("integration/go/language/after_script.sh")
-    end
-  end
-
-  it "should succesfuly run lang/go", real: true do
-    file = {"language" => "go"}.to_yaml
-    task = create(
-      :task,
-      sha: "HEAD",
-      branch: "lang/go"
-    )
-
-    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/integration/nodejs_spec.rb

@@ -1,65 +0,0 @@
-require 'spec_helper'
-require 'yaml'
-require 'tmpdir'
-require 'fileutils'
-
-describe "(integration) 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(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_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
-
-  it "should succesfuly run lang/nodejs witn npm", real: true do
-    file = {
-      "language" => "node_js",
-      'before_script' => "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_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/integration/python_spec.rb

@@ -1,44 +0,0 @@
-require 'spec_helper'
-require 'yaml'
-require 'tmpdir'
-require 'fileutils'
-
-describe "(integration) 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(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_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/integration/ruby_spec.rb

@@ -1,195 +0,0 @@
-require 'spec_helper'
-require 'fileutils'
-require 'tempfile'
-require 'yaml'
-
-describe "(integration) 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 write_script_to_filter(prefix, script)
-    File.open(fixture_path("integration/ruby/#{prefix}before_script.sh"), 'w') do |io|
-      io << script.to_before_script
-    end
-    File.open(fixture_path("integration/ruby/#{prefix}after_script.sh"), 'w') do |io|
-      io << script.to_after_script
-    end
-    File.open(fixture_path("integration/ruby/#{prefix}script.sh"), 'w') do |io|
-      io << script.to_script
-    end
-  end
-
-  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(options[:task], b)
-    end
-    rs
-  end
-
-  context "generation" do
-    let(:config) { fixture("integration/ruby/language/config.yml") }
-
-    it "should successfuly generate scripts using language: ruby" do
-      c = fixture("integration/ruby/language/config.yml")
-      b = build(c)
-      expect(b.scripts).to have(1).item
-      script = b.scripts[0]
-      write_script_to_filter("language/", script)
-      expect(script.to_before_script).to eq fixture("integration/ruby/language/before_script.sh")
-      expect(script.to_script).to        eq fixture("integration/ruby/language/script.sh")
-      expect(script.to_after_script).to  eq fixture("integration/ruby/language/after_script.sh")
-    end
-
-    it "should successfuly generate scripts for deploy" do
-      c = fixture("integration/ruby/deploy/config.yml")
-      b = build(c)
-      expect(b.scripts).to have(1).item
-      script = b.scripts[0]
-      write_script_to_filter("deploy/", script)
-      expect(script.to_before_script).to eq fixture("integration/ruby/deploy/before_script.sh")
-      expect(script.to_script).to        eq fixture("integration/ruby/deploy/script.sh")
-      expect(script.to_after_script).to  eq fixture("integration/ruby/deploy/after_script.sh")
-    end
-
-    it "should successfuly generate scripts for rvm matrix" do
-      c = fixture("integration/ruby/matrix/config.yml")
-      b = build(c)
-
-      expect(b.scripts).to have(2).items
-
-      script = b.scripts[0]
-      write_script_to_filter("matrix/0.", script)
-
-      expect(script.to_before_script).to eq fixture("integration/ruby/matrix/0.before_script.sh")
-      expect(script.to_script).to        eq fixture("integration/ruby/matrix/0.script.sh")
-      expect(script.to_after_script).to  eq fixture("integration/ruby/matrix/0.after_script.sh")
-
-      script = b.scripts[1]
-      write_script_to_filter("matrix/1.", script)
-
-      expect(script.to_before_script).to eq fixture("integration/ruby/matrix/1.before_script.sh")
-      expect(script.to_script).to        eq fixture("integration/ruby/matrix/1.script.sh")
-      expect(script.to_after_script).to  eq fixture("integration/ruby/matrix/1.after_script.sh")
-
-      deploy = Vx::Builder.deploy(b.matrix, branch: "master").build
-      expect(deploy).to have(1).item
-
-      script = Vx::Builder.script(create(:task), deploy[0])
-      write_script_to_filter("matrix/d.", script)
-
-      expect(script.to_before_script).to eq fixture("integration/ruby/matrix/d.before_script.sh")
-      expect(script.to_script).to        eq fixture("integration/ruby/matrix/d.script.sh")
-      expect(script.to_after_script).to  eq fixture("integration/ruby/matrix/d.after_script.sh")
-    end
-  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_before_script
-        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 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_before_script
-        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_before_script
-        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_before_script
-        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_before_script
-        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/rust_spec.rb

@@ -1,42 +0,0 @@
-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