gwtools 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70d808a737fd03e736ac1f86a7af6b840662f983598f6fa3055ef5e02413afb3
-  data.tar.gz: 38a8c1a3c3a3620fbd91e2067114bdb511c23e3ad813ea51d5aeabce3d21a799
+  metadata.gz: 2d38d7819049120197657aaada9c96d48c0aec7519c35939e5fa5626a1835159
+  data.tar.gz: bc0c358a7491f712175631dd210aca21cc55fb3385428df4e6064d22297b74ba
 SHA512:
-  metadata.gz: '08f5e834d9273fd23a5a62f86ce383c5e72a0f5f99c445272d33b64625e79015a743f152e6dd98e50e863485e7380630714de7eb12b0031ce43ae14a9d47d6cb'
-  data.tar.gz: 383d8c48e3a9964354d0e015827010f01e44bff50485e8d7551512a8e5186d4844ddc9e9f806005e109a755a3f0e91b6faf77151c60f6f93cefef4d080fbf987
+  metadata.gz: be161ff8c7e2f6e7912fd128894b238f396fe89e405889bb043bf316bc4831be2d99d5caa367f875d23bef8f2a31413a3e94ed3e1895a71f003bc65a655045ac
+  data.tar.gz: '069e6744aff50f322c59396abeacb7425938f7e2d80dfdf1bdc339c52570bc83f6b5d23381dd59052d57e7e072201dc7300e4daf84d3ce04917db1a6b3efe04e'

data/lib/gwtools/analysis/file_handler.rb

@@ -9,7 +9,6 @@ module Gwtools
     def initialize(file_path, target_path = '')
       @file_path = file_path || raise(ArgumentError, 'Missing required argument `file_path`')
       @target_path = target_path
-
       analyDataStr
     end
 
@@ -63,7 +62,6 @@ module Gwtools
                                        @body,
                                        @responseJson
                                        )
-      # end
     end
 
     def getURL

data/lib/gwtools/analysis/swift_parser.rb

@@ -20,6 +20,24 @@ module Gwtools
     #   @ENUMS = enums
     # end
 
+    def self.add_quotes(array1, array2)
+      array1.map do |element|
+        if array2.include?(element)
+          "`#{element}`"
+        else
+          element
+        end
+      end
+    end
+
+    def self.output_content(config_file)
+      # 处理特殊字符
+      this_name = Parser.extract_enum_name(config_file)
+      array1 = this_name.split(".")
+      array2 = %w[enum struct class protocol extension self]
+      return config_file.gsub(this_name, add_quotes(array1, array2).join("."))
+    end
+
     def self.read_file(file_path)
       swift_file = File.open(file_path, "r")
       file_content = swift_file.read.force_encoding("UTF-8")
@@ -195,31 +213,13 @@ module Gwtools
       enum
     end
 
-    def add_quotes(array1, array2)
-      array1.map do |element|
-        if array2.include?(element)
-          "#{element}_"
-        else
-          element
-        end
-      end
-    end
-
-    def output_content(config_file)
-      # 处理特殊字符
-      this_name = Parser.extract_enum_name(config_file)
-      array1 = this_name.split(".")
-      array2 = %w[enum struct class protocol extension self]
-      return config_file.gsub(this_name, add_quotes(array1, array2).join("."))
-    end
-
     def to_swift()
       content_str = "public enum #{@enum_name} {\n"
       @sub_enums.each do |key, value|
         content_str += value.to_swift()
       end
       content_str += "}\n"
-      return output_content(content_str)
+      return Parser.output_content(content_str)
     end
 
     def write_to_file(file_path)

data/lib/gwtools/command/generate/req_info.rb

@@ -21,7 +21,11 @@ module Gwtools
         end
 
         def run
-          FileHandler.new(@file_path, @target_path)
+          fh = FileHandler.new(@file_path, @target_path)
+
+          # File.rename("#{target_path + '/' + app_name}.swift_", "#{target_path + '/' + app_name}.swift")
+          # `swiftformat --swiftversion 5.0 "#{target_path + '/' + app_name}.swift",`
+
         end
 
       end

data/lib/gwtools/generate/swift.rb

@@ -64,26 +64,10 @@ public extension <%="#{@api_name}"%> {
 <% end %>
         }
 }
-          ERB
-          ERB.new(template, nil, '>').result(binding)
-        end
 
-        def add_quotes(array1, array2)
-          array1.map do |element|
-            if array2.include?(element)
-              "#{element}_"
-            else
-              element
-            end
-          end
-        end
 
-        def output_content(config_file)
-          # 处理特殊字符
-          this_name = Parser.extract_enum_name(config_file)
-          array1 = this_name.split(".")
-          array2 = %w[enum struct class protocol extension self]
-          return config_file.gsub(this_name, add_quotes(array1, array2).join("."))
+          ERB
+          ERB.new(template, nil, '>').result(binding)
         end
 
         def initialize(file_path, api_name, httpmethod, prefixPath, modulePath, detailPath,
@@ -99,8 +83,16 @@ public extension <%="#{@api_name}"%> {
           @readme = readme
           puts "write to ==> #{file_path}"
           File.open(file_path, 'w+') do |f|
-            puts output_content(config_file)
-            f.puts(output_content(config_file))
+            # f.puts(Parser.output_content(config_file))
+            f.puts(config_file)
+          end
+
+          # 格式化
+          `swiftformat --swiftversion 5.0 #{file_path}`
+          # 替换内容，重新写入
+          replaced_content = File.read(file_path)
+          File.open(file_path, "w") do |new_file|
+            new_file.puts(Parser.output_content(replaced_content))
           end
         end
       end
@@ -223,6 +215,8 @@ extension <##SomeViewModel##> {
             .catchErrorJustReturn([])
     }
 }
+
+public extension app_api.api.v1_0.complaintsComments.protocol.getProtocols {}
 """
 
         ModelReqGenerateConfig.new(
@@ -237,11 +231,6 @@ extension <##SomeViewModel##> {
           responseJson[root_path].is_a?(Array),
           readme
         )
-
-        `swiftformat --swiftversion 5.0 "#{target_path + '/' + app_name}.swift",`
-
-        # puts target_swift_file = "#{target_path}/#{app_name}.swift"
-
       end
 
       def self.capitalize_first_letter(str)

data/lib/gwtools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gwtools
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gwtools
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - chenglq