redbreast 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a61b421737d7f28ab41362cb78ad00e3fd2246588e6346938dbe3589c82320e7
-  data.tar.gz: ca241430323a6822e1b1943e67ebf1dddec6ea663e26fde0cd3d792d97f30f17
+  metadata.gz: 55140102c283d2812b099b0ec63dc475d12faef4beac0cc12d39cca5b87c2f61
+  data.tar.gz: 70704e2afa3b62adc8693d87cdf47891e255abdaf0b416cc11ae4190acd9d634
 SHA512:
-  metadata.gz: 5cdb3304c7d176836430c1ec41826071a8544f171b0f9004f87a5a11da2bb7a817e79cfc28ca4662a44f5084b85bdf83f491a831a930b94b80e009610bcc1f0a
-  data.tar.gz: a3257f6b265ed44b1f1a7fe12326002838e3f25c063001051c2b550ff716898621491157e4948855706f52fe748ff5ded3560db968e4fa40b1c986ce9815c5f3
+  metadata.gz: b7945675763fad73af01dcdd6018dbd032d782449f028f0e0d7d289cf028c4b7ce6d4ae5f129a2b47755e14a31b93cbc9bf1f6b6fe33e544558145635d5c6a78
+  data.tar.gz: 51d20e13ab388b0e2bd71a696bda633eed452f4d2be7b6e0179ffd0d6b7f2dffe056e7f0f144c6fdf47272c0168e0b7e95afb369f269c493c8c52531b74546eb

data/lib/redbreast.rb

@@ -27,18 +27,24 @@ require 'redbreast/crawlers/color_crawler'
 require 'redbreast/serializers/serializer'
 require 'redbreast/serializers/objc_serializer'
 require 'redbreast/serializers/swift_serializer'
+require 'redbreast/serializers/swiftui_serializer'
 
 # Template generators
 require 'redbreast/template_generators/objc_template_generator'
 require 'redbreast/template_generators/swift_template_generator'
+require 'redbreast/template_generators/swiftui_template_generator'
 require 'redbreast/template_generators/images/objc_images_template_generator'
 require 'redbreast/template_generators/images/swift_images_template_generator'
+require 'redbreast/template_generators/images/swiftui_images_template_generator'
 require 'redbreast/template_generators/colors/objc_colors_template_generator'
 require 'redbreast/template_generators/colors/swift_colors_template_generator'
+require 'redbreast/template_generators/colors/swiftui_colors_template_generator'
 require 'redbreast/template_generators/tests/colors/objc_colors_tests_template_generator'
 require 'redbreast/template_generators/tests/colors/swift_colors_tests_template_generator'
+require 'redbreast/template_generators/tests/colors/swiftui_colors_tests_template_generator'
 require 'redbreast/template_generators/tests/images/objc_images_tests_template_generator'
 require 'redbreast/template_generators/tests/images/swift_images_tests_template_generator'
+require 'redbreast/template_generators/tests/images/swiftui_images_tests_template_generator'
 
 # Error Handler
 require 'redbreast/error_handler'

data/lib/redbreast/commands/color_generator.rb

@@ -39,6 +39,9 @@ module Redbreast
         when 'swift'
           serializer = Redbreast::Serializer::Swift
           template_generator = Redbreast::TemplateGenerator::Color::Swift
+        when 'swiftui'
+          serializer = Redbreast::Serializer::SwiftUI
+          template_generator = Redbreast::TemplateGenerator::Color::SwiftUI
         end
         serializer.new(color_names, bundle, app_name).save(output_source_path: output_path, template_generator: template_generator.new, generate_colors: true)
       end

data/lib/redbreast/commands/color_test_generator.rb

@@ -41,6 +41,9 @@ module Redbreast
         when 'swift'
           serializer = Redbreast::Serializer::Swift
           template_generator = Redbreast::TemplateGenerator::ColorTest::Swift
+        when 'swiftui'
+          serializer = Redbreast::Serializer::SwiftUI
+          template_generator = Redbreast::TemplateGenerator::ColorTest::SwiftUI
         end
         serializer.new(color_names, bundle, app_name).save(output_source_path: output_path, template_generator: template_generator.new, generate_colors: true)
 

data/lib/redbreast/commands/image_generator.rb

@@ -39,6 +39,9 @@ module Redbreast
         when 'swift'
           serializer = Redbreast::Serializer::Swift
           template_generator = Redbreast::TemplateGenerator::Image::Swift
+        when 'swiftui'
+          serializer = Redbreast::Serializer::SwiftUI
+          template_generator = Redbreast::TemplateGenerator::Image::SwiftUI
         end
         serializer.new(image_names, bundle, app_name).save(output_source_path: output_path, template_generator: template_generator.new, generate_colors: false)
 

data/lib/redbreast/commands/image_test_generator.rb

@@ -41,6 +41,9 @@ module Redbreast
         when 'swift'
           serializer = Redbreast::Serializer::Swift
           template_generator = Redbreast::TemplateGenerator::ImageTest::Swift
+        when 'swiftui'
+          serializer = Redbreast::Serializer::SwiftUI
+          template_generator = Redbreast::TemplateGenerator::ImageTest::SwiftUI
         end
         serializer.new(image_names, bundle, app_name).save(output_source_path: output_path, template_generator: template_generator.new, generate_colors: false)
 

data/lib/redbreast/commands/setup.rb

@@ -56,7 +56,7 @@ module Redbreast
       # Language
 
       def language_prompt
-        languages = { 'Swift' => 'swift', 'Objective-C' => 'objc' }
+        languages = { 'Swift' => 'swift', 'SwiftUI' => 'swiftui', 'Objective-C' => 'objc', }
         prompt.select('Choose a language: ', languages)
       end
 
@@ -76,6 +76,8 @@ module Redbreast
           prompt.ask(prompt_text, default: 'mainBundle')
         when 'swift'
           prompt.ask(prompt_text, default: 'main')
+        when 'swiftui'
+          prompt.ask(prompt_text, default: 'main')
         end
       end
 
@@ -85,6 +87,8 @@ module Redbreast
           "[NSBundle #{bundle_name}]"
         when 'swift'
           ".#{bundle_name}"
+        when 'swiftui'
+          ".#{bundle_name}"
         end
       end
 
@@ -97,6 +101,8 @@ module Redbreast
           prompt.ask(prompt_text, default: './Common/Categories/Images')
         when 'swift'
           prompt.ask(prompt_text, default: './Common/Extensions/UIImageExtension.swift')
+        when 'swiftui'
+          prompt.ask(prompt_text, default: './Common/Extensions/ImageExtension.swift')
         end
       end
 
@@ -109,6 +115,8 @@ module Redbreast
           prompt.ask(prompt_text, default: './Common/Categories/Colors')
         when 'swift'
           prompt.ask(prompt_text, default: './Common/Extensions/UIColorExtension.swift')
+        when 'swiftui'
+          prompt.ask(prompt_text, default: './Common/Extensions/ColorExtension.swift')
         end
       end
 
@@ -125,6 +133,8 @@ module Redbreast
           prompt.ask(prompt_text, default: './Common/Categories/ImagesTest')
         when 'swift'
           prompt.ask(prompt_text, default: './Common/Extensions/UIImageExtensionTest.swift')
+        when 'swiftui'
+          prompt.ask(prompt_text, default: './Common/Extensions/ImageExtensionTest.swift')
         end
       end
 
@@ -135,6 +145,8 @@ module Redbreast
           prompt.ask(prompt_text, default: './Common/Categories/ColorsTest')
         when 'swift'
           prompt.ask(prompt_text, default: './Common/Extensions/UIColorExtensionTest.swift')
+        when 'swiftui'
+          prompt.ask(prompt_text, default: './Common/Extensions/ColorExtensionTest.swift')
         end
       end
 
@@ -144,6 +156,8 @@ module Redbreast
           nil
         when 'swift'
           prompt.ask("Please enter a name that will be used for testable import in #{bundle} bundle?", default: "#{app_name}", required: true)
+        when 'swiftui'
+          prompt.ask("Please enter a name that will be used for testable import in #{bundle} bundle?", default: "#{app_name}", required: true)
         end
       end
 

data/lib/redbreast/io/config.rb

@@ -2,7 +2,7 @@ module Redbreast
   module IO
     # Used for reading and writing to config file
     class Config
-      CONFIG_FILE_PATH = "#{Dir.pwd}/.redbrest.yml"
+      CONFIG_FILE_PATH = "#{Dir.pwd}/.redbreast.yml"
 
       class << self
         def write(data)

data/lib/redbreast/serializers/swift_serializer.rb

@@ -23,6 +23,7 @@ module Redbreast
         vars, arr = generate_variables(names: names, spacing: spacing, indentation: indentation, variable: variable, bundle: bundle, text: text, array: arr)
 
         arr = arr.uniq
+        #text += indentation.empty? && text.empty? ? "\n" : ''
         arr.each do |enum_name|
           names_new = []
           names_new_enum = []
@@ -44,7 +45,7 @@ module Redbreast
 
           text += "\n" + spacing + '}' + "\n"
         end
-        text = vars
+        text + vars
       end
 
       def generate_extension(extended_class, app_name)

data/lib/redbreast/serializers/swiftui_serializer.rb

@@ -0,0 +1,107 @@
+require_relative 'serializer' 
+
+module Redbreast
+  module Serializer
+    # Used to save swift files
+    class SwiftUI < Base
+      include Helper::General
+
+      def save(output_source_path:, template_generator:, generate_colors:)
+        directory = File.dirname(output_source_path)
+        FileUtils.mkdir_p directory unless File.exist? directory
+
+        file = ERB.new(template_generator.template, nil, '-').result(binding)
+        File.write(output_source_path, file)
+      end
+
+      def generate_file_swift(names:, spacing: "\t", indentation: '', variable:, bundle:)
+        return if names.empty?
+
+        text = ''
+        arr = []
+
+        vars, arr = generate_variables(names: names, spacing: spacing, indentation: indentation, variable: variable, bundle: bundle, text: text, array: arr)
+
+        arr = arr.uniq
+        #text += indentation.empty? && text.empty? ? "\n" : ''
+        arr.each do |enum_name|
+          names_new = []
+          names_new_enum = []
+          new_enum_name = enum_name
+
+          text += "\n" + spacing + 'enum ' + enum_name + ' {'
+          names_new, names_new_enum = separate_variables_from_folders(names: names, enum_name: enum_name, new_enum_name: new_enum_name, names_new_enum: names_new_enum, names_new: names_new)
+
+          if !names_new_enum.empty? && new_enum_name == enum_name
+            indentation += indentation.empty? || indentation[-1] == '/' ? '' : '/'
+            text += "\n" + generate_file_swift(names: names_new_enum, spacing: spacing + "\t", indentation: indentation + enum_name, variable: variable, bundle: bundle)
+          end
+
+          unless names_new.empty?
+
+            indentation += indentation.empty? || indentation[-1] == '/' ? '' : '/'
+            text += generate_file_swift(names: names_new, spacing: spacing + "\t", indentation: indentation + enum_name, variable: variable, bundle: bundle)
+          end
+
+          text += "\n" + spacing + '}' + "\n"
+        end
+        text + vars
+      end
+
+      def generate_extension(extended_class, app_name)
+        text = 'extension ' + extended_class + " {\n"
+
+        return text if app_name.nil? || app_name.empty?
+
+        text + "\tenum " + app_name + " {}\n}\n\nextension " + extended_class + '.' + app_name + " {"
+      end
+
+      def create_swift_test_cases(names:, declaration:, app_name:)
+        text = ''
+        app_name_text = app_name.nil? || app_name.empty? ? '' : app_name + '.'
+
+        names.each do |name|
+          temp_array = name.split('/')
+          variable = temp_array.pop
+          additional_text = temp_array.count.zero? ? '' : '.'
+          text += "\t\t" + declaration + app_name_text + temp_array.join('.') + additional_text + clean_variable_name(variable)
+          text += name == names.last ? '' : "\n"
+        end
+
+        text
+      end
+
+      def generate_variables(names:, spacing:, indentation:, bundle:, variable:, text:, array:)
+        names.each do |name|
+          temp_arr = name.split('/')
+
+          if temp_arr.length != 1
+            array.push(temp_arr.first)
+          else
+            name_prefix = indentation.empty? ? '' : '/'
+            text += "\n" + spacing + variable % [clean_variable_name(name), indentation + name_prefix + name, bundle[:reference]]
+          end
+        end
+
+        [text, array]
+      end
+
+      def separate_variables_from_folders(names:, enum_name:, new_enum_name:, names_new_enum:, names_new:)
+        names.each do |name|
+          temp_arr = name.split('/')
+
+          next if temp_arr.length == 1
+
+          if temp_arr.length > 2
+            names_new_enum.push(temp_arr.drop(1).join('/')) if temp_arr.first == new_enum_name
+            next
+          end
+
+          names_new.push(temp_arr.drop(1).join('/')) if temp_arr[0] == enum_name
+        end
+
+        [names_new, names_new_enum]
+      end
+    end
+  end
+end

data/lib/redbreast/template_generators/colors/swift_colors_template_generator.rb

@@ -10,7 +10,8 @@ module Redbreast
           <<~TEMPLATE
             import UIKit
 
-            //THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+            // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+            // swiftlint:disable file_length type_body_length line_length superfluous_disable_command
             <%= generate_extension('UIColor', app_name) %>
             <%= generate_file_swift(names: asset_names, variable: 'static var %s: UIColor { return UIColor(named: "%s", in: %s, compatibleWith: nil)! }', bundle: bundle) %>
             }

data/lib/redbreast/template_generators/colors/swiftui_colors_template_generator.rb

@@ -0,0 +1,23 @@
+require_relative '../swiftui_template_generator' 
+
+module Redbreast
+  module TemplateGenerator
+    module Color
+      # Used for creating colors in swift.
+      class SwiftUI < TemplateGenerator::SwiftUI
+        include ERB::Util
+        def template
+          <<~TEMPLATE
+            import SwiftUI
+
+            // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+            // swiftlint:disable file_length type_body_length line_length superfluous_disable_command
+            <%= generate_extension('Color', app_name) %>
+            <%= generate_file_swift(names: asset_names, variable: 'static var %s: Color { Color("%s", bundle: %s) }', bundle: bundle) %>
+            }
+          TEMPLATE
+        end
+      end
+    end
+  end
+end

data/lib/redbreast/template_generators/images/swift_images_template_generator.rb

@@ -11,7 +11,8 @@ module Redbreast
           <<~TEMPLATE
             import UIKit
 
-            //THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+            // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+            // swiftlint:disable file_length type_body_length line_length superfluous_disable_command
             <%= generate_extension('UIImage', app_name) %>
             <%= generate_file_swift(names: asset_names, variable: 'static var %s: UIImage { return UIImage(named: "%s", in: %s, compatibleWith: nil)! }', bundle: bundle) %>
             }

data/lib/redbreast/template_generators/images/swiftui_images_template_generator.rb

@@ -0,0 +1,24 @@
+require_relative '../swiftui_template_generator' 
+
+module Redbreast
+  module TemplateGenerator
+    module Image
+      # Used for creating images in swift.
+      class SwiftUI < TemplateGenerator::SwiftUI
+        include ERB::Util
+
+        def template
+          <<~TEMPLATE
+            import SwiftUI
+
+            // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+            // swiftlint:disable file_length type_body_length line_length superfluous_disable_command
+            <%= generate_extension('Image', app_name) %>
+            <%= generate_file_swift(names: asset_names, variable: 'static var %s: Image { Image("%s", bundle: %s) }', bundle: bundle) %>
+            }
+          TEMPLATE
+        end
+      end
+    end
+  end
+end

data/lib/redbreast/template_generators/swiftui_template_generator.rb

@@ -0,0 +1,11 @@
+module Redbreast
+  module TemplateGenerator
+    # Class for creating SwiftUI templates
+    class SwiftUI
+      include ERB::Util
+      def template
+        raise NotImplementedError, 'Abstract Method'
+      end
+    end
+  end
+end

data/lib/redbreast/template_generators/tests/colors/swift_colors_tests_template_generator.rb

@@ -12,7 +12,7 @@ module Redbreast
   import XCTest
   @testable import <%= bundle[:testableImport] %>
 
-  //THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+  // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
   class <%= File.basename(bundle[:outputTestPathColors], ".*") %>: XCTestCase {
 
       func testIfColorsArePresent() {

data/lib/redbreast/template_generators/tests/colors/swiftui_colors_tests_template_generator.rb

@@ -0,0 +1,27 @@
+require 'redbreast/template_generators/swiftui_template_generator'
+
+module Redbreast
+  module TemplateGenerator
+    module ColorTest
+      # Used for creating color tests in swift.
+      class SwiftUI < TemplateGenerator::SwiftUI
+        include ERB::Util
+        def template
+<<~TEMPLATE
+  import SwiftUI
+  import XCTest
+  @testable import <%= bundle[:testableImport] %>
+
+  // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+  class <%= File.basename(bundle[:outputTestPathColors], ".*") %>: XCTestCase {
+
+      func testIfColorsArePresent() {
+  <%= create_swift_test_cases(names: asset_names, declaration: '_ = Color.', app_name: app_name) %>
+      }
+  }
+TEMPLATE
+        end
+      end
+    end
+  end
+end

data/lib/redbreast/template_generators/tests/images/swift_images_tests_template_generator.rb

@@ -12,7 +12,7 @@ module Redbreast
   import XCTest
   @testable import <%= bundle[:testableImport] %>
 
-  //THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+  // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
   class <%= File.basename(bundle[:outputTestPathImages], ".*") %>: XCTestCase {
 
       func testIfImagesArePresent() {

data/lib/redbreast/template_generators/tests/images/swiftui_images_tests_template_generator.rb

@@ -0,0 +1,27 @@
+require 'redbreast/template_generators/swiftui_template_generator'
+
+module Redbreast
+  module TemplateGenerator
+    module ImageTest
+      # Used for creating image tests in swift.
+      class SwiftUI < TemplateGenerator::SwiftUI
+        include ERB::Util
+        def template
+<<~TEMPLATE
+  import SwiftUI
+  import XCTest
+  @testable import <%= bundle[:testableImport] %>
+
+  // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+  class <%= File.basename(bundle[:outputTestPathImages], ".*") %>: XCTestCase {
+
+      func testIfImagesArePresent() {
+    <%= create_swift_test_cases(names: asset_names, declaration: '_ = Image.', app_name: app_name) %>
+      }
+  }
+TEMPLATE
+        end
+      end
+    end
+  end
+end

data/lib/redbreast/version.rb

@@ -1,3 +1,3 @@
 module Redbreast
-  VERSION = '1.0.2'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redbreast
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
 platform: ruby
 authors:
 - Maroje
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,17 +162,23 @@ files:
 - lib/redbreast/serializers/objc_serializer.rb
 - lib/redbreast/serializers/serializer.rb
 - lib/redbreast/serializers/swift_serializer.rb
+- lib/redbreast/serializers/swiftui_serializer.rb
 - lib/redbreast/template_generators/.DS_Store
 - lib/redbreast/template_generators/colors/objc_colors_template_generator.rb
 - lib/redbreast/template_generators/colors/swift_colors_template_generator.rb
+- lib/redbreast/template_generators/colors/swiftui_colors_template_generator.rb
 - lib/redbreast/template_generators/images/objc_images_template_generator.rb
 - lib/redbreast/template_generators/images/swift_images_template_generator.rb
+- lib/redbreast/template_generators/images/swiftui_images_template_generator.rb
 - lib/redbreast/template_generators/objc_template_generator.rb
 - lib/redbreast/template_generators/swift_template_generator.rb
+- lib/redbreast/template_generators/swiftui_template_generator.rb
 - lib/redbreast/template_generators/tests/colors/objc_colors_tests_template_generator.rb
 - lib/redbreast/template_generators/tests/colors/swift_colors_tests_template_generator.rb
+- lib/redbreast/template_generators/tests/colors/swiftui_colors_tests_template_generator.rb
 - lib/redbreast/template_generators/tests/images/objc_images_tests_template_generator.rb
 - lib/redbreast/template_generators/tests/images/swift_images_tests_template_generator.rb
+- lib/redbreast/template_generators/tests/images/swiftui_images_tests_template_generator.rb
 - lib/redbreast/version.rb
 - redbreast.gemspec
 homepage: https://github.com/infinum/redbreast