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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a48cd5adc2e2ee1dc11a581760a775d1955fdf21
-  data.tar.gz: c3214e917c9883b0bedf335a74e2b1f66e925bdd
+  metadata.gz: 8ba20882ed0c72497ad65e88ca2afe9003c46a60
+  data.tar.gz: 3c27b790c0862c894a95f9707ab522fa3988be80
 SHA512:
-  metadata.gz: a301664e5e94aee837e217ac7a94e6a2d131a0fa5b7580c26cebbc445d34dc044afd4acea8590046e486c70419a3d13bfa4ca27d1a83649717e9e75a1385074c
-  data.tar.gz: d00316f0b90ea0a7ad40792ac98995a72f6ac027ac6d9b559f083daea294879e9e3c3a1e66e48b827cab5cbb357946e5566134374c36f56819df50d0a4e962fc
+  metadata.gz: eeea40bdf321061becc49103e829436c9c31ab77be419a7ae0a56bd9ffdb66d4142465ed376a35a672353a6219b1f6dbb26a999780b2f4b6e7d4d43430e850f3
+  data.tar.gz: 57ee29abf9be33e9ae6e1b1d7af1f24ac40bf927323e2e23505de79f28116fdcd1da6a71a72bd29c06c29506db06a10aa23ca37d3fb509fc846fb2968aa4be42

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

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

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

@@ -34,7 +34,9 @@ module Evrone
         end
 
         def make_fetch_command
-          %{ (test -d #{path} || git clone -q #{src} #{path}) && cd #{path} && git checkout -qf #{sha} }.strip
+          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
         end
 
         def commit_info

data/spec/lib/scm/git_spec.rb

@@ -60,10 +60,11 @@ describe Evrone::CI::SCM::Git do
 
   context "make_fetch_command" do
     include Evrone::Common::Spawn
+
     let(:env) { {'GIT_SSH' => git.git_ssh.location.path} }
     let(:run) do
       git.git_ssh.open do
-        spawn(env, git.make_fetch_command) {|o| puts o }
+        spawn(env, git.make_fetch_command, &method(:add_to_output))
       end
     end
     subject { git.make_fetch_command }
@@ -72,7 +73,7 @@ describe Evrone::CI::SCM::Git do
       run
     end
 
-    it { should eq "(test -d #{path} || git clone -q #{src} #{path}) && cd #{path} && git checkout -qf #{sha}" }
+    it { should be }
 
     it "should be success" do
       expect(run).to eq 0
@@ -89,7 +90,7 @@ 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) {|o| puts o }
+          spawn(env, git.make_fetch_command, &method(:add_to_output))
         end
         expect(code).to eq 0
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evrone-ci-common
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre1
+  version: 0.2.0.pre3
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evrone-common-spawn