vx-builder 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 595e992a1dd450009a45d6b454d8c373ca9f0343
-  data.tar.gz: 5e57530da8bbce538e77996df2d88d4916077cc8
+  metadata.gz: cc388974f9a96b875a54aa696fd8355ecb33c0e7
+  data.tar.gz: aa0518b528ee2928db46e43ccda9c50011572cba
 SHA512:
-  metadata.gz: 9fc0af12b7aacfc32d4c4f14d32277742445afa624008ae4b93c0de815ca375f78d60ca81c785c21ae0dc4c4d3846f02b6d6f4e57baacadaf776f96e0b4e7192
-  data.tar.gz: 356cce5b8ea9fbbbcc07c107b8edabe98cdaa6f8a2406184ca68409c56f97aa7d3e55ce81f68f47c519b942b5f04ad33f698fb995142c161373c9d55b525b959
+  metadata.gz: ea105c4c7af16bc0e6c12bcea6a259274120c059ed0565ed70bf12e06746f090c0865622a5a4cb80769bcb80531f08d52b68f4da2ba9fc67fe3ebd81387f21ed
+  data.tar.gz: c8aec854e833d2957f0e18b6f63640b9d0ad1b62c3c4ff074a3af25c0373fb8e7a9b5aa26119b4cd9aa523063650e26950c45599f423bfd36fe58a8350cdde84

data/lib/vx/builder/script.rb

@@ -6,6 +6,8 @@ module Vx
 
       autoload :Env,          File.expand_path("../script/env",           __FILE__)
       autoload :Ruby,         File.expand_path("../script/ruby",          __FILE__)
+      autoload :Java,         File.expand_path("../script/java",          __FILE__)
+      autoload :Scala,        File.expand_path("../script/scala",         __FILE__)
       autoload :Script,       File.expand_path("../script/script",        __FILE__)
       autoload :Prepare,      File.expand_path("../script/prepare",       __FILE__)
       autoload :Databases,    File.expand_path("../script/databases",     __FILE__)
@@ -19,6 +21,8 @@ module Vx
         use Builder::Script::Services
         use Builder::Script::Env
         use Builder::Script::Prepare
+        use Builder::Script::Java
+        use Builder::Script::Scala
         use Builder::Script::Ruby
         use Builder::Script::Script
       end

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

@@ -8,7 +8,9 @@ module Vx
 
         def call(env)
           env.init << "set -e"
+          env.init << "export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
           env.init << 'export LC_ALL=en_US.UTF8'
+          env.init << "source /etc/profile.d/*.sh"
           env.source.global_env.each do |e|
             env.init << trace_sh_command("export #{e}")
           end

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

@@ -0,0 +1,31 @@
+module Vx
+  module Builder
+    class Script
+
+      Java = Struct.new(:app) do
+
+        include Helper::TraceShCommand
+
+        def call(env)
+          if java(env)
+            env.cache_key << "jdk-#{java env}"
+
+            env.before_install.tap do |i|
+              i << "source $(which jdk_switcher.sh)"
+              i << trace_sh_command("jdk_switcher use #{java env}")
+            end
+          end
+
+          app.call(env)
+        end
+
+        private
+
+          def java(env)
+            env.source.jdk.first
+          end
+
+      end
+    end
+  end
+end

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

@@ -14,7 +14,6 @@ module Vx
             env.cache_key << gemfile(env)
 
             env.before_install.tap do |i|
-              i << "source /etc/profile.d/rbenv.sh"
               i << 'eval "$(rbenv init -)" || true'
               i << "rbenv shell #{make_rbenv_version_command env}"
               i << trace_sh_command("export BUNDLE_GEMFILE=${PWD}/#{gemfile(env)}")
@@ -32,6 +31,11 @@ module Vx
               i << trace_sh_command("bundle clean --force")
             end
 
+            if env.source.script.empty?
+              script = "test -f Rakefile && #{trace_sh_command "bundle exec rake"} || true"
+              env.script << script
+            end
+
             if env.source.cached_directories != false
               env.cached_directories.push "~/.rubygems"
             end

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

@@ -0,0 +1,48 @@
+module Vx
+  module Builder
+    class Script
+
+      Scala = Struct.new(:app) do
+
+        include Helper::TraceShCommand
+
+        DEFAULT_SCALA = '2.10.3'
+
+        def call(env)
+          if enabled?(env)
+            env.cache_key << "scala-#{scala env}"
+
+            env.announce.tap do |i|
+              i << "echo Using scala #{scala env}"
+            end
+
+            if env.source.script.empty?
+              env.script.tap do |i|
+                i << "if [[ -d project || -f build.sbt ]] ; then #{trace_sh_command "sbt ++#{scala env} test"} ; fi"
+              end
+            end
+
+            if env.source.cached_directories != false
+              env.cached_directories.push "~/.sbt"
+              env.cached_directories.push "~/.ivy2"
+            end
+          end
+
+          app.call(env)
+        end
+
+        private
+
+          def enabled?(env)
+            env.source.scala.first || env.language == 'scala'
+          end
+
+          def scala(env)
+            env.source.scala.first || DEFAULT_SCALA
+          end
+
+
+      end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ module Vx
   module Builder
     class Source
 
-      LANGS    = %w{ rvm scala java }.freeze
+      LANGS    = %w{ rvm scala jdk }.freeze
       KEYS     = %w{ gemfile services before_script script before_install image
                      after_success }.freeze
       AS_ARRAY = (KEYS + LANGS).freeze

data/lib/vx/builder/version.rb

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

data/spec/fixtures/scala.yml

@@ -0,0 +1,10 @@
+language: scala
+scala:
+  - 2.11.0-M8
+  - 2.10.3
+  - 2.9.3
+jdk:
+  - oraclejdk7
+  - openjdk6
+
+script: sbt ++$TRAVIS_SCALA_VERSION check-gen-type-classes test

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

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Vx::Builder::Script::Java do
+  let(:app)    { ->(env) { env } }
+  let(:script) { described_class.new app }
+  let(:source) { create :source, name: "scala.yml" }
+  let(:env)    { create :env, source: source }
+  let(:run)    { script.call env }
+  subject { run }
+
+  it { should eq env }
+
+  context "run it" do
+    subject { env }
+
+    context "should be success" do
+      before { run }
+      its(:before_install) { should_not be_empty }
+    end
+
+  end
+
+end

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

@@ -13,15 +13,22 @@ describe Vx::Builder::Script::Ruby do
     let(:command) { create :command_from_env, env: env }
     subject { env }
 
-    before { run }
-
     context "should be success" do
+      before { run }
       its(:before_install)     { should_not be_empty }
       its(:announce)           { should_not be_empty }
       its(:install)            { should_not be_empty }
       its(:cached_directories) {  should eq %w{ ~/.rubygems } }
     end
 
+    context "when script is empty" do
+      before do
+        env.source.script.clear
+        run
+      end
+      its(:script) { should_not be_empty }
+    end
+
 
   end
 

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

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Vx::Builder::Script::Scala do
+  let(:app)    { ->(env) { env } }
+  let(:script) { described_class.new app }
+  let(:source) { create :source, name: "scala.yml" }
+  let(:env)    { create :env, source: source }
+  let(:run)    { script.call env }
+  subject { run }
+
+  it { should eq env }
+
+  context "run it" do
+    subject { env }
+
+    context "should be success" do
+      before { run }
+      its(:announce)           { should_not be_empty }
+      its(:cached_directories) { should eq %w{ ~/.sbt ~/.ivy2 } }
+    end
+
+    context "when script is empty" do
+      before do
+        env.source.script.clear
+        run
+      end
+      its(:script) { should_not be_empty }
+    end
+
+
+  end
+
+end

data/spec/support/create.rb

@@ -17,7 +17,8 @@ def create(name, options = {})
     )
 
   when :source
-    Vx::Builder::Source.from_yaml(fixture("travis.yml"))
+    name = options[:name] || "travis.yml"
+    Vx::Builder::Source.from_yaml(fixture(name))
 
   when :env
     OpenStruct.new(
@@ -28,7 +29,7 @@ def create(name, options = {})
       before_script:  [],
       script:         [],
       after_script:   [],
-      source:         create(:source),
+      source:         options[:source] || create(:source),
       task:           create(:task),
       cache_key:      [],
       cached_directories: []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Dmitry Galinsky
@@ -129,8 +129,10 @@ files:
 - lib/vx/builder/script.rb
 - lib/vx/builder/script/cache.rb
 - lib/vx/builder/script/env.rb
+- lib/vx/builder/script/java.rb
 - lib/vx/builder/script/prepare.rb
 - lib/vx/builder/script/ruby.rb
+- lib/vx/builder/script/scala.rb
 - lib/vx/builder/script/script.rb
 - lib/vx/builder/script/services.rb
 - lib/vx/builder/source.rb
@@ -139,14 +141,17 @@ files:
 - lib/vx/builder/source/serializable.rb
 - lib/vx/builder/task.rb
 - lib/vx/builder/version.rb
+- spec/fixtures/scala.yml
 - spec/fixtures/travis.yml
 - spec/fixtures/travis_bug_1.yml
 - spec/fixtures/travis_bug_2.yml
 - spec/lib/builder/configuration_spec.rb
 - spec/lib/builder/script/cache_spec.rb
 - spec/lib/builder/script/env_spec.rb
+- spec/lib/builder/script/java_spec.rb
 - spec/lib/builder/script/prepare_spec.rb
 - spec/lib/builder/script/ruby_spec.rb
+- spec/lib/builder/script/scala_spec.rb
 - spec/lib/builder/script_spec.rb
 - spec/lib/builder/source_matrix_spec.rb
 - spec/lib/builder/source_spec.rb
@@ -181,14 +186,17 @@ signing_key:
 specification_version: 4
 summary: Write a gem summary
 test_files:
+- spec/fixtures/scala.yml
 - spec/fixtures/travis.yml
 - spec/fixtures/travis_bug_1.yml
 - spec/fixtures/travis_bug_2.yml
 - spec/lib/builder/configuration_spec.rb
 - spec/lib/builder/script/cache_spec.rb
 - spec/lib/builder/script/env_spec.rb
+- spec/lib/builder/script/java_spec.rb
 - spec/lib/builder/script/prepare_spec.rb
 - spec/lib/builder/script/ruby_spec.rb
+- spec/lib/builder/script/scala_spec.rb
 - spec/lib/builder/script_spec.rb
 - spec/lib/builder/source_matrix_spec.rb
 - spec/lib/builder/source_spec.rb