rlt 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 294c220cc2dee9c6f061133ed9f650c6571a4bbc
-  data.tar.gz: b7d2fdbf841d7ccd869d0e71d5ab41e44c2fcc72
+  metadata.gz: 46295cd21589c55682d55c4ab969f516cda5777f
+  data.tar.gz: a8de2fa6b1ae7144b26e6fef5d51812ae0133568
 SHA512:
-  metadata.gz: fabcfa9a794d57858e5bd403830de86af1a5135e3c3d5dc6a7ae68cbda437347587998d0c24724a83559c4a6263212c315e61d84e9a138982fb4c47c68e41004
-  data.tar.gz: 195171058600ae6638532f09327f0966b9f79c28ff0035641b0c1ec7a8ddc672091037da1ea2d5a943d91290e33d1650e41f9590a498d60e45df0f2244252fb6
+  metadata.gz: 2cb0c963875edba813177e4dc70b1337d3931097752dc815f1291492e26f36384240a88b2a20a763caa32ca8e3d13e854158830317383b2044b9e8407d7b15ea
+  data.tar.gz: f925443939063cc7a1b85f64b509deac9cdef6e1240fa16574d09ccccefc42b6279a5180384494d30b66a9ff95590670b3e6c0b8b18fd7d1da243fcc81027ae5

data/lib/rlt/commands/close.rb

@@ -4,22 +4,21 @@ module Rlt
   module Commands
     class Close
       def self.run(config)
-        master_branch = master_branch(config)
+        default_branch = default_branch(config)
         current_branch_name = Utils::GitUtil.current_branch_name
-        return if should_stop?(master_branch, config)
-        run_internal(current_branch_name, master_branch)
+        return if should_stop?(default_branch)
+        run_internal(current_branch_name, default_branch)
         Utils::Logger.info "Done closing `#{current_branch_name}`."
       end
 
-      def self.run_internal(current_branch_name, master_branch)
-        merge_back_and_forth(current_branch_name, master_branch)
+      def self.run_internal(current_branch_name, default_branch)
+        merge_back_and_forth(current_branch_name, default_branch)
         delete_branch(current_branch_name)
       end
 
-      def self.should_stop?(master_branch, config)
+      def self.should_stop?(default_branch)
         return true if uncommitted_changes?
-        return true if config_not_existing?(config)
-        return true if master_branch_now?(master_branch)
+        return true if default_branch_now?(default_branch)
       end
 
       def self.uncommitted_changes?
@@ -28,26 +27,20 @@ module Rlt
         result
       end
 
-      def self.config_not_existing?(config)
-        result = config['master_branch'].nil?
-        print_explicit_config_error if result
+      def self.default_branch_now?(default_branch)
+        result = Utils::GitUtil.current_branch_name == default_branch
+        print_default_branch_now_error(default_branch) if result
         result
       end
 
-      def self.master_branch_now?(master_branch)
-        result = Utils::GitUtil.current_branch_name == master_branch
-        print_master_branch_now_error(master_branch) if result
-        result
-      end
-
-      def self.master_branch(config)
-        config['master_branch']
+      def self.default_branch(config)
+        config['default_branch'] || 'master'
       end
 
-      def self.merge_back_and_forth(current_branch_name, master_branch)
-        Utils::GitUtil.merge_from(master_branch, print_info: true)
+      def self.merge_back_and_forth(current_branch_name, default_branch)
+        Utils::GitUtil.merge_from(default_branch, print_info: true)
         return if any_conflict?
-        Utils::GitUtil.checkout(master_branch, print_info: true)
+        Utils::GitUtil.checkout(default_branch, print_info: true)
         Utils::GitUtil.merge_from(current_branch_name, print_info: true)
       end
 
@@ -62,20 +55,8 @@ module Rlt
         Utils::Logger.error 'Commit them first!'
       end
 
-      # rubocop:disable Metrics/MethodLength
-      def self.print_explicit_config_error
-        Utils::Logger.error 'You must explicitly configure name of master branch at `.rlt.yml`'
-        Utils::Logger.error 'For example,'
-        Utils::Logger.error ''
-        Utils::Logger.error '# .rlt.yml'
-        Utils::Logger.error 'command:'
-        Utils::Logger.error '  close:'
-        Utils::Logger.error '    master_branch: master'
-      end
-      # rubocop:enable Metrics/MethodLength
-
-      def self.print_master_branch_now_error(master_branch)
-        Utils::Logger.error "You cannot close `#{master_branch}`."
+      def self.print_default_branch_now_error(default_branch)
+        Utils::Logger.error "You cannot close `#{default_branch}`."
       end
 
       def self.print_conflict_error

data/lib/rlt/commands/switch.rb

@@ -34,7 +34,7 @@ module Rlt
       end
 
       def self.dont_change_branch_name?(config, branch_name)
-        list = %w[master develop] + (config['exclude'] || [])
+        list = %w[master develop] + (config['dont_change_names'] || [])
         list.include? branch_name
       end
 

data/lib/rlt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rlt
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rlt
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Eunjae Lee