vsvipergen 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2237d50089bbb1374fe4783be7b0abd6e07da584ec8536f559cff3fa732c8a05
-  data.tar.gz: 95da7c8c0b649e1b9f5777ef200b05b722d84340e93d0fbaa45d01a24fd6660b
+  metadata.gz: 7f552f327f810c4c2a4062820a094842adc7c9f11ab61c733807e7575eca2c85
+  data.tar.gz: baa628bcd652087c7dcf35f99c3da6530158b5520c7152a11be74a6891f84b23
 SHA512:
-  metadata.gz: 9e6a776ed620fc46b68106f3a371dce7c8705bc6a9dc4a982497fd8807a869dc847129ffe853f6b963bcda10a1ba433f46babc6d50c5ef6899b1a2d05aad1819
-  data.tar.gz: 4766da2836e839a3524e31339d7206784a7b6a7adec765cadfa405750620a4ceb021a8a77a609c0fc14696bc0198dd447d93c5ba79a62d898dac990928919b28
+  metadata.gz: f8dff4fbd309c3c7a898e7b798dc03e03caf57eb387e49e6e56759ed0bc6664d7ddfa8bd74b5caba01732298d21764f79d7fd1284b32c355ec0c0ca5a49f10ec
+  data.tar.gz: 197d4d6c066ea0e6aaf3420e80d644a4959302473743b88f36a14e0fe7007a5f4ce0e8afd4eb72f19d0f874462753feff19562c2ea51acc0661b2f529200413d

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    vsvipergen (0.1.3)
+    vsvipergen (0.1.4)
+      colorize (~> 0.8.1)
       xcodeproj (~> 1.7.0)
 
 GEM
@@ -11,6 +12,7 @@ GEM
     atomos (0.1.3)
     claide (1.0.2)
     colored2 (3.1.2)
+    colorize (0.8.1)
     nanaimo (0.2.6)
     rake (10.5.0)
     xcodeproj (1.7.0)
@@ -25,8 +27,10 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.16)
+  colorize (~> 0.8.1)
   rake (~> 10.0)
   vsvipergen!
+  xcodeproj (~> 1.7.0)
 
 BUNDLED WITH
    1.16.2

data/bin/console

@@ -9,6 +9,7 @@ require "vsvipergen_presenter"
 require "vsvipergen_view"
 require "vsvipergen_router"
 require "xcodeproj"
+require "colorize"
 
 #################################################
 ############ handle user input start ############
@@ -29,7 +30,7 @@ end
 
 # objective-c 선택일 경우 프로젝트 파일 이름 입력 요구
 if lang.strip == "objc" || lang.strip == "o" then
-    puts "input project file name [ex:VLunch] :"
+    puts "input xcode project file name [ex:VLunch] :"
     while true
         projectName = gets
     
@@ -38,7 +39,7 @@ if lang.strip == "objc" || lang.strip == "o" then
 end
 
 # 파일 prefix 입력 요구
-puts "input file prefix [ex:type Login for VSLoginViewController(or VSLoginPage), ...] : "
+puts "input file prefix [ex:type" + " Login".yellow + " for VS" + "Login".yellow + "ViewController(or VS" + "Login".yellow + "Page), ...] : "
 filePrefix = gets
 
 if filePrefix == "" then
@@ -47,7 +48,7 @@ end
 
 # objective-c 선택일 경우 모델 prefix 입력 요구
 if lang.strip == "objc" || lang.strip == "o" then
-    puts "input model prefix [ex:type User for VSUserVO] : "
+    puts "input model prefix [ex:type" + " User".yellow + " for VS" + "User".yellow + "VO] : "
     modelPrefix = gets
     
     if modelPrefix == "" then
@@ -65,6 +66,7 @@ end
 ############# create file generator #############
 fileGenerators = []
 generatedFilePaths = []
+subPathAndFilePathHashes = []
 
 generatorFactory = Vsvipergen::ViperGeneratorFactory.new
 generatorFactory.init(filePrefix, modelPrefix, now, year)
@@ -84,6 +86,8 @@ end
 for generator in fileGenerators
     files = generator.makeFiles
 
+    subPathAndFilePathHashes.push(generator.subPathAndFilePathHash)
+
     for file in files
         generatedFilePaths.push(file)
     end
@@ -99,11 +103,39 @@ if lang.strip == "objc" || lang.strip == "o" then
     project = Xcodeproj::Project.open(xcodeProjectFile.strip)
     targets = project.targets
     mainTarget = project.targets.first
-    newGroup = project.new_group(filePrefix.strip)
+    newGroup = project.new_group(filePrefix.strip.downcase)
 
-    # Add a file to the project in the main group
+    # Add files, groups to the project in the main group
     for filePath in generatedFilePaths
-        file = newGroup.new_file(filePath.strip)
+
+        # extract child group name from file path
+        pathArr = filePath.split("/")
+        childGroupName = pathArr[pathArr.count - 2]
+        childGroup = nil
+
+        if childGroupName != "" then
+            # check same child group added to newGroup
+            addChildGroupAlready = false
+            newGroup.groups.each { |group|
+                if group.name == childGroupName then
+                    addChildGroupAlready = true
+                    childGroup = group
+                end
+            }
+
+            # add child group to newGroup
+            if addChildGroupAlready == false then
+                puts "add child group : #{childGroupName}"
+                childGroup = newGroup.new_group(childGroupName)
+            end
+
+            # Add file to child group
+            file = childGroup.new_file(filePath.strip)
+        else
+            puts "could not extract child group name from file path, add file to parent group(#{newGroup.name})".red
+            # Add file to new group
+            file = newGroup.new_file(filePath.strip)
+        end
 
         # Add the file to the main target
         mainTarget.add_file_references([file])

data/exe/vsvipergen

@@ -8,6 +8,7 @@ require "vsvipergen_presenter"
 require "vsvipergen_view"
 require "vsvipergen_router"
 require "xcodeproj"
+require "colorize"
 
 #################################################
 ############ handle user input start ############
@@ -28,7 +29,7 @@ end
 
 # objective-c 선택일 경우 프로젝트 파일 이름 입력 요구
 if lang.strip == "objc" || lang.strip == "o" then
-    puts "input project file name [ex:VLunch] :"
+    puts "input xcode project file name [ex:VLunch] :"
     while true
         projectName = gets
     
@@ -37,7 +38,7 @@ if lang.strip == "objc" || lang.strip == "o" then
 end
 
 # 파일 prefix 입력 요구
-puts "input file prefix [ex:type Login for VSLoginViewController(or VSLoginPage), ...] : "
+puts "input file prefix [ex:type" + " Login".yellow + " for VS" + "Login".yellow + "ViewController(or VS" + "Login".yellow + "Page), ...] : "
 filePrefix = gets
 
 if filePrefix == "" then
@@ -46,7 +47,7 @@ end
 
 # objective-c 선택일 경우 모델 prefix 입력 요구
 if lang.strip == "objc" || lang.strip == "o" then
-    puts "input model prefix [ex:type User for VSUserVO] : "
+    puts "input model prefix [ex:type" + " User".yellow + " for VS" + "User".yellow + "VO] : "
     modelPrefix = gets
     
     if modelPrefix == "" then
@@ -98,11 +99,39 @@ if lang.strip == "objc" || lang.strip == "o" then
     project = Xcodeproj::Project.open(xcodeProjectFile.strip)
     targets = project.targets
     mainTarget = project.targets.first
-    newGroup = project.new_group(filePrefix.strip)
+    newGroup = project.new_group(filePrefix.strip.downcase)
 
-    # Add a file to the project in the main group
+    # Add files, groups to the project in the main group
     for filePath in generatedFilePaths
-        file = newGroup.new_file(filePath.strip)
+
+        # extract child group name from file path
+        pathArr = filePath.split("/")
+        childGroupName = pathArr[pathArr.count - 2]
+        childGroup = nil
+
+        if childGroupName != "" then
+            # check same child group added to newGroup
+            addChildGroupAlready = false
+            newGroup.groups.each { |group|
+                if group.name == childGroupName then
+                    addChildGroupAlready = true
+                    childGroup = group
+                end
+            }
+
+            # add child group to newGroup
+            if addChildGroupAlready == false then
+                puts "add child group : #{childGroupName}"
+                childGroup = newGroup.new_group(childGroupName)
+            end
+
+            # Add file to child group
+            file = childGroup.new_file(filePath.strip)
+        else
+            puts "could not extract child group name from file path, add file to parent group(#{newGroup.name})".red
+            # Add file to new group
+            file = newGroup.new_file(filePath.strip)
+        end
 
         # Add the file to the main target
         mainTarget.add_file_references([file])

data/lib/templates/VS<$$>Contracts.h

@@ -10,23 +10,23 @@
 #import <UIKit/UIKit.h>
 #import "VS<$modelPrefix$>VO.h"
 
-// view -> presenter
+// presenter 클래스가 구현해야 할 프로토콜 : view 클래스가 호출
 @protocol I<$prefix$>PresenterForView <NSObject>
 @end
 
-// presenter -> view
+// view 클래스가 구현해야 할 프로토콜 : presenter 클래스가 호출
 @protocol I<$prefix$>ViewForPresenter <NSObject>
 @end
 
-// presenter -> Interactor
+// interactor 클래스가 구현해야 할 프로토콜 : presenter 클래스가 호출
 @protocol I<$prefix$>InteractorForPresenter <NSObject>
 @end
 
-// interactor -> presenter
+// presenter 클래스가 구현해야 할 프로토콜 : interactor 클래스가 호출
 @protocol I<$prefix$>PresenterForInteractor <NSObject>
 @end
 
-// router
+// router 클래스가 구현해야 할 프로토콜 : 외부 viper 모듈에서 호출
 @protocol I<$prefix$>Router <NSObject>
 + (UIViewController *)create<$prefix$>Module;
 @end

data/lib/templates/view/VS<$$>ViewController.h

@@ -10,5 +10,5 @@
 #import "VS<$prefix$>Contracts.h"
 
 @interface VS<$prefix$>ViewController : UIViewController <I<$prefix$>ViewForPresenter>
-@property (nonatomic, weak) id<I<$prefix$>PresenterForView> presenter;
+@property (nonatomic, strong) id<I<$prefix$>PresenterForView> presenter;
 @end

data/lib/vsvipergen/version.rb

@@ -1,3 +1,3 @@
 module Vsvipergen
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/vsvipergen_contracts.rb

@@ -56,7 +56,7 @@ module Vsvipergen
       templateJavaFileContents.gsub! "<$now$>", now.strip
       templateJavaFileContents.gsub! "<$year$>", year.strip
       templateJavaFileContents.gsub! "<$prefix$>", prefix.strip
-
+      
       ViperFileWriter.new.writeFile(newJavaFilePath, templateJavaFileContents)
     end
   end

data/vsvipergen.gemspec

@@ -34,6 +34,10 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'xcodeproj', '~> 1.7.0'
+  spec.add_development_dependency 'colorize', '~> 0.8.1'
+
   # spec.add_development_dependency "rpec", "~> 3.0"
   spec.add_runtime_dependency 'xcodeproj', '~> 1.7.0'
+  spec.add_runtime_dependency 'colorize', '~> 0.8.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vsvipergen
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - vendys-choohyoung
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: xcodeproj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 description: generating VS<$prefix$>Protocol.h, VS<$prefix$>ViewController.h, VS<$prefix$>ViewController.m,
   VS<$prefix$>Presenter.h, VS<$prefix$>Presenter.m, VS<$prefix$>Interactor.h, VS<$prefix$>Interactor.m,
   VS<$prefix$>Router.h, VS<$prefix$>Router.m