vipergen 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3247a8166344baa0ddda9c8dbe2c075d9b38cbd8
-  data.tar.gz: 59b81a5b17de090ab513717644ca6d0dff9415a7
+  metadata.gz: b1808e7fb8e6e8f67adc01355dedd9097304dd52
+  data.tar.gz: 7bdf7932d7f3e2a686891cb1efc4b1e8d69d63be
 SHA512:
-  metadata.gz: 879f5c3929b2228b75b95f5766d9380185321c2ab6ca513529d80da07eb5a7e2a3b336d9a0cdcb0ea44b7dfd24a961b5f0845fddd4958f1ab3179f027483644d
-  data.tar.gz: 35a37204ea55241aa6e956e801bdc838383ffe7474375bb6488ea695c19442b2e98d284e7be2fca16cd565afa346edb646cd0511dd834b1624aabafd8d732a5b
+  metadata.gz: d15353e2e591ad34ce129acd3df2f853e18c85bbea5bce31a90688dbe1ec6a637867fd7e12c84fe8a1bf70ab668d7c7bee887446773cb9867ac1c868975d89db
+  data.tar.gz: 81cef6cd1053b84421cb017a7e066fc9a2f4a407b9eeb4827125f810bb0d0826bc099bafc40691c99602213d02ec06021b896d1f4b8ebe31f8a9179deac12dd7

data/README.md

@@ -37,7 +37,10 @@ The implementation scheme returned by this generator is hardly inspired in the e
 ### Changelog 0.2.3
 - VIPER Example using the Twitter API 
 - Default template implemented in Swift
-- 
+
+### Changelog 0.2.5
+- Add `COMPANY` parameter to set the company name on the files header
+- Set Swift as the default language
 
 ### Expected in version 0.3
 - Integrate with XCode as a plugin (http://nshipster.com/xcode-plugins/)
@@ -88,6 +91,11 @@ You have just to execute the following command
 ```bash
 vipergen generate MyFirstViperModule --path=~/myproject/shared
 ```
+Another example:
+```bash
+vipergen generate MySecondViperModule --path=~/myproject/shared --author='My Name' --company='My Company' --template='existing_template' --language=swift
+```
+
 And then the files structure will be automatically created. Don't forget to add this folder to your project dragging it into the XCode/Appcode inspector
 
 ## How can I try the demo project?

data/lib/templates/naja/swift/Interactor/VIPERInteractor.swift

@@ -0,0 +1,17 @@
+//
+//  VIPERInteractor.swift
+//
+//  Created by AUTHOR.
+//  Copyright © YEAR COMPANY. All rights reserved.
+//
+
+import Foundation
+
+class VIPERInteractor: VIPERInteractorInputProtocol {
+    
+    // MARK: Properties
+    
+    weak var presenter: VIPERInteractorOutputProtocol?
+    
+    // MARK: VIPERInteractorInputProtocol    
+}

data/lib/templates/naja/swift/Presenter/VIPERPresenter.swift

@@ -0,0 +1,21 @@
+//
+//  VIPERPresenter.swift
+//
+//  Created by AUTHOR.
+//  Copyright © YEAR COMPANY. All rights reserved.
+//
+
+import Foundation
+
+class VIPERPresenter: VIPERPresenterProtocol, VIPERInteractorOutputProtocol {
+    
+    // MARK: Properties
+    
+    weak var view: VIPERViewProtocol?
+    var interactor: VIPERInteractorInputProtocol?
+    var wireFrame: VIPERWireFrameProtocol?
+    
+    // MARK: VIPERPresenterProtocol
+    
+    // MARK: VIPERInteractorOutputProtocol
+}

data/lib/templates/naja/swift/Protocols/VIPERProtocols.swift

@@ -0,0 +1,28 @@
+//
+//  VIPERProtocols.swift
+//
+//  Created by AUTHOR.
+//  Copyright © YEAR COMPANY. All rights reserved.
+//
+
+import Foundation
+
+protocol VIPERViewProtocol: class {
+
+}
+
+protocol VIPERPresenterProtocol: class {
+
+}
+
+protocol VIPERInteractorInputProtocol {
+
+}
+
+protocol VIPERInteractorOutputProtocol: class {
+
+}
+
+protocol VIPERWireFrameProtocol {
+
+}

data/lib/templates/naja/swift/Views/VIPERView.swift

@@ -0,0 +1,24 @@
+//
+//  VIPERView.swift
+//
+//  Created by AUTHOR.
+//  Copyright © YEAR COMPANY. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+class VIPERView: UIViewController, VIPERViewProtocol {
+    
+    // MARK: Properties
+
+    var presenter: VIPERPresenterProtocol?
+    
+    // MARK: UIViewController
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+    }
+    
+    // MARK: VIPERViewProtocol
+}

data/lib/templates/naja/swift/WireFrame/VIPERWireFrame.swift

@@ -0,0 +1,41 @@
+//
+//  VIPERWireFrame.swift
+//
+//  Created by AUTHOR.
+//  Copyright © YEAR COMPANY. All rights reserved.
+//
+
+import UIKit
+
+public class VIPERWireFrame: VIPERWireFrameProtocol {
+
+    // MARK: Properties
+    
+    weak var navigationController: UINavigationController?
+    
+    // MARK: Factory
+    
+    public class func presentVIPERFromViewController(source: UIViewController) {
+        let presenter = VIPERPresenter()
+        let view = VIPERView()
+        /*
+            If using UIStoryboard use:
+            let storyboard = UIStoryboard(name: "Main", bundle: NSBundle.mainBundle())
+            view = storyboard.instantiateViewControllerWithIdentifier("VIPERView") as! VIPERView
+        */
+        let interactor = VIPERInteractor()
+        let wireFrame = VIPERWireFrame()
+        
+        view.presenter = presenter
+        interactor.presenter = presenter
+        presenter.view = view
+        presenter.interactor = interactor
+        presenter.wireFrame = wireFrame
+        
+        let navigationController = UINavigationController(rootViewController: view)
+        wireFrame.navigationController = navigationController
+        source.presentViewController(navigationController, animated: true, completion: nil)
+    }
+    
+    // MARK: VIPERWireFrameProtocol
+}

data/lib/templates/naja/viperspec.yml

@@ -0,0 +1,4 @@
+author: Raphael Oliveira 
+author_email: raphaelfpoliveira@gmail.com
+template_description: Yet another Swift VIPER template 
+updated_at: 2015-12-15

data/lib/vipergen/generator.rb

@@ -6,44 +6,46 @@ module Vipergen
 		REPLACEMENT_KEY = "VIPER"
 		AUTHOR_REPLACEMENT_KEY = "AUTHOR"
 		YEAR_REPLACEMENT_KEY = "YEAR"
+	        COMPANY_REPLACEMENT_KEY = "COMPANY"
 
 		# Main method that generate the VIPER files structure
-		def self.generate_viper(template, language, name, path, author)
+		def self.generate_viper(template, language, name, path, author, company)
 			puts "Generating VIPER-Module"
 			puts "Template: #{template}"
 			puts "Language: #{language}"
 			puts "Name: #{name}"
 			puts "Path: #{path}"
 			puts "Author: #{author}"
+        		puts "Company: #{company}"
 			path_from = Vipergen::FileManager.path_from(template, language)
 			path_to = Vipergen::FileManager.destination_viper_path(path, name)
 			Vipergen::FileManager.copy(path_from, path_to)
 			files = Vipergen::FileManager.files_in_path(path_to)
-			rename_files(files, name, author)
+			rename_files(files, name, author, company)
 		end
 
 		# Rename all the files in the files array
 		# - It renames the name of the file 
 		# - It renames the content of the file
-		def self.rename_files(files, name, author)
+		def self.rename_files(files, name, author, company)
 			files.each do |file|
 				raise SyntaxError unless file.include? (Vipergen::Generator::REPLACEMENT_KEY)
-				rename_file(file, name, author)
+				rename_file(file, name, author, company)
 			end
 		end
 
 		# Rename a given file
 		# - It renames the name of the file
 		# - It renames the content of the file
-		def self.rename_file(file, name, author)
+		def self.rename_file(file, name, author, company)
 			new_path = file.gsub((Vipergen::Generator::REPLACEMENT_KEY), name)
 			Vipergen::FileManager.move(file, new_path)
-			rename_file_content(new_path, name, author)
+			rename_file_content(new_path, name, author, company)
 		end
 
 		# Rename the file content
 		# @return: An String with the every VIPER replaced by 'name'
-		def self.rename_file_content(filename, name, author)
+		def self.rename_file_content(filename, name, author, company)
 			# Reading content
 			file = File.open(filename, "rb")
 			content = file.read
@@ -53,6 +55,7 @@ module Vipergen
 			content = content.gsub((Vipergen::Generator::REPLACEMENT_KEY), name)
 			content = content.gsub((Vipergen::Generator::AUTHOR_REPLACEMENT_KEY), author)
 			content = content.gsub((Vipergen::Generator::YEAR_REPLACEMENT_KEY), "#{Time.new.year}")
+			content = content.gsub((Vipergen::Generator::COMPANY_REPLACEMENT_KEY), company)
 
 			# Saving content with replaced string
 			File.open(filename, "w+") do |file|
@@ -60,4 +63,4 @@ module Vipergen
 			end
 		end
 	end
-end
+end

data/lib/vipergen/templatemanager.rb

@@ -4,7 +4,7 @@ module Vipergen
 
 		# Returns the templates dir
 	    def self.templates_dir
-	      t = "#{Gem.dir}/gems/#{Vipergen::NAME}-#{Vipergen::VERSION}/lib/templates"
+	      t = "#{File.expand_path File.dirname(__FILE__)}/../templates"
 	    end
 
 		# Get the available templates paths

data/lib/vipergen/version.rb

@@ -1,4 +1,4 @@
 module Vipergen
   NAME = "vipergen"
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/vipergen/viperthor.rb

@@ -3,13 +3,14 @@ require 'vipergen'
 
 module Vipergen
   class ViperThor < Thor
-	desc "generate", "Generate a VIPER module"
-	option :language, :required => false, :default => 'objc', :type => :string, :desc => "The language of the generated module (swift, objc)"
+	desc "generate MODULE", "Generate a VIPER module"
+	option :language, :required => false, :default => 'swift', :type => :string, :desc => "The language of the generated module (swift, objc)"
 	option :template, :required => false, :default => 'default', :type => :string , :desc => "Template for the generation"
 	option :path, :required => true, :type => :string , :desc => "Path where the output module is going to be saved"
 	option :author, :required => false, :default => 'VIPER', :type => :string , :desc => "Author to be specified on the file's header. Otherwise VIPER will be used"
+	option :company, :required => false, :default => 'Company', :type => :string, :desc => "Company to be specified on the file's header. Otherwise Company will be used"
 	def generate(name)
-	   Vipergen::Generator.generate_viper(options[:template], options[:language], name, options[:path], options[:author])
+	   Vipergen::Generator.generate_viper(options[:template], options[:language], name, options[:path], options[:author], options[:company])
 	end
 
 	desc "templates", "Get a list of available templates"
@@ -17,4 +18,4 @@ module Vipergen
 		puts Vipergen::TemplateManager.templates_description()
 	end
   end
-end
+end

data/spec/vipergen/vipergen_spec.rb

@@ -44,14 +44,14 @@ end
 describe Vipergen::Generator do
 	context "when renaming file content" do 
 		before (:each) do
-			File.open("test.txt", 'w') {|f| f.write("I'm a #{Vipergen::Generator::REPLACEMENT_KEY} file by #{Vipergen::Generator::AUTHOR_REPLACEMENT_KEY} on #{Vipergen::Generator::YEAR_REPLACEMENT_KEY}") }
+			File.open("test.txt", 'w') {|f| f.write("I'm a #{Vipergen::Generator::REPLACEMENT_KEY} file by #{Vipergen::Generator::AUTHOR_REPLACEMENT_KEY} @ #{Vipergen::Generator::COMPANY_REPLACEMENT_KEY} on #{Vipergen::Generator::YEAR_REPLACEMENT_KEY}") }
 		end
 
 		it "should rename every VIPER word to the given name" do
-			Vipergen::Generator.rename_file_content("test.txt","RENAMED", "pepito")
+			Vipergen::Generator.rename_file_content("test.txt","RENAMED", "pepito", "ViperGen")
 			file = File.open("test.txt", "rb")
 			content = file.read
-			expect(content).to eq("I'm a RENAMED file by pepito on #{Time.new.year}")
+			expect(content).to eq("I'm a RENAMED file by pepito @ ViperGen on #{Time.new.year}")
 		end
 
 		after (:each) do
@@ -66,18 +66,19 @@ describe Vipergen::Generator do
 
 		it "every file should be renamed in rename_files" do
 			expect(Vipergen::Generator).to receive(:rename_file)
-			Vipergen::Generator.rename_files(["#{Vipergen::Generator::REPLACEMENT_KEY}file.txt"], "MyModule", "Pepi")
+			Vipergen::Generator.rename_files(["#{Vipergen::Generator::REPLACEMENT_KEY}file.txt"], "MyModule", "Pepi", "ViperGen")
 		end
 
 		it "should raise a SyntaxError exeption if there's a file in the template without the proper name" do
-			expect{Vipergen::Generator.rename_files(["asgasgs.txt"], "MyModule", "Pepi")}.to raise_error
+			expect{Vipergen::Generator.rename_files(["asgasgs.txt"], "MyModule", "Pepi", "ViperGen")}.to raise_error
 		end
 
 		it "should rename the VIPER in name to the given name" do
 			file = "#{Vipergen::Generator::REPLACEMENT_KEY}test.txt"
 			name = "RENAMED"
 			author = "PEPI"
-			Vipergen::Generator.rename_file(file, name, author)
+                        company = "ViperGen"
+			Vipergen::Generator.rename_file(file, name, author, company)
 			expect(File.exist? "RENAMEDtest.txt").to eq(true)
 		end
 
@@ -85,8 +86,9 @@ describe Vipergen::Generator do
 			file = "#{Vipergen::Generator::REPLACEMENT_KEY}test.txt"
 			name = "RENAMED"
 			author = "PEPI"
+                        company = "ViperGen"
 			expect(Vipergen::Generator).to receive(:rename_file_content)
-			Vipergen::Generator.rename_file(file, name, author)
+			Vipergen::Generator.rename_file(file, name, author, company)
 		end
 
 		after (:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vipergen
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Pedro Piñera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -116,6 +116,12 @@ files:
 - lib/templates/default/swift/View/VIPERView.swift
 - lib/templates/default/swift/WireFrame/VIPERWireFrame.swift
 - lib/templates/default/viperspec.yml
+- lib/templates/naja/swift/Interactor/VIPERInteractor.swift
+- lib/templates/naja/swift/Presenter/VIPERPresenter.swift
+- lib/templates/naja/swift/Protocols/VIPERProtocols.swift
+- lib/templates/naja/swift/Views/VIPERView.swift
+- lib/templates/naja/swift/WireFrame/VIPERWireFrame.swift
+- lib/templates/naja/viperspec.yml
 - lib/vipergen.rb
 - lib/vipergen/dirutils.rb
 - lib/vipergen/filemanager.rb
@@ -146,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Generates XCode VIPER module controllers structure