mvcgen 0.1.14 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 751e9be161142a542aa1b6476c958c9e9992fe35
-  data.tar.gz: 8e113bc4776a6c07e6c181d30871bcfc476f220e
+  metadata.gz: 527aae911488c059b370377b568eb048100bef88
+  data.tar.gz: 20d4c574b8e76bbabd3bb910f3fc87de6b2022f0
 SHA512:
-  metadata.gz: 54df0effd6c136733b1fbcf8756d0213dd76162840ee6eb04088a14a4258ff78b5d483a95c20a23e7a1825a93e0573c87cf6cb30a5dcfdb1385e41fb0a322773
-  data.tar.gz: a10b148bb0567ddcc2e66a0857b5b7841455561518245fefbd006e052f0e25921ab0998f2c00ecb50302840f723a1264252c85c0f6ec8fd41dac4c5d595278e1
+  metadata.gz: 1e39f86088333a7f5293c923c330f3dfc12fce17677cabb026d832ee1d6b3098988d5d43b3b2c0fcc60af4f356c18a250b828ccefc717e88c2aadd2ea9dbb441
+  data.tar.gz: e5678b20e1f644360626037b64c0a18168f35953bb92e9a7fc1dfb6f5a6b76328e8357c705cc6e15679baf6a3f1a1aa6de52d53630fa92ad3a7e1b6a3ce1da0e

data/lib/mvcgen/filemanager.rb

@@ -39,7 +39,7 @@ module MVCgen
 			to_expand_path = File.expand_path(to)
 			from_expand_path = File.expand_path(from)
 			FileUtils.mkdir_p (to_expand_path)
-			FileUtils.copy_entry(from_expand_path, to_expand_path)	
+			FileUtils.copy_entry(from_expand_path, to_expand_path, remove_destination = true)	
 		end
 
 		# Move a system item to another place

data/lib/mvcgen/generator.rb

@@ -5,30 +5,23 @@ module MVCgen
 	# Cosntants
 	class Generator
 		# Constants
-		LANGUAGES = ["swift"]
-		REPLACEMENT_KEY = "MVC"
+		LANGUAGES = ["swift", "podfile"]
+		REPLACEMENT_KEY = "MVCGEN"
 
-		def self.create_xcode_project(template, language, name, path)
-			puts "Create Xcode Project"
-			puts "Template: #{template}"
-			puts "Language: #{language}"
-			puts "Name: #{name}"
-			puts "Path: #{path}"
-			proj = Xcodeproj::Project.new("#{path}/#{name}.xcodeproj")
-			app_target = proj.new_target(:application, "#{name} - Development", :ios, '10.0')
-			# header_ref = proj.main_group.new_file('./Class.h')
-			# implm_ref = proj.main_group.new_file('./Class.m')
-			basefiles_path = "#{Gem.dir}/gems/#{MVCgen::NAME}-#{MVCgen::VERSION}/lib/basexcodetemplate"
-			to_path =  "#{path}/#{name}"
-			MVCgen::FileManager.copy(basefiles_path, to_path)
-			files = MVCgen::FileManager.files_in_path(to_path)
-			self.addxcodefiles(to_path,proj.main_group,app_target)
-			# app_target.add_file_references([files])
-			proj.save
-			# podfile_path = "#{Gem.dir}/gems/#{MVCgen::NAME}-#{MVCgen::VERSION}/lib/podfile/Podfile"
-			# to_path =  "#{path}/#{name}"
+		def self.add_to_xcode(path, name, filespath)
+			puts "Adding files to xcode project..."
+			# proj = Xcodeproj::Project.new("#{path}/#{name}.xcodeproj")
+			# app_target_dev = proj.new_target(:application, "#{name} - Development", :ios, '10.0')
+			# header_ref = proj.main_group.new_file('./Class.swift')
+
+			project_file = "#{path}/#{name}.xcodeproj"
+			proj = Xcodeproj::Project.open(project_file)
 
-			# MVCgen::FileManager.copy(podfile_path, to_path)
+			# TODO: view this to improve path files: allowable_project_paths
+			self.addxcodefiles(filespath,proj.main_group,proj.targets.first)
+			
+			proj.save
+			puts "Finish adding files"
 		end
 
 		def self.addxcodefiles(direc, current_group, main_target)
@@ -38,9 +31,9 @@ module MVCgen
 					new_folder = File.basename(item)
 					created_group = current_group.new_group(new_folder)
 					self.addxcodefiles("#{item}/*", created_group, main_target)
-				# elsif item.include? ".xcassets"
-				# 	i = current_group.new_reference(item)
-					# main_target.add_file_references([item])
+				elsif item == "Assets.xcassets"
+					main_target.add_frameworks_bundles([item])
+					break
 				else 
 				  i = current_group.new_file(item)
 				  main_target.add_file_references([i])
@@ -51,17 +44,26 @@ module MVCgen
 		# Main method that generate the MVC files structure
 		def self.generate_mvc(template, language, name, path)
 
-			self.create_xcode_project(template, language, name, path)
 			puts "Generating MVC-Module"
-			# puts "Template: #{template}"
-			# puts "Language: #{language}"
-			# puts "Name: #{name}"
-			# puts "Path: #{path}"
+			puts "Template: #{template}"
+			puts "Language: #{language}"
+			puts "Name: #{name}"
+			puts "Path: #{path}"
+
+			# Copy language files to project folder
 			path_from = MVCgen::FileManager.path_from(template, language)
 			path_to = MVCgen::FileManager.destination_mvc_path(path, name)
 			MVCgen::FileManager.copy(path_from, path_to)
-			files = MVCgen::FileManager.files_in_path(path_to)
+
+			# Copy podfile to project folder
+			podfile_path = MVCgen::FileManager.path_from(template, "podfile")
+			expand_path = File.expand_path(path)
+			MVCgen::FileManager.copy(podfile_path, expand_path)
+
+			# TODO: later if needed
+			files = MVCgen::FileManager.files_in_path(expand_path)
 			rename_files(files,name)
+			self.add_to_xcode(path, name, path_to)
 		end
 
 		# Rename all the files in the files array
@@ -69,8 +71,9 @@ module MVCgen
 		# - It renames the content of the file
 		def self.rename_files(files, name)
 			files.each do |file|
-				raise SyntaxError unless file.include? (MVCgen::Generator::REPLACEMENT_KEY)
-				rename_file(file, name)
+				if file.include? (MVCgen::Generator::REPLACEMENT_KEY)
+					rename_file(file, name)
+				end
 			end
 		end
 

data/lib/mvcgen/version.rb

@@ -1,4 +1,4 @@
 module MVCgen
   NAME = "mvcgen"
-  VERSION = "0.1.14"
+  VERSION = "0.1.18"
 end

data/lib/templates/default/mvcspec.yml

@@ -1,4 +1,4 @@
 author: daniel
 author_email: daniel.martinezcg@gmail.com
-template_description: Default template with the simplest structure using MVC
+template_description: Default template with the simplest structure to startup a project in xcode, using MVC
 updated_at: 2018-07-23

data/lib/templates/default/podfile/Podfile

@@ -0,0 +1,73 @@
+# Uncomment the next line to define a global platform for your project
+platform :ios, '10.0'
+
+def commom_pods
+  # Comment the next line if you're not using Swift and don't want to use dynamic frameworks
+  use_frameworks!
+
+  # Pods for NotATour
+  pod 'CryptoSwift'
+  pod 'SwiftyJSON'
+  pod 'TextFieldEffects'
+  pod 'NotificationBannerSwift'
+  pod 'RAMAnimatedTabBarController'
+  pod 'ObjectMapper', '~> 3.1'
+  pod 'DKImagePickerController'
+  pod 'SwiftDate', '~> 4.5.1'
+  pod 'NVActivityIndicatorView'
+  pod 'Kingfisher', '~> 4.0'
+  pod 'PMAlertController'
+  pod 'ActionSheetPicker-3.0', '~> 2.3.0'
+  pod 'Kingfisher', '~> 4.0'
+  pod 'paper-onboarding', '~> 4.0.2'
+  pod 'Pastel'
+  
+  # Alamofire
+  pod 'Alamofire', '~> 4.4'
+  pod 'AlamofireObjectMapper', '~> 5.0'
+  
+  
+  # AWS
+  pod 'AWSCognito'
+  pod 'AWSCognitoIdentityProvider'
+  pod 'AWSS3'
+  
+  
+  # AlamofireNetworkActivityLogger
+  pod 'AlamofireNetworkActivityLogger', '~> 2.0'
+  
+  # Facebook
+  pod 'FacebookCore'
+  pod 'FacebookLogin'
+  
+  # OneSignal
+  pod 'OneSignal'
+  
+  # Fabric
+  pod 'Fabric'
+  pod 'Crashlytics'
+
+end
+
+target 'MVCGEN' do
+  use_frameworks!
+  commom_pods
+end
+
+# target 'MVCGENTest' do
+#   inherit! :search_paths
+#   # Pods for testing
+# end
+
+# target 'MVCGENUITests' do
+#   inherit! :search_paths
+#   # Pods for testing
+# end
+
+# target 'OneSignalNotificationServiceExtension' do
+#   use_frameworks!
+#   pod 'OneSignal'
+# end
+
+
+

data/lib/templates/default/swift/AppDelegate.swift

@@ -0,0 +1,181 @@
+//
+//  AppDelegate.swift
+//  MVCGEN
+//
+//  Created by Daniel Martinez on 23/7/18.
+//  Copyright © 2018 Houlak. All rights reserved.
+//
+
+import UIKit
+import CoreData
+import FBSDKCoreKit
+import FBSDKLoginKit
+import FacebookCore
+import FBSDKCoreKit
+import FBSDKLoginKit
+import Alamofire
+import OneSignal
+import Fabric
+import Crashlytics
+import FBSDKLoginKit
+import RAMAnimatedTabBarController
+
+@UIApplicationMain
+class AppDelegate: UIResponder, UIApplicationDelegate {
+
+    var window: UIWindow?
+    private let homeStoryboard = UIStoryboard(name: "Home", bundle: Bundle.main)
+    private let loginStoryboard = UIStoryboard(name: "Login", bundle: Bundle.main)
+    
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+        // Override point for customization after application launch.
+        
+        UIApplication.shared.statusBarStyle = .lightContent
+        
+        // TODO: enable after setting script in build phases and appid
+//        self.setupFabric()
+        
+        self.setupOneSignal(launchOptions)
+        
+        // Call the 'activate' method to log an app event for use
+        // in analytics and advertising reporting.
+        AppEventsLogger.activate(application)
+        
+        self.checkUserLoggedIn()
+        
+        self.setupAWS()
+        
+        return true
+    }
+    
+    func setupFabric() {
+        Fabric.with([Crashlytics.self])
+    }
+    
+    func setupOneSignal(_ launchOptions: [UIApplicationLaunchOptionsKey: Any]?){
+        let onesignalInitSettings = [kOSSettingsKeyAutoPrompt: false]
+        // Replace 'YOUR_APP_ID' with your OneSignal App ID.
+        OneSignal.initWithLaunchOptions(launchOptions,
+                                        appId: Config.sharedInstance.oneSignalAppId(),
+                                        handleNotificationReceived: {
+                                            notification in
+                                            
+                                            if let notification = notification {
+                                                self.handleNotification(notification: notification)
+                                            }
+                                            
+                                        },
+                                        handleNotificationAction: {
+                                            result in
+                                            
+                                            if let notification = result?.notification {
+                                                self.handleNotification(notification: notification)
+                                            }
+                                            
+                                            // TODO: Set new notification icon active in profilevc
+                                            if let tabController = self.window!.rootViewController as? RAMAnimatedTabBarController {
+                                                tabController.setSelectIndex(from: tabController.selectedIndex, to: 3)
+                                            }
+                                        },
+                                        settings: onesignalInitSettings)
+        
+        OneSignal.inFocusDisplayType = OSNotificationDisplayType.notification;
+
+        // TODO
+        // Recommend moving the below line to prompt for push after informing the user about
+        //   how your app will use them.
+        OneSignal.promptForPushNotifications(userResponse: { accepted in
+            print("User accepted notifications: \(accepted)")
+        })
+        
+        // Sync hashed email if you have a login system or collect it.
+        //   Will be used to reach the user at the most optimal time of day.
+        // OneSignal.syncHashedEmail(userEmail)
+        
+        // Print OneSignal Player ID
+        let status: OSPermissionSubscriptionState = OneSignal.getPermissionSubscriptionState()
+        let userID = status.subscriptionStatus.userId
+        print("OneSignal User ID = \(userID ?? "")")
+    }
+    
+    func handleNotification(notification: OSNotification){
+        // TODO set new notification badge
+        
+    }
+    
+    func checkUserLoggedIn() {
+        
+        if let _ = UserDefaults.standard.value(forKey: UserDefaultsConstants.userAuthTokenKey) as? String, let _ = UserDefaults.standard.value(forKey: UserDefaultsConstants.savedUserKey) as? String {
+            // Token stored in NSUserDefaults. Log in user
+            
+            // TODO: need to check if user ha ve accepted terms & conditions
+            
+            let rootController = self.homeStoryboard.instantiateViewController(withIdentifier: "HomeNav")
+            self.window?.rootViewController = rootController
+            
+        }
+    }
+    
+    // Facebook login
+    
+//    func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any] = [:]) -> Bool {
+//        return FBSDKApplicationDelegate.sharedInstance().application(app, open: url, options: options)
+//    }
+
+    func logout() {
+        
+        Alamofire.SessionManager.default.session.getTasksWithCompletionHandler {
+            dataTasks, uploadTasks, downloadTasks in dataTasks.forEach {
+                $0.cancel()
+            }
+            uploadTasks.forEach {
+                $0.cancel()
+            }
+            downloadTasks.forEach {
+                $0.cancel()
+            }
+        }
+        
+        FilesManager.sharedInstance.removeAllAppLocalFiles()
+        
+        // Facebook logout
+        let fbLoginManager : FBSDKLoginManager = FBSDKLoginManager()
+        fbLoginManager.logOut()
+        
+        for view in self.window!.subviews {
+            view.removeFromSuperview()
+        }
+        
+        let rootController = self.loginStoryboard.instantiateViewController(withIdentifier: "LoginVC")
+        self.window?.rootViewController = rootController
+    }
+    
+    func applicationWillResignActive(_ application: UIApplication) {
+        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+        // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
+    }
+
+    func applicationDidEnterBackground(_ application: UIApplication) {
+        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+    }
+
+    func applicationWillEnterForeground(_ application: UIApplication) {
+        // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
+    }
+
+    func applicationDidBecomeActive(_ application: UIApplication) {
+        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    }
+
+    func applicationWillTerminate(_ application: UIApplication) {
+        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+
+    }
+    
+    func setupAWS() {
+        let _ = AWSManager.sharedInstance
+    }
+    
+}
+

data/lib/templates/default/swift/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,133 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "57x57",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "57x57",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "50x50",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "50x50",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "72x72",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "72x72",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}