vx-builder 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d410f86eaa7114f27290753d18125560c337c88c
-  data.tar.gz: 4a84c40ccd12b84a3177bae7119b36d42b39c7d4
+  metadata.gz: be5cdd3fce6728724ea5b5dfeafc8ad84a296a8c
+  data.tar.gz: d656d3934abcae13a35bc817e075314a242901dc
 SHA512:
-  metadata.gz: f110a7511cf4da5aa23a84b6584639f2b955ba1497d3b835f78fd8b33a9d144a009a7364db019447c70c8fb08eb0a077641635e18a050ed8f48030ad19866901
-  data.tar.gz: d15b4e3a847752c76c9ffbcc5dce61790f9e76626075a2f64d1eff4f9d28c0b1d51580d03fc492ee27b540cd4745cd57bf416ee491e57db533b3ac7e0c22def8
+  metadata.gz: 873d68e4ea251f4d05bef3f0b7ba0ca96ea2cef984dd62dc651f8a01ed1a28775bfd2035a2aff0bf696eca4662519285dd7f15e175a097555a8eb2c94601e7e5
+  data.tar.gz: bfe817065afd19d996a7c5d6dd1120ef823b1b0f6367035ee7c18c24f6a2c56c99740debc865a63a764b8ff25f2f1c3447a073aed684e113de594e3aec57dcf4

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

@@ -13,7 +13,7 @@ module Vx
             env.before_install.tap do |i|
               i << 'eval "$(rbenv init -)" || true'
               i << "rbenv shell #{make_rbenv_version_command env}"
-              i << 'export BUNDLE_GEMFILE=${PWD}/Gemfile'
+              i << "export BUNDLE_GEMFILE=${PWD}/#{gemfile(env)}"
               i << 'export GEM_HOME=$HOME/cached/rubygems'
             end
 
@@ -38,6 +38,15 @@ module Vx
             env.source.rvm.first
           end
 
+          def gemfile(env)
+            if env.source.gemfile
+              env.source.gemfile.first
+            else
+              env.source.gemfile = ["Gemfile"]
+              gemfile(env)
+            end
+          end
+
           def make_rbenv_version_command(env)
             select_rbenv_version(env)
           end

data/lib/vx/builder/source/constants.rb

@@ -3,7 +3,7 @@ module Vx
     class Source
 
       LANGS    = %w{ rvm scala java go }.freeze
-      KEYS     = %w{ services before_script script before_install }.freeze
+      KEYS     = %w{ gemfile services before_script script before_install }.freeze
       AS_ARRAY = (KEYS + LANGS).freeze
 
     end

data/lib/vx/builder/source/matrix.rb

@@ -3,7 +3,7 @@ module Vx
     class Source
       class Matrix
 
-        KEYS = (Source::LANGS + %w{ matrix_env:env }).freeze
+        KEYS = (Source::LANGS + %w{ gemfile matrix_env:env }).freeze
         NOT_MATRIX_KEYS = %w{ script before_script services before_install }
 
         attr_reader :source

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

data/spec/fixtures/travis.yml

@@ -1,5 +1,7 @@
 rvm:
   - 2.0.0
+gemfile:
+  - 'Gemfile'
 before_script:
   - "echo before_script"
 before_install:

data/spec/lib/builder/script/ruby_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Vx::Builder::Script::Ruby do
+  let(:app)    { ->(_) { 0 } }
+  let(:script) { described_class.new app }
+  let(:env)    { create :env }
+  let(:run)    { script.call env }
+  subject { run }
+
+  it { should eq 0 }
+
+  context "run it" do
+    let(:command) { create :command_from_env, env: env }
+    before { run }
+
+    it "should be success" do
+      puts env
+      puts command
+
+      system( command )
+      expect($?.to_i).to eq 0
+    end
+  end
+
+end

data/spec/lib/builder/source_spec.rb

@@ -7,6 +7,7 @@ describe Vx::Builder::Source do
 
   its(:attributes)    { should be }
   its(:rvm)           { should eq %w{ 2.0.0 } }
+  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!"] }
 
@@ -28,6 +29,7 @@ describe Vx::Builder::Source do
     context "build new instance" do
       let(:expected) { {
         "rvm"            => ["2.0.0"],
+        "gemfile"        => ["Gemfile"],
         "before_script"  => ["echo before_script"],
         "before_install" => ["echo before_install"],
         "script"         => ["RAILS_ENV=test ls -1 && echo DONE!"],
@@ -50,6 +52,7 @@ describe Vx::Builder::Source do
       context "from_attributes" do
         let(:attrs) {{
           rvm:           "2.0.0",
+          gemfile:       "Gemfile",
           before_script: "echo before_script",
           before_install: "echo before_install",
           script:        "RAILS_ENV=test ls -1 && echo DONE!"
@@ -67,27 +70,27 @@ describe Vx::Builder::Source do
 
   context "to_matrix_s" do
     subject { config.to_matrix_s }
-    it { should eq 'rvm:2.0.0' }
+    it { should eq 'gemfile:Gemfile, rvm:2.0.0' }
 
     context "when many items" do
       before do
         mock(config).rvm { %w{ 1.9.3 2.0.0 } }
         mock(config).scala { %w{ 2.10.1 } }
       end
-      it { should eq "rvm:1.9.3, scala:2.10.1" }
+      it { should eq "gemfile:Gemfile, rvm:1.9.3, scala:2.10.1" }
     end
   end
 
   context "matrix_keys" do
     subject { config.matrix_keys }
-    it { should eq("rvm" => "2.0.0") }
+    it { should eq("rvm" => "2.0.0", "gemfile" => "Gemfile") }
 
     context "when many items" do
       before do
         mock(config).rvm { %w{ 1.9.3 2.0.0 } }
         mock(config).scala { %w{ 2.10.1 } }
       end
-      it { should eq({"rvm"=>"1.9.3", "scala"=>"2.10.1"}) }
+      it { should eq({"rvm"=>"1.9.3", "scala"=>"2.10.1", "gemfile" => "Gemfile"}) }
     end
   end
 

data/spec/support/create.rb

@@ -20,9 +20,16 @@ def create(name, options = {})
 
   when :env
     OpenStruct.new(
-      init:   [],
-      source: create(:source),
-      task:   create(:task)
+      init:           [],
+      before_install: [],
+      install:        [],
+      announce:       [],
+      before_script:  [],
+      script:         [],
+      after_script:   [],
+      source:         create(:source),
+      task:           create(:task),
+      cache_key:      []
     )
 
   when :command_from_env

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vx-common
@@ -146,6 +146,7 @@ files:
 - spec/lib/builder/configuration_spec.rb
 - spec/lib/builder/script/env_spec.rb
 - spec/lib/builder/script/prepare_spec.rb
+- spec/lib/builder/script/ruby_spec.rb
 - spec/lib/builder/script_spec.rb
 - spec/lib/builder/source_matrix_spec.rb
 - spec/lib/builder/source_spec.rb
@@ -186,6 +187,7 @@ test_files:
 - spec/lib/builder/configuration_spec.rb
 - spec/lib/builder/script/env_spec.rb
 - spec/lib/builder/script/prepare_spec.rb
+- spec/lib/builder/script/ruby_spec.rb
 - spec/lib/builder/script_spec.rb
 - spec/lib/builder/source_matrix_spec.rb
 - spec/lib/builder/source_spec.rb