evrone-ci-common 0.2.0.pre4 → 0.2.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81ca8965c9dae40ab4566ba5d5c048a2a87b389e
-  data.tar.gz: 4e6d92fed51fc19fcadc01aa927f1a34682d4add
+  metadata.gz: 4bf4a415c501a8ed67dfe244d27461497184022e
+  data.tar.gz: 043c7c33e4bac0a495bb96d7e5bf3b9d7c08d6a0
 SHA512:
-  metadata.gz: ed9a28451eee34d32576499f36d9308b93b8e41b2a0e7f8dc54fb2df7faf6c06a76e1a2508fb248202388d62c80316e64867432fb81fed19d7701f1536ce735f
-  data.tar.gz: 9633d1460ab29127d4a381917408f7bd4b20840b877a599dd4fd1fa515ae2bb72fdfb4579296be7ac82ab8dd59a8f684c3954dc9520ecf96e1bba3513ee93c64
+  metadata.gz: 788eefddbf3408645b46d6af40bc01352e56d1bc0b9df95700d225cdfb43f603ce192a4cba0f03fdede1b40018b40cf49ecc336b6c0c3b1e222a97d1e742dd2f
+  data.tar.gz: fdbabe1369b1cffc7e790d636b69a02e41b551c055bf4e6d9f407f48191ecf3f3a43341fbe157d1619cc21116b91d314b77d4298e8fba2caba2b25426bfca755

data/evrone-ci-common.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'evrone-common-spawn', '0.0.4'
+  spec.add_runtime_dependency 'evrone-common-spawn', '0.0.6'
   spec.add_runtime_dependency 'evrone-common-rack-builder', '0.0.2'
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/evrone/ci/common/helper/upload_sh_command.rb

@@ -0,0 +1,25 @@
+require 'base64'
+
+module Evrone
+  module CI
+    module Common
+      module Helper
+        module UploadShCommand
+
+          def upload_sh_command(path, content, options = {})
+            encoded = ::Base64.encode64(content).gsub("\n", '')
+            "(echo #{encoded} | #{upload_sh_base64_command options}) > #{path}"
+          end
+
+          private
+
+            def upload_sh_base64_command(options)
+              %{base64 --decode}
+            end
+
+        end
+      end
+    end
+  end
+end
+

data/lib/evrone/ci/common/output_buffer.rb

@@ -0,0 +1,76 @@
+require 'thread'
+
+module Evrone
+  module CI
+    module Common
+      class OutputBuffer
+
+        attr_reader :interval
+
+        def initialize(interval = 1, &block)
+          @interval = interval.to_f
+          @buffer   = ""
+          @write    = block
+          @mutex    = Mutex.new
+          @closed   = false
+
+          start_watching
+        end
+
+        def << (str)
+          closed!
+
+          @mutex.synchronize do
+            @buffer << str
+          end
+        end
+
+        def close
+          @closed = true
+          @thread.join
+        end
+
+        def flush
+          closed!
+          @mutex.synchronize { write }
+        end
+
+        def empty?
+          @buffer.size == 0
+        end
+
+        class ClosedBuffer < Exception ; end
+
+        private
+
+          def write
+            unless empty?
+              @write.call @buffer.dup
+              @buffer.clear
+            end
+          end
+
+          def closed!
+            raise ClosedBuffer if @closed
+          end
+
+          def start_watching
+            @thread = Thread.new do
+              loop do
+                sleep interval
+
+                unless empty?
+                  @mutex.synchronize { write }
+                end
+
+                break if @closed
+              end
+            end
+            @thread.abort_on_exception = true
+          end
+
+      end
+    end
+  end
+end
+

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

@@ -1,7 +1,7 @@
 module Evrone
   module CI
     module Common
-      VERSION = "0.2.0.pre4"
+      VERSION = "0.2.0.pre5"
     end
   end
 end

data/lib/evrone/ci/common.rb

@@ -4,20 +4,17 @@ module Evrone
   module CI
 
     module Common
-
       module Helper
-        autoload :Shell,       File.expand_path("../common/helper/shell",       __FILE__)
-        autoload :Middlewares, File.expand_path("../common/helper/middlewares", __FILE__)
+        autoload :Shell,           File.expand_path("../common/helper/shell",             __FILE__)
+        autoload :Middlewares,     File.expand_path("../common/helper/middlewares",       __FILE__)
+        autoload :UploadShCommand, File.expand_path("../common/helper/upload_sh_command", __FILE__)
       end
 
-      autoload :PerformMessageWrapper, File.expand_path("../common/perform_message_wrapper", __FILE__)
-
+      autoload :OutputBuffer,  File.expand_path("../common/output_buffer",      __FILE__)
     end
 
     module SCM
-
       autoload :Git, File.expand_path("../scm/git", __FILE__)
-
     end
 
   end

data/lib/evrone/ci/scm/git/git_ssh.rb

@@ -35,7 +35,7 @@ module Evrone
           end
 
           def location
-            @location ||= write_tmp_file 'git', template, 0700
+            @location ||= write_tmp_file 'git', self.class.template(key_location && key_location.path), 0700
           end
 
           def key_location
@@ -44,11 +44,13 @@ module Evrone
             end
           end
 
-          def template
-            key = key_location ? "-i #{key_location.path}" : ""
-            out = ['#!/bin/sh']
-            out << "exec /usr/bin/ssh -A -o StrictHostKeyChecking=no #{key} $@"
-            out.join "\n"
+          class << self
+            def template(key_location)
+              key = key_location ? "-i #{key_location}" : ""
+              out = ['#!/bin/sh']
+              out << "exec /usr/bin/ssh -A -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null #{key} $@"
+              out.join "\n"
+            end
           end
 
         end

data/lib/evrone/ci/scm/git.rb

@@ -11,14 +11,13 @@ module Evrone
 
         COMMIT_RE = /^(.*) -:- (.*) \((.*)\) -:- (.*)$/
 
-        attr_reader :src, :sha, :path, :logger, :git_ssh, :pull_request_id, :branch
+        attr_reader :src, :sha, :path, :logger, :git_ssh, :branch
 
         def initialize(src, sha, path, options = {}, &block)
           @src             = src
           @sha             = sha
           @path            = path
           @branch          = options[:branch]
-          @pull_request_id = options[:pull_request_id]
           @git_ssh         = GitSSH.new options[:deploy_key]
           @logger          = block
         end
@@ -30,11 +29,9 @@ module Evrone
         end
 
         def fetch
-          code = open do
-            repo_exist? ? update : clone
+          open do
+            run_git make_fetch_command
           end
-          code = checkout if code == 0
-          code
         end
 
         def self.make_export_command(from, to)
@@ -42,10 +39,15 @@ module Evrone
         end
 
         def make_fetch_command
-          clone_cmd = "git clone -q #{src} #{path}"
+          clone_cmd    = "git clone -q #{src} #{path}"
           checkout_cmd = "git checkout -qf #{sha}"
+          fetch_cmd    = "git fetch -q origin"
           cmd = %{
-            if [ ! -d #{path} ] ; then
+            if [ -d #{path}/.git ] ; then
+              echo "$ #{fetch_cmd}" &&
+              cd #{path} &&
+              #{fetch_cmd} || exit $? ;
+            else
               echo "$ #{clone_cmd}" &&
               #{clone_cmd} || exit $? ;
             fi ;
@@ -89,27 +91,10 @@ module Evrone
             %{git log -1 --pretty=format:'%H -:- %cn (%ce) -:- %s'}
           end
 
-          def repo_exist?
-            File.directory?(path.to_s + "/.git")
-          end
-
-          def update
-            run_git 'git fetch origin', chdir: path
-          end
-
-          def clone
-            run_git "git clone -q #{src} #{path}"
-          end
-
-          def checkout
-            run_git "git checkout -qf #{sha}", chdir: path
-          end
-
           def run_git(cmd, options = {})
             env = {
               'GIT_SSH' => git_ssh.location.path
             }
-            logger.call "$ #{cmd}\n"
             spawn(env, cmd, options, &logger)
           end
 

data/spec/lib/common/helper/upload_sh_command_spec.rb

@@ -0,0 +1,39 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+require 'evrone/common/spawn'
+require 'fileutils'
+
+describe Evrone::CI::Common::Helper::UploadShCommand do
+  let(:object) { Object.new }
+  subject { object }
+
+  before do
+    object.extend described_class
+    object.extend Evrone::Common::Spawn
+  end
+
+  it { should be_respond_to(:upload_sh_command) }
+
+  context "#upload_sh_command" do
+    let(:file)    { '/tmp/.test' }
+    let(:content) { 'Дима' }
+    let(:cmd) { object.upload_sh_command file, content }
+
+    before { FileUtils.rm_rf file }
+    after { FileUtils.rm_rf file }
+
+    it "should be successful" do
+      object.spawn cmd do |out|
+        puts " ===> #{out}"
+      end
+
+      expect(File).to be_readable(file)
+      expect(File.read file).to eq content
+    end
+
+  end
+
+end
+
+

data/spec/lib/common/output_buffer_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe Evrone::CI::Common::OutputBuffer do
+  let(:collected) { "" }
+  let(:write)     { ->(str) { collected << str } }
+  let(:buffer)    { described_class.new(0.5, &write) }
+
+  after do
+    buffer.close
+  end
+
+  it { should be }
+
+  it "should add string to buffer" do
+    buffer << "1"
+    buffer << "2"
+    expect(collected).to eq ''
+    sleep 1
+    expect(collected).to eq '12'
+
+    buffer << '3'
+    expect(collected).to eq '12'
+    sleep 1
+    expect(collected).to eq '123'
+  end
+
+  it "should raise error when add to closed buffer" do
+    buffer.close
+    expect {
+      buffer << "1"
+    }.to raise_error
+  end
+
+  it "should flush buffer" do
+    buffer << "1"
+    sleep 0.1
+    expect(collected).to eq ''
+    buffer.flush
+    expect(collected).to eq '1'
+  end
+
+end

data/spec/lib/scm/git_spec.rb

@@ -15,7 +15,11 @@ describe Evrone::CI::SCM::Git do
 
   subject { git }
 
-  before { FileUtils.rm_rf path }
+  before do
+    FileUtils.rm_rf path
+    FileUtils.mkdir_p path
+  end
+
   after  { FileUtils.rm_rf path }
 
   context "just created" do
@@ -23,7 +27,6 @@ describe Evrone::CI::SCM::Git do
     its(:sha)                 { should eq sha }
     its(:path)                { should eq path }
     its(:branch)              { should be_nil }
-    its(:pull_request_id)     { should be_nil }
     its("git_ssh.deploy_key") { should be_nil }
   end
 
@@ -32,11 +35,6 @@ describe Evrone::CI::SCM::Git do
     its(:branch)  { should eq 'master' }
   end
 
-  context "assign pull_request_id" do
-    let(:options) { { pull_request_id: 1} }
-    its(:pull_request_id) { should eq 1 }
-  end
-
   context "assign deploy_key" do
     let(:options) { { deploy_key: deploy_key } }
     its("git_ssh.deploy_key") { should eq deploy_key }
@@ -81,10 +79,9 @@ describe Evrone::CI::SCM::Git do
     include Evrone::Common::Spawn
 
     let(:options) { { deploy_key: deploy_key } }
-    let(:env) { {'GIT_SSH' => git.git_ssh.location.path} }
     let(:run) do
       git.open do
-        spawn(env, git.make_fetch_command, &method(:add_to_output))
+        spawn(git_ssh_env, git.make_fetch_command, &method(:add_to_output))
       end
     end
     subject { git.make_fetch_command }
@@ -109,8 +106,8 @@ describe Evrone::CI::SCM::Git do
 
     context "twice" do
       it "should be" do
-        code = git.git_ssh.open do
-          spawn(env, git.make_fetch_command, &method(:add_to_output))
+        code = git.open do
+          spawn(git_ssh_env, git.make_fetch_command, &method(:add_to_output))
         end
         expect(code).to eq 0
       end
@@ -123,6 +120,10 @@ describe Evrone::CI::SCM::Git do
         expect(run).to eq 128
       end
     end
+
+    def git_ssh_env
+      { 'GIT_SSH' => git.git_ssh.location.path }
+    end
   end
 
   context ".make_export_command" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evrone-ci-common
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre4
+  version: 0.2.0.pre5
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-05 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evrone-common-spawn
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: evrone-common-rack-builder
   requirement: !ruby/object:Gem::Requirement
@@ -125,12 +125,16 @@ files:
 - lib/evrone/ci/common.rb
 - lib/evrone/ci/common/helper/middlewares.rb
 - lib/evrone/ci/common/helper/shell.rb
+- lib/evrone/ci/common/helper/upload_sh_command.rb
+- lib/evrone/ci/common/output_buffer.rb
 - lib/evrone/ci/common/tagged_logging.rb
 - lib/evrone/ci/common/version.rb
 - lib/evrone/ci/scm/git.rb
 - lib/evrone/ci/scm/git/git_ssh.rb
 - spec/lib/common/helper/middlewares_spec.rb
 - spec/lib/common/helper/shell_spec.rb
+- spec/lib/common/helper/upload_sh_command_spec.rb
+- spec/lib/common/output_buffer_spec.rb
 - spec/lib/scm/git_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -160,5 +164,7 @@ summary: Common code for ci
 test_files:
 - spec/lib/common/helper/middlewares_spec.rb
 - spec/lib/common/helper/shell_spec.rb
+- spec/lib/common/helper/upload_sh_command_spec.rb
+- spec/lib/common/output_buffer_spec.rb
 - spec/lib/scm/git_spec.rb
 - spec/spec_helper.rb