evrone-ci-common 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b17b5c76d7046f2b5f0bc3b022c255f3376fac0
-  data.tar.gz: 2b2461bb491dc87af1532d58e6631b4df8c5732b
+  metadata.gz: e833f784c332a5c8869427a5b56a0f1a379bf192
+  data.tar.gz: e6400620531bf10a5b79316774695c870a804e4b
 SHA512:
-  metadata.gz: a8203fd0db2e58212d74b509102355766e496baccd6fcbf767d9f32b8b090e0bc55a14492bc067a0cb54f724015f3d73030bc06d7463f7338ab9d57570f983f7
-  data.tar.gz: 6ade35c3184be60a0e3f21f0ff17ce905af51d0a3197333502cc41bf20f6cd1b381ed0eff5eb8b0e1c33df98e8d920bb8095dc314cc1a3640aaf5b2b46a95586
+  metadata.gz: 271322ba63da3c438165dab37685869771d6d1410382fc5cbf98074eb4318216ff7c7d7f638bca2f9f424ee73485f22474f8cd3c68c9d5596473110748d18772
+  data.tar.gz: 1679bed77958ddc617430a0331fb2f34187705e4daab8149eb38b42e6d9136c30432fc7fed33deac6d50263b3426341b859dfd097829ea00dbf3495a8e993677

data/Rakefile

@@ -1,3 +1,6 @@
+require 'rubygems'
+require 'bundler'
+Bundler.require
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 

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

@@ -1,7 +1,7 @@
 module Evrone
   module CI
     module Common
-      VERSION = "0.0.6"
+      VERSION = "0.0.7"
     end
   end
 end

data/lib/evrone/ci/common.rb

@@ -14,9 +14,9 @@ module Evrone
 
     end
 
-    module CSM
+    module SCM
 
-      autoload :Git, File.expand_path("../csm/git", __FILE__)
+      autoload :Git, File.expand_path("../scm/git", __FILE__)
 
     end
 

data/lib/evrone/ci/{csm → scm}/git/git_ssh.rb

@@ -1,6 +1,6 @@
 module Evrone
   module CI
-    module CSM
+    module SCM
 
       class Git
 

data/lib/evrone/ci/{csm → scm}/git.rb

@@ -3,7 +3,7 @@ require File.expand_path("../git/git_ssh", __FILE__)
 
 module Evrone
   module CI
-    module CSM
+    module SCM
 
       class Git
 
@@ -33,6 +33,10 @@ module Evrone
           %{ (cd '#{from}' && git checkout-index -a -f --prefix='#{to}/') }.strip
         end
 
+        def make_fetch_command
+          %{ (test -d #{path} || git clone -q #{src} #{path}) && cd #{path} && git checkout -qf #{sha} }.strip
+        end
+
         def commit_info
           rs = {}
           if str = commit_info_string
@@ -50,45 +54,45 @@ module Evrone
 
         private
 
-        def commit_info_string
-          output = ""
-          code = spawn commit_info_cmd, chdir: path do |io|
-            output << io
-          end
-          if code == 0
-            output.strip
-          else
-            nil
+          def commit_info_string
+            output = ""
+            code = spawn commit_info_cmd, chdir: path do |io|
+              output << io
+            end
+            if code == 0
+              output.strip
+            else
+              nil
+            end
           end
-        end
 
-        def commit_info_cmd
-          %{git log -1 --pretty=format:'%H -:- %cn (%ce) -:- %s'}
-        end
+          def commit_info_cmd
+            %{git log -1 --pretty=format:'%H -:- %cn (%ce) -:- %s'}
+          end
 
-        def repo_exist?
-          File.directory?(path.to_s + "/.git")
-        end
+          def repo_exist?
+            File.directory?(path.to_s + "/.git")
+          end
 
-        def update
-          run_git 'git fetch origin', chdir: path
-        end
+          def update
+            run_git 'git fetch origin', chdir: path
+          end
 
-        def clone
-          run_git "git clone -q '#{src}' '#{path}'"
-        end
+          def clone
+            run_git "git clone -q #{src} #{path}"
+          end
 
-        def checkout
-          run_git "git checkout -qf #{sha}", chdir: 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
+          def run_git(cmd, options = {})
+            env = {
+              'GIT_SSH' => git_ssh.location.path
+            }
+            logger.call "$ #{cmd}\n"
+            spawn(env, cmd, options, &logger)
+          end
 
       end
 

data/spec/lib/{csm → scm}/git_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'evrone/ci/message/testing'
 
-describe Evrone::CI::CSM::Git do
+describe Evrone::CI::SCM::Git do
   let(:path)       { '/tmp/.test/repo'               }
   let(:message)    { Evrone::CI::Message::PerformBuild.test_message }
   let(:src)        { message.src }
@@ -29,7 +29,7 @@ describe Evrone::CI::CSM::Git do
 
     it { should eq 0 }
 
-    it "should create nessesary deirectories and checkout sha" do
+    it "should create nessesary directories and checkout sha" do
       subject
       expect(File.directory? path).to be
       expect(File.directory? "#{path}/.git").to be
@@ -40,7 +40,7 @@ describe Evrone::CI::CSM::Git do
 
     it "should capture output" do
       subject
-      expect(output).to eq "$ git clone -q '#{src}' '#{path}'\n$ git checkout -qf #{sha}\n"
+      expect(output).to eq "$ git clone -q #{src} #{path}\n$ git checkout -qf #{sha}\n"
     end
 
     context "twice" do
@@ -58,6 +58,48 @@ describe Evrone::CI::CSM::Git do
     end
   end
 
+  context "make_fetch_command" do
+    include Evrone::Common::Spawn
+
+    let(:run) { spawn(git.make_fetch_command) {|o| puts o } }
+    subject { git.make_fetch_command }
+
+    before do
+      run
+    end
+
+    it { should eq "(test -d #{path} || git clone -q #{src} #{path}) && cd #{path} && git checkout -qf #{sha}" }
+
+    it "should be success" do
+      expect(run).to eq 0
+    end
+
+    it "should create nessesary directories and checkout sha" do
+      expect(File.directory? path).to be
+      expect(File.directory? "#{path}/.git").to be
+      Dir.chdir path do
+        expect((`git rev-parse HEAD`).strip).to eq sha
+      end
+    end
+
+    context "twice" do
+      it "should be" do
+        code = spawn subject do |o|
+          puts o.inspect
+        end
+        expect(code).to eq 0
+      end
+    end
+
+    context "with error" do
+      let(:src) { "/not-exists-repo.git"  }
+
+      it "should return 128 exitstatus and add error to output" do
+        expect(run).to eq 128
+      end
+    end
+  end
+
   context ".make_export_command" do
     let(:from) { path }
     let(:to)   { '/tmp/.test/export' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evrone-ci-common
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Dmitry Galinsky
@@ -129,12 +129,12 @@ files:
 - lib/evrone/ci/common/perform_message_wrapper.rb
 - lib/evrone/ci/common/tagged_logging.rb
 - lib/evrone/ci/common/version.rb
-- lib/evrone/ci/csm/git.rb
-- lib/evrone/ci/csm/git/git_ssh.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/perform_message_wrapper_spec.rb
-- spec/lib/csm/git_spec.rb
+- spec/lib/scm/git_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -164,6 +164,5 @@ test_files:
 - spec/lib/common/helper/middlewares_spec.rb
 - spec/lib/common/helper/shell_spec.rb
 - spec/lib/common/perform_message_wrapper_spec.rb
-- spec/lib/csm/git_spec.rb
+- spec/lib/scm/git_spec.rb
 - spec/spec_helper.rb
-has_rdoc: