evrone-ci-worker 0.2.0.pre27 → 0.2.0.pre28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d9087b50e29982ccf2df4af64ce15f8e6e10801
-  data.tar.gz: 9c3c7f1304a4a5aed273e5906387a50dddbca6c0
+  metadata.gz: e6cf0b0887a284839ad78e87338b5c6c01b6387f
+  data.tar.gz: 9d0bc82d9da7bfb5b03d226fa5387e477e858672
 SHA512:
-  metadata.gz: fb491b907daf77ece535d898e6c4594b4e0865b7b7d44a53794871a75a7aa75ea1b8baf54cdd4e7bf2af8042accd47162a3acf848ad66d9125869a57a32086de
-  data.tar.gz: 035e7619385e2dcff48ff222a2bdf8d9c5607d27f949bb3b597d449851b690b48e8128cf5efd45ad9a4b0930b8392e250af1627097a1a358e10ff439cd2b0a83
+  metadata.gz: f4ba61e8fc3398c563d264071290d2e214f1d6c1c505b8e0300fab0d869f97232dd6a29ad53ceb49988ce8c881fda7f175bc3db183693d8e694e8bf4b10b8dad
+  data.tar.gz: 94eccc5cfebd5472a7c69c40fb7b1acb236e2e70282691f4eba171c8e1ff0bf306d2bce0665303864e3ec7477f525680ac372f2969a9254826b1f71e12cc0bed

data/Gemfile

@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 gemspec
 gem 'evrone-ci-common', path: File.expand_path("../../common", __FILE__)
 gem 'evrone-ci-message', path: File.expand_path("../../message", __FILE__)
+gem 'evrone-ci-container_connector', path: File.expand_path("../../container_connector", __FILE__)

data/Rakefile

@@ -23,5 +23,5 @@ end
 
 desc "run travis build"
 task :travis do
-  exec "bundle exec rake SPEC_OPTS='--format documentation -t ~run_docker --order=rand'"
+  exec "bundle exec rake SPEC_OPTS='--format documentation -t ~docker --order=rand'"
 end

data/evrone-ci-worker.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'evrone-ci-common',   "= #{Evrone::CI::Worker::VERSION}"
-  spec.add_runtime_dependency 'evrone-ci-message',  "= #{Evrone::CI::Worker::VERSION}"
+  spec.add_runtime_dependency 'evrone-ci-common',               "= #{Evrone::CI::Worker::VERSION}"
+  spec.add_runtime_dependency 'evrone-ci-message',              "= #{Evrone::CI::Worker::VERSION}"
+  spec.add_runtime_dependency 'evrone-ci-container_connector',  "= #{Evrone::CI::Worker::VERSION}"
   spec.add_runtime_dependency 'evrone-common-amqp', '~> 0.2.5'
-  spec.add_runtime_dependency 'docker-api',         '= 1.5.4'
   spec.add_runtime_dependency 'hashr',              '= 0.0.22'
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/evrone/ci/worker.rb

@@ -22,12 +22,8 @@ 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__)
-
-      autoload :DockerStartContainer,  File.expand_path("../worker/middlewares/docker_start_container",  __FILE__)
-      autoload :DockerScript,          File.expand_path("../worker/middlewares/docker_script",           __FILE__)
+      autoload :StartConnector,        File.expand_path("../worker/middlewares/start_connector",         __FILE__)
+      autoload :RunScript,             File.expand_path("../worker/middlewares/run_script",              __FILE__)
 
       module Helper
         autoload :Logger,              File.expand_path("../worker/helper/logger",                       __FILE__)

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

@@ -19,24 +19,19 @@ module Evrone
                timeout:      30 * 60,
                logger:       Common::TaggedLogging.new(Logger.new STDOUT),
 
-               tmp_dir_name: "tmp",
-
                workers:          1,
                path_prefix:      nil,
 
                docker: {
-                 remote_dir: "/home/ci",
+                 user: "ci",
+                 password: "ci",
                  init:       %w{ /usr/bin/runsvdir -P /etc/service },
                  image:      "dmexe/ci",
+                 remote_dir: "/home/ci",
+               },
 
-                 ssh: {
-                   host:     nil, # used in tests
-                   port:     nil, # used in tests
-                   user:     "ci",
-                   password: "ci"
-                 },
-
-                 create_options: nil # used in tests
+               local: {
+                 remote_dir: "/tmp/.local_connector"
                }
 
         def timeout
@@ -55,6 +50,14 @@ module Evrone
           @@null_logger
         end
 
+        def connector_options
+          self[self.run]
+        end
+
+        def connector_remote_dir
+          connector_options[:remote_dir]
+        end
+
       end
     end
   end

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

@@ -14,8 +14,8 @@ module Evrone
           use LogJob
           use UpdateJobStatus
           use Timeout
-          use DockerStartContainer
-          use DockerScript
+          use StartConnector
+          use RunScript
         end
 
         def initialize(job, _)

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

@@ -9,23 +9,22 @@ module Evrone
 
         include Common::Helper::Middlewares
 
-        attr_reader :job, :path_prefix
+        attr_reader :job
 
         middlewares do
           use LogJob
           use UpdateJobStatus
           use Timeout
-          use LocalCreateDirs
-          use LocalScript
+          use StartConnector
+          use RunScript
         end
 
-        def initialize(job, path_prefix)
-          @job         = job
-          @path_prefix = Pathname.new(path_prefix).expand_path
+        def initialize(job, _)
+          @job = job
         end
 
         def perform
-          env = OpenStruct.new job: job, path_prefix: path_prefix
+          env = OpenStruct.new job: job
           run_middlewares(env){ |_| 0 }
         end
 

data/lib/evrone/ci/worker/middlewares/{docker_script.rb → run_script.rb}

@@ -1,15 +1,17 @@
+require 'evrone/ci/common'
+
 module Evrone
   module CI
     module Worker
 
-      DockerScript = Struct.new(:app) do
+      RunScript = Struct.new(:app) do
 
         include Helper::Logger
         include Helper::Config
         include Common::Helper::UploadShCommand
 
         def call(env)
-          if env.ssh && env.docker_repo_dir
+          if env.spawner
             code = run_script(env)
             run_after_script(env)
 
@@ -31,32 +33,30 @@ module Evrone
         private
 
           def run_script(env)
-            home = config.docker.remote_dir
-            file = [home, ".ci_build.sh"].join("/")
+            file = [env.spawner.work_dir, ".ci_build.sh"].join("/")
 
-            script = [upload_sh_command(file, script_content(env, home))]
+            script = [upload_sh_command(file, script_content(env))]
             script << "env - HOME=$HOME bash #{file}"
             script = script.join(" && ")
 
-            env.ssh.spawn script, chdir: home, read_timeout: read_timeout, &env.job.method(:add_to_output)
+            env.spawner.spawn script, read_timeout: read_timeout, &env.job.method(:add_to_output)
           end
 
           def run_after_script(env)
-            home = config.docker.remote_dir
-            file = [home, ".ci_after_build.sh"].join("/")
+            file = [env.spawner.work_dir, ".ci_after_build.sh"].join("/")
 
             script = [upload_sh_command(file, after_script_content(env))]
             script << "env - HOME=$HOME bash #{file}"
             script = script.join(" && ")
 
-            env.ssh.spawn script, chdir: home, read_timeout: read_timeout, &env.job.method(:add_to_output)
+            env.spawner.spawn script, read_timeout: read_timeout, &env.job.method(:add_to_output)
           end
 
-          def script_content(env, home)
+          def script_content(env)
             buf = ["set -e"]
-            buf << "echo before_script > #{home}/.ci_state"
+            buf << "echo before_script > #{env.spawner.work_dir}/.ci_state"
             buf << env.job.message.before_script
-            buf << "echo script > #{home}/.ci_state"
+            buf << "echo script > #{env.spawner.work_dir}/.ci_state"
             buf << env.job.message.script
             buf.join("\n")
           end
@@ -68,10 +68,9 @@ module Evrone
           end
 
           def read_state(env)
-            home = config.docker.remote_dir
             buf = ""
-            state_file = "#{home}/.ci_state"
-            env.ssh.spawn "cat #{state_file}" do |out|
+            state_file = "#{env.spawner.work_dir}/.ci_state"
+            env.spawner.spawn "cat #{state_file}" do |out|
               buf << out
             end
             buf.strip

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

@@ -0,0 +1,36 @@
+require 'socket'
+require 'pathname'
+require 'evrone/ci/container_connector'
+
+module Evrone
+  module CI
+    module Worker
+
+      StartConnector = Struct.new(:app) do
+
+        include Helper::Config
+        include Helper::Logger
+
+        def call(env)
+          options = config.connector_options
+          options.merge! logger: logger
+          env.connector = Evrone::CI::ContainerConnector.lookup(config.run, options)
+          env.connector.start do |spawner|
+            env.job.add_to_output "using #{Socket.gethostname}##{spawner.id}\n"
+            logger.tagged("#{spawner.id}") do
+              begin
+                env.spawner = spawner
+                app.call env
+              ensure
+                env.spawner = spawner
+              end
+            end
+          end
+        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.pre27"
+      VERSION = "0.2.0.pre28"
     end
   end
 end

data/spec/lib/worker/configuration_spec.rb

@@ -4,26 +4,27 @@ describe Evrone::CI::Worker::Configuration do
   let(:config) { Evrone::CI::Worker.config }
   subject { config }
 
-  its(:run)             { should eq :docker     }
-  its(:docker)          { should be             }
-  its(:tmp_dir_name)    { should eq 'tmp'       }
-  its(:timeout)         { should eq 1800        }
-  its(:amqp_url)        { should be_nil         }
+  its(:run)                  { should eq :docker }
+  its(:docker)               { should be         }
+  its(:timeout)              { should eq 1800    }
+  its(:amqp_url)             { should be_nil     }
+  its(:connector_options)    { should eq config.docker }
+  its(:connector_remote_dir) { should eq config.docker.remote_dir }
 
   context "docker" do
     subject { config.docker }
 
-    its(:ssh)           { should be             }
-    its(:remote_dir)    { should eq '/home/ci'  }
-    its(:init)          { should be             }
-    its(:image)         { should eq 'dmexe/ci'  }
+    its(:user)       { should be }
+    its(:password)   { should be }
+    its(:init)       { should be }
+    its(:image)      { should be }
+    its(:remote_dir) { should be }
   end
 
-  context "docker.ssh" do
-    subject { config.docker.ssh }
+  context "local" do
+    subject { config.local }
 
-    its(:user)          { should eq 'ci'        }
-    its(:password)      { should eq 'ci'        }
+    its(:remote_dir){ should be }
   end
 
   context ".configure" do
@@ -33,7 +34,7 @@ describe Evrone::CI::Worker::Configuration do
         c.docker.image = 'image'
       end
     }
-    its(:run)           { should eq :local     }
-    its("docker.image") { should eq 'image'    }
+    its(:run)           { should eq :local  }
+    its("docker.image") { should eq 'image' }
   end
 end

data/spec/lib/worker/docker_spec.rb

@@ -1,20 +1,19 @@
 require 'spec_helper'
-require 'pathname'
-require 'fileutils'
 
-describe Evrone::CI::Worker::Docker do
+describe Evrone::CI::Worker::Docker, docker: true do
   let(:options) { { } }
   let(:job)     { create :job, options }
-  let(:path)    { '/tmp/.ci' }
-  let(:local)   { described_class.new job, path }
+  let(:local)   { described_class.new job, nil }
   subject { local }
 
-  after { FileUtils.rm_rf path }
-
-  context "perform", run_docker: true do
+  context "perform" do
     subject { local.perform }
     it { should eq 0 }
 
+    before do
+      Evrone::CI::Worker.config.run = "docker"
+    end
+
     context "when fail before_script" do
       let(:options) { { before_script: "false" } }
       it { should eq(-1) }

data/spec/lib/worker/local_spec.rb

@@ -1,18 +1,18 @@
 require 'spec_helper'
-require 'pathname'
-require 'fileutils'
 
 describe Evrone::CI::Worker::Local do
   let(:options) { { } }
   let(:job)     { create :job, options }
-  let(:path)    { '/tmp/.ci' }
-  let(:local)   { described_class.new job, path }
+  let(:local)   { described_class.new job, nil }
   subject { local }
 
-  after { FileUtils.rm_rf path }
-
-  context "perform", local_run: true do
+  context "perform" do
     subject { local.perform }
+
+    before do
+      Evrone::CI::Worker.config.run = "local"
+    end
+
     it { should eq 0 }
 
     context "when fail before_script" do

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

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe Evrone::CI::Worker::RunScript do
+  let(:exit_code)     { 0 }
+  let(:app)           { ->(_) { exit_code } }
+  let(:script)        { "echo script" }
+  let(:before_script) { "echo before_script" }
+  let(:after_script)  { "echo after_script" }
+  let(:job)           { create :job,
+                          script: script,
+                          before_script: before_script,
+                          after_script: after_script }
+  let(:env)           { OpenStruct.new job: job }
+  let(:mid)           { described_class.new app }
+  let(:connector_mid) { Evrone::CI::Worker::StartConnector.new(mid) }
+
+  subject { connector_mid.call env }
+
+  shared_examples "run script" do
+
+    it "should be" do
+      expect(subject).to eq 0
+      job.release
+      expect(all_job_log_output).to match("script")
+      expect(all_job_log_output).to match("after_script")
+    end
+
+    context "when script failed" do
+      let(:script) { "false" }
+      it "should be" do
+        expect(subject).to eq(1)
+        job.release
+        expect(all_job_log_output).to match("after_script")
+      end
+    end
+
+    context "when  before_script failed" do
+      let(:before_script) { "false" }
+      it "should be" do
+        expect(subject).to eq(-1)
+        job.release
+        expect(all_job_log_output).to match("after_script")
+      end
+    end
+  end
+
+  context "local connector" do
+    before do
+      Evrone::CI::Worker.config.run = "local"
+    end
+
+    it_should_behave_like "run script"
+  end
+
+  context "local connector", docker: true do
+    before do
+      Evrone::CI::Worker.config.run = "docker"
+    end
+
+    it_should_behave_like "run script"
+  end
+end
+

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

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Evrone::CI::Worker::StartConnector do
+  let(:exit_code)   { 0 }
+  let(:app)         { ->(_) { exit_code } }
+  let(:job)         { create :job }
+  let(:env)         { OpenStruct.new job: job }
+  let(:mid)         { described_class.new app }
+
+  subject { mid.call env }
+
+  context "local connector" do
+    before do
+      Evrone::CI::Worker.config.run = "local"
+    end
+
+    it "should successfully start" do
+      expect(subject).to eq 0
+      expect(env.connector).to be
+    end
+  end
+
+  context "docker connector", docker: true do
+    before do
+      Evrone::CI::Worker.config.run = "docker"
+    end
+
+    it "should successfully start" do
+      expect(subject).to eq 0
+      expect(env.connector).to be
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -14,5 +14,15 @@ RSpec.configure do |config|
   config.before(:each) do
     Evrone::Common::AMQP::Testing.clear
     Evrone::CI::Worker.reset_config!
+
+    Evrone::CI::Worker.configure do |c|
+=begin
+      c.docker.ssh.port = 2223
+      c.docker.ssh.host = 'localhost'
+      c.docker.create_options = {
+        'PortSpecs' => ['2022:22']
+      }
+=end
+    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.pre27
+  version: 0.2.0.pre28
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evrone-ci-common
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre27
+        version: 0.2.0.pre28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre27
+        version: 0.2.0.pre28
 - !ruby/object:Gem::Dependency
   name: evrone-ci-message
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre27
+        version: 0.2.0.pre28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre27
+        version: 0.2.0.pre28
 - !ruby/object:Gem::Dependency
-  name: evrone-common-amqp
+  name: evrone-ci-container_connector
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.0.pre28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.0.pre28
 - !ruby/object:Gem::Dependency
-  name: docker-api
+  name: evrone-common-amqp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: hashr
   requirement: !ruby/object:Gem::Requirement
@@ -169,11 +169,9 @@ files:
 - lib/evrone/ci/worker/initializers/amqp.rb
 - lib/evrone/ci/worker/job.rb
 - lib/evrone/ci/worker/local.rb
-- lib/evrone/ci/worker/middlewares/docker_script.rb
-- lib/evrone/ci/worker/middlewares/docker_start_container.rb
-- 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/run_script.rb
+- lib/evrone/ci/worker/middlewares/start_connector.rb
 - lib/evrone/ci/worker/middlewares/timeout.rb
 - lib/evrone/ci/worker/middlewares/update_job_status.rb
 - lib/evrone/ci/worker/version.rb
@@ -181,11 +179,9 @@ files:
 - spec/lib/worker/docker_spec.rb
 - spec/lib/worker/job_spec.rb
 - spec/lib/worker/local_spec.rb
-- spec/lib/worker/middlewares/docker_script_spec.rb
-- spec/lib/worker/middlewares/docker_start_container_spec.rb
-- 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/run_script_spec.rb
+- spec/lib/worker/middlewares/start_connector_spec.rb
 - spec/lib/worker/middlewares/timeout_spec.rb
 - spec/lib/worker/middlewares/update_job_status_spec.rb
 - spec/lib/worker_spec.rb
@@ -223,11 +219,9 @@ test_files:
 - spec/lib/worker/docker_spec.rb
 - spec/lib/worker/job_spec.rb
 - spec/lib/worker/local_spec.rb
-- spec/lib/worker/middlewares/docker_script_spec.rb
-- spec/lib/worker/middlewares/docker_start_container_spec.rb
-- 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/run_script_spec.rb
+- spec/lib/worker/middlewares/start_connector_spec.rb
 - spec/lib/worker/middlewares/timeout_spec.rb
 - spec/lib/worker/middlewares/update_job_status_spec.rb
 - spec/lib/worker_spec.rb

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

@@ -1,83 +0,0 @@
-require 'docker'
-require 'evrone/common/spawn'
-require 'socket'
-require 'pathname'
-
-module Evrone
-  module CI
-    module Worker
-
-      DockerStartContainer = Struct.new(:app) do
-
-        include Helper::Config
-        include Helper::Logger
-        include Evrone::Common::Spawn
-
-        def call(env)
-          spawn_container(env) do
-            open_ssh_session(env) do
-              app.call env
-            end
-          end
-        end
-
-        private
-
-          def open_ssh_session(env)
-            host = env.container_addr
-            user = config.docker.ssh.user
-            pass = config.docker.ssh.password
-
-            ssh_options = {
-              password:      pass,
-              port:          config.docker.ssh.port || 22,
-              paranoid:      false,
-              forward_agent: false
-            }
-            sleep 2
-            env.job.add_to_output "open ssh session to #{user}@#{host}:#{ssh_options[:port]}\n"
-            open_ssh(host, "ci", ssh_options) do |ssh|
-              begin
-                env.ssh = ssh
-                logger.tagged "ssh" do
-                  yield
-                end
-              end
-            end
-          end
-
-          def spawn_container(env)
-            env.container = ::Docker::Container.create create_options
-            env.container.start
-
-            env.job.add_to_output "using #{Socket.gethostname}/#{env.container.id}\n"
-
-            env.container_addr  = env.container.json['NetworkSettings']['IPAddress']
-            env.docker_repo_dir = Pathname.new(config.docker.remote_dir).join(env.job.message.name)
-
-            logger.tagged "docker #{env.container.id}" do
-              begin
-                logger.info "start container"
-                sleep 3
-                yield
-              ensure
-                env.container.stop
-                logger.info "stop container"
-              end
-            end
-          end
-
-          def create_options
-            {
-              'Cmd'       => config.docker.init,
-              'Image'     => config.docker.image,
-              'Memory'    => 1610612736, # 1.5g
-            }.merge(config.docker.create_options || {})
-          end
-
-      end
-    end
-  end
-end
-
-

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

@@ -1,29 +0,0 @@
-require 'evrone/ci/common'
-
-module Evrone
-  module CI
-    module Worker
-
-      LocalCreateDirs = Struct.new(:app) do
-
-        include Common::Helper::Shell
-        include Worker::Helper::Config
-
-        def call(env)
-          tmp_dir!  env
-
-          app.call env
-        end
-
-        private
-
-          def tmp_dir!(env)
-            env.tmp_dir = env.path_prefix.join(config.tmp_dir_name)
-                                         .join(env.job.message.name)
-            recreate env.tmp_dir
-          end
-      end
-
-    end
-  end
-end

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

@@ -1,53 +0,0 @@
-require 'evrone/ci/common'
-
-module Evrone
-  module CI
-    module Worker
-
-      LocalScript = Struct.new(:app) do
-
-        include Common::Helper::Shell
-
-        def call(env)
-          script = env.tmp_dir.join("build.sh")
-          write_file script, content(env), 0700
-
-          code = bash file: script, &env.job.method(:add_to_output)
-
-          if code == 0
-            app.call env
-          else
-            state = read_state(env)
-            case state
-            when "script"
-              code
-            else
-              code * -1
-            end
-          end
-        end
-
-        private
-
-          def content(env)
-            buf = ["set -e"]
-            buf << "echo before_script > #{env.tmp_dir}/state"
-            buf << env.job.message.before_script
-            buf << "echo script > #{env.tmp_dir}/state"
-            buf << env.job.message.script
-            buf.join("\n")
-          end
-
-          def read_state(env)
-            state_file = env.tmp_dir.join("state")
-            if File.readable? state_file
-              File.read(state_file).strip
-            end
-          end
-
-      end
-    end
-  end
-end
-
-

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

@@ -1,48 +0,0 @@
-require 'spec_helper'
-
-describe Evrone::CI::Worker::DockerScript, run_docker: true do
-  let(:exit_code)     { 0 }
-  let(:app)           { ->(_) { exit_code } }
-  let(:script)        { "echo script" }
-  let(:before_script) { "echo before_script" }
-  let(:after_script)  { "echo after_script" }
-  let(:job)           { create :job,
-                          script: script,
-                          before_script: before_script,
-                          after_script: after_script }
-  let(:env)           { OpenStruct.new job: job }
-  let(:mid)           { described_class.new app }
-  let(:docker_mid)    { Evrone::CI::Worker::DockerStartContainer.new(mid) }
-
-  subject { docker_mid.call env }
-
-  before do
-    stub(env).docker_repo_dir { Pathname.new '/tmp' }
-  end
-
-  it "should be" do
-    expect(subject).to eq 0
-    job.release
-    expect(all_job_log_output).to match("script")
-    expect(all_job_log_output).to match("after_script")
-  end
-
-  context "when script failed" do
-    let(:script) { "false" }
-    it "should be" do
-      expect(subject).to eq(1)
-      job.release
-      expect(all_job_log_output).to match("after_script")
-    end
-  end
-
-  context "when  before_script failed" do
-    let(:before_script) { "false" }
-    it "should be" do
-      expect(subject).to eq(-1)
-      job.release
-      expect(all_job_log_output).to match("after_script")
-    end
-  end
-end
-

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

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe Evrone::CI::Worker::DockerStartContainer, run_docker: true do
-  let(:exit_code)   { 0 }
-  let(:app)         { ->(_) { exit_code } }
-  let(:job)         { create :job }
-  let(:env)         { OpenStruct.new job: job }
-  let(:mid)         { described_class.new app }
-
-  subject { mid.call env }
-
-  it "should be" do
-    expect(subject).to eq 0
-
-    expect(env.ssh).to be
-    expect(env.container).to be
-    expect(env.docker_repo_dir.to_s).to eq "/home/ci/evrone/test-repo"
-  end
-
-end
-

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

@@ -1,32 +0,0 @@
-require 'spec_helper'
-require 'pathname'
-require 'fileutils'
-
-describe Evrone::CI::Worker::LocalCreateDirs do
-  let(:app)         { ->(_) { 0 } }
-  let(:job)         { create :job }
-  let(:path_prefix) { Pathname.new '/tmp/.ci' }
-  let(:env)         { OpenStruct.new job: job, path_prefix: path_prefix }
-  let(:mid)         { described_class.new app }
-
-  subject { mid.call env }
-
-  after do
-    FileUtils.rm_rf path_prefix
-  end
-
-  it { should eq 0 }
-
-  context "create and assign directories" do
-
-    before do
-      subject
-    end
-
-    it "tmp_dir" do
-      expect(env.tmp_dir.to_s).to eq '/tmp/.ci/tmp/evrone/test-repo'
-      expect(File.directory? env.tmp_dir).to be
-    end
-
-  end
-end

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

@@ -1,45 +0,0 @@
-require 'spec_helper'
-require 'pathname'
-require 'fileutils'
-
-describe Evrone::CI::Worker::LocalScript do
-  let(:before_script) { "echo before_script"  }
-  let(:script)        { "echo script" }
-  let(:app)           { ->(_) { 0 } }
-  let(:job)           { create :job, script: script, before_script: before_script }
-  let(:path_prefix)   { Pathname.new "/tmp/.ci" }
-  let(:work_dir)      { path_prefix.join("work") }
-  let(:tmp_dir)       { path_prefix.join("tmp") }
-  let(:env)           { OpenStruct.new job: job, work_dir: work_dir, tmp_dir: tmp_dir }
-  let(:mid)           { described_class.new app }
-
-  subject { mid.call env }
-
-  after do
-    FileUtils.rm_rf path_prefix
-  end
-
-  before do
-    FileUtils.mkdir_p work_dir
-    FileUtils.mkdir_p tmp_dir
-  end
-
-  it { should eq 0 }
-
-  it "should capture output" do
-    subject
-    job.release
-    expect(last_job_log_message.log).to be_include("before_script\nscript\n")
-  end
-
-  context "when script failed" do
-    let(:script) { 'false' }
-    it { should satisfy { |n| [1,127].include?(n) } }
-  end
-
-  context "when before_script failed" do
-    let(:before_script) { 'false' }
-    it { should satisfy { |n| [-1,-127].include?(n) } }
-  end
-end
-