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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ba20882ed0c72497ad65e88ca2afe9003c46a60
-  data.tar.gz: 3c27b790c0862c894a95f9707ab522fa3988be80
+  metadata.gz: 81ca8965c9dae40ab4566ba5d5c048a2a87b389e
+  data.tar.gz: 4e6d92fed51fc19fcadc01aa927f1a34682d4add
 SHA512:
-  metadata.gz: eeea40bdf321061becc49103e829436c9c31ab77be419a7ae0a56bd9ffdb66d4142465ed376a35a672353a6219b1f6dbb26a999780b2f4b6e7d4d43430e850f3
-  data.tar.gz: 57ee29abf9be33e9ae6e1b1d7af1f24ac40bf927323e2e23505de79f28116fdcd1da6a71a72bd29c06c29506db06a10aa23ca37d3fb509fc846fb2968aa4be42
+  metadata.gz: ed9a28451eee34d32576499f36d9308b93b8e41b2a0e7f8dc54fb2df7faf6c06a76e1a2508fb248202388d62c80316e64867432fb81fed19d7701f1536ce735f
+  data.tar.gz: 9633d1460ab29127d4a381917408f7bd4b20840b877a599dd4fd1fa515ae2bb72fdfb4579296be7ac82ab8dd59a8f684c3954dc9520ecf96e1bba3513ee93c64

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

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

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

@@ -11,18 +11,26 @@ module Evrone
 
         COMMIT_RE = /^(.*) -:- (.*) \((.*)\) -:- (.*)$/
 
-        attr_reader :src, :sha, :path, :logger, :git_ssh
+        attr_reader :src, :sha, :path, :logger, :git_ssh, :pull_request_id, :branch
 
         def initialize(src, sha, path, options = {}, &block)
-          @src      = src
-          @sha      = sha
-          @path     = path
-          @git_ssh  = GitSSH.new options[:deploy_key]
-          @logger   = 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
+
+        def open
+          git_ssh.open do
+            yield if block_given?
+          end
         end
 
         def fetch
-          code = git_ssh.open do
+          code = open do
             repo_exist? ? update : clone
           end
           code = checkout if code == 0
@@ -36,7 +44,16 @@ module Evrone
         def make_fetch_command
           clone_cmd = "git clone -q #{src} #{path}"
           checkout_cmd = "git checkout -qf #{sha}"
-          %{ (test -d #{path} || ( echo $ #{clone_cmd} && #{clone_cmd} ) ) && cd #{path} && echo $ #{checkout_cmd} && #{checkout_cmd} }.strip
+          cmd = %{
+            if [ ! -d #{path} ] ; then
+              echo "$ #{clone_cmd}" &&
+              #{clone_cmd} || exit $? ;
+            fi ;
+            echo "$ #{checkout_cmd}" &&
+            cd #{path} &&
+            #{checkout_cmd}
+          }.gsub("\n", ' ').gsub(/\ +/, ' ').strip
+          cmd
         end
 
         def commit_info

data/spec/lib/scm/git_spec.rb

@@ -8,8 +8,9 @@ describe Evrone::CI::SCM::Git do
   let(:sha)        { message.sha }
   let(:deploy_key) { message.deploy_key }
   let(:output)     { "" }
+  let(:options)    { {} }
   let(:git)        {
-    described_class.new src, sha, path, deploy_key: deploy_key, &method(:add_to_output)
+    described_class.new src, sha, path, options, &method(:add_to_output)
   }
 
   subject { git }
@@ -18,13 +19,31 @@ describe Evrone::CI::SCM::Git do
   after  { FileUtils.rm_rf path }
 
   context "just created" do
-    its(:src)                 { should eq src        }
-    its(:sha)                 { should eq sha        }
-    its(:path)                { should eq path       }
+    its(:src)                 { should eq src }
+    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
+
+  context "assign branch" do
+    let(:options) { { branch: 'master' } }
+    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 }
   end
 
   context "fetch" do
+    let(:options) { { deploy_key: deploy_key } }
     subject { git.fetch }
 
     it { should eq 0 }
@@ -61,9 +80,10 @@ describe Evrone::CI::SCM::Git do
   context "make_fetch_command" do
     include Evrone::Common::Spawn
 
+    let(:options) { { deploy_key: deploy_key } }
     let(:env) { {'GIT_SSH' => git.git_ssh.location.path} }
     let(:run) do
-      git.git_ssh.open do
+      git.open do
         spawn(env, git.make_fetch_command, &method(:add_to_output))
       end
     end
@@ -106,9 +126,10 @@ describe Evrone::CI::SCM::Git do
   end
 
   context ".make_export_command" do
-    let(:from) { path }
-    let(:to)   { '/tmp/.test/export' }
-    let(:expected) { "(cd '#{from}' && git checkout-index -a -f --prefix='#{to}/')" }
+    let(:options)  { { deploy_key: deploy_key } }
+    let(:from)     { path }
+    let(:to)       { '/tmp/.test/export' }
+    let(:expected) { "(cd '#{ from }' && git checkout-index -a -f --prefix='#{ to}/')" }
     subject { described_class.make_export_command from, to}
     it { should eq expected }
 
@@ -129,8 +150,9 @@ describe Evrone::CI::SCM::Git do
   end
 
   context "commit_info" do
+    let(:options) { { deploy_key: deploy_key } }
     subject { git.commit_info }
-    before  { git.fetch       }
+    before  { git.fetch }
 
     it "should be" do
       expect(subject.sha).to     eq 'b665f90239563c030f1b280a434b3d84daeda1bd'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evrone-ci-common
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre3
+  version: 0.2.0.pre4
 platform: ruby
 authors:
 - Dmitry Galinsky