evrone-ci-router 0.2.0.pre6 → 0.2.0.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b94c8376879d91b2de864073f24bc5d589bccfd
-  data.tar.gz: 368d854de16ce106accf64c68fa0dc7e09095e39
+  metadata.gz: 0648af88fd7d60a34190b8b1cf1a3a7a36ecc057
+  data.tar.gz: b828184375819d2be53ebfd0f7562612447053ce
 SHA512:
-  metadata.gz: ab083e25b26e0aedd1b4097ac21e670457ad7683eca48e70c61006f1c66da815e60b211bf5c96a6bed65c9ccda17ef54688d160a08d277464f364eda083fe41f
-  data.tar.gz: 54f17cc8e86715801242e2f0a3f20d80a8ff1b63efd85e7f99966666e63dc220844d7a49ff1b6bc3d164a6ff986d7f4445808210a6373e4848765d8249015e47
+  metadata.gz: fb9ca8359cf42faa0325cf0fca81475286afcef9429c774e00ecde969a1665bb77dbbf68b57c2e268fbbc505c6028164fd65cd6e12cbd041ac4b6edc30ca327e
+  data.tar.gz: a34b90f5c682d12d5ae5034b9783faeaf428dbb9b8233c257a782a91185be77558e05fb4c9e5706ce8ea41bb28a6f6fd1d117377869437cf879ab6462526306f

data/Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in evrone-ci-job.gemspec
 gemspec
+
 gem 'evrone-ci-common', path: File.expand_path("../../common", __FILE__)
 gem 'evrone-ci-message', path: File.expand_path("../../message", __FILE__)
 

data/evrone-ci-router.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'evrone-ci-common',   "= #{Evrone::CI::Router::VERSION}"
   spec.add_runtime_dependency 'evrone-ci-message',  "= #{Evrone::CI::Router::VERSION}"
-  spec.add_runtime_dependency 'evrone-common-amqp', '~> 0.1.1'
+  spec.add_runtime_dependency 'evrone-common-amqp', '~> 0.2.4'
   spec.add_runtime_dependency 'hashr',              '= 0.0.22'
 
   spec.add_development_dependency "bundler", "~> 1.3"

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

@@ -6,9 +6,10 @@ module Evrone
     class Router
       class Build
 
-        STARTED  = 2
-        FINISHED = 3
-        FAILED   = 5
+        INITIALIED = 0
+        STARTED    = 2
+        FINISHED   = 3
+        FAILED     = 5
 
         include Router::Helper::Logger
         include Router::Helper::Config

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

@@ -1,5 +1,6 @@
 require 'optparse'
 require 'evrone/common/amqp'
+require 'evrone/ci/common/env_file'
 
 module Evrone
   module CI
@@ -8,6 +9,7 @@ module Evrone
 
         include Helper::Config
         include Helper::Logger
+        include Common::EnvFile
 
         def initialize
           @options = {}
@@ -35,27 +37,18 @@ module Evrone
               opts.on("-w", "--workers NUM", "Number of workers, default 1") do |v|
                 @options[:workers] = v.to_i
               end
-              opts.on("-c", "--config FILE", "Path to configuration file") do |v|
-                read_configuration v
+              opts.on("-c", "--config FILE", "Path to configuration file, default /etc/evrone/ci") do |v|
+                @options[:config] = v
               end
             end.parse!
 
+            read_env_file @options.delete(:config)
+
             @options.each_pair do |k,v|
               config.public_send("#{k}=", v)
             end
           end
 
-          def read_configuration(file)
-            file = File.expand_path(file)
-            buf  = File.read(file)
-
-            buf.split("\n").each do |line|
-              puts line
-              env, value = line.split("=").map(&:strip)
-              ENV[env] = value
-            end
-          end
-
       end
     end
   end

data/lib/evrone/ci/router/consumers/builds_consumer.rb

@@ -6,18 +6,19 @@ module Evrone
       class BuildsConsumer
 
         include Evrone::Common::AMQP::Consumer
+        include Helper::Logger
 
         exchange 'ci.builds'
-        queue    'ci.worker.builds.generic'
+        queue    'ci.worker.builds'
         ack      true
 
         model Message::PerformBuild
 
         def perform(message)
-          build = Build.new message
-          _     = Thread.current[:consumer_id] || 0
-
-          Router.new(build).perform
+          logger.tagged self.class.consumer_id do
+            build = Build.new message
+            Router.new(build).perform
+          end
           ack!
         end
 

data/lib/evrone/ci/router/consumers/job_status_consumer.rb

@@ -0,0 +1,16 @@
+require 'evrone/common/amqp'
+
+module Evrone
+  module CI
+    class Router
+      class JobStatusConsumer
+
+        include Evrone::Common::AMQP::Consumer
+
+        exchange 'ci.jobs.status'
+
+      end
+    end
+  end
+end
+

data/lib/evrone/ci/router/initializers/amqp.rb

@@ -1,64 +1,3 @@
-require 'evrone/common/amqp'
+require 'evrone/ci/common/amqp'
 
-module Evrone::CI::Router::AMQP
-
-  Base = Struct.new("Subscribing", :app) do
-    include Evrone::CI::Router::Helper::Logger
-
-    def consumer_name
-      Thread.current[:consumer_name]
-    end
-
-    def consumer_id
-      Thread.current[:consumer_id]
-    end
-
-    def consumer_tag
-      consumer_id ? "#{consumer_name.split('::').last} #{consumer_id}" : consumer_name
-    end
-  end
-
-  class Subscribing < Base
-    def call(env)
-      logger.tagged(consumer_tag) do
-        logger.warn "subsribing #{env[:exchange].name}"
-        rs = app.call env
-        logger.warn "shutdown"
-        rs
-      end
-    end
-  end
-
-  class Recieving < Base
-    def call(env)
-      logger.warn "payload recieved #{env[:payload].inspect[0...60]}..."
-      rs = app.call env
-      logger.warn "commit message"
-      rs
-    end
-  end
-
-  class Publishing < Base
-    def call(env)
-      app.call env
-    end
-  end
-end
-
-Evrone::Common::AMQP.configure do |c|
-  c.subscribing do
-    use Evrone::CI::Router::AMQP::Subscribing
-  end
-
-  c.recieving do
-    use Evrone::CI::Router::AMQP::Recieving
-  end
-
-  c.publishing do
-    use Evrone::CI::Router::AMQP::Publishing
-  end
-
-  c.content_type = 'application/x-protobuf'
-  c.logger       = nil
-  c.url          = Evrone::CI::Router.config.amqp_url
-end
+Evrone::CI::Common::AMQP.setup(Evrone::CI::Router.logger, url: Evrone::CI::Router.config.amqp_url)

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

@@ -5,6 +5,10 @@ module Evrone
 
         Ruby = Struct.new(:app) do
 
+          ALIASES = {
+            '1.8.7' => "system"
+          }
+
           include Helper::TraceShCommand
 
           def call(env)
@@ -12,8 +16,8 @@ module Evrone
               env.before_install.tap do |i|
                 i << 'eval "$(rbenv init -)" || true'
                 i << "rbenv shell #{make_rbenv_version_command env}"
-                i << trace_sh_command('export BUNDLE_GEMFILE=${PWD}/Gemfile')
-                i << trace_sh_command('export GEM_HOME=$HOME/cached/rubygems')
+                i << 'export BUNDLE_GEMFILE=${PWD}/Gemfile'
+                i << 'export GEM_HOME=$HOME/cached/rubygems'
               end
 
               env.announce.tap do |a|
@@ -34,10 +38,19 @@ module Evrone
           private
 
             def rvm(env)
-              env.travis.rvm.last
+              env.travis.rvm.first
             end
 
             def make_rbenv_version_command(env)
+              select_rbenv_version_by_aliases(env) ||
+                select_rbenv_version(env)
+            end
+
+            def select_rbenv_version_by_aliases(env)
+              ALIASES[rvm(env)]
+            end
+
+            def select_rbenv_version(env)
               %{
                 $(rbenv versions |
                   sed -e 's/^\*/ /' |

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

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

data/lib/evrone/ci/router.rb

@@ -6,6 +6,8 @@ require 'thread'
 require 'bundler'
 Bundler.require :default
 
+require 'evrone/ci/common/error_notifier'
+
 require File.expand_path("../..", __FILE__) + "/ci/router/ext/string.rb"
 require File.expand_path("../..", __FILE__) + "/ci/router/ext/array.rb"
 
@@ -24,6 +26,7 @@ module Evrone
       autoload :BuildStatusConsumer,  File.expand_path("../router/consumers/build_status_consumer",  __FILE__)
       autoload :BuildsConsumer,       File.expand_path("../router/consumers/builds_consumer",        __FILE__)
       autoload :JobsConsumer,         File.expand_path("../router/consumers/jobs_consumer",          __FILE__)
+      autoload :JobStatusConsumer,    File.expand_path("../router/consumers/job_status_consumer",    __FILE__)
 
       module Helper
         autoload :Config,             File.expand_path("../router/helper/config",                    __FILE__)
@@ -96,6 +99,8 @@ module Evrone
           message = build.to_perform_job_message travis, number
           logger.info "delivery job #{message.id}.#{number} #{travis.to_matrix_s}"
           JobsConsumer.publish message
+
+          publish_job_status_message build, travis, number
         end
 
         true
@@ -107,7 +112,7 @@ module Evrone
       end
 
       def log_build
-        logger.tagged("BUILD #{build.message.id}") do
+        logger.tagged("build #{build.message.id}") do
           logger.info "starting build"
           rs = yield
           logger.info "done build"
@@ -122,6 +127,7 @@ module Evrone
           rs = yield
         rescue Exception => e
           logger.error("ERROR: #{e.inspect}\n    BACKTRACE:\n#{e.backtrace.map{|i| "    #{i}" }.join("\n")}")
+          Common::ErrorNotifier.notify(e)
         end
 
         if rs
@@ -140,6 +146,18 @@ module Evrone
           BuildStatusConsumer.publish message
         end
 
+        def publish_job_status_message(build, travis, job_number)
+          message = Message::JobStatus.new(
+            build_id: build.message.id,
+            job_id:   job_number,
+            status:   Build::INITIALIED,
+            tm:       Time.now.to_i,
+            matrix:   travis.matrix_keys
+          )
+          logger.info "delivery job status #{message.inspect}"
+          JobStatusConsumer.publish message
+        end
+
     end
   end
 end

data/spec/lib/router_spec.rb

@@ -65,6 +65,16 @@ describe Evrone::CI::Router do
       expect(messages).to have(1).item
       expect(message.job_id).to eq 1
     end
+
+    it "should publish job_status message with status = INITIALIZED" do
+      expect {
+        subject
+      }.to change(Evrone::CI::Router::JobStatusConsumer.messages, :count).by(1)
+      message = Evrone::CI::Router::JobStatusConsumer.messages.last
+      expect(message.build_id).to eq build.message.id
+      expect(message.job_id).to eq 1
+      expect(message.status).to eq 0
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evrone-ci-router
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre6
+  version: 0.2.0.pre7
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evrone-ci-common
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre6
+        version: 0.2.0.pre7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre6
+        version: 0.2.0.pre7
 - !ruby/object:Gem::Dependency
   name: evrone-ci-message
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre6
+        version: 0.2.0.pre7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre6
+        version: 0.2.0.pre7
 - !ruby/object:Gem::Dependency
   name: evrone-common-amqp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: hashr
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +147,7 @@ files:
 - lib/evrone/ci/router/consumers/build_logs_consumer.rb
 - lib/evrone/ci/router/consumers/build_status_consumer.rb
 - lib/evrone/ci/router/consumers/builds_consumer.rb
+- lib/evrone/ci/router/consumers/job_status_consumer.rb
 - lib/evrone/ci/router/consumers/jobs_consumer.rb
 - lib/evrone/ci/router/ext/array.rb
 - lib/evrone/ci/router/ext/string.rb
@@ -197,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: ci router