git-safe 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b7839df797b7a01ee24bafccc8f6086ed5142ffbe7d7cf5901899a410e895d6
-  data.tar.gz: 0032cd4ceed5039f1e0e3b60cb872ec8a68aa3cbfe17e745198b2842c19cb329
+  metadata.gz: 8a0b6c1caa45fd00e0efe0b635aa4cbdc50f8668e79c026d670a1f2acde51311
+  data.tar.gz: f713c7662244c7af08dc51aafef385a2cf1e5a024b86933792a3ffcfa208aa39
 SHA512:
-  metadata.gz: 68d399eb56a55c992bcc12f7d4bf7e3f87b1a2b3a670e93bffba1d27703d70d3ee117eb28a6a66a1a90671cca2242d1f40720a4040366d951735562d8df9fa5c
-  data.tar.gz: 9ab7a7a5e919e57787702a2300dacdb006a35339a6a1d0fa6850d6360178ce1f23328ea4df45a5e364ac64de5f1eb1b46a9fcf8a64655ab1bdebb1d32a9ac977
+  metadata.gz: 38e7580cc42dd60935067ea391761b673365d0e841b35b74365c4239b091ddf874c9a5f79630c6e9db81cff2139e27bd93f93b9ba29ff5cbd6110b7c1947cbd1
+  data.tar.gz: 515f5f954b357bf43ae07acd9eb3bf6c73b317654cb1221bc463a2551316b4e77f2baa9fb4dbf09d4ea1de71c9f5491c7415588ed596122ff883ba4a9d2fcd4d

data/.circleci/config.yml

@@ -0,0 +1,16 @@
+version: 2.1
+orbs:
+  ruby: circleci/ruby@0.1.2 
+
+jobs:
+  build:
+    docker:
+      - image: circleci/ruby:2.6.3-stretch-node
+    executor: ruby/default
+    steps:
+      - checkout
+      - run:
+          name: Which bundler?
+          command: bundle -v
+      - ruby/bundle-install
+

data/.gitignore

@@ -10,3 +10,4 @@
 # rspec failure tracking
 .rspec_status
 spec/support/working-dirs/*
+*.gem

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## v0.2.0 (2020-11-10)
+* [#1](https://github.com/perryqh/git-safe-ruby/pull/1) introducing reset_to_remote to fix push -force
+
+## v0.1.0 (2020-02-21)
+* Initial release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-safe (0.1.0)
+    git-safe (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/git-safe.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{A concurrent-safe way to perform multiple ssh configuration git operations against "origin".}
   spec.description   = %q{Some applications need to access git "origin" from multiple threads or processes with different security access approaches. This gem makes it possible}
-  spec.homepage      = "https://github.com/perrqh/git-safe-ruby"
+  spec.homepage      = "https://rubygems.org/gems/git-safe"
 
 
   # Specify which files should be added to the gem when it is released.

data/lib/git-safe/git.rb

@@ -64,6 +64,10 @@ module GitSafe
       execute_git_cmd("git #{git_locale} merge #{to_merge_name}")
     end
 
+    def reset_local_to_remote(remote_name)
+      execute_git_cmd("git #{git_locale} reset --hard #{remote_name}")
+    end
+
     def push(remote: 'origin', branch: 'master', force: false)
       force_flag = force ? '-f ' : ''
       execute_git_cmd("git #{git_locale} push #{force_flag}#{remote} #{branch}")
@@ -119,7 +123,7 @@ module GitSafe
       end
     end
 
-    def clone_or_fetch_and_merge(remote_uri, branch: 'master', remote_name: 'origin', depth: nil, force_fresh_clone: false, git_config: {})
+    def clone_or_fetch_and_merge(remote_uri, branch: 'master', remote_name: 'origin', depth: nil, force_fresh_clone: false, reset_to_remote: false, git_config: {})
       delete_work_tree if force_fresh_clone
 
       unless has_remote?
@@ -129,7 +133,11 @@ module GitSafe
       config_set(git_config)
       fetch
       checkout(branch: branch)
-      merge("#{remote_name}/#{branch}")
+      if reset_to_remote
+        reset_local_to_remote("#{remote_name}/#{branch}")
+      else
+        merge("#{remote_name}/#{branch}")
+      end
     end
 
     def git_config

data/lib/git-safe/version.rb

@@ -1,3 +1,3 @@
 module GitSafe
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-safe
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Perry Hertler
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,9 +88,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -105,10 +107,10 @@ files:
 - lib/git-safe/ssh_tempfile.rb
 - lib/git-safe/version.rb
 - lib/git_safe.rb
-homepage: https://github.com/perrqh/git-safe-ruby
+homepage: https://rubygems.org/gems/git-safe
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A concurrent-safe way to perform multiple ssh configuration git operations
   against "origin".