vx-common 0.2.0.pre31 → 0.2.0.pre32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5d36777c4485eeccb793d8cde2b9ab22224569f
-  data.tar.gz: 1f40cf797f093630f70b1ccaa5fbe4b9592d868f
+  metadata.gz: 7076a2b1bd0f717ca958885555c1531b1e4fbd51
+  data.tar.gz: 7a55f90047f4e7be60d56b6a180ad49318f60f71
 SHA512:
-  metadata.gz: 792fefe5b95aecb79d41fd1fa3a64cde662f5089a43d978243557ac6c4175632286ee69a1dbc4db519869002cbf3aa8326a073e2407a24cb587e387616170974
-  data.tar.gz: 140e30aebb67d5b6459202b8651b7839088d26fef5f61f4b62dab27e82cd738414a6a8504c0197ea114cb7fed934d5803d119b9fac3c2922901fa565b7ba9154
+  metadata.gz: cc13d3e60b303fc0e27cd0354d20f03ffd04c14a4e65b81a776c02b6c9bc9a6634279005fdefe6150d938c7d4e1ac9d8f9f7ca5112db6343b743f228875d42dc
+  data.tar.gz: 545f83252bb3049771b7066141985acc0db52a40391bfe287cce3e5f876e25d3133980a0cb3f144ab3a3da5677f3c9a91b8c592b0fab80c1084905cce9b43869

data/lib/vx/common/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Common
-    VERSION = "0.2.0.pre31"
+    VERSION = "0.2.0.pre32"
   end
 end

data/lib/vx/scm/git/git_ssh.rb

@@ -47,7 +47,7 @@ module Vx
           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 << "exec /usr/bin/ssh -A -o LogLevel=quiet -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null #{key} $@"
             out.join "\n"
           end
         end

data/lib/vx/scm/git.rb

@@ -10,7 +10,7 @@ module Vx
 
       COMMIT_RE = /^(.*) -:- (.*) \((.*)\) -:- (.*)$/
 
-      attr_reader :src, :sha, :path, :logger, :git_ssh, :branch
+      attr_reader :src, :sha, :path, :logger, :git_ssh, :branch, :pull_request_id
 
       def initialize(src, sha, path, options = {}, &block)
         @src             = src
@@ -18,6 +18,7 @@ module Vx
         @path            = path
         @branch          = options[:branch]
         @git_ssh         = GitSSH.new options[:deploy_key]
+        @pull_request_id = options[:pull_request_id]
         @logger          = block
       end
 
@@ -40,22 +41,25 @@ module Vx
       def make_fetch_command(options = {})
         depth        = options.key?(:depth) ? options[:depth] : 50
         clone_branch = " --branch=#{branch}" if branch
-        clone_cmd    = "git clone -q --depth=#{depth}#{clone_branch} #{src} #{path}"
         checkout_cmd = "git checkout -qf #{sha}"
-        fetch_cmd    = "git fetch -q origin"
-        cmd = %{
-            if [ -d #{path}/.git ] ; then
-              echo "$ #{fetch_cmd}" &&
-              cd #{path} &&
-        #{fetch_cmd} || exit $? ;
-            else
-              echo "$ #{clone_cmd}" &&
-        #{clone_cmd} || exit $? ;
-            fi ;
-            echo "$ #{checkout_cmd}" &&
-            cd #{path} &&
-        #{checkout_cmd}
-        }.gsub("\n", ' ').gsub(/\ +/, ' ').strip
+        fetch_cmd    = nil
+
+        if pull_request_id
+          clone_branch = ""
+          fetch_cmd = "git fetch origin +refs/pull/#{pull_request_id}/merge:"
+          checkout_cmd = "git checkout -q FETCH_HEAD"
+        end
+
+        clone_cmd = "git clone -q --depth=#{depth}#{clone_branch} #{src} #{path}"
+
+        cmd = []
+        cmd << %{ echo "$ #{clone_cmd}" && #{clone_cmd} }
+        cmd << %{ cd #{path} }
+        cmd << %{ echo "$ #{fetch_cmd}" && #{fetch_cmd} } if fetch_cmd
+        cmd << %{ echo "$ #{checkout_cmd}" && #{checkout_cmd} }
+
+        cmd = cmd.join(" && ").gsub("\n", ' ').gsub(/\ +/, ' ').strip
+        puts "---> #{cmd}"
         cmd
       end
 

data/spec/lib/scm/git_spec.rb

@@ -60,11 +60,6 @@ describe Vx::SCM::Git do
       expect(output).to match(Regexp.escape "$ git clone -q --depth=50 #{src} #{path}")
     end
 
-    context "twice" do
-      before { git.fetch }
-      it { should eq 0 }
-    end
-
     context "with error" do
       let(:src) { "/not-exists-repo.git"  }
 
@@ -104,15 +99,6 @@ describe Vx::SCM::Git do
       end
     end
 
-    context "twice" do
-      it "should be" do
-        code = git.open do
-          spawn(git_ssh_env, git.make_fetch_command, &method(:add_to_output))
-        end
-        expect(code).to eq 0
-      end
-    end
-
     context "with error" do
       let(:src) { "/not-exists-repo.git"  }
 
@@ -147,7 +133,20 @@ describe Vx::SCM::Git do
       it "should export repo" do
         expect(File.readable? "#{to}/Gemfile").to be_true
       end
+
+      context "run with pull_request" do
+        let(:options) { { deploy_key: deploy_key, pull_request_id: 1 } }
+
+        it "should be success" do
+          expect($?.to_i).to eq 0
+        end
+
+        it "should export repo" do
+          expect(File.readable? "#{to}/Gemfile").to be_true
+        end
+      end
     end
+
   end
 
   context "commit_info" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-common
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre31
+  version: 0.2.0.pre32
 platform: ruby
 authors:
 - Dmitry Galinsky