rlt 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfdc9c5d045cbcc39ffb1bb464837a33bd7d8c7d
-  data.tar.gz: c67974bfc4c30f3f4e8b92054ea808a1d0bc0c39
+  metadata.gz: 294c220cc2dee9c6f061133ed9f650c6571a4bbc
+  data.tar.gz: b7d2fdbf841d7ccd869d0e71d5ab41e44c2fcc72
 SHA512:
-  metadata.gz: d6cbd4a5ea9cf4f13615bfb22ed8b626cdfe87ad676744a3fa57063dab7eecff0a2bbdf58a53756f5bc87677b1e51e5bf8e132bc327b1a84884846398520b57d
-  data.tar.gz: 134515e9e44e1d5c20d651886e8bad2f5eaf1ac5f1c9e04b4cc9019735f966b453f934c4456b040655ea197605f67e552f1ae1984fe38226582b057b6aeb6990
+  metadata.gz: fabcfa9a794d57858e5bd403830de86af1a5135e3c3d5dc6a7ae68cbda437347587998d0c24724a83559c4a6263212c315e61d84e9a138982fb4c47c68e41004
+  data.tar.gz: 195171058600ae6638532f09327f0966b9f79c28ff0035641b0c1ec7a8ddc672091037da1ea2d5a943d91290e33d1650e41f9590a498d60e45df0f2244252fb6

data/lib/rlt/cli.rb

@@ -4,6 +4,7 @@ require 'thor'
 require 'rlt/commands/cmt'
 require 'rlt/commands/switch'
 require 'rlt/commands/close'
+require 'rlt/commands/rst'
 
 module Rlt
   class CLI < Thor

data/lib/rlt/commands/cmt.rb

@@ -9,8 +9,26 @@ module Rlt
     class Cmt
       CONF_SUBJECT_TEMPLATE = 'subject_template'
       CONF_BODY_TEMPLATE = 'body_template'
+      CONF_PRE = 'pre'
 
       def self.run(config, add_all)
+        result = run_pre_script_if_any(config)
+        return print_abort_due_to_pre_script_failure unless result
+        ask_and_commit(add_all, config)
+      end
+
+      def self.print_abort_due_to_pre_script_failure
+        Utils::Logger.error 'Aborted due to the pre-script failed.'
+      end
+
+      def self.run_pre_script_if_any(config)
+        return true if config[CONF_PRE].nil?
+        Utils::Logger.info 'Executing pre-script:'
+        Utils::Logger.desc "  #{config[CONF_PRE]}"
+        Utils::Shell.new.run_safely config[CONF_PRE]
+      end
+
+      def self.ask_and_commit(add_all, config)
         branch_name = Utils::GitUtil.current_branch_name
         Utils::Logger.info "Committing to '#{branch_name}'"
         (subject, body) = subject_and_body(config, branch_name)

data/lib/rlt/commands/rst.rb

@@ -0,0 +1,11 @@
+
+module Rlt
+  module Commands
+    class Rst
+      def self.run(_config)
+        Utils::GitUtil.reset_hard_head
+        Utils::GitUtil.clean_untracked
+      end
+    end
+  end
+end

data/lib/rlt/config.rb

@@ -21,20 +21,30 @@ module Rlt
       c.keys
     end
 
-    def load_config
-      YAML.load_file(file_path)
+    def load_config(path)
+      result = YAML.load_file(path)
+      return result if result.is_a? Hash
+      {}
     rescue Errno::ENOENT
       {}
     end
 
-    def file_path
+    def local_config_path
       sample_config_path = "#{Dir.pwd}/.rlt.sample.yml"
       return sample_config_path if Rlt.debug && File.exist?(sample_config_path)
       "#{Dir.pwd}/.rlt.yml"
     end
 
+    def global_config_path
+      File.expand_path('~/.rlt.yml')
+    end
+
+    def load_all_configs
+      load_config(global_config_path).merge(load_config(local_config_path))
+    end
+
     def config_map
-      (@config_map ||= load_config)
+      (@config_map ||= load_all_configs)
     end
   end
 

data/lib/rlt/utils/git_util.rb

@@ -34,7 +34,7 @@ module Rlt
       end
 
       def self.add_all
-        Shell.new.run 'git', 'add', '-A'
+        Shell.new.run 'git add -A'
       end
 
       def self.uncommitted_change?
@@ -51,44 +51,43 @@ module Rlt
 
       def self.save_stash(message, opts = {})
         Logger.info 'Saving stash' if opts[:print_info]
-        Shell.new.run 'git', 'stash', 'save', '--include-untracked', message
+        Shell.new.run 'git stash save', '--include-untracked', message
       end
 
       def self.apply_stash(name, opts = {})
         Logger.info 'Applied stash' if opts[:print_info]
-        Shell.new.run 'git', 'stash', 'apply', name, '--index'
+        Shell.new.run 'git stash apply', name, '--index'
       end
 
       def self.drop_stash(name, opts = {})
         Logger.info 'Dropped stash' if opts[:print_info]
-        Shell.new.run 'git', 'stash', 'drop', name
+        Shell.new.run 'git stash drop', name
       end
 
       def self.checkout(branch_name, opts = {})
         Logger.info "Switching to `#{branch_name}`" if opts[:print_info]
-        Shell.new.run 'git', 'checkout', branch_name
+        Shell.new.run 'git checkout', branch_name
       end
 
       def self.silently_try_checkout(branch_name)
-        result = Shell.new(no_output: true).run_safely 'git', 'checkout', branch_name
-        result.success?
+        Shell.new(no_output: true).run_safely 'git checkout', branch_name
       end
 
       def self.silently_create_and_checkout(branch_name)
-        Shell.new(no_output: true).run 'git', 'checkout', '-b', branch_name
+        Shell.new(no_output: true).run 'git checkout -b', branch_name
       end
 
       def self.commit_with_long_message(message)
         Logger.verbose message if Rlt.debug
         commit_msg_file_path = "#{Dir.tmpdir}/.rlt.commit.msg.#{StringUtil.short_random_string}"
         File.write(commit_msg_file_path, message)
-        Shell.new.run 'git', 'commit', '-F', commit_msg_file_path
+        Shell.new.run 'git commit -F', commit_msg_file_path
         File.delete(commit_msg_file_path)
       end
 
       def self.merge_from(branch_name, opts = {})
         Logger.info "Merging from `#{branch_name}`" if opts[:print_info]
-        Shell.new.run 'git', 'merge', branch_name
+        Shell.new.run 'git merge', branch_name
       end
 
       def self.any_conflict?
@@ -97,7 +96,7 @@ module Rlt
 
       def self.delete_branch(branch_name, opts = {})
         Logger.info "Deleting `#{branch_name}`" if opts[:print_info]
-        Shell.new.run 'git', 'branch', '-d', branch_name
+        Shell.new.run 'git branch -d', branch_name
       end
 
       def self.remotes
@@ -106,7 +105,15 @@ module Rlt
 
       def self.safely_delete_remote_branch(remote, branch_name, opts = {})
         Logger.info "Try deleting remote branch: #{remote}/#{branch_name}" if opts[:print_info]
-        Shell.new.run_safely 'git', 'push', remote, ":#{branch_name}"
+        Shell.new.run_safely 'git push', remote, ":#{branch_name}"
+      end
+
+      def self.reset_hard_head
+        Shell.new.run 'git reset --hard HEAD'
+      end
+
+      def self.clean_untracked
+        Shell.new.run 'git clean -fd'
       end
     end
   end

data/lib/rlt/utils/shell.rb

@@ -18,7 +18,7 @@ module Rlt
       def run_safely(*args)
         result = @cmd.run!(*args, user: current_user)
         puts '' if Rlt.debug
-        result
+        result.success?
       end
 
       def current_user

data/lib/rlt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rlt
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Eunjae Lee
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-08 00:00:00.000000000 Z
+date: 2018-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel
@@ -136,6 +136,7 @@ files:
 - lib/rlt/cli.rb
 - lib/rlt/commands/close.rb
 - lib/rlt/commands/cmt.rb
+- lib/rlt/commands/rst.rb
 - lib/rlt/commands/switch.rb
 - lib/rlt/config.rb
 - lib/rlt/debug.rb