lgit 0.3.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d29e963fe6d26aa9b8de93d7ec5509a3daa9efc4499233fe0d9e0e358b192c95
-  data.tar.gz: ccc2fbdbcc21196e970249cf6197c44e803c2faa21a7f9b3f0985ec6e76cd8cf
+  metadata.gz: 2d930bd4c761f1bfb030903aa641b8a3acb0686cd95503363445e0f6de464d50
+  data.tar.gz: 98227fefbc3a5e6b665628452cbec23d4401d5c43a961c06fe7d98d578fc52b2
 SHA512:
-  metadata.gz: d7238657b5b65fa0918e676090c9c058c2eac04f7b522adece8bf3bf3542541adfc7a500f75363289e9eaa4b43b085770dcc2560038efee4eb89fd443c63f40c
-  data.tar.gz: 6c5bf22694a0df071acf6ece731f91ace66c407b4ec35ed8af58262b286114b0e51f2537af4dcf755cbc563a9eed1ec4d676af5d9cc1c5ecfa0ba9a39c1ddfcf
+  metadata.gz: a6c229fa6e2a027bb8ed01da054fd5708886e55845fe2fa71938805c3875e8236b0b4591cf886a69431506d57c33f7839d812b9523a485520f3f8f0dc1c31878
+  data.tar.gz: 96d12cc805d7bdda5bda6faf5ae0eaf39c8a59c30df03e17038cc0ed1e455eded9cd86607d8bd3243ae90fdea250564af5407c3f4b1a4fa42139e365464889ed

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    lgit (0.2.1)
+    lgit (0.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     minitest (5.11.3)
-    rake (10.5.0)
+    rake (13.0.1)
 
 PLATFORMS
   ruby
@@ -17,7 +17,7 @@ DEPENDENCIES
   bundler (~> 1.16)
   lgit!
   minitest (~> 5.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
 
 BUNDLED WITH
-   1.16.6
+   1.17.3

data/README.md

@@ -22,16 +22,16 @@ Or install it yourself as:
 
 ## Usage
 
-Rebase current branch from master
+Rebase current branch from specified base or master by default
 
 ```shell
-lgit rebase
+lgit rebase [<base>]
 ```
 
-Create new branch from freshly pulled master
+Create new branch from freshly pulled base or master by default
 
 ```shell
-lgit branch <name>
+lgit branch <name> [<base>]
 ```
 
 Delete all branches for which remotes are gone. *Use with caution!*
@@ -56,4 +56,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Lgit project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/lgit/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Lgit project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/Luladjiev/lgit/blob/master/CODE_OF_CONDUCT.md).

data/exe/lgit

@@ -12,10 +12,10 @@ git = Lgit::Git.new
 
 case ARGV[0]
 when 'branch'
-  git.create_branch ARGV[1]
+  git.create_branch(ARGV[1], ARGV[2])
 when 'rebase'
-  if git.get_branch == 'master'
-    puts 'Error: Cannot rebase master!'
+  if git.get_branch == git.get_default_branch
+    puts "Error: Cannot rebase #{git.get_default_branch}!"
     exit 2
   end
   git.rebase ARGV[1]

data/lgit.gemspec

@@ -31,6 +31,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

data/lib/lgit/version.rb

@@ -1,3 +1,3 @@
 module Lgit
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.5.1'.freeze
 end

data/lib/lgit.rb

@@ -1,26 +1,41 @@
 require 'lgit/version'
+require 'open3'
 
 module Lgit
   ###
   # Git related class
   class Git
-    def refresh_base(base = 'master')
+    def refresh_base(base)
+      base ||= get_default_branch
+
       `git checkout #{base}`
       `git pull`
     end
 
     def get_branch
-      `git name-rev --name-only HEAD`.strip
+      `git branch --show-current`.strip
+    end
+
+    def get_default_branch
+      stdout, _, status = Open3.capture3("git symbolic-ref refs/remotes/origin/HEAD")
+
+      return `git config init.defaultBranch`.strip if status != 0
+
+      stdout.strip[20..-1]
     end
 
-    def create_branch(name)
+    def create_branch(name, base)
       return unless name
 
-      refresh_base
+      base ||= get_default_branch
+
+      refresh_base base
       `git checkout -b #{name}`
     end
 
-    def rebase(base = 'master')
+    def rebase(base)
+      base ||= get_default_branch
+
       refresh_base base
       `git checkout - `
       `git rebase #{base}`

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lgit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Peter Luladjiev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2022-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -94,8 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Git on steroids