coaster 1.3.27 → 1.3.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f6845ad78b984bcd3b7e731c99f301cbb9cf988d2252450b0e961af3de2f630
-  data.tar.gz: 00be20732649e4a1176873079b6d23a25bc0e2ead9b204fb7cc2da4ca2862219
+  metadata.gz: cee8914e3be8e12b37a81c3217b8d9725737dd505908db7055727cd6d88ef7e8
+  data.tar.gz: 67c6aaec914f4a2ff93b932c575f86d77753b76032ea8e3f369e47500b1c9de1
 SHA512:
-  metadata.gz: bc1393903d6481ec4037b3cc71281fbb0d7ae998517065004d281c836effc2e9694e749d8bfe14aea8742e59c92b100002d6c3144cc8926f065d0f6149f13110
-  data.tar.gz: 8ed7983c0ffde2f9b0817367187d8b719978adf433f29c7584a2d838176813f204deee4406417f9d5d40f5f05b985230f3e4c60eb05c633accc1ac3055cd07d6
+  metadata.gz: 38d61efdc28e80bb944cc546da9c139a4aa454c65fe6c61166258e911135125d9c9c92ee6493c71f54cd9055e828590d07344deaa672b7d072054823d4232aa5
+  data.tar.gz: 2b2cf7c5738c15875820905b080e35c240b209b0e4a1cc4f454f2f69e46b1e088d55fd96afdb1583d642a1cb5e2ae6dea94cf6bcbc84f2c9a5e69f98cb7c8be2

data/lib/coaster/core_ext/standard_error.rb

@@ -86,9 +86,9 @@ class StandardError
       @level = message.level
       @tkey = message.tkey
       @attributes = @attributes.merge(message.attributes || {})
-      msg = message
+      msg = message.message
     when Exception
-      msg = message
+      msg = message.message
     when Hash then
       @coaster = true # coaster 확장을 사용한 에러임을 확인할 수 있음.
       hash = message.with_indifferent_access rescue message
@@ -120,7 +120,7 @@ class StandardError
     msg = "{#{cause.message}}" if msg.blank? && cause
     super(msg)
     @digest_message = self.class.digest_message(msg)
-    set_backtrace(msg.backtrace) if msg.is_a?(Exception)
+    set_backtrace(message.backtrace) if message.is_a?(Exception)
     @fingerprint << @digest_message
     @fingerprint << digest_backtrace
     @fingerprint.compact!

data/lib/coaster/git/repository.rb

@@ -0,0 +1,142 @@
+module Coaster
+  module Git
+    class Repository
+      class << self
+        def 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 "Run command: #{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
+
+      attr_reader :path
+
+      def initialize(path)
+        @path = path
+        @sha = current_sha
+      end
+
+      def run_cmd(command)
+        self.class.run_cmd(path, command)
+      end
+
+      def run_git_cmd(command, **options)
+        cmd = "git #{self.class.option_parser(options)} #{command}"
+        run_cmd(cmd)
+      end
+
+      def add!
+        run_git_cmd('add .')
+      end
+
+      def commit!(message)
+        run_git_cmd("commit -m \"#{message}\"")
+      end
+
+      def branch!(name)
+        run_git_cmd("branch #{name}")
+      end
+
+      def checkout!(name)
+        run_git_cmd("checkout #{name}")
+      end
+
+      def submodule_add!(path, url, git_options: {})
+        run_git_cmd("submodule add #{url} #{path}", **git_options)
+      end
+
+      def submodule_init!(path)
+        run_git_cmd("submodule init #{path}")
+      end
+
+      def submodule_update!(*paths, options: {})
+        run_git_cmd("submodule update #{self.class.option_parser(options)} #{paths.join(' ')}")
+      end
+
+      def current_sha
+        run_git_cmd('rev-parse HEAD').strip
+      end
+
+      def submodule_paths
+        @submodule_paths ||= run_git_cmd('submodule status --recursive').split("\n").map do |line|
+          line.split(' ')[1]
+        end
+      end
+
+      def submodules
+        @submodules ||= submodule_paths.map do |path|
+          [path, Git::Repository.new(File.join(@path, path))]
+        end.to_h
+      end
+
+      def merge(pointer)
+        pointers = pointers(pointer).join(',')
+        puts "#{path} merged deploy, #{pointers}"
+        run_git_cmd("merge #{pointer} --commit -m \"merged deploy, #{pointers}\"")
+      end
+
+      def submodule_sha(path, pointer: nil)
+        pointer ||= @sha
+        run_git_cmd("ls-tree #{pointer} #{path}").split(' ')[2]
+      end
+
+      def deep_merge(pointer)
+        submodules.values.each do |submodule|
+          sm_sha = submodule_sha(submodule.path, pointer: pointer)
+          submodule.merge(sm_sha)
+        end
+        merge(pointer)
+      end
+
+      def pointers(sha)
+        run_git_cmd("branch --contains #{sha}").split("\n").map do |br|
+          (br.start_with?('*') ? br[2..-1] : br).strip
+        end
+      end
+
+      def remove
+        self.class.run_cmd(path.split('/')[0..-2].join('/'), "rm -rf #{path}")
+      end
+    end
+  end
+end

data/lib/coaster/git.rb

@@ -0,0 +1,9 @@
+require 'open3'
+
+module Coaster
+  module Git
+
+  end
+end
+
+require 'coaster/git/repository'

data/lib/coaster/version.rb

@@ -1,3 +1,3 @@
 module Coaster
-  VERSION = '1.3.27'
+  VERSION = '1.3.29'
 end

data/test/test_git.rb

@@ -0,0 +1,56 @@
+require 'test_helper'
+require 'minitest/autorun'
+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.run_git_cmd('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.run_git_cmd('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.run_git_cmd('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.run_git_cmd('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_object_translation.rb

@@ -24,7 +24,7 @@ module Coaster
     end
 
     def test_translation_missing
-      assert_equal 'translation missing: en.class.Coaster.NotTranslated.self', NotTranslated._translate
+      assert_equal 'Translation missing: en.class.Coaster.NotTranslated.self', NotTranslated._translate
     end
 
     def test_fallback

data/test/test_standard_error.rb

@@ -64,12 +64,12 @@ module Coaster
       assert_equal 'user message', e.user_message
       assert_equal 'standard error title', e.title
       e = UntitledError.new(tkey: 'no.translation')
-      assert_equal "translation missing: en.no.translation (Coaster::TestStandardError::UntitledError)", e.to_s
-      assert_equal "translation missing: en.no.translation (Coaster::TestStandardError::UntitledError)", e.message
+      assert_equal "Translation missing: en.no.translation (Coaster::TestStandardError::UntitledError)", e.to_s
+      assert_equal "Translation missing: en.no.translation (Coaster::TestStandardError::UntitledError)", e.message
       assert_nil e.description
       assert_nil e.desc
-      assert_equal 'translation missing: en.no.translation', e._translate
-      assert_equal "translation missing: en.no.translation", e.user_message
+      assert_equal 'Translation missing: en.no.translation', e._translate
+      assert_equal "Translation missing: en.no.translation", e.user_message
       assert_equal 'standard error title', e.title
     end
 
@@ -316,7 +316,7 @@ LOG
       assert_equal 'NameError', e.to_hash['type']
       assert_equal 999999, e.to_hash['status']
       assert_equal 500, e.to_hash['http_status']
-      assert_equal "standard error translation (bc1746 #{bt})", e.user_message
+      assert_equal "standard error translation (3dd84e #{bt})", e.user_message
       assert_match(/undefined local variable or method `aa'/, e.to_hash['message'])
     end
 
@@ -387,5 +387,11 @@ LOG
         assert_equal "Test sample error (58ee3f #{bt})", e.user_message
       end
     end
+
+    def test_wrapping_digest
+      a = StandardError.new('#<Abc:0x111>')
+      b = StandardError.new(a)
+      assert_equal '#<Abc:0x111>', b.message
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coaster
 version: !ruby/object:Gem::Version
-  version: 1.3.27
+  version: 1.3.29
 platform: ruby
 authors:
 - buzz jung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-12 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -197,6 +197,8 @@ files:
 - lib/coaster/core_ext/standard_error.rb
 - lib/coaster/core_ext/standard_error/raven.rb
 - lib/coaster/core_ext/standard_error/sentry.rb
+- lib/coaster/git.rb
+- lib/coaster/git/repository.rb
 - lib/coaster/rails_ext.rb
 - lib/coaster/rails_ext/backtrace_cleaner.rb
 - lib/coaster/safe_yaml_serializer.rb
@@ -207,6 +209,7 @@ files:
 - test/support/models.rb
 - test/support/schema.rb
 - test/test_backtrace.rb
+- test/test_git.rb
 - test/test_helper.rb
 - test/test_month.rb
 - test/test_object_translation.rb
@@ -241,6 +244,7 @@ test_files:
 - test/support/models.rb
 - test/support/schema.rb
 - test/test_backtrace.rb
+- test/test_git.rb
 - test/test_helper.rb
 - test/test_month.rb
 - test/test_object_translation.rb