redbreast 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b87d5ad0784aec595012ad081b5b1bb4e269010f61f4e7ceef1357a28f294f0
-  data.tar.gz: 927b1b4b0f14e681f704f6e0265345db2a0bfa0e42f20807b317f32ba6a6c157
+  metadata.gz: 4e4247b8ea9785ed5c37e2d0a46ded030dfeff01c64ceeee4d144d803b23c411
+  data.tar.gz: 2509327fc0ebeb80b802a5e633c4d88b1e416831f3e8ed1fba75f32914148d43
 SHA512:
-  metadata.gz: 4be80f6303152194ae46f3dc222a1704a3c59e56f2fc916595eef3a6edb35b46b513caf522ff526460b59d4f87b776ba8c876e4c649eaa1ef8db16bd58b03f8c
-  data.tar.gz: a5645a6f368a39e1a2e7bfbfbe3a2899c91219b3e5119a7decd60e4291b93f4ab34290565557adc9ae6e4c33f1288146f79bded9d52ca8d126c5c9d98df0b746
+  metadata.gz: 937c6973d5e526e7f516226ece7a23682fecf9f0bd24eefc59b1c13083562a623a66a422846a71d6a79e3dfbb3fea198922252ec3977258dfcf8b40c946b1c04
+  data.tar.gz: 6e8f426eee7cd8ec036e866f546c4f87e702143edef687fdbc6af51766f479ef2dc0d98c162b3e458696c6f53aafffc61a349ec98f624d2c02d4ef187517e45d

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

@@ -38,7 +38,7 @@ module Redbreast
             outputSourcePathColors: output_source_path_colors,
             outputTestPathImages: output_test_path_images,
             outputTestPathColors: output_test_path_colors,
-            testableImport: include_tests ? testable_import_prompt(bundle, language) : nil
+            testableImport: include_tests ? testable_import_prompt(bundle, app_name, language) : nil
           }
           compact fields
         end
@@ -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/UIColorExtension.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,15 +145,19 @@ 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
 
-      def testable_import_prompt(bundle, language)
+      def testable_import_prompt(bundle, app_name, language)
         case language
         when 'objc'
           nil
         when 'swift'
-          prompt.ask("Please enter testable import name for bundle #{bundle}?", required: true)
+          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

@@ -20,10 +20,10 @@ module Redbreast
         text = ''
         arr = []
 
-        text, arr = generate_variables(names: names, spacing: spacing, indentation: indentation, variable: variable, bundle: bundle, text: text, array: 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" : ''
+        #text += indentation.empty? && text.empty? ? "\n" : ''
         arr.each do |enum_name|
           names_new = []
           names_new_enum = []
@@ -40,12 +40,12 @@ module Redbreast
           unless names_new.empty?
 
             indentation += indentation.empty? || indentation[-1] == '/' ? '' : '/'
-            text += "\n" + generate_file_swift(names: names_new, spacing: spacing + "\t", indentation: indentation + enum_name, variable: variable, bundle: bundle)
+            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
+        text + vars
       end
 
       def generate_extension(extended_class, app_name)
@@ -53,7 +53,7 @@ module Redbreast
 
         return text if app_name.nil? || app_name.empty?
 
-        text + "\tenum " + app_name + " {}\n}\n\nextension " + extended_class + '.' + app_name + " {\n"
+        text + "\tenum " + app_name + " {}\n}\n\nextension " + extended_class + '.' + app_name + " {"
       end
 
       def create_swift_test_cases(names:, declaration:, app_name:)
@@ -79,9 +79,7 @@ module Redbreast
             array.push(temp_arr.first)
           else
             name_prefix = indentation.empty? ? '' : '/'
-            text += spacing + variable % [clean_variable_name(name), indentation + name_prefix + name, bundle[:reference]]
-            #text += spacing + declaration + clean_variable_name(name) + type + indentation + name_prefix + name + var_end + bundle[:reference] + line_end
-            text += name == names.last ? '' : "\n"
+            text += "\n" + spacing + variable % [clean_variable_name(name), indentation + name_prefix + name, bundle[:reference]]
           end
         end
 

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,7 @@ module Redbreast
           <<~TEMPLATE
             import UIKit
 
-            //THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+            // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
             <%= 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,22 @@
+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
+            <%= 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,7 @@ module Redbreast
           <<~TEMPLATE
             import UIKit
 
-            //THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+            // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
             <%= 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,23 @@
+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
+            <%= 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.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redbreast
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Maroje
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-10 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - maroje.marcelic@infinum.com
 executables:
@@ -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
@@ -180,7 +186,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -195,8 +201,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A CLI for safe and strongly typed resources
 test_files: []