kuy 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4eadde951fb2567d25a2fd34f311e890a0aeab3aa2e036bf4ae3f0c3b10e9282
-  data.tar.gz: b5381937aa2998150a1eb9977052d696dac8125002fc0063f48e950ed7d23648
+  metadata.gz: 31dc3a147035a7536f85ba12934d780032873e9cb9ea5fc2b292498ebba46daf
+  data.tar.gz: 6d2c979e4cea89c40b16f3466038255262c8a230fe207b3b4a923a15ed2e1a53
 SHA512:
-  metadata.gz: fba23ad93a94cbe4d12d918140924807396e32528d193d8e507caa73ee2e5a2643ee016a12278a73c2ff19bf996d7166e9d1ba3b38cfbd13c1fd1fa73cfbaaa3
-  data.tar.gz: 95d56df6d570550fba6043ef79a6edc5f5fe78af983c76825fe224667a427016f6f86b921364d20cafd8c22634c3e099995745235c340ed049f89c1f15614466
+  metadata.gz: c11c55e94edf7d6f85c3c34ca4129165274404dfa521519c4783bf1101d93fff83c6eb63ce38344d5a9cef8b393894ddd6b1bbe67ef44a04a476319066fe78fb
+  data.tar.gz: a484040c7a8bc4d361af26fc0ea9d4beb4bd7eb1958849b325fc9a9ac8c7cac0cd611e9595402190eee0a8e7d9c22ed07632534b15679fce4438d975dee363f2

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+0.2.0:
+  * Show information when git is not available
+  * kuy command accepts first argument as branch name
+
+0.1.0:
+ * Initial gem release
+ * kuy command for pulling and merging from origin/develop branch
+ * kuymaster command for pulling and merging from origin/master branch

data/README.md

@@ -8,17 +8,26 @@ Kuy assumes git is already installed.
 gem install kuy
 ```
 
+## Installation with Homebrew and brew-gem
+If you use zsh and MacOS, there is possibility `kuy` and `kuymaster` commands are not found.
+As alternative, you can install this gem with [Homebrew] and [brew-gem].
+
+```sh
+brew install brew-gem
+brew gem install kuy
+```
+
 ## How to Use
 Run `kuy` or `kuymaster` command in your git feature branch.
 
 Suppose you have a branch named `my-feature-branch` and you want to pull `develop` branch and merge into `my-feature-branch`.
-```
+```sh
 git checkout my-feature-branch
 kuy
 ```
 
 Or if you want to pull `master` branch and merge into `my-feature-branch`.
-```
+```sh
 git checkout my-feature-branch
 kuymaster
 ```
@@ -26,3 +35,6 @@ kuymaster
 ## License
 
 Kuy is released under the [MIT License](https://opensource.org/licenses/MIT).
+
+[Homebrew]: https://brew.sh
+[brew-gem]: https://github.com/sportngin/brew-gem

data/bin/kuy

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/kuy'
-Kuy.pull_and_merge_from(:develop)
+require 'kuy'
+branch = ARGV.empty? ? :develop : ARGV.first
+Kuy.pull_and_merge_from(:branch)

data/bin/kuymaster

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/kuy'
+require 'kuy'
 Kuy.pull_and_merge_from(:master)

data/kuy.gemspec

@@ -2,7 +2,7 @@ require 'date'
 
 Gem::Specification.new do |s|
   s.name        = 'kuy'
-  s.version     = '0.1.0'
+  s.version     = '0.2.0'
   s.date        = Date.today.to_s
   s.summary     = 'Kuy is a Ruby gem to simplify git feature branch workflow if you want to pull and merge your develop or master branch'
   s.description = 'Kuy is a Ruby gem to simplify git feature branch workflow if you want to pull and merge your develop or master branch'

data/lib/kuy.rb

@@ -1,12 +1,14 @@
 class Kuy
   def self.pull_and_merge_from(branch)
+    return 'git is not installed' if system('git --version').nil?
+
     current_branch = `git rev-parse --abbrev-ref HEAD`.strip
 
-    puts "checkout and update from #{branch}"
+    puts "Running checkout and update from origin/#{branch}"
     `git checkout #{branch}`
     `git pull origin #{branch}`
 
-    puts "merging with #{current_branch}"
+    puts "Merging with origin/#{current_branch}"
     `git checkout #{current_branch}`
     `git merge #{branch} --no-ff`
     puts 'Done!'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Kunto Aji Kristianto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-02 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies: []
 description: Kuy is a Ruby gem to simplify git feature branch workflow if you want
   to pull and merge your develop or master branch
@@ -20,6 +20,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - bin/kuy