evrone-ci-router 0.2.0.pre1 → 0.2.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edee6c03fb2fd412081abfcc5d0a1728f18a277b
-  data.tar.gz: 8de6b06ce57d13adff8d12ead02ac3a0560436d7
+  metadata.gz: fbdfc3042cc3a96d761347400e67482f9517fd19
+  data.tar.gz: 2f2e905f4511aa5da16dd819c6d25840568311af
 SHA512:
-  metadata.gz: 41e077af700321ee78461ced593a229000544e47372fc88dc2c18fa46318de8c1747204460fb990c60297b06edc7f8db43397bc70065cde1cf22a7db2fb23d0a
-  data.tar.gz: 553fe1631f488f868241ff00ca844a20ae049fe054712d47bc66d91854b14e086454c0f2b14a6c02d93afd5ac52081d30cdcff0feb3f9dea1b12a2973deb6546
+  metadata.gz: 9be6a237a177cc2b04d3df19189f4e47b202e26914eb3a1e942b454bed71b211a8666f095cecf6ac930eb645e5eff9230d517d76e042570af77e192601cbb8ef
+  data.tar.gz: 6fe0b6691129097ed73b6809ec5d1687036a45d1ae5d0f5297f48eca41cd5f03ae78bf86bc891e206d0de3d76d3c38b372c056f85deb04590af8038c22f296bf

data/Rakefile

@@ -6,9 +6,11 @@ require "bundler/gem_tasks"
 
 RSpec::Core::RakeTask.new(:spec)
 
+desc "download test repo and run spec"
 task :default => ["test:create_repo", :spec]
 
 namespace :test do
+  desc "download test repo"
   task :create_repo do
     dir = "fixtures/repo"
     unless File.directory? dir
@@ -19,4 +21,5 @@ namespace :test do
   end
 end
 
+desc "run travis build"
 task :travis => :default

data/lib/evrone/ci/router/build.rb

@@ -13,21 +13,23 @@ module Evrone
         include Router::Helper::Logger
         include Router::Helper::Config
 
-        attr_reader :message, :output
-        attr_accessor :matrix, :jobs_count, :commit_info
+        attr_reader :message, :output, :output_counter
+        attr_accessor :jobs_count, :commit_info
 
         def initialize(perform_build_message)
-          @output  = ''
-          @message = perform_build_message
+          @output_counter = 0
+          @output         = ''
+          @message        = perform_build_message
         end
 
         def to_perform_job_message(travis, job_id)
           script_builder   = travis.to_script_builder
+          sha = (commit_info && commit_info.sha) || message.sha
           job_message = Message::PerformJob.new(
             id:               message.id,
             name:             message.name,
             src:              message.src,
-            sha:              message.sha,
+            sha:              sha,
             pull_request_id:  message.pull_request_id,
             deploy_key:       message.deploy_key,
             job_id:           job_id,
@@ -45,7 +47,6 @@ module Evrone
             status:     status,
             tm:         tm.to_i,
             tm_usec:    tm.usec,
-            matrix:     matrix || [],
             jobs_count: jobs_count || 0,
           }
 
@@ -71,11 +72,10 @@ module Evrone
         end
 
         def create_build_log_message(data)
-          tm = Time.now
+          @output_counter += 1
           Message::BuildLog.new(
             build_id:  message.id,
-            tm:        tm.to_i,
-            tm_usec:   tm.usec,
+            tm:        @output_counter,
             log:       data
           )
         end

data/lib/evrone/ci/router/script_builder/ruby.rb

@@ -13,7 +13,7 @@ module Evrone
                 i << 'eval "$(rbenv init -)" || true'
                 i << "rbenv shell #{make_rbenv_version_command env}"
                 i << 'export BUNDLE_GEMFILE=${PWD}/Gemfile'
-                i << 'export GEM_HOME=/tmp/.rubygems'
+                i << 'export GEM_HOME=$HOME/cached/rubygems'
               end
 
               env.before_install.tap do |b|
@@ -24,7 +24,7 @@ module Evrone
               end
 
               env.install.tap do |i|
-                i << trace_sh_command("bundle install")
+                i << trace_sh_command("bundle install && bundle clean --force")
               end
             end
 

data/lib/evrone/ci/router/version.rb

@@ -1,7 +1,7 @@
 module Evrone
   module CI
     class Router
-      VERSION = "0.2.0.pre1"
+      VERSION = "0.2.0.pre3"
     end
   end
 end

data/lib/evrone/ci/router.rb

@@ -94,7 +94,6 @@ module Evrone
 
       def create_and_delivery_build_matrix
         matrix = BuildMatrix.new travis
-        build.matrix     = matrix.keys
         build.jobs_count = matrix.travises.size
 
         matrix.travises.each_with_index do |travis, idx|
@@ -109,6 +108,7 @@ module Evrone
 
       def load_travis
         @travis = Travis.from_file repo_dir.join(".travis.yml")
+        @travis
       end
 
       def create_repo_dir

data/spec/lib/build_spec.rb

@@ -7,30 +7,31 @@ describe Evrone::CI::Router::Build do
   subject { build }
 
   context "just created" do
-    its(:message) { should eq msg }
-    its(:output)  { should eq ''  }
+    its(:message)        { should eq msg }
+    its(:output)         { should eq ''  }
+    its(:output_counter) { should eq 0 }
   end
 
   context "create_build_log_message" do
-    let(:tm)   { Time.new(2012, 12, 10, 15, 45) }
     let(:data) { 'log' }
     subject { build.create_build_log_message data }
 
-    before do
-      mock(Time).now { tm }
-    end
-
     it { should be_an_instance_of(Evrone::CI::Message::BuildLog) }
     its(:build_id) { should eq build.message.id }
-    its(:tm)       { should eq tm.to_i }
+    its(:tm)       { should eq 1 }
     its(:log)      { should eq data }
+
+    it "should increment counter" do
+      expect {
+        subject
+      }.to change(build, :output_counter).by(1)
+    end
   end
 
   context "to_build_status_message" do
     subject { build.to_build_status_message Evrone::CI::Router::Build::STARTED }
 
     before do
-      build.matrix     = ["rvm"]
       build.jobs_count = 1
     end
 
@@ -39,7 +40,6 @@ describe Evrone::CI::Router::Build do
     its(:status)     { should eq 2 }
     its(:tm)         { should be }
     its(:tm_usec)    { should be }
-    its(:matrix)     { should eq %w{ rvm } }
     its(:jobs_count) { should eq 1 }
 
     context "when commit_info exists" do
@@ -65,11 +65,19 @@ describe Evrone::CI::Router::Build do
     subject { build.add_to_output(data) ; build }
 
     its(:output) { should eq data }
+
     it "should delivery message" do
       expect {
         subject
       }.to change(messages, :size).by(1)
     end
+
+    it "should increment output_counter" do
+      expect {
+        subject
+      }.to change(build, :output_counter).by(1)
+      expect(messages.first.tm).to eq 1
+    end
   end
 
   context "add_command_to_output" do
@@ -78,11 +86,19 @@ describe Evrone::CI::Router::Build do
     subject { build.add_command_to_output(data) ; build }
 
     its(:output) { should eq "$ #{data}\n" }
+
     it "should delivery message" do
       expect {
         subject
       }.to change(messages, :size).by(1)
     end
+
+    it "should increment output_counter" do
+      expect {
+        subject
+      }.to change(build, :output_counter).by(1)
+      expect(messages.first.tm).to eq 1
+    end
   end
 
   context ".to_perform_job_message" do
@@ -104,5 +120,14 @@ describe Evrone::CI::Router::Build do
       its(:script)        { should be                  }
       its(:matrix_keys)   { should eq ['rvm:2.0.0']    }
     end
+
+    context "when commit_info.sha exists" do
+      before do
+        build.commit_info = OpenStruct.new sha: "commit info sha"
+      end
+
+      its(:sha) { should eq 'commit info sha' }
+
+    end
   end
 end

data/spec/lib/script_builder_spec.rb

@@ -17,13 +17,13 @@ describe Evrone::CI::Router::ScriptBuilder do
           tail -n1)
     }.compact
     s << 'export BUNDLE_GEMFILE=${PWD}/Gemfile'
-    s << "export GEM_HOME=/tmp/.rubygems"
+    s << "export GEM_HOME=$HOME/cached/rubygems"
     trace s, "env"
     s << "gem query -q -in '^bundler$' > /dev/null || gem install bundler -q --no-rdoc --no-ri"
     trace s, "ruby --version"
     trace s, "gem --version"
     trace s, "bundle --version"
-    trace s, "bundle install"
+    trace s, "bundle install && bundle clean --force"
     trace s, "echo before_script"
     s.join("\n")
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evrone-ci-router
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre1
+  version: 0.2.0.pre3
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evrone-ci-common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre1
+        version: 0.2.0.pre3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre1
+        version: 0.2.0.pre3
 - !ruby/object:Gem::Dependency
   name: evrone-ci-message
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre1
+        version: 0.2.0.pre3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre1
+        version: 0.2.0.pre3
 - !ruby/object:Gem::Dependency
   name: evrone-common-amqp
   requirement: !ruby/object:Gem::Requirement