rlt 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d5e0d5c96151a0109da828bea2aceefe7724ae31f1b48db2b857a8be57544fc
-  data.tar.gz: 4bb26123cb6654a975937707851fd789cabd0a6d70a6b53da1e088ea53ab7776
+  metadata.gz: 924868479d56a4d4bf7f01d69665c6047abfb764535c31989a0d7dd6a1042c53
+  data.tar.gz: 2920cea7739142556919b8694e5a231c5b59a6e5780920dd7cda30510eef0e09
 SHA512:
-  metadata.gz: 212073d3b4b2acd1f826124fbf37d70ca267a019d1d0dd724d9ffdf2c5e0468b205d1b6a046f20a51ede74078eb9b8f97be15c2b835a21c80101025dd2970e98
-  data.tar.gz: '09018f8e6be388149a24971bcb84a6879d8ec57de64c161647aee08ee26ecf3082e7d8e926a0532e701ada21242540a09496d51addda4013a2f5e393d91e4bd1'
+  metadata.gz: 13301ef6ae59a1a799a965ccfbfd97161d5e7597a8db66b6bbf55cbb3d520744afa5271a490443a717e2c1a13026a38dcf253364d745ef2790a28cb7495f156c
+  data.tar.gz: 33230ffa43b5a38a34462f518f8aec736ddb769c954f64d9a135d715c5000c7dd2aeb5e0ae97e1afaa72ca432a58eb3edd5fe0be143ecb11ae6e672946989660

data/Gemfile.lock

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

data/README.md

@@ -24,6 +24,9 @@ $ rlt switch <branch_name>
 
 This will switch to `<branch_name>`. If the branch does not exist, then it will create it.
 
+And it automatically stashes uncommitted changes including untracked files switching to other branch.
+When coming back, it automatically unstashes it.
+
 ## Configuration
 
 The great power in rlt comes from configuration, using ERB syntax in YAML.

data/lib/rlt/colored_text.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'pastel'
+
+module Rlt
+  class ColoredText
+    def self.verbose(msg)
+      Pastel.new.white(msg)
+    end
+
+    def self.info(msg)
+      Pastel.new.cyan(msg)
+    end
+
+    def self.desc(msg)
+      Pastel.new.magenta(msg)
+    end
+
+    def self.warn(msg)
+      Pastel.new.yellow(msg)
+    end
+
+    def self.error(msg)
+      Pastel.new.red(msg)
+    end
+  end
+end

data/lib/rlt/commands/cmt_command.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'erb'
-require 'pastel'
 require 'tty-prompt'
 require 'tmpdir'
 
@@ -13,7 +12,7 @@ module Rlt
 
       def self.run(config, *arguments)
         branch_name = acquire_branch_name
-        puts "Commiting to '#{Pastel.new.green(branch_name)}'\n\n"
+        puts "Commiting to '#{ColoredText.info(branch_name)}'\n\n"
         (subject, body) = subject_and_body(config, branch_name)
         add_all if arguments[0] == '-a'
         commit(subject, body)
@@ -49,7 +48,7 @@ module Rlt
       end
 
       def self.ask_body
-        puts 'Body: ' + Pastel.new.magenta('(Insert empty line to finish)')
+        puts 'Body: ' + ColoredText.desc('(Insert empty line to finish)')
         lines = ask_multiline_until_done('>', :cyan)
         lines.join("\n")
       end

data/lib/rlt/commands/switch_command.rb

@@ -9,7 +9,9 @@ module Rlt
 
       def self.run(config, *arguments)
         branch_name = change_branch_name(config, arguments[0])
+        save_stash_if_any
         switch(branch_name)
+        apply_stash_if_any(branch_name)
       end
 
       def self.change_branch_name(config, branch_name)
@@ -19,6 +21,20 @@ module Rlt
         ERB.new(branch_name_template).result binding
       end
 
+      def self.save_stash_if_any
+        return if `git status -s`.strip.empty?
+        Logger.info 'Saving stash'
+        Shell.new.run 'git', 'stash', 'save', '--include-untracked', 'Auto stash'
+      end
+
+      def self.apply_stash_if_any(branch_name)
+        name = stash_name(branch_name)
+        return if name.nil?
+        Logger.info 'Applied stash'
+        Shell.new.run 'git', 'stash', 'apply', name, '--index'
+        Shell.new.run 'git', 'stash', 'drop', name
+      end
+
       def self.exclude?(config, branch_name)
         list = %w[master develop] + (config['exclude'] || [])
         list.include? branch_name
@@ -29,13 +45,13 @@ module Rlt
       end
 
       def self.checkout(branch_name)
-        result = shell.run_safely 'git', 'checkout', branch_name
+        result = Shell.new(no_output: true).run_safely 'git', 'checkout', branch_name
         Logger.info "Switched to '#{branch_name}'." unless result.failure?
         result
       end
 
       def self.create_and_checkout(branch_name)
-        shell.run 'git', 'checkout', '-b', branch_name
+        Shell.new(no_output: true).run 'git', 'checkout', '-b', branch_name
         Logger.info "Created & Switched to '#{branch_name}'."
       end
 
@@ -50,8 +66,12 @@ module Rlt
         arguments.size == 1
       end
 
-      def self.shell
-        Shell.new(no_output: true)
+      def self.stash_name(branch_name)
+        line = `git stash list`.strip.split("\n").find do |line|
+          line.split(':')[1].strip == "On #{branch_name}"
+        end
+        return nil if line.nil?
+        line.split(':').first
       end
     end
   end

data/lib/rlt/logger.rb

@@ -5,19 +5,23 @@ require 'pastel'
 module Rlt
   class Logger
     def self.verbose(msg)
-      puts Pastel.new.white(msg)
+      puts ColoredText.verbose(msg)
     end
 
     def self.info(msg)
-      puts Pastel.new.cyan(msg)
+      puts ColoredText.info(msg)
+    end
+
+    def self.desc(msg)
+      puts ColoredText.desc(msg)
     end
 
     def self.warn(msg)
-      puts Pastel.new.yellow(msg)
+      puts ColoredText.warn(msg)
     end
 
     def self.error(msg)
-      puts Pastel.new.red(msg)
+      puts ColoredText.error(msg)
     end
   end
 end

data/lib/rlt/version.rb

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

data/lib/rlt.rb

@@ -2,6 +2,7 @@
 
 require 'rlt/version'
 require 'rlt/shell'
+require 'rlt/colored_text'
 require 'rlt/logger'
 require 'rlt/base_command'
 require 'rlt/git_native_command_builder'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rlt
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Paul Lee
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel
@@ -133,6 +133,7 @@ files:
 - exe/rlt
 - lib/rlt.rb
 - lib/rlt/base_command.rb
+- lib/rlt/colored_text.rb
 - lib/rlt/command_runner.rb
 - lib/rlt/commands/cmt_command.rb
 - lib/rlt/commands/switch_command.rb