rlt 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b014aed42ee9f1d1b4ecd34949eeeda4f07806143b9c2323900db6d2acc8ef0d
-  data.tar.gz: cc26f6909253057f325a877724eaa408100e725117c39bbfe55f683a619ffb68
+  metadata.gz: 7d5e0d5c96151a0109da828bea2aceefe7724ae31f1b48db2b857a8be57544fc
+  data.tar.gz: 4bb26123cb6654a975937707851fd789cabd0a6d70a6b53da1e088ea53ab7776
 SHA512:
-  metadata.gz: 6ad76cec7c0bc731b7053aa47fd5136f6fc1f137945b15470d22ef62934e7ae9fe58a14892b54bde6d833a65fec6de0da4e1e059b15ec89fe5e19c08d0b6a590
-  data.tar.gz: b448baa3c0f3d39b0e90962810498a57db78fe28549b06d2bc092ae752270efa44a7c0c196d8bf0be532883b5ff30922c2e5602ea7d696d4dbe96c273ffac0e3
+  metadata.gz: 212073d3b4b2acd1f826124fbf37d70ca267a019d1d0dd724d9ffdf2c5e0468b205d1b6a046f20a51ede74078eb9b8f97be15c2b835a21c80101025dd2970e98
+  data.tar.gz: '09018f8e6be388149a24971bcb84a6879d8ec57de64c161647aee08ee26ecf3082e7d8e926a0532e701ada21242540a09496d51addda4013a2f5e393d91e4bd1'

data/.rlt.sample.yml

@@ -1,6 +1,9 @@
 command:
   switch:
     branch_name_template: JIRA-<%= branch_name %>
+    exclude:
+      - some_branch
+      - some_other_branch
   cmt:
     subject_template: >
       <%=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rlt (0.1.2)
+    rlt (0.1.3)
       pastel (~> 0.7.2)
       tty-command (~> 0.8.0)
       tty-prompt (~> 0.16.1)

data/lib/rlt/commands/cmt_command.rb

@@ -31,7 +31,7 @@ module Rlt
 
       def self.commit(subject, body)
         commit_msg_file_path = "#{Dir.tmpdir}/.rlt.commit.msg.#{short_random_string}"
-        File.write(commit_msg_file_path, "#{subject}\n\n#{body}")
+        File.write(commit_msg_file_path, "#{subject}\n\n#{body}".strip)
         Shell.new.run 'git', 'commit', '-F', commit_msg_file_path
         File.delete(commit_msg_file_path)
       end

data/lib/rlt/commands/switch_command.rb

@@ -13,11 +13,17 @@ module Rlt
       end
 
       def self.change_branch_name(config, branch_name)
+        return branch_name if exclude?(config, branch_name)
         branch_name_template = config[CONF_BRANCH_NAME_TEMPLATE]
         return branch_name if branch_name_template.nil?
         ERB.new(branch_name_template).result binding
       end
 
+      def self.exclude?(config, branch_name)
+        list = %w[master develop] + (config['exclude'] || [])
+        list.include? branch_name
+      end
+
       def self.switch(branch_name)
         create_and_checkout(branch_name) if checkout(branch_name).failure?
       end

data/lib/rlt/config.rb

@@ -5,23 +5,20 @@ require 'yaml'
 module Rlt
   module Config
     def config(category, command)
-      category_config(category)[command] || category_config(category)[original(command)] || {}
-    rescue NoMethodError
-      {}
+      c = config_map.dig category, command
+      return c unless c.nil?
+      return {} if command == original_name(command)
+      config_map.dig(category, original_name(command)) || {}
     end
 
-    def original(command)
-      config('alias', command)
+    def original_name(command)
+      config_map.dig 'alias', command
     end
 
     def config_keys(category)
-      category_config(category).keys
-    rescue NoMethodError
-      []
-    end
-
-    def category_config(category)
-      (@config ||= load_config)[category]
+      c = config_map.dig(category)
+      return [] if c.nil?
+      c.keys
     end
 
     def load_config
@@ -37,5 +34,9 @@ module Rlt
         "#{Dir.pwd}/.rlt.yml"
       end
     end
+
+    def config_map
+      (@config_map ||= load_config)
+    end
   end
 end

data/lib/rlt/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rlt
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Paul Lee