redbreast 1.1.2 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4333c7695d94182141a09737fe4d5c298f2c7f48ef2b0235170436cb1746f41d
-  data.tar.gz: b2616e3e40e1958b58cae329046e25c3619903dd90b93af89c59da8242d34205
+  metadata.gz: 6aca71fbf8dac645718a3761e8ea63d558da0408e164f3b76719c71033a998b0
+  data.tar.gz: 259911278e8748361af3ca309e0b737725b059f5ea2d325b129f1ad28d039942
 SHA512:
-  metadata.gz: ac62100673841d410911b49bb8dfa6c2d2992ecaec3b0fac8371a8af3c6f592e907809abfbc54d6673f8e450976017ec1d47f23dae352efa69011d3cac560885
-  data.tar.gz: fdccea173c982b8969ee4d5cfcf4377ec615cf84b7137503a3120bcf2bd9a66541eb13a7925da21a1a215dc40b9ae631f287c238f01a9bc7331bdb9b6049e9dc
+  metadata.gz: 55b2b2c6be72a7c22caa55a307ae1b1f4cb2baf13912fccc3c66d781503938a7ea36a90402d8cf9737cf1a7ebd9fbb653088bb56bbec46a7837ce1da497bee3b
+  data.tar.gz: '078a5708d06c491efd4c75afcdf80c1fc3026ec5365fa1ed0955a49afb974ce32e909cc1b20d14996f7aecc39b7f8ef7c8d649779d5706096cd4fdd79a9001d3'

data/.gitignore

@@ -10,3 +10,37 @@
 
 # rspec failure tracking
 .rspec_status
+
+# Created by https://www.toptal.com/developers/gitignore/api/macos
+# Edit at https://www.toptal.com/developers/gitignore?templates=macos
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# End of https://www.toptal.com/developers/gitignore/api/macos

data/.ruby-version

@@ -0,0 +1 @@
+2.7.0

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.1
-before_install: gem install bundler -v 1.14.6
+  - 2.7.0
+before_install: gem install bundler -v 2.3.4

data/lib/redbreast/serializers/swift_serializer.rb

@@ -5,6 +5,7 @@ module Redbreast
     # Used to save swift files
     class Swift < Base
       include Helper::General
+      SPACER = "    "
 
       def save(output_source_path:, template_generator:, generate_colors:)
         directory = File.dirname(output_source_path)
@@ -14,7 +15,7 @@ module Redbreast
         File.write(output_source_path, file)
       end
 
-      def generate_file_swift(names:, spacing: "\t", indentation: '', variable:, bundle:)
+      def generate_file_swift(names:, spacing: SPACER, indentation: '', variable:, bundle:)
         return if names.empty?
 
         text = ''
@@ -22,25 +23,25 @@ module Redbreast
 
         vars, arr = generate_variables(names: names, spacing: spacing, indentation: indentation, variable: variable, bundle: bundle, text: text, array: arr)
 
-        arr = arr.uniq
+        arr = arr.uniq.sort_by(&:downcase)
 
         arr.each do |enum_name|
           names_new = []
           names_new_enum = []
           new_enum_name = enum_name
 
-          text += "\n" + spacing + 'enum ' + upper_camel_case(enum_name) + ' {'
+          text += "\n" + spacing + 'public enum ' + upper_camel_case(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)
+            text += "\n" + generate_file_swift(names: names_new_enum, spacing: spacing + SPACER, 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)
+            text += generate_file_swift(names: names_new, spacing: spacing + SPACER, indentation: indentation + enum_name, variable: variable, bundle: bundle)
           end
 
           text += "\n" + spacing + '}' + "\n"
@@ -49,11 +50,11 @@ module Redbreast
       end
 
       def generate_extension(extended_class, app_name)
-        text = 'extension ' + extended_class + " {\n"
+        text = 'public extension ' + extended_class + " {\n"
 
         return text if app_name.nil? || app_name.empty?
 
-        text + "\tenum " + app_name + " {}\n}\n\nextension " + extended_class + '.' + app_name + " {"
+        text + SPACER + "enum " + app_name + " {}\n}\n\nextension " + extended_class + '.' + app_name + " {"
       end
 
       def create_swift_test_cases(names:, declaration:, app_name:)
@@ -65,7 +66,7 @@ module Redbreast
           variable = temp_array.pop
           additional_text = temp_array.count.zero? ? '' : '.'
 
-          text += "\t\t" + declaration + app_name_text + temp_array.map { |enum| upper_camel_case(enum) }.join('.') + additional_text + clean_variable_name(variable)
+          text += SPACER + SPACER + declaration + app_name_text + temp_array.map { |enum| upper_camel_case(enum) }.join('.') + additional_text + clean_variable_name(variable)
           text += name == names.last ? '' : "\n"
         end
 
@@ -73,7 +74,7 @@ module Redbreast
       end
 
       def generate_variables(names:, spacing:, indentation:, bundle:, variable:, text:, array:)
-        names.each do |name|
+        names.sort_by(&:downcase).each do |name|
           temp_arr = name.split('/')
 
           if temp_arr.length != 1

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

@@ -13,7 +13,7 @@ module Redbreast
             // 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) %>
+            <%= generate_file_swift(names: asset_names, variable: 'public static var %s: UIColor { return UIColor(named: "%s", in: %s, compatibleWith: nil)! }', bundle: bundle) %>
             }
           TEMPLATE
         end

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

@@ -14,7 +14,7 @@ module Redbreast
             // 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) %>
+            <%= generate_file_swift(names: asset_names, variable: 'public static var %s: Image { Image("%s", bundle: %s) }', bundle: bundle) %>
             }
           TEMPLATE
         end

data/lib/redbreast/version.rb

@@ -1,3 +1,3 @@
 module Redbreast
-  VERSION = '1.1.2'
+  VERSION = '1.2.2'
 end

data/redbreast.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 2.3'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.77'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redbreast
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.2
 platform: ruby
 authors:
 - Maroje
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -130,10 +130,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -143,9 +143,7 @@ files:
 - bin/console
 - bin/setup
 - exe/redbreast
-- lib/.DS_Store
 - lib/redbreast.rb
-- lib/redbreast/.DS_Store
 - lib/redbreast/commands/color_generator.rb
 - lib/redbreast/commands/color_test_generator.rb
 - lib/redbreast/commands/configuration_installer.rb
@@ -163,7 +161,6 @@ files:
 - 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
@@ -201,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: A CLI for safe and strongly typed resources