redbreast 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0af297ef6e37a2914f39cefda66be835e4d8550728f87faebf68748843ba0e8d
-  data.tar.gz: c2b0b4251ae80070c635453c9988eec30d285e2a3e7cab4607a14aa10f54d220
+  metadata.gz: c480f664a7236aa040c135bbb0ac9ab3b0094079def7706d52e622f8761e50fe
+  data.tar.gz: 7d0c140bd021d378e57c10bc83bd46bef2c18cf47df4805d82b2f45a970fcbe0
 SHA512:
-  metadata.gz: 7af2661161d5e3b4c6fd4764d4836065eb136494dbb70ff0767c51cb847ab66f9c6c631429267072a74fb255f22baa17bab18f95d7813ef287a21278a4d01690
-  data.tar.gz: 806e793afb6fe385b2207b96cc60bf239f58f249d1da38d048bd5f884c9d9ff3e76436dd124c0b983f06845898548040afff714b8be3353091daec87f2ea0d28
+  metadata.gz: 4e189fc86aa4bb2908217306485a6a1a42d79347934f46b132e32b97111084508799363c6e4b23528b229778227a13f44ce1fb90ca9c344c5ee2ff778679784d
+  data.tar.gz: e44abf29a209555d579a51d8cbbf9651f5c41b77d4a348c933b612992423aa8b83fb6631ff6b26f432ae74c0fba77c23a65e625034cadd33e5ddca41e3800e6d

data/lib/redbreast/commands/setup.rb

@@ -18,11 +18,11 @@ module Redbreast
       end
 
       def call
-        language = language_prompt
         app_name = app_name_prompt
-        bundle_names = bundle_names_prompt(language).split(' ')
-        assets_types = assets_types_prompt
+        bundle_names = bundle_names_prompt().split(' ')
         bundles = bundle_names.map do |bundle|
+          language = language_prompt(bundle)
+          assets_types = assets_types_prompt(bundle)
           reference = bundle_reference(bundle, language)
           assets_search_path = assets_search_path_prompt(bundle)
           output_source_path_images = assets_types == 1 ? nil : images_sources_path_prompt(bundle, language)
@@ -31,6 +31,7 @@ module Redbreast
           output_test_path_images = assets_types != 1 && include_tests ? images_tests_path_prompt(bundle, language) : nil
           output_test_path_colors = assets_types != 0 && include_tests ? colors_tests_path_prompt(bundle, language) : nil
           fields = {
+            language: language,
             name: bundle,
             reference: reference,
             assetsSearchPath: assets_search_path,
@@ -43,7 +44,6 @@ module Redbreast
           compact fields
         end
         config = {
-          language: language,
           bundles: bundles,
           app_name: app_name
         }
@@ -55,9 +55,9 @@ module Redbreast
 
       # Language
 
-      def language_prompt
+      def language_prompt(bundle)
         languages = { 'Swift' => 'swift', 'SwiftUI' => 'swiftui', 'Objective-C' => 'objc', }
-        prompt.select('Choose a language: ', languages)
+        prompt.select("Choose a language for bundle #{bundle}: ", languages)
       end
 
       # Assets source path
@@ -69,16 +69,9 @@ module Redbreast
 
       # Bundle names promt
 
-      def bundle_names_prompt(language)
-        prompt_text = 'Please enter bundle names that you use separated by spaces'
-        case language
-        when 'objc'
-          prompt.ask(prompt_text, default: 'mainBundle')
-        when 'swift'
-          prompt.ask(prompt_text, default: 'main')
-        when 'swiftui'
-          prompt.ask(prompt_text, default: 'main')
-        end
+      def bundle_names_prompt()
+        prompt_text = 'Please enter bundle names that you use separated by spaces. For Obj-C use mainBundle.'
+        prompt.ask(prompt_text, default: 'main')
       end
 
       def bundle_reference(bundle_name, language)
@@ -95,7 +88,7 @@ module Redbreast
       # Images source path
 
       def images_sources_path_prompt(bundle, language)
-        prompt_text = "Where would you like to store images resources files for bundle #{bundle}?"
+        prompt_text = "Where would you like to store image resources files for bundle #{bundle}?"
         case language
         when 'objc'
           prompt.ask(prompt_text, default: './Common/Categories/Images')
@@ -109,7 +102,7 @@ module Redbreast
       # Colors source path
 
       def colors_sources_path_prompt(bundle, language)
-        prompt_text = "Where would you like to store colors resources files for bundle #{bundle}?"
+        prompt_text = "Where would you like to store color resources files for bundle #{bundle}?"
         case language
         when 'objc'
           prompt.ask(prompt_text, default: './Common/Categories/Colors')
@@ -127,7 +120,7 @@ module Redbreast
       end
 
       def images_tests_path_prompt(bundle, language)
-        prompt_text = "Where would you like to store tests for bundle #{bundle}?"
+        prompt_text = "Where would you like to store image tests for bundle #{bundle}?"
         case language
         when 'objc'
           prompt.ask(prompt_text, default: './Common/Categories/ImagesTest')
@@ -139,7 +132,7 @@ module Redbreast
       end
 
       def colors_tests_path_prompt(bundle, language)
-        prompt_text = "Where would you like to store tests for bundle #{bundle}?"
+        prompt_text = "Where would you like to store color tests for bundle #{bundle}?"
         case language
         when 'objc'
           prompt.ask(prompt_text, default: './Common/Categories/ColorsTest')
@@ -169,9 +162,9 @@ module Redbreast
 
       # Assets type prompt
 
-      def assets_types_prompt
+      def assets_types_prompt(bundle)
         types = { 'Images' => 0, 'Colors' => 1, 'Both' => 2 }
-        prompt.select('Choose a type: ', types)
+        prompt.select("Choose a type for bundle #{bundle}: ", types)
       end
     end
   end

data/lib/redbreast/version.rb

@@ -1,3 +1,3 @@
 module Redbreast
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redbreast
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Maroje