spectre-git 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c40edb02b5e9fe5d095eca2af447ce6553c654ce0433b30dfcfe092b4fa96ef9
-  data.tar.gz: 39cf6a7614a9477cb4f8308171da878b5c0c89b935ba29cf7c9639bebf661767
+  metadata.gz: 43429a3308a69bf57e10cc825c1ec52263c12a54965a6b2574c7fd9f3cfef396
+  data.tar.gz: cfe8b65f89eebaa202b63f4e18fd209c69de68fdde886d0d7cc42cec4e23b54c
 SHA512:
-  metadata.gz: a701da80760f5a042809cebbc3fd0bd4e167e717800a755d4701ab1fe2e56e2de22541eecedd5b6eb0fa99dc624a5076dbf9d72d6302c98cd5117b1b75f970cb
-  data.tar.gz: 57392178020a4aa10bf2f436e71ecea8c5fd66b17c152ce7737ad0cf0976c0614dae211a136d0533c07c4f5223f37ca9bb474b6558c5f9289156185d39f3440a
+  metadata.gz: d4e10d58912256192d3eda3c2435d571c879c20c4a573ae6d2022b1b7c8f94e37634aa5c885237783d0cdf6a98b0c2f76b94ffac9156f71e8e3450ee33ddcab7
+  data.tar.gz: 806344e64f6fff644fb76629af41437af7ba5055ee0c3c0f893dd6b11209bd72a5a84557c0e7cc9111997c310c4378d7f448a1d8bdb500ea8eb1a9bad875cedf

data/lib/spectre/git.rb

@@ -1,5 +1,5 @@
+require 'open3'
 require 'fileutils'
-require 'git'
 require 'logger'
 require 'spectre'
 
@@ -10,7 +10,7 @@ module Spectre
       def initialize cfg, logger
         @__logger = logger
         @__cfg = cfg
-        @__repo = nil
+        @__repo_path = nil
 
         url(@__cfg['url'])
         @__cfg['branch'] = 'master' unless @__cfg['branch']
@@ -23,8 +23,8 @@ module Spectre
 
         @__cfg['url'] = url_match[:url]
         @__cfg['scheme'] = url_match[:scheme]
-        @__cfg['username'] = url_match[:user]
-        @__cfg['password'] = url_match[:pass]
+        @__cfg['username'] = url_match[:user] unless @__cfg['username']
+        @__cfg['password'] = url_match[:pass] unless @__cfg['password']
         @__cfg['name'] = url_match[:name] unless @__cfg['name']
         @__cfg['working_dir'] = './tmp' unless @__cfg['working_dir']
       end
@@ -42,42 +42,74 @@ module Spectre
         @__cfg['working_dir']
       end
 
+      def cert file_path
+        @__cfg['cert'] = file_path
+      end
+
       def branch name
         @__cfg['branch'] = name
       end
 
       def clone
-        @__cfg['working_dir'] = path = File.join(@__cfg['working_dir'], @__cfg['name'])
-        FileUtils.rm_rf(path)
-        @__repo = ::Git.clone(get_url, path, branch: @__cfg['branch'], log: @__logger)
+        @__repo_path = File.absolute_path File.join(@__cfg['working_dir'], @__cfg['name'])
+
+        if File.exist? @__repo_path
+          FileUtils.rm_rf(@__repo_path)
+          @__logger.debug("repo path '#{@__repo_path}' removed")
+        end
+
+        FileUtils.mkpath(@__repo_path)
+        @__logger.debug("repo path '#{@__repo_path}' created")
+
+        clone_cmd = ['git', 'clone']
+        clone_cmd << '--branch'
+        clone_cmd << @__cfg['branch']
+
+        if @__cfg['cert']
+          clone_cmd << '--config'
+          clone_cmd << "http.sslCAInfo=#{@__cfg['cert']}"
+        end
+
+        clone_cmd << get_url
+        clone_cmd << @__repo_path
+
+        clone_cmd = clone_cmd.join(' ')
+
+        @__logger.info("#{clone_cmd.gsub /:([^\:\@\/\/]*)@/, ':*****@'}")
+
+        run(clone_cmd, log: false)
       end
 
       def add path
-        @__repo.add(path)
+        run("git add \"#{path}\"")
       end
 
       def add_all
-        @__repo.add(all: true)
+        run("git add --all")
       end
 
-      def add_tag name, annotate: false, message: nil
-        @__repo.add_tag(name, annotate: annotate, message: message)
+      def tag name, message: nil
+        run("git tag -a -m \"#{message}\"")
       end
 
       def commit message
-        @__repo.commit(message)
+        run("git commit -m \"#{message}\"")
       end
 
       def push
-        @__repo.push('origin', @__cfg['branch'])
+        run("git push")
       end
 
       def pull
-        @__repo.pull('origin', @__cfg['branch'])
+        run("git pull")
+      end
+
+      def pull
+        run("git pull")
       end
 
       def write_file path, content
-        full_path = File.join(@__cfg['working_dir'], path)
+        full_path = File.join(@__repo_path, path)
 
         file = File.open(full_path, 'w')
         file.write(content)
@@ -87,12 +119,26 @@ module Spectre
       end
 
       def read_file path
-        full_path = File.join(@__cfg['working_dir'], path)
+        full_path = File.join(@__repo_path, path)
         File.read(full_path)
       end
 
       def cleanup
-        FileUtils.rm_rf(@__cfg['working_dir'])
+        FileUtils.rm_rf(@__repo_path)
+      end
+
+      def run cmd, log: true
+        stdin, stdout, stderr, wait_thr = Open3.popen3(cmd, chdir: @__repo_path)
+
+        @__logger.info(cmd) if log
+
+        output = stdout.gets(nil)
+        stdout.close
+
+        error = stderr.gets(nil)
+        stderr.close
+
+        raise error unless wait_thr.value.exitstatus == 0
       end
 
       private

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: spectre-git
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Christian Neubauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-06-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: git
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: spectre-core
   requirement: !ruby/object:Gem::Requirement