git_repo_upgrader 0.0.4 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0345825f5246e6d66a553508642ddf7251d9a4f07fdf9033169ed3474aba3072'
-  data.tar.gz: 2becbc7c0a41fd47307a6b4ab7c1577a04f9474e9c50e826288443ef10536e6d
+  metadata.gz: 9dc4cb2cb119aeb8d1b096ec3a88f26fd669f26a074a105e5961dff3d62d875a
+  data.tar.gz: 411d906824438dd973f43539aa64358e1fa9cb4bfc4d53b7954a5074f9da7ca0
 SHA512:
-  metadata.gz: 4a326537cc36bb640805db961d557b1b083a96680b71ac41af28447806d6c8f4f7c82e561c16fccbc6bfcacd8d10e8a5e124d51cd8cb0996c31ae4c02506d294
-  data.tar.gz: 88f84cfe06bf259b18ca45f501368f7766035cb592a994eafb18a00675bf632944c6ed3e09dd7a211fc6296d8361e95c36cb2672e41df616f9ef5cc1676e9605
+  metadata.gz: de6ae723180bb226c7f610a2378b8609a4c89390a5fdd7a824cbe95aa99372012d68ea3827f9777d9105e1592316105c4987211cf83aabdf9e7dae7001a36cda
+  data.tar.gz: 19b772a4dacaf70bf231b3a5961047c02929be01ee9614167051e3c7c1c5e6031c0d9a83e20a79756b0f5ce84da6a93e23e190736b3129300dde449a6515e9c8

data/README.md

@@ -1,9 +1,16 @@
 # git_repo_upgrader
+[![Gem](https://img.shields.io/gem/v/git_repo_upgrader?_color=default&style=plastic&logo=ruby&logoColor=red)](https://rubygems.org/gems/git_repo_upgrader)
+![downloads](https://img.shields.io/gem/dt/git_repo_upgrader?color=blue&style=plastic)
+[![License: MIT](https://img.shields.io/badge/License-MIT-gold.svg?style=plastic&logo=mit)](LICENSE)
 
-Copy specific files from another git repository into your current project and provide (optional) automatic commits.
+> Copy specific files from another git repository into your current project and provide (optional) automatic commits.
 
 Useful for manually integrated files from another git project. Do upgrades by one command.
 
+```diff
+- early version, not to be meant for production use
+```
+
 # Contents
 
 * [Installation](#installation)
@@ -50,7 +57,7 @@ TODO
 
 At best create a new rake task containing a options hash and then run #upgrade.
 
-See the examples below for option hahes.
+See the examples below for option hashes.
 
 ### Examples
 
@@ -67,7 +74,8 @@ See the examples below for option hahes.
             'dist/app.bundle.css' => 'web/js/lib/project/app.bundle.css',
             # copy a whole directory recursively
             'dist/img' => 'web/js/lib/project/img',
-        }
+        },
+        commit: 'prompt' # 'prompt' by default, other options: 'false','auto'
     }
     GitRepoUpgrader.upgrade options
 ```

data/lib/git_repo_upgrader/version.rb

@@ -1,3 +1,3 @@
 module GitRepoUpgrader
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.7'.freeze
 end

data/lib/git_repo_upgrader.rb

@@ -23,7 +23,8 @@ require 'git_repo_upgrader/version'
 #               'dist/app.bundle.css' => 'web/js/lib/project/app.bundle.css',
 #               # copy a whole directory recursively
 #               'dist/img' => 'web/js/lib/project/img',
-#           }
+#           },
+#           commit: 'false'
 #       }
 #       GitRepoUpgrader.upgrade options
 #
@@ -36,15 +37,22 @@ module GitRepoUpgrader
   GIT_REPO_NAME_REGEX = /\/([^\/]+).git/
 
   # @param [Hash] options
+  # @param [Hash] options.repo
+  # @param [String] options.repo.uri
+  # @param [String] options.repo.branch
+  # @param [Hash<String,String>] options.files_to_copy <src,destination>
+  # @param ['auto','skip','prompt'] options.commit='prompt'
   def self.upgrade(options)
     puts '*****************************'.yellow
-    puts '** Git Repo Upgrader'.yellow
+    puts "** Git Repo Upgrader #{GitRepoUpgrader::VERSION}".yellow
     puts '*****************************'.yellow
     repo_dir, tmp_dir = _checkout_git_repo options[:repo][:uri], options[:repo][:branch]
     _copy_files_from_checkout repo_dir, options[:files_to_copy]
     _cleanup_checkout tmp_dir
     repo_name = options[:repo][:uri].match(GIT_REPO_NAME_REGEX)[1]
-    _commit_files options[:files_to_copy], repo_name
+    if options[:commit] != false && options[:commit] != 'false' && options[:commit] != 'skip'
+      _commit_files options[:files_to_copy], repo_name, type: options[:commit]
+    end
     puts
     puts "Everything done, be happy! :-) ".magenta
   end
@@ -52,7 +60,7 @@ module GitRepoUpgrader
   private
 
   # @param [String] github source path
-  # @param [String] branch
+  # @param [String] branch='master'
   # @return [String] path to repo dir
   def self._checkout_git_repo(source, branch)
     print ' - creating tmp dir ... '
@@ -62,12 +70,13 @@ module GitRepoUpgrader
     print tmp_dirname + ' ... '
     Dir.chdir tmp_dirname
     puts 'done'.green
+    branch = 'master' unless branch
     begin
-      puts ' - checkoutA repository ' + source + " (#{branch}) ... "
+      puts ' - checkout repository ' + source + " (#{branch}) ... "
       git_command = "git clone --single-branch --branch #{branch} #{source}"
       puts '   ' + git_command.blue
       git_result = system(git_command)
-      raise "invalid username or password" unless git_result
+      raise "Error occurred while trying to clone the repository. Check messages before. Invalid username or password?" unless git_result
     rescue RuntimeError => e
       puts e.to_s.red
       retry
@@ -78,7 +87,6 @@ module GitRepoUpgrader
     [File.expand_path(repo_dir), tmp_dirname]
   end
 
-
   def self._copy_files_from_checkout(repo_dir, files_to_copy)
     Dir.chdir repo_dir
     puts ' - copy repo files ... '
@@ -87,7 +95,9 @@ module GitRepoUpgrader
       final_dest = PROJECT_DIR + '/' + dest
       # remove last folder from path, because FileUtils.cp_r creates the last folder in dest implicitly
       final_dest = final_dest[0...-1] if final_dest.end_with? '/' # cut / at the end if available
-      final_dest = Pathname(final_dest).dirname.to_s # cut last folder
+      if (File.basename(source) == File.basename(dest))
+        final_dest = Pathname(final_dest).dirname.to_s # cut last folder if identical names are used to avoid duplicates
+      end
       FileUtils.cp_r(repo_dir + '/' + source, final_dest)
     end
   end
@@ -99,21 +109,24 @@ module GitRepoUpgrader
     puts 'done'.green
   end
 
-  def self._commit_files(files, repo_name)
-    puts
-    default_input = 'y'
+  # @param ['prompt','auto','skip'] type
+  def self._commit_files(files, repo_name, type: 'prompt')
     yes_no = nil
-    loop do
-      print "Commit the copied files above? (y/n) [#{default_input}]:".yellow
-      yes_no = STDIN.gets.chomp
-      yes_no = default_input if yes_no == ''
-      if yes_no == '' || !(['y', 'n'].include? yes_no)
-        puts "Invalid option '#{yes_no}'".red
-      else
-        break
+    if type == 'prompt'
+      puts
+      default_input = 'y'
+      loop do
+        print "Commit the copied files above? (y/n) [#{default_input}]:".yellow
+        yes_no = STDIN.gets.chomp
+        yes_no = default_input if yes_no == ''
+        if yes_no == '' || !(['y', 'n'].include? yes_no)
+          puts "Invalid option '#{yes_no}'".red
+        else
+          break
+        end
       end
     end
-    if yes_no == 'y'
+    if yes_no == 'y' || type == 'auto'
       Dir.chdir PROJECT_DIR
       # add
       git_commit_command1 = %Q(git add "#{files.values.join('" "')}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_repo_upgrader
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
 platform: ruby
 authors:
 - Matthäus J. N. Beyrle
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-24 00:00:00.000000000 Z
+date: 2023-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Copy specific files from another git repo by one command