vx-builder 0.2.2 → 0.3.0

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

@@ -0,0 +1,50 @@
+module Vx
+  module Builder
+    class ScriptBuilder
+
+      class Scala < Base
+
+        DEFAULT_SCALA = '2.10.3'
+
+        def call(env)
+          if enabled?(env)
+            do_cache_key(env) do |i|
+              i << "scala-#{scala env}"
+            end
+
+            do_announce(env) do |i|
+              i << trace_sh_command("export SCALA_VERSION=#{scala env}")
+            end
+
+            do_install(env) do |i|
+              i << "if [[ -d project || -f build.sbt ]] ; then #{trace_sh_command "sbt ++#{scala env} update"} ; fi"
+            end
+
+            do_script(env) do |i|
+              i << "if [[ -d project || -f build.sbt ]] ; then #{trace_sh_command "sbt ++#{scala env} test"} ; fi"
+            end
+
+            do_cached_directories(env) do |i|
+              i << "~/.sbt"
+              i << "~/.ivy2"
+            end
+          end
+
+          app.call(env)
+        end
+
+        private
+
+          def enabled?(env)
+            env.source.scala.first || env.source.language == 'scala'
+          end
+
+          def scala(env)
+            env.source.scala.first || DEFAULT_SCALA
+          end
+
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module Vx
+  module Builder
+    class ScriptBuilder
+
+      Script = Struct.new(:app) do
+
+        include Helper::TraceShCommand
+
+        def call(env)
+          env.source.before_install.each do |c|
+            env.before_install << trace_sh_command(c)
+          end
+
+          env.source.before_script.each do |c|
+            env.before_script << trace_sh_command(c)
+          end
+
+          env.source.script.each do |c|
+            env.script << trace_sh_command(c)
+          end
+
+          env.source.after_success.each do |c|
+            env.after_success << trace_sh_command(c)
+          end
+
+          app.call(env)
+        end
+
+      end
+    end
+  end
+end

data/lib/vx/builder/script_builder/script.rb-e

@@ -0,0 +1,32 @@
+module Vx
+  module Builder
+    class Script
+
+      Script = Struct.new(:app) do
+
+        include Helper::TraceShCommand
+
+        def call(env)
+          env.source.before_install.each do |c|
+            env.before_install << trace_sh_command(c)
+          end
+
+          env.source.before_script.each do |c|
+            env.before_script << trace_sh_command(c)
+          end
+
+          env.source.script.each do |c|
+            env.script << trace_sh_command(c)
+          end
+
+          env.source.after_success.each do |c|
+            env.after_success << trace_sh_command(c)
+          end
+
+          app.call(env)
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module Vx
+  module Builder
+    class ScriptBuilder
+
+      class Services < Base
+
+        ALIASES = {
+          'rabbitmq' => 'rabbitmq-server'
+        }
+
+        def call(env)
+          env.source.services.each do |srv|
+            srv = ALIASES[srv] || srv
+            env.init << trace_sh_command("sudo service #{srv} start")
+          end
+          unless env.source.services.empty?
+            env.init << trace_sh_command("sleep 3")
+          end
+
+          app.call(env)
+        end
+
+      end
+    end
+  end
+end

data/lib/vx/builder/task.rb

@@ -3,7 +3,7 @@ module Vx
     class Task
 
       attr_reader :name, :src, :sha, :deploy_key, :branch, :pull_request_id,
-        :cache_url_prefix, :artifacts_url_prefix, :job_id, :build_id
+        :cache_url_prefix, :job_id, :build_id
 
       def initialize(options = {})
         @name                 = options[:name]
@@ -15,16 +15,10 @@ module Vx
         @branch               = options[:branch]
         @pull_request_id      = options[:pull_request_id]
         @cache_url_prefix     = options[:cache_url_prefix]
-        @artifacts_url_prefix = options[:artifacts_url_prefix]
-        @deploy               = !!options[:deploy]
 
         validate!
       end
 
-      def deploy?
-        @deploy
-      end
-
       private
 
         def validate!

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

data/spec/fixtures/integration/ruby/deploy/config.yml

@@ -1,11 +1,15 @@
 language: ruby
 
+env:
+  global: "FOO"
+  matrix: "BAR"
+
 deploy:
 
-  - command: cap staging deploy
+  - shell: cap staging deploy
     branch: master
 
-  - command: cap producation deploy
+  - shell: cap producation deploy
     branch: production
 
 after_deploy: echo after deploy

data/spec/fixtures/integration/ruby/deploy/d.after_script.sh

@@ -6,5 +6,5 @@ export CI_BRANCH=master
 export VX_ROOT=$(pwd)
 cd ${VX_ROOT}/code/name
 
-# after deploy
+# after script
 test -f $HOME/.casher/bin/casher && /opt/rbenv/versions/1.9.3-p547/bin/ruby $HOME/.casher/bin/casher push http://example.com/master/rvm-1.9.3-gemfile.tgz

data/spec/fixtures/integration/ruby/deploy/d.before_script.sh

@@ -7,6 +7,8 @@ export DEBIAN_FRONTEND=noninteractive
 export CI_JOB_ID=1
 export CI_BUILD_ID=12
 export CI_BRANCH=master
+echo \$\ export\ FOO
+export FOO
 export VX_ROOT=$(pwd)
 mkdir -p ${VX_ROOT}/data/name
 mkdir -p ${VX_ROOT}/code/name
@@ -52,6 +54,6 @@ bundle install
 echo \$\ bundle\ clean\ --force
 bundle clean --force
 
-# before deploy
+# before script
 echo \$\ echo\ before\ deploy
 echo before deploy

data/spec/fixtures/integration/ruby/deploy/d.script.sh

@@ -1,4 +1,8 @@
 
-# deploy
+# script
 echo \$\ cap\ staging\ deploy
-cap staging deploy
+cap staging deploy
+
+# after success
+echo \$\ echo\ after\ deploy
+echo after deploy

data/spec/fixtures/integration/ruby/matrix/config.yml

@@ -8,4 +8,7 @@ script: rake
 
 after_script: echo after script
 
-deploy: cap staging deploy
+deploy:
+  shell: cap staging deploy
+
+after_deploy: echo after deploy

data/spec/fixtures/integration/ruby/matrix/d.after_script.sh

@@ -6,5 +6,5 @@ export CI_BRANCH=master
 export VX_ROOT=$(pwd)
 cd ${VX_ROOT}/code/name
 
-# after deploy
+# after script
 test -f $HOME/.casher/bin/casher && /opt/rbenv/versions/1.9.3-p547/bin/ruby $HOME/.casher/bin/casher push http://example.com/master/rvm-1.9.3-gemfile.tgz

data/spec/fixtures/integration/ruby/matrix/d.before_script.sh

@@ -52,4 +52,4 @@ bundle install
 echo \$\ bundle\ clean\ --force
 bundle clean --force
 
-# before deploy
+# before script

data/spec/fixtures/integration/ruby/matrix/d.script.sh

@@ -1,4 +1,8 @@
 
-# deploy
+# script
 echo \$\ cap\ staging\ deploy
-cap staging deploy
+cap staging deploy
+
+# after success
+echo \$\ echo\ after\ deploy
+echo after deploy

data/spec/fixtures/travis.yml

@@ -30,13 +30,8 @@ cache:
   directories:
   - ~/.cache
 
-artifacts:
-  - ../app/foo.txt
-  - /app/*.txt
-  - app/
-  - prefix: $CI_JOB_ID/
-
-deploy: "cap deploy production"
+deploy:
+  shell: "cap deploy production"
 
 after_deploy: echo after deploy
 before_deploy: echo before deploy

data/spec/integration/ruby_spec.rb

@@ -4,9 +4,9 @@ describe "(integration) ruby" do
   let(:build_configuration) {
     Vx::Builder::BuildConfiguration.from_yaml(config)
   }
-  let(:matrix) { Vx::Builder::Matrix.new build_configuration }
+  let(:matrix) { Vx::Builder.matrix build_configuration }
   let(:task)   { create :task }
-  let(:script) { Vx::Builder::Script.new(task, source) }
+  let(:script) { Vx::Builder.script(task, source) }
   subject { matrix }
 
   def write_script_to_filter(prefix)
@@ -26,18 +26,17 @@ describe "(integration) ruby" do
   context "language" do
     let(:config) { fixture("integration/ruby/language/config.yml") }
 
-    its(:build_configurations) { should have(1).item }
+    its(:build) { should have(1).item }
 
     context "first configuration" do
-      let(:source) { matrix.build_configurations.first }
+      let(:source) { matrix.build.first }
       subject { script }
 
       before { write_script_to_filter "language/" }
 
-      it { should_not be_deploy }
       its(:to_before_script) { should eq fixture("integration/ruby/language/before_script.sh") }
-      its(:to_script) { should eq fixture("integration/ruby/language/script.sh") }
-      its(:to_after_script) { should eq fixture("integration/ruby/language/after_script.sh") }
+      its(:to_script)        { should eq fixture("integration/ruby/language/script.sh") }
+      its(:to_after_script)  { should eq fixture("integration/ruby/language/after_script.sh") }
     end
   end
 
@@ -46,7 +45,7 @@ describe "(integration) ruby" do
 
     context "configuration" do
       let(:task)   { create :task, deploy: true }
-      let(:source) { matrix.deploy_configuration("master") }
+      let(:source) { Vx::Builder.deploy(matrix, branch: "master").build }
       subject { script }
 
       before { write_script_to_filter "deploy/d." }
@@ -55,45 +54,42 @@ describe "(integration) ruby" do
         expect(source).to be
       end
 
-      it { should be_deploy }
       its(:to_before_script) { should eq fixture("integration/ruby/deploy/d.before_script.sh") }
-      its(:to_script) { should eq fixture("integration/ruby/deploy/d.script.sh") }
-      its(:to_after_script) { should eq fixture("integration/ruby/deploy/d.after_script.sh") }
+      its(:to_script)        { should eq fixture("integration/ruby/deploy/d.script.sh") }
+      its(:to_after_script)  { should eq fixture("integration/ruby/deploy/d.after_script.sh") }
     end
   end
 
   context "matrix" do
     let(:config) { fixture("integration/ruby/matrix/config.yml") }
 
-    its(:build_configurations) { should have(2).item }
+    its(:build) { should have(2).item }
 
     context "0th configuration" do
-      let(:source) { matrix.build_configurations[0] }
+      let(:source) { matrix.build[0] }
       subject { script }
 
       before { write_script_to_filter "matrix/0." }
 
-      it { should_not be_deploy }
       its(:to_before_script) { should eq fixture("integration/ruby/matrix/0.before_script.sh") }
       its(:to_script) { should eq fixture("integration/ruby/matrix/0.script.sh") }
       its(:to_after_script) { should eq fixture("integration/ruby/matrix/0.after_script.sh") }
     end
 
     context "1th configuration" do
-      let(:source) { matrix.build_configurations[1] }
+      let(:source) { matrix.build[1] }
       subject { script }
 
       before { write_script_to_filter "matrix/1." }
 
-      it { should_not be_deploy }
       its(:to_before_script) { should eq fixture("integration/ruby/matrix/1.before_script.sh") }
       its(:to_script) { should eq fixture("integration/ruby/matrix/1.script.sh") }
       its(:to_after_script) { should eq fixture("integration/ruby/matrix/1.after_script.sh") }
     end
 
     context "deploy configuration" do
-      let(:task)   { create :task, deploy: true }
-      let(:source) { matrix.deploy_configuration("master") }
+      let(:task)   { create :task }
+      let(:source) { Vx::Builder.deploy(matrix, branch: "master").build }
       subject { script }
 
       before { write_script_to_filter "matrix/d." }
@@ -102,7 +98,6 @@ describe "(integration) ruby" do
         expect(source).to be
       end
 
-      it { should be_deploy }
       its(:to_before_script) { should eq fixture("integration/ruby/matrix/d.before_script.sh") }
       its(:to_script) { should eq fixture("integration/ruby/matrix/d.script.sh") }
       its(:to_after_script) { should eq fixture("integration/ruby/matrix/d.after_script.sh") }

data/spec/lib/builder/build_configuration/cache_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Vx::Builder::BuildConfiguration::Cache do
+  let(:params) { { "directories" => ['/a', '/b'] } }
+  let(:env)    { described_class.new params }
+  subject { env }
+
+  its(:attributes) { should eq("directories"=>["/a", "/b"], "enabled"=>true) }
+
+  context "attributes" do
+    context "when cache is valid hash" do
+      let(:params) { {"directories" => ['/a']} }
+      it { should be_enabled }
+      its(:directories) { should eq ['/a'] }
+    end
+
+    context "when cache is invalid hash" do
+      let(:params) { {"key" => ['/a']} }
+      it { should be_enabled }
+      its(:directories) { should eq [] }
+    end
+
+    context "when is nil" do
+      let(:params) { nil }
+      it { should be_enabled }
+      its(:directories) { should eq [] }
+    end
+
+    context "when is false value" do
+      let(:params) { false }
+      it { should_not be_enabled }
+      its(:directories){ should eq [] }
+    end
+  end
+end

data/spec/lib/builder/build_configuration/deploy/base_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Vx::Builder::BuildConfiguration::Deploy::Base do
+  let(:params) { {
+    "shell"  => "echo true",
+    "branch" => "master"
+  } }
+  subject { described_class.new params }
+
+  context "#branch" do
+    it "should be empty if key 'branch' is not exists" do
+      expect(get_branch nil).to eq []
+    end
+
+    it "should be if string" do
+      expect(get_branch "master").to eq ['master']
+    end
+
+    it "should be if array" do
+      expect(get_branch [:master, :staging]).to eq %w{ master staging }
+    end
+
+    def get_branch(branch)
+      described_class.new(params.merge("branch" => branch)).branch
+    end
+  end
+
+  context ".loaded" do
+    subject { described_class.loaded }
+    it { should have(1).items }
+  end
+
+end