coaster 1.3.33 → 1.3.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 684eb09e07b2184d93f7dd1ba8ef28df6d75c29bbaac226e4e513da16e0d22f5
-  data.tar.gz: 5479f75d9364214c164b022a7fc2fb96802c7258663909b16afbdcb75d45ad8e
+  metadata.gz: d90387f0828b0ece5fec61d33b6dd1458da6944816a877f8f222d0c732b3737e
+  data.tar.gz: 64d540a0623b059d65789d58118c668640dd9679595eb2b3582aa5708c639480
 SHA512:
-  metadata.gz: 58f78f7427f2069f3c69389f23dfec8140c365f0d9817e8ee71cc00db978365344d2f4b109acc9268889150509ce63ae56f6b02f087915815ac6d91e5b91e183
-  data.tar.gz: 3e70c07f05f01312fd95a33b711ea7bd4289db6e4e447392250a8c22568ed8af236456c80f3846ae530621e1038320b70a5f11d74d269a99f13b0bed32b81879
+  metadata.gz: 6aa3bc61db4b538553799902876097e555fcc508ee7c7c8b86d19fca60f8d19e6c7dadf74812fa79bac75b7863ce0e3052b47d70e3e682555e8394f790465f3c
+  data.tar.gz: 0a9a86bf0baef2c0c07eb2bf3bc7c6a284eb201139c61b2536d04e00db7c0339f6a7062fdd604a39fa74c660c9cdda4eb323c2747c13825fee562cfcddca416e

data/lib/coaster/cmd_options.rb

@@ -1,3 +1,5 @@
+require 'optparse'
+
 module Coaster
   class CmdOptions
     class << self
@@ -9,36 +11,6 @@ module Coaster
         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
@@ -97,7 +69,7 @@ module Coaster
       end
     end
 
-    attr_accessor :repository
+    attr_reader :cmd, :sub_cmd, :args, :remain_args, :options, :str
 
     def initialize(cmd, *args, **options)
       arg_options = args.extract_options!
@@ -111,11 +83,13 @@ module Coaster
       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)
+      @args.delete_if do |arg|
+        if arg.is_a?(self.class)
+          options = arg.to_h.merge(options)
+          true
+        else
+          false
+        end
       end
       options['--'] ||= []
       options['--'] += @remain_args if @remain_args

data/lib/coaster/git/repository.rb

@@ -31,7 +31,7 @@ module Coaster
       end
 
       def commit(*args, **options)
-        opts = Options.new('commit', *options)
+        opts = Options.new('commit', *args, **options)
         opts['--message'] ||= "no message"
         run_git_cmd("commit", opts)
       end
@@ -109,6 +109,8 @@ module Coaster
         File.open(ga_file, 'w') do |f|
           f.puts ga_lines.join("\n")
         end
+        add('.')
+        commit
       end
 
       def deep_merge(pointer)

data/lib/coaster/git.rb

@@ -1,4 +1,6 @@
 require 'open3'
+require 'active_support'
+require 'active_support/core_ext'
 
 module Coaster
   module Git

data/lib/coaster/version.rb

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

data/test/test_git_repository.rb

@@ -30,11 +30,6 @@ module Coaster
       @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')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coaster
 version: !ruby/object:Gem::Version
-  version: 1.3.33
+  version: 1.3.35
 platform: ruby
 authors:
 - buzz jung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-08 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj