lgit 0.2.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78a058ba7e5a9502ddb1cfca3a8d73e35bd8433b11110c972fdabe934107f424
-  data.tar.gz: cdcf157eb6c5371c68ba543953457b2cf15ebf39b50db30db402e546002ee578
+  metadata.gz: 2e86a10b2122a1b29aaa417a714eee4cc76ef8a84b0dbcdf6f11a2bc85cba19d
+  data.tar.gz: eab5647700602140ba3ab044748269dcf360d4adb03496b74d0a7a7b9ff41524
 SHA512:
-  metadata.gz: 07d4446027ffbe1f53c2f4fbeaa2a8e4e023b1514cd95db8ad5dffb5b0a8937e723f4a1872ee5c877fe568b2fe3d5524ef17fa00281d904d184b4e23c20f9a4d
-  data.tar.gz: e920fbfae441cb993a4d8f0a9841df184d44e71dd23eeeb9aeb1507a0a2a692d6046f447acb718378ac431dec2d590d2519390d9e94b1fec09f151bfe121830e
+  metadata.gz: 0563ae5834377d87e1d06fac991ae53b6f66caff727d278a583cdd6c07ca788ff9c207b51427b1ffbabf39eb5746c53259f26ce58cbc72e89af1996d40e9d492
+  data.tar.gz: 2d8b4664adc0358a34ef6d753ab2553e97a85784c116c63d7a13f138ef90a109de14ed405738126e2914eb11130fab94e125c41d56a66ab15140776a2861e6ed

data/.gitignore

@@ -7,3 +7,4 @@
 /spec/reports/
 /tmp/
 /.idea
+*.gem

data/Gemfile.lock

@@ -1,22 +1,23 @@
 PATH
   remote: .
   specs:
-    lgit (0.1.0)
+    lgit (0.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     minitest (5.11.3)
-    rake (10.5.0)
+    rake (13.0.1)
 
 PLATFORMS
+  ruby
   x64-mingw32
 
 DEPENDENCIES
   bundler (~> 1.16)
   lgit!
   minitest (~> 5.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
 
 BUNDLED WITH
-   1.16.5
+   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!*
@@ -48,7 +48,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/lgit. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/luladjiev/lgit. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -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

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "lgit"
+require 'lgit'
 
 if ARGV.size.zero?
   puts 'Specify command'
@@ -11,13 +12,14 @@ 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!"
+  default_branch = git.get_default_branch
+  if git.get_branch == default_branch
+    puts "Error: Cannot rebase #{default_branch}!"
     exit 2
   end
-  git.rebase
+  git.rebase ARGV[1]
 when 'delete-branches'
   git.delete_branches
 else

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.2.1"
+  VERSION = '0.5.0'.freeze
 end

data/lib/lgit.rb

@@ -1,27 +1,40 @@
-require "lgit/version"
+require 'lgit/version'
 
 module Lgit
+  ###
+  # Git related class
   class Git
-    def refresh_master
-      `git checkout master`
+    def refresh_base(base)
+      base ||= get_default_branch
+
+      `git checkout #{base}`
       `git pull`
     end
 
     def get_branch
+      `git branch --show-current`.strip
+    end
+
+    def get_default_branch
+      #`git remote show origin`.split("\n")[3].match(/:\s(.*)$/)[1].strip
       `git name-rev --name-only HEAD`.strip
     end
 
-    def create_branch(name)
-      if name
-        refresh_master
-        `git checkout -b #{name}`
-      end
+    def create_branch(name, base)
+      return unless name
+
+      base ||= get_default_branch
+
+      refresh_base base
+      `git checkout -b #{name}`
     end
 
-    def rebase
-      refresh_master
+    def rebase(base)
+      base ||= get_default_branch
+
+      refresh_base base
       `git checkout - `
-      `git rebase master`
+      `git rebase #{base}`
     end
 
     def delete_branches

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lgit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Peter Luladjiev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2022-04-29 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.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Git on steroids