evrone-ci-worker 0.2.0.pre14 → 0.2.0.pre15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 130708766e3ff874435eed56ac662468891c58cd
-  data.tar.gz: b596632b508dadaf7ba79ff9ae1846da4c08dbab
+  metadata.gz: 83df4d5bd1c3ad411698023e8d1954cc19c020b4
+  data.tar.gz: 9b53181386d8c5779d78b90d6b2bf535007784d7
 SHA512:
-  metadata.gz: 22bb06a2b5431f7a93d2308489d5a75d546ad2df511fa5f72259849802ac80b38d85fce22228b88c75073a0300366f21917cefe0139ac58385b51e95812874e5
-  data.tar.gz: 36e67da7b86ff5542ecaa4d7110a364393f0c426b2385535f421c8a81d3984abddea94397dc1c379b9549239907bbf40171054abc21ad4819fd5408337e4ee53
+  metadata.gz: 0d4ae45a760524afc7da44419d11b3a0555668ab4d2e924d35205492abd3b976b872afa3940264106f7ed71ce365ba8db0680291bc555dce041044b287752906
+  data.tar.gz: c10ef6d32bc71e2fbf0c9f22e6f53699cee908e0aec9b1d2b50b3376aff1bb06ab684b587de131b99b7559b3c7275b90e29f7f3c6886cf43a779fb53314ea3bf

data/lib/evrone/ci/worker.rb

@@ -21,6 +21,7 @@ module Evrone
 
       autoload :LogJob,                File.expand_path("../worker/middlewares/log_job",                 __FILE__)
       autoload :UpdateJobStatus,       File.expand_path("../worker/middlewares/update_job_status",       __FILE__)
+      autoload :Timeout,               File.expand_path("../worker/middlewares/timeout",                 __FILE__)
 
       autoload :LocalCreateDirs,       File.expand_path("../worker/middlewares/local_create_dirs",       __FILE__)
       autoload :LocalScript,           File.expand_path("../worker/middlewares/local_script",            __FILE__)

data/lib/evrone/ci/worker/docker.rb

@@ -13,6 +13,7 @@ module Evrone
         middlewares do
           use LogJob
           use UpdateJobStatus
+          use Timeout
           use DockerStartContainer
           use DockerScript
         end

data/lib/evrone/ci/worker/local.rb

@@ -14,6 +14,7 @@ module Evrone
         middlewares do
           use LogJob
           use UpdateJobStatus
+          use Timeout
           use LocalCreateDirs
           use LocalScript
         end

data/lib/evrone/ci/worker/middlewares/docker_script.rb

@@ -4,8 +4,6 @@ module Evrone
 
       DockerScript = Struct.new(:app) do
 
-        TIMEOUT = 30 * 60
-
         include Helper::Logger
         include Helper::Config
         include Common::Helper::UploadShCommand
@@ -40,7 +38,7 @@ module Evrone
             script << "env - HOME=$HOME bash #{file}"
             script = script.join(" && ")
 
-            env.ssh.spawn script, chdir: home, timeout: TIMEOUT, &env.job.method(:add_to_output)
+            env.ssh.spawn script, chdir: home, &env.job.method(:add_to_output)
           end
 
           def run_after_script(env)

data/lib/evrone/ci/worker/middlewares/timeout.rb

@@ -0,0 +1,26 @@
+require 'timeout'
+
+module Evrone
+  module CI
+    module Worker
+
+      Timeout = Struct.new(:app) do
+
+        def call(env)
+          rs = nil
+          ::Timeout.timeout(_timeout) do
+            rs = app.call env
+          end
+          rs
+        end
+
+        def _timeout
+          30 * 60
+        end
+
+      end
+    end
+  end
+end
+
+

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

@@ -1,7 +1,7 @@
 module Evrone
   module CI
     module Worker
-      VERSION = "0.2.0.pre14"
+      VERSION = "0.2.0.pre15"
     end
   end
 end

data/spec/lib/worker/middlewares/timeout_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Evrone::CI::Worker::Timeout do
+  let(:exit_code) { 0 }
+  let(:app)       { ->(_) { exit_code } }
+  let(:env)       { OpenStruct.new }
+  let(:mid)       { described_class.new app }
+
+  subject { mid.call env }
+
+  it { should eq 0 }
+
+  context "when timeout happened" do
+    let(:app) { ->(_) { sleep 1 ; exit_code } }
+
+    before do
+      mock(mid)._timeout { 0.1 }
+    end
+
+    it "should raise" do
+      expect {
+        subject
+      }.to raise_error(Timeout::Error)
+    end
+  end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evrone-ci-worker
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre14
+  version: 0.2.0.pre15
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2013-11-18 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.pre14
+        version: 0.2.0.pre15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre14
+        version: 0.2.0.pre15
 - !ruby/object:Gem::Dependency
   name: evrone-ci-message
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre14
+        version: 0.2.0.pre15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre14
+        version: 0.2.0.pre15
 - !ruby/object:Gem::Dependency
   name: evrone-common-amqp
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,7 @@ files:
 - lib/evrone/ci/worker/middlewares/local_create_dirs.rb
 - lib/evrone/ci/worker/middlewares/local_script.rb
 - lib/evrone/ci/worker/middlewares/log_job.rb
+- lib/evrone/ci/worker/middlewares/timeout.rb
 - lib/evrone/ci/worker/middlewares/update_job_status.rb
 - lib/evrone/ci/worker/version.rb
 - spec/lib/worker/configuration_spec.rb
@@ -185,6 +186,7 @@ files:
 - spec/lib/worker/middlewares/local_create_dirs_spec.rb
 - spec/lib/worker/middlewares/local_script_spec.rb
 - spec/lib/worker/middlewares/log_job_spec.rb
+- spec/lib/worker/middlewares/timeout_spec.rb
 - spec/lib/worker/middlewares/update_job_status_spec.rb
 - spec/lib/worker_spec.rb
 - spec/spec_helper.rb
@@ -212,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: ci worker
@@ -226,6 +228,7 @@ test_files:
 - spec/lib/worker/middlewares/local_create_dirs_spec.rb
 - spec/lib/worker/middlewares/local_script_spec.rb
 - spec/lib/worker/middlewares/log_job_spec.rb
+- spec/lib/worker/middlewares/timeout_spec.rb
 - spec/lib/worker/middlewares/update_job_status_spec.rb
 - spec/lib/worker_spec.rb
 - spec/spec_helper.rb