coaster 1.3.32 → 1.3.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ade22d0084d98fb4169986fce083c991fdf00b2d5e95a4fec2f2fb2a03b0ffbb
-  data.tar.gz: 43bedfaf5b382b1817bac45efd7ed1416f75696dc625faecf7be4f680e532985
+  metadata.gz: 684eb09e07b2184d93f7dd1ba8ef28df6d75c29bbaac226e4e513da16e0d22f5
+  data.tar.gz: 5479f75d9364214c164b022a7fc2fb96802c7258663909b16afbdcb75d45ad8e
 SHA512:
-  metadata.gz: 0bc77179288fb0841bf49646c799f75793f03e941032ee04fca006113a516f14f984cf07222a56e4e93fd49f45b3469726e84428bca177b86341d4cf3dbe1928
-  data.tar.gz: 144d370265cfc0ab7618edd71f66239269c039710a3192579d53badefa67c54e49db75646bfa437af91167a73243f0a6bbb25039c46b9be504110797a86a8329
+  metadata.gz: 58f78f7427f2069f3c69389f23dfec8140c365f0d9817e8ee71cc00db978365344d2f4b109acc9268889150509ce63ae56f6b02f087915815ac6d91e5b91e183
+  data.tar.gz: 3e70c07f05f01312fd95a33b711ea7bd4289db6e4e447392250a8c22568ed8af236456c80f3846ae530621e1038320b70a5f11d74d269a99f13b0bed32b81879

data/bin/coaster

@@ -5,7 +5,7 @@ require 'coaster/git'
 
 command = ARGV.shift
 if command == 'git'
-  repo = Git::Repository.new(Dir.pwd)
+  repo = Coaster::Git::Repository.new(Dir.pwd)
   subcommand = ARGV.shift
   repo.send(subcommand, *ARGV)
 else

data/lib/coaster/cmd_options.rb

@@ -0,0 +1,159 @@
+module Coaster
+  class CmdOptions
+    class << self
+      def options_to_s(options)
+        case options
+        when Hash then options_h_to_s(options)
+        when Array, Set then options.map{|o| options_to_s(o)}.join(' ')
+        else options
+        end
+      end
+
+      def options_s_to_h(options)
+        opts = {}
+        options = " #{options}"
+        options_indexes = options.enum_for(:scan, / -\w| --\w+| -- /).map { Regexp.last_match.begin(0) }
+        options_indexes << 0
+        options_indexes.each_cons(2) do |a, b|
+          option = options[a+1..b-1]
+          h = option_s_to_h(option)
+          options_h_merger(h, base: opts)
+        end
+        opts
+      end
+
+      def option_s_to_h(option)
+        if option.start_with?(/--\w/)
+          opt = option.split('=', 2)
+          opt << '' if opt.length == 1
+        elsif option.start_with?(/-\w/)
+          opt = option.split(' ', 2)
+          opt << '' if opt.length == 1
+        elsif option.start_with?('-- ')
+          opt = ['--', option[3..-1].split(' ')]
+        else
+          return {}
+        end
+        opt[1] = opt[1].split(',') if opt[1].include?(',')
+        opt[1] = opt[1].map{|s| s.include?('=') ? Hash[s.split('=', 2)] : s}.to_h if opt[1].is_a?(Array)
+        [opt].to_h
+      end
+
+      def option_v_to_s(option_v)
+        case option_v
+        when Hash then option_v.map{|vk,vv| Set[vk, vv]}.to_set
+        when Array then option_v.map{|v| option_v_to_s(v)}.join(',')
+        when Set then option_v.map{|v| option_v_to_s(v)}.join('=')
+        else
+          option_v = (option_v || '').to_s
+          option_v = option_v.gsub(/"/, '\"')
+          option_v = "\"#{option_v}\"" if option_v.include?(' ')
+          option_v
+        end
+      end
+
+      def options_h_to_s(options)
+        opts = []
+
+        # multiple options can be passed by set
+        options.map do |k, v|
+          if v.is_a?(Set)
+            v.each {|set_v| opts << [k, set_v]}
+          else
+            opts << [k, v]
+          end
+        end
+
+        targets = ''
+        parsed = opts.map do |k, v|
+          if k.start_with?(/--\w/)
+            v = option_v_to_s(v)
+            if v.is_a?(Set)
+              v.map {|vv| "#{k}=#{option_v_to_s(vv)}" }.join(' ')
+            else
+              "#{k}#{v.length > 0 ? "=#{v}" : ''}" # ex, --config-env=<name>=<envvar>
+            end
+          elsif k.start_with?(/-\w/)
+            v = option_v_to_s(v)
+            if v.is_a?(Set)
+              v.map {|vv| "#{k} #{option_v_to_s(vv)}"}.join(' ')
+            else
+              "#{k} #{v}" # ex, -c <name>=<value>
+            end
+          elsif k == '--'
+            if v.present?
+              v = Array.wrap(v)
+              v = v.map{|e| option_v_to_s(e)}.join(' ')
+              targets = "-- #{v}" # ex, -- <args>
+              ''
+            end
+          else
+            raise "Unknown option: #{k}"
+          end
+        end
+
+        parsed << targets
+        parsed.join(' ')
+      end
+    end
+
+    attr_accessor :repository
+
+    def initialize(cmd, *args, **options)
+      arg_options = args.extract_options!
+      options = options.merge(arg_options)
+      @cmd = cmd
+      @cmd, @sub_cmd = @cmd if @cmd.is_a?(Array)
+      remain_ix = args.index{ |k| k == '--'}
+      if remain_ix
+        @remain_args = args[remain_ix+1..-1]
+        @args = args[0...remain_ix]
+      else
+        @args = args
+      end
+      if @args.first.is_a?(self.class)
+        options = @args.first.to_h.merge(options)
+      end
+      if @args.last.is_a?(self.class)
+        options = @args.last.to_h.merge(options)
+      end
+      options['--'] ||= []
+      options['--'] += @remain_args if @remain_args
+      @options = options
+      @args << self.class.options_to_s(options).strip
+      @str = @args.join(' ')
+    end
+
+    def parser_proc(*args)
+      raise 'Not implemented'
+    end
+
+    def parser
+      parser_proc = parser_proc(@cmd, @sub_cmd)
+      instance_exec(&parser_proc)
+    end
+
+    def to_h
+      return @hash if defined?(@hash)
+      @hash = {}
+      remain_args = parser.parse!(@str.split(' '))
+      @hash['--'] = remain_args if remain_args.any?
+      @hash
+    end
+    delegate :[], :[]=, :key?, :map, :each, to: :to_h
+
+    def merge(*args, **options)
+      if args.first.is_a?(CmdOptions)
+        other = args.shift
+      else
+        other = self.class.new([@cmd, @sub_cmd], *args, **options)
+      end
+      self.class.new(to_h.merge(other.to_h))
+    end
+
+    def to_s
+      return self.class.options_h_to_s(@hash) if defined?(@hash)
+      @str
+    end
+  end
+end

data/lib/coaster/git/options.rb

@@ -0,0 +1,118 @@
+require 'coaster/cmd_options'
+
+module Coaster
+  module Git
+    class Options < ::Coaster::CmdOptions
+      OPTION_PARSER = {
+        'git' => {
+          nil => proc do
+            OptionParser.new do |opts|
+              opts.on('-c', '--config-env=NAME=VALUE') { |v|
+                name, envvar = v.split('=')
+                @hash['--config-env'] ||= {}
+                @hash['--config-env'][name] = envvar
+              }
+            end
+          end,
+        },
+        'config' => {
+          nil => proc do
+            OptionParser.new do |opts|
+            end
+          end,
+        },
+        'status' => {
+          nil => proc do
+            OptionParser.new do |opts|
+            end
+          end,
+        },
+        'add' => {
+          nil => proc do
+            OptionParser.new do |opts|
+            end
+          end,
+        },
+        'commit' => {
+          nil => proc do
+            OptionParser.new do |opts|
+              opts.on('-m', '--message') { |v| @hash['--message'] = v }
+            end
+          end,
+        },
+        'fetch' => {
+          nil => proc do
+            OptionParser.new do |opts|
+            end
+          end,
+        },
+        'branch' => {
+          nil => proc do
+            OptionParser.new do |opts|
+            end
+          end
+        },
+        'checkout' => {
+          nil => proc do
+            OptionParser.new do |opts|
+            end
+          end
+        },
+        'merge' => {
+          nil => proc do
+            OptionParser.new do |opts|
+              opts.on('-m', '--message') { |v| @hash['--message'] = v }
+              opts.on('--no-commit') { |v| @hash['--no-commit'] = '' }
+            end
+          end
+        },
+        'log' => {
+          nil => proc do
+            OptionParser.new do |opts|
+            end
+          end
+        },
+        'diff' => {
+          nil => proc do
+            OptionParser.new do |opts|
+            end
+          end
+        },
+        'submodule' => {
+          nil => proc do
+            OptionParser.new do |opts|
+            end
+          end,
+          'add' => proc do
+            OptionParser.new do |opts|
+            end
+          end,
+          'init' => proc do
+            OptionParser.new do |opts|
+            end
+          end,
+          'update' => proc do
+            OptionParser.new do |opts|
+            end
+          end
+        },
+        'ls-tree' => {
+          nil => proc do
+            OptionParser.new do |opts|
+            end
+          end
+        },
+        'rev-parse' => {
+          nil => proc do
+            OptionParser.new do |opts|
+            end
+          end
+        },
+      }
+
+      def parser_proc(cmd, sub_cmd, *args)
+        OPTION_PARSER[cmd][sub_cmd]
+      end
+    end
+  end
+end

data/lib/coaster/git/repository.rb

@@ -1,104 +1,67 @@
 module Coaster
   module Git
     class Repository
-      class << self
-        def option_parser(options)
-          case options
-          when Hash then hash_option_parser(options)
-          when Array, Set then options.map{|o| option_parser(o)}.join(' ')
-          else options
-          end
-        end
-
-        def hash_option_parser(options)
-          opts = []
-
-          # multiple options can be passed by set
-          options.map do |k, v|
-            if v.is_a?(Set)
-              v.each {|set_v| opts << [k, set_v]}
-            else
-              opts << [k, v]
-            end
-          end
-
-          parsed = opts.map do |k, v|
-            v = case v
-            when Hash then v.map{|vk,vv| "#{vk}=#{vv}"}.join(',')
-            when Array then v.join(',')
-            else v || ''
-            end
-            v = v.strip
-            if k.start_with?('--')
-              "#{k}#{v.length > 0 ? "=#{v}" : ''}" # ex, --config-env=<name>=<envvar>
-            else
-              "#{k} #{v.length > 0 ? "#{v}" : ''}" # ex, -c <name>=<value>
-            end
-          end
-
-          parsed.join(' ')
-        end
-
-        def run_cmd(path, command)
-          puts "#{path}: #{command}"
-          stdout, stderr, status = Open3.capture3(command, chdir: path)
-          if status.success?
-            puts "  ↳ success: #{stdout}"
-            stdout
-          else
-            raise "Error executing command: #{command}\n  ↳ #{stderr}"
-          end
-        end
-
-        def create(path)
-          run_cmd(path.split('/')[0..-2].join('/'), "git init #{path}")
-          run_cmd(path, "git commit --allow-empty -m 'initial commit'")
-          new(path)
-        end
-      end
+      include Coaster::Git
 
       attr_reader :path
 
       def initialize(path)
         @path = path
-        @sha = current_sha
       end
 
-      def run_cmd(command)
-        self.class.run_cmd(path, command)
+      def run_cmd(command, path: nil)
+        super(path || @path, command)
+      end
+
+      def with_git_options(*args, **options, &block)
+        @git_options = Options.new('git', *args, **options)
+        yield
+        @git_options = nil
       end
 
-      def run_git_cmd(command, *options)
-        cmd = "git #{self.class.option_parser(options)} #{command}"
+      def run_git_cmd(command, *args, **options)
+        opts = Options.new(command, *args, **options)
+        cmd = "git #{@git_options} #{Array.wrap(command).join(' ')} #{opts}"
         run_cmd(cmd)
       end
 
       def add(*paths, **options)
-        run_git_cmd("add #{self.class.hash_option_parser(options)} #{paths.join(' ')}")
+        opts = Options.new('add', **options)
+        run_git_cmd("add", *paths, opts)
       end
 
-      def commit(message)
-        run_git_cmd("commit -m \"#{message}\"")
+      def commit(*args, **options)
+        opts = Options.new('commit', *options)
+        opts['--message'] ||= "no message"
+        run_git_cmd("commit", opts)
       end
 
-      def branch(name)
-        run_git_cmd("branch #{name}")
+      def branch(*args, **options)
+        run_git_cmd("branch", *args, **options)
       end
 
-      def checkout(name)
-        run_git_cmd("checkout #{name}")
+      def checkout(*args, **options)
+        run_git_cmd("checkout", *args, **options)
       end
 
-      def submodule_add!(path, url, git_options: {})
-        run_git_cmd("submodule add #{url} #{path}", **git_options)
+      def submodule_add!(repo, path, *args, **options)
+        run_git_cmd(["submodule", 'add'], repo, path, *args, **options)
       end
 
-      def submodule_init!(path)
-        run_git_cmd("submodule init #{path}")
+      def submodule_init!(*paths)
+        run_git_cmd(["submodule", "init"], *paths)
       end
 
-      def submodule_update!(*paths, options: {})
-        run_git_cmd("submodule update #{self.class.option_parser(options)} #{paths.join(' ')}")
+      def submodule_update!(*paths, **options)
+        run_git_cmd(["submodule", "update"], *paths, **options)
+      end
+
+      def fetch(*args, **options)
+        run_git_cmd("fetch", *args, **options)
+      end
+
+      def status(*args, **options)
+        run_git_cmd("status", *args, **options)
       end
 
       def current_sha
@@ -117,33 +80,57 @@ module Coaster
         end.to_h
       end
 
-      def merge(pointer)
+      def merge(pointer, *args, **options)
+        opts = Options.new('merge', *args, **options)
         pointers = pointers(pointer).join(',')
-        puts "#{path} merged deploy: #{pointers}"
-        run_git_cmd("merge #{pointer} --commit -m \"merged deploy: #{pointers}\"")
+        puts "[MERGE] #{path} #{pointers} #{options}"
+        opts['--message'] ||= "Merge #{pointers}"
+        run_git_cmd("merge #{pointer} #{opts}")
       end
 
       def submodule_sha(path, pointer: nil)
-        pointer ||= @sha
+        pointer ||= current_sha
         run_git_cmd("ls-tree #{pointer} #{path}").split(' ')[2]
       end
 
+      def merge_without_submodules
+        run_git_cmd('config merge.ours.name "Keep ours merge driver"')
+        run_git_cmd('config merge.ours.driver true')
+        ga_file = File.join(@path, '.gitattributes')
+        run_cmd("touch #{ga_file}")
+        ga_lines = File.read(ga_file).split("\n")
+        ga_lines_appended = ga_lines + submodules.keys.map{|sb_path| "#{sb_path} merge=ours" }
+        File.open(ga_file, 'w') do |f|
+          f.puts ga_lines_appended.join("\n")
+        end
+        add('.')
+        commit
+        yield
+        File.open(ga_file, 'w') do |f|
+          f.puts ga_lines.join("\n")
+        end
+      end
+
       def deep_merge(pointer)
+        puts "[DEEP_MERGE] #{path} #{pointer}"
         submodules.values.each do |submodule|
           sm_sha = submodule_sha(submodule.path, pointer: pointer)
           submodule.merge(sm_sha)
         end
-        merge(pointer)
+        merge_without_submodules do
+          merge(pointer)
+        end
       end
 
       def pointers(sha)
         run_git_cmd("branch --contains #{sha}").split("\n").map do |br|
-          (br.start_with?('*') ? br[2..-1] : br).strip
-        end
+          br = (br.start_with?('*') ? br[2..-1] : br).strip
+          br.match?(/^\(.*\)$/) ? nil : br
+        end.compact
       end
 
       def remove
-        self.class.run_cmd(path.split('/')[0..-2].join('/'), "rm -rf #{path}")
+        run_cmd("rm -rf #{path}", path: path.split('/')[0..-2].join('/'))
       end
     end
   end

data/lib/coaster/git.rb

@@ -2,8 +2,28 @@ require 'open3'
 
 module Coaster
   module Git
+    def run_cmd(path, command)
+      puts "#{path}: #{command}"
+      stdout, stderr, status = Open3.capture3(command, chdir: path)
+      if status.success?
+        puts "  ↳ success: #{stdout.split("\n").join("\n             ")}"
+        stdout
+      else
+        raise "Error executing command\nPATH: #{path}\nCMD: #{command}\nSTDERR:\n  ↳ #{stderr.split("\n").join("\n    ")}\nSTDOUT:\n  ↳ #{stdout.split("\n").join("\n    ")}"
+      end
+    end
 
+    class << self
+      include Coaster::Git
+
+      def create(path)
+        run_cmd(path.split('/')[0..-2].join('/'), "git init #{path}")
+        run_cmd(path, "git commit --allow-empty -m 'initial commit'")
+        Repository.new(path)
+      end
+    end
   end
 end
 
+require 'coaster/git/options'
 require 'coaster/git/repository'

data/lib/coaster/version.rb

@@ -1,3 +1,3 @@
 module Coaster
-  VERSION = '1.3.32'
+  VERSION = '1.3.33'
 end

data/test/test_git.rb

@@ -4,53 +4,5 @@ require 'coaster/git'
 
 module Coaster
   class TestGit < Minitest::Test
-    def setup
-      super
-      @test_repo_root = File.expand_path('../../tmp/test_repo', __FILE__)
-      FileUtils.rm_rf(@test_repo_root)
-      FileUtils.mkdir_p(@test_repo_root)
-      @beta = Git::Repository.create(File.join(@test_repo_root, 'beta'))
-      @beta.run_cmd('echo "hello beta" > README.md')
-      @beta.add('.')
-      @beta.run_git_cmd('commit -m "hello"')
-      @beta.branch('beta_feature')
-      @beta.checkout('beta_feature')
-      @beta.run_cmd('echo "beta_feature" >> README.md')
-      @beta.add('.')
-      @beta.run_git_cmd('commit -m "beta_feature"')
-      @beta.run_git_cmd('checkout main')
-
-      @alpha = Git::Repository.create(File.join(@test_repo_root, 'alpha'))
-      @alpha.submodule_add!('sb/beta', @beta.path, git_options: {'-c' => {'protocol.file.allow' => 'always'}})
-      @alpha.submodule_update!('sb/beta')
-      @alpha.run_cmd('echo "hello alpha" > README.md')
-      @alpha.add('.')
-      @alpha.run_git_cmd('commit -m "hello"')
-    end
-
-    def teardown
-      FileUtils.rm_rf(@test_repo_root)
-      super
-    end
-
-    def test_git_deep_merge
-      assert_equal "hello alpha\n", @alpha.run_cmd('cat README.md')
-      assert_equal "hello beta\n", @alpha.run_cmd('cat sb/beta/README.md')
-
-      @alpha.branch('alpha_feature')
-      @alpha.checkout('alpha_feature')
-      @alpha.run_cmd('echo "alpha_feature" >> README.md')
-      @alpha.submodules['sb/beta'].run_git_cmd('checkout beta_feature')
-      @alpha.add('.')
-      @alpha.run_git_cmd('commit -m "alpha_feature"')
-      assert_equal "README.md\nsb/beta\n", @alpha.run_git_cmd('diff --name-only HEAD~1 HEAD')
-
-      @alpha.checkout('main')
-      @alpha.submodule_update!
-      assert_equal "hello beta\n", @alpha.run_cmd('cat sb/beta/README.md')
-      @alpha.deep_merge('alpha_feature')
-      assert_equal "hello alpha\nalpha_feature\n", @alpha.run_cmd('cat README.md')
-      assert_equal "hello beta\nbeta_feature\n", @alpha.run_cmd('cat sb/beta/README.md')
-    end
   end
 end

data/test/test_git_options.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+require 'minitest/autorun'
+require 'coaster/git'
+
+module Coaster
+  module Git
+    class TestOptions < Minitest::Test
+      def test_options_to_s
+        # assert_equal '-a b -c d  ', Options.new(nil, '-a' => 'b', '-c' => 'd').to_s
+        assert_equal '--no-commit ', Options.new(nil, '--no-commit').to_s
+        assert_equal '-c a=b', Options.new(nil, '-c' => {'a' => 'b'}).to_s
+        assert_equal '-c a=b -c c=d', Options.new(nil, '-c' => {'a' => 'b', 'c' => 'd'}).to_s
+        assert_equal '-c a=b -c c=d', Options.new(nil, '-c' => Set[{'a' => 'b'}, {'c' => 'd'}]).to_s
+        assert_equal '--config=a=b,c=d', Options.new(nil, '--config' => [Set['a', 'b'], Set['c', 'd']]).to_s
+        assert_equal '--config=a=b --config=c=d', Options.new(nil, '--config' => Set[{'a' => 'b'}, {'c' => 'd'}]).to_s
+        assert_equal '-c a=b  -- aaa bbb', Options.new(nil, '-c' => {'a' => 'b'}, '--' => ['aaa', 'bbb']).to_s
+      end
+
+      def test_options_to_h
+        opts = Options.new('git', '-c' => {'b' => 1}, '--config-env' => 'd=1')
+        assert_equal({"--config-env"=>{"b"=>"1", "d"=>"1"}}, opts.to_h)
+        assert_equal('--config-env=b=1 --config-env=d=1 ', opts.to_s)
+        opts = Options.new('merge', '--no-commit')
+        assert_equal({"--no-commit" => ''}, opts.to_h)
+        assert_equal('--no-commit ', opts.to_s)
+        opts = Options.new('git', {'-c' => {'a' => 'b'}, '--' => ['aaa', 'bbb']})
+        assert_equal('-c a=b  -- aaa bbb', opts.to_s)
+        assert_equal({"--config-env" => {"a" => "b"}, '--' => ['aaa', 'bbb']}, opts.to_h)
+      end
+    end
+  end
+end

data/test/test_git_repository.rb

@@ -0,0 +1,64 @@
+require 'test_helper'
+require 'minitest/autorun'
+require 'coaster/git'
+
+module Coaster
+  class TestGitRepository < Minitest::Test
+    def setup
+      super
+      @test_repo_root = File.expand_path('../../tmp/test_repo', __FILE__)
+      FileUtils.rm_rf(@test_repo_root)
+      FileUtils.mkdir_p(@test_repo_root)
+      @beta = Coaster::Git.create(File.join(@test_repo_root, 'beta'))
+      @beta.run_cmd('echo "hello beta" > README.md')
+      @beta.add('.')
+      @beta.run_git_cmd('commit -m "hello"')
+      @beta.branch('beta_feature')
+      @beta.checkout('beta_feature')
+      @beta.run_cmd('echo "beta_feature" >> README.md')
+      @beta.add('.')
+      @beta.run_git_cmd('commit -m "beta_feature"')
+      @beta.run_git_cmd('checkout main')
+
+      @alpha = Coaster::Git.create(File.join(@test_repo_root, 'alpha'))
+      @alpha.with_git_options({'-c' => {'protocol.file.allow' => 'always'}}) do
+        @alpha.submodule_add!(@beta.path, 'sb/beta')
+      end
+      @alpha.submodule_update!('sb/beta')
+      @alpha.run_cmd('echo "hello alpha" > README.md')
+      @alpha.add('.')
+      @alpha.run_git_cmd('commit -m "hello"')
+    end
+
+    def teardown
+      FileUtils.rm_rf(@test_repo_root)
+      super
+    end
+
+    def test_git_deep_merge
+      assert_equal "hello alpha\n", @alpha.run_cmd('cat README.md')
+      assert_equal "hello beta\n", @alpha.run_cmd('cat sb/beta/README.md')
+
+      @alpha.branch('alpha_feature')
+      @alpha.checkout('alpha_feature')
+      @alpha.run_cmd('echo "alpha_feature" >> README.md')
+      @alpha.submodules['sb/beta'].run_git_cmd('checkout beta_feature')
+      @alpha.add('.')
+      @alpha.run_git_cmd('commit -m "alpha_feature"')
+      assert_equal "README.md\nsb/beta\n", @alpha.run_git_cmd('diff --name-only HEAD~1 HEAD')
+
+      @alpha.checkout('main')
+      @alpha.submodule_update!
+      @alpha.submodules['sb/beta'].run_cmd('echo "main new commit" >> README2.md')
+      @alpha.submodules['sb/beta'].add('.')
+      @alpha.submodules['sb/beta'].run_git_cmd('commit -m "main new commit"')
+      @alpha.add('.')
+      @alpha.run_git_cmd('commit -m "main new commit"')
+      assert_equal "hello beta\n", @alpha.run_cmd('cat sb/beta/README.md')
+
+      @alpha.deep_merge('alpha_feature')
+      assert_equal "hello alpha\nalpha_feature\n", @alpha.run_cmd('cat README.md')
+      assert_equal "hello beta\nbeta_feature\n", @alpha.run_cmd('cat sb/beta/README.md')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coaster
 version: !ruby/object:Gem::Version
-  version: 1.3.32
+  version: 1.3.33
 platform: ruby
 authors:
 - buzz jung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-30 00:00:00.000000000 Z
+date: 2023-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -190,6 +190,7 @@ files:
 - Rakefile
 - bin/coaster
 - lib/coaster.rb
+- lib/coaster/cmd_options.rb
 - lib/coaster/core_ext.rb
 - lib/coaster/core_ext/array.rb
 - lib/coaster/core_ext/date.rb
@@ -200,6 +201,7 @@ files:
 - lib/coaster/core_ext/standard_error/raven.rb
 - lib/coaster/core_ext/standard_error/sentry.rb
 - lib/coaster/git.rb
+- lib/coaster/git/options.rb
 - lib/coaster/git/repository.rb
 - lib/coaster/rails_ext.rb
 - lib/coaster/rails_ext/backtrace_cleaner.rb
@@ -212,6 +214,8 @@ files:
 - test/support/schema.rb
 - test/test_backtrace.rb
 - test/test_git.rb
+- test/test_git_options.rb
+- test/test_git_repository.rb
 - test/test_helper.rb
 - test/test_month.rb
 - test/test_object_translation.rb
@@ -249,6 +253,8 @@ test_files:
 - test/support/schema.rb
 - test/test_backtrace.rb
 - test/test_git.rb
+- test/test_git_options.rb
+- test/test_git_repository.rb
 - test/test_helper.rb
 - test/test_month.rb
 - test/test_object_translation.rb