spectre-git 0.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d095a2bea71ef37d5836a116e5c76cadbe5284a7a41ca760fbd0a0f4032e6f81
-  data.tar.gz: 30c03a76df3cb252d8faff721ef6b7efbba0cd37f2181531c83086f730a53345
+  metadata.gz: 601d03616fada342e6d886e5d257be8b6909d7e0b29a3b5d413cf6164b5a605c
+  data.tar.gz: 7c2a0892ef5543f0191ff351bedc62d16c9d92daf38c5a0445fecaf28683a850
 SHA512:
-  metadata.gz: 0f48d279ed4d9a41a9a4f26e6fe216a982cb9202c7b4105aac5652a53e3e5b38979588d85a997a0debae018e79ffd473c2c861b7a809de775a5cc9566dd5548a
-  data.tar.gz: 6339afdf9e290e9dc7da2b0729e43276a9f90a475b354260b438c9c788496f03d464297e2539ff3ef1a69e53e0b8adde088405c4c9ca4b2ede130bb3c26422b9
+  metadata.gz: 0e1d9ff166fcb1b3a95d98f2ff7c46f9bb95e201da4a4ae1f17b3a0bbfbec4c09b0b3c0c49b8660bb728a1a9360e51b489ed3b5c4d2386868a9d7d79d4f8615b
+  data.tar.gz: 4d5903bca250a0f7e86ef39e4ac24673bfcfb2794df7f51602e2554e56085c8595ebe6fa11e4d1fa325a0afa0069b789c4869a034fc9f8c95c64c7349024770d

data/lib/spectre/git.rb

@@ -1,179 +1,170 @@
-require 'open3'
-require 'fileutils'
-require 'logger'
-require 'spectre'
-
-
-module Spectre
-  module Git
-    class GitAccess < Spectre::DslClass
-      def initialize cfg, logger
-        @__logger = logger
-        @__cfg = cfg
-        @__repo_path = nil
-
-        url(@__cfg['url'])
-        @__cfg['branch'] = 'master' unless @__cfg['branch']
-      end
-
-      def url git_url
-        url_match = git_url.match /^(?<scheme>http(?:s)?):\/\/(?:(?<user>[^\/:]*):(?<pass>.*)@)?(?<url>.*\/(?<name>[^\/]*)\.git)$/
-
-        raise "invalid git url: '#{git_url}'" unless url_match
-
-        @__cfg['url_path'] = url_match[:url]
-        @__cfg['scheme'] = url_match[:scheme]
-        @__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
-
-      def username user
-        @__cfg['username'] = user
-      end
-
-      def password pass
-        @__cfg['password'] = pass
-      end
-
-      def working_dir path
-        @__cfg['working_dir'] = path if path
-        @__cfg['working_dir']
-      end
-
-      def cert file_path
-        @__cfg['cert'] = file_path
-      end
-
-      def branch name
-        @__cfg['branch'] = name
-      end
-
-      def clone
-        @__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
-        run("git add \"#{path}\"")
-      end
-
-      def add_all
-        run("git add --all")
-      end
-
-      def tag name, message: nil
-        run("git tag -a -m \"#{message}\"")
-      end
-
-      def commit message
-        run("git commit -m \"#{message}\"")
-      end
-
-      def push
-        run("git push")
-      end
-
-      def pull
-        run("git pull")
-      end
-
-      def pull
-        run("git pull")
-      end
-
-      def write_file path, content
-        full_path = File.join(@__repo_path, path)
-
-        file = File.open(full_path, 'w')
-        file.write(content)
-        file.close
-
-        full_path
-      end
-
-      def read_file path
-        full_path = File.join(@__repo_path, path)
-        File.read(full_path)
-      end
-
-      def cleanup
-        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
-
-      def get_url
-        cred = @__cfg['username'] ? "#{@__cfg['username']}:#{@__cfg['password']}@" : ''
-        "#{@__cfg['scheme']}://#{cred}#{@__cfg['url_path']}"
-      end
-    end
-
-    class << self
-      @@cfg = {}
-      @@logger = ::Logger.new(STDOUT)
-      @@last_access = nil
-
-      def git name = nil, &block
-        cfg = @@cfg[name] || {}
-
-        cfg['url'] = name if not cfg['url']
-
-        @@last_access = GitAccess.new(cfg, @@logger) if name
-        @@last_access.instance_eval &block
-      end
-    end
-
-    Spectre.register do |config|
-      @@logger = ::Logger.new config['log_file'], progname: 'spectre/git'
-
-      if config.key? 'git'
-        config['git'].each do |name, cfg|
-          @@cfg[name] = cfg
-        end
-      end
-    end
-
-    Spectre.delegate :git, to: self
-  end
-end
+require 'open3'
+require 'fileutils'
+require 'logger'
+
+module Spectre
+  module Git
+    class GitAccess
+      include Spectre::Delegate if defined? Spectre::Delegate
+
+      def initialize cfg, logger
+        @__logger = logger
+        @__cfg = cfg
+        @__repo_path = nil
+
+        url(@__cfg['url'])
+        @__cfg['branch'] = 'master' unless @__cfg['branch']
+      end
+
+      def url git_url
+        url_match = git_url
+          .match(%r{^(?<scheme>http(?:s)?)://(?:(?<user>[^/:]*):(?<pass>.*)@)?(?<url>.*/(?<name>[^/]*)\.git)$})
+
+        raise "invalid git url: '#{git_url}'" unless url_match
+
+        @__cfg['url_path'] = url_match[:url]
+        @__cfg['scheme'] = url_match[:scheme]
+        @__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
+
+      def username user
+        @__cfg['username'] = user
+      end
+
+      def password pass
+        @__cfg['password'] = pass
+      end
+
+      def working_dir path
+        @__cfg['working_dir'] = path if path
+        @__cfg['working_dir']
+      end
+
+      def cert file_path
+        @__cfg['cert'] = file_path
+      end
+
+      def branch name
+        @__cfg['branch'] = name
+      end
+
+      def clone
+        @__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 << build_url
+        clone_cmd << @__repo_path
+
+        clone_cmd = clone_cmd.join(' ')
+
+        @__logger.info(clone_cmd.gsub(%r{:([^\:\@/]*)@}, ':*****@').to_s)
+
+        run(clone_cmd, log: false)
+      end
+
+      def add path
+        run("git add \"#{path}\"")
+      end
+
+      def add_all
+        run('git add --all')
+      end
+
+      def tag name, message: nil
+        run("git tag -a -m \"#{message}\" \"#{name}\"")
+      end
+
+      def commit message
+        run("git commit -m \"#{message}\"")
+      end
+
+      def push
+        run('git push')
+      end
+
+      def pull
+        run('git pull')
+      end
+
+      def write_file path, content
+        full_path = File.join(@__repo_path, path)
+
+        file = File.open(full_path, 'w')
+        file.write(content)
+        file.close
+
+        full_path
+      end
+
+      def read_file path
+        full_path = File.join(@__repo_path, path)
+        File.read(full_path)
+      end
+
+      def cleanup
+        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.zero?
+      end
+
+      private
+
+      def build_url
+        cred = @__cfg['username'] ? "#{@__cfg['username']}:#{@__cfg['password']}@" : ''
+        "#{@__cfg['scheme']}://#{cred}#{@__cfg['url_path']}"
+      end
+    end
+
+    class Client
+      include Spectre::Delegate if defined? Spectre::Delegate
+
+      def initialize config, logger
+        @config = config['git'] || {}
+        @logger = logger
+        @last_access = nil
+      end
+
+      def git(name = nil, &)
+        config = @config[name] || {}
+
+        config['url'] = name unless config['url']
+
+        @last_access = GitAccess.new(config, @logger) if name
+        @last_access.instance_eval(&)
+      end
+    end
+  end
+
+  Engine.register(Git::Client, :git) if defined? Engine
+end

metadata

@@ -1,46 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: spectre-git
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Christian Neubauer
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-30 00:00:00.000000000 Z
+date: 2025-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: spectre-core
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: stringio
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Adds basic git commands to the spectre framework
 email:
-- me@christianneubauer.de
+- christian.neubauer@ionos.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/spectre/git.rb
-homepage: https://github.com/cneubauer/spectre-git
+homepage: https://github.com/ionos-spectre/spectre-git
 licenses:
-- MIT
+- GPL-3.0-or-later
 metadata:
-  allowed_push_host: https://rubygems.org/
-  homepage_uri: https://github.com/cneubauer/spectre-git
-  source_code_uri: https://github.com/cneubauer/spectre-git
-  changelog_uri: https://github.com/cneubauer/spectre-git/blob/master/CHANGELOG.md
-post_install_message: 
+  homepage_uri: https://github.com/ionos-spectre/spectre-git
+  source_code_uri: https://github.com/ionos-spectre/spectre-git
+  changelog_uri: https://github.com/ionos-spectre/spectre-git/blob/master/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib
@@ -48,15 +59,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.6.6
 specification_version: 4
 summary: Git module for spectre
 test_files: []