cova 0.1.4 → 0.1.5

data/bin/cova

@@ -2,13 +2,13 @@
 
 require 'rubygems'
 
-require 'logger'
 require 'colorize'
-require 'fileutils'
 require 'thor'
+require 'xcodeproj'
 require 'cocoapods'
+
 require 'covalog'
 require 'covaio'
 require 'covamain'
 
-Cova.start
+Cova.start

data/lib/cova.rb

@@ -1,12 +1,12 @@
 require 'rubygems'
 
-require 'logger'
 require 'colorize'
-require 'fileutils'
 require 'thor'
+require 'xcodeproj'
 require 'cocoapods'
+
 require 'covalog'
 require 'covaio'
 require 'covamain'
 
-Cova.start
+Cova.start

data/lib/covaio.rb

@@ -9,7 +9,7 @@ module CovaIO
 			@dir_xcode_build_home 	= File.expand_path("~/Library/Developer/Xcode/DerivedData")
 			@dir_cova_apps_home 	= File.expand_path("~/.cova/apps")
 
-			@repo_cova 				= "git://github.com/dancali/cova.git"
+			@repo_cova_ios 			= "git://github.com/dancali/cova-ios.git"
 			@repo_cova_mods			= "git://github.com/dancali/cova-mods.git"
 			@repo_xctool			= "git://github.com/facebook/xctool.git"
 		end
@@ -23,7 +23,7 @@ module CovaIO
 		end
 
 		def _io_exec_xctool(cmd="build", config="Debug", sdk="iphonesimulator")
-			_io_exec @dir_xctool_home + "/xctool.sh -workspace cova.xcworkspace -scheme cova -configuration #{config} -sdk #{sdk} #{cmd}"
+			_io_exec @dir_xctool_home + "/xctool.sh -workspace cova.xcworkspace -scheme Cova -configuration #{config} -sdk #{sdk} #{cmd}"
 		end
 
 		def _io_pod_add_repo(name, repo)
@@ -65,6 +65,23 @@ module CovaIO
 			return File.directory?(@dir_cova_apps_home + "/" + name)
 		end
 
+		def _io_open_app_source(name)
+			if not _io_app_exists name
+				_log_info "Looks like the app #{name} does not exist. Please create if first."
+				_log_line_error
+				return false
+			end
+
+			app_project = "#{@dir_cova_apps_home}/#{name}/ios/cova.xcworkspace"
+			if not File.exist?(app_project)
+				_log_info "Looks like the app #{name} was never build. Please build it first."
+				return false
+			end
+
+			_io_exec "open #{app_project}"
+			return true
+		end
+
 		def _io_ls(dir)
 			Dir.foreach(dir) {|entry| puts "#{entry}" unless (entry =='.' || entry == '..') }
 		end
@@ -73,8 +90,11 @@ module CovaIO
 			pwd = Dir.pwd
 			Dir.chdir(dir)
 			_io_exec "git clone #{repo}"
-			Dir.chdir(pwd)
-			return _io_isdir(dir + "/" + File.basename(repo, ".*"))
+			reponame = File.basename(repo, ".*")
+			Dir.chdir(reponame)
+			#_io_exec "git remote add upstream #{repo}"
+			#Dir.chdir(pwd)
+			return _io_isdir(dir + "/" + reponame)
 		end
 
 		def _io_rmdir(dir)

data/lib/covamain.rb

@@ -44,13 +44,13 @@ class Cova < Thor
 	  end
 
 	  if _io_mkdir @dir_cova_home and _io_mkdir @dir_cova_apps_home and _io_mkdir @dir_cocoapods_home
-	  	  if _io_clone_repo @repo_xctool, @dir_cova_home and _io_clone_repo @repo_cova, @dir_cova_home
+	  	  if _io_clone_repo @repo_xctool, @dir_cova_home and _io_clone_repo @repo_cova_ios, @dir_cova_home
 	  	  	  if _io_pod_add_repo "cova", @repo_cova_mods
 			  	  _log_block_success
 			  	  puts
   				  puts "Congrats! Cove is now installed. Enjoy and build the next great app sensation!".green
   				  puts
-  			  	  puts "For more info check out http://cova.io".black
+  			  	  puts "For more info check out http://cova.io"
   			 	  puts
 		  	  	  return true
 		  	  end
@@ -89,6 +89,87 @@ class Cova < Thor
 		return false
     end
 
+	desc 'newapp NAME', 'Creates a new app'
+    def newapp (name)
+
+	#	`cp -r Cova #{name}`
+	#	app_root = "#{name}"
+    #	Dir.chdir app_root
+
+    #	_io_exec "pod repo update cova"
+	#	_io_exec "pod install"
+	#	_io_exec "open Cova.xcworkspace"
+
+#		`mv app.xcodeproj #{name}.xcodeproj`	
+ #   	project  = Xcodeproj::Project.new "#{name}.xcodeproj"
+#		target = project.targets[0]
+ #   	target.name = name
+#		project.targets[1].name = "#{name}Tests"
+
+#		debug_build_settings = target.build_configuration_list.build_configurations[1].build_settings
+
+    	# `cp ../cova/cova/cova-Info.plist #{name}-Info.plist`
+    	# `cp ../cova/cova/AppDelegate.h AppDelegate.h`
+    	# `cp ../cova/cova/AppDelegate.m AppDelegate.m`
+    	# `cp ../cova/cova/cova-Prefix.pch #{name}-Prefix.pch`
+    	# `cp ../cova/cova/main.m main.m`
+		#info_plist_file = project.new_file("app-Info.plist")
+		#pch_file = project.new_file("#{name}-Prefix.pch")
+		# main_file = project.new_file("main.m")
+		# delegate_h_file = project.new_file("AppDelegate.h")
+		# delegate_m_file = project.new_file("AppDelegate.m")
+		# target.add_file_references([main_file, delegate_h_file, delegate_m_file])
+  #       release_build_settings = target.build_configuration_list.build_configurations[0].build_settings
+  #       release_build_settings['INFOPLIST_FILE'] = "#{name}-Info.plist"
+  #       release_build_settings['GCC_PREFIX_HEADER'] = "#{name}-Prefix.pch"
+		# debug_build_settings = target.build_configuration_list.build_configurations[1].build_settings
+  #       debug_build_settings['INFOPLIST_FILE'] = "#{name}-Info.plist"
+  #       debug_build_settings['GCC_PREFIX_HEADER'] = "#{name}-Prefix.pch"
+		# project.add_system_framework "CoreData", target
+  #   	project.add_system_framework "UIKit", target
+  #   	project.add_system_framework "Foundation", target
+
+#		project.save_as("#{name}.xcodeproj")
+#		_io_exec "open #{name}.xcodeproj"
+
+        #debug_build_settings['PRODUCT_NAME'] = name
+        #puts 
+        #puts debug_build_settings['PRODUCT_NAME'] 
+
+    	#puts project.pretty_print
+
+    	#info_plist = project.main_group.new_file("#{name}-Info.plist")
+		#target.add_file_references([info_plist])
+
+    	#debug = project.build_configurations
+    	#pp debug
+
+    	#config   = project.configuration_list :ios
+		
+		#project.add_system_framework "CoreData", target
+    	#project.add_system_framework "UIKit", target
+    	#project.add_system_framework "Foundation", target
+
+    	#src = project.new_group "src"
+    	#res = project.new_group "res"
+    	#test = project.new_group "test"
+
+		#File.open("src/main.m", 'w') {|f| f.write("#import <UIKit/UIKit.h>\r\n#import \"AppDelegate.h\"\r\nint main(int argc, char *argv[]) {\r\n@autoreleasepool { return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); }\r\n}")}
+		#File.open("src/AppDelegate.h", 'w') {|f| f.write("#import <UIKit/UIKit.h>\r\n@interface AppDelegate : UIResponder <UIApplicationDelegate>\r\n @property (strong, nonatomic) UIWindow *window; \r\n@property (readonly, strong, nonatomic) NSManagedObjectContext *managedObjectContext; \r\n@property (readonly, strong, nonatomic) NSManagedObjectModel *managedObjectModel; \r\n@property (readonly, strong, nonatomic) NSPersistentStoreCoordinator *persistentStoreCoordinator; \r\n- (void)saveContext; \r\n- (NSURL *)applicationDocumentsDirectory; \r\n@end")}
+		#main_file = src.new_file("src/main.m")
+		#delegate_file = src.new_file("src/AppDelegate.h")
+		
+		#project.save_as("#{name}.xcodeproj")
+
+		#File.open("Podfile", 'w') {|f| f.write("platform :ios, '5.0'\r\npod 'covamod-core'")}
+		#_io_exec "pod setup"
+		#_io_exec "pod repo update cova"
+		#_io_exec "pod install"
+		#_io_exec "open #{name}.xcworkspace"
+		
+		#_io_exec "open #{name}.xcodeproj"
+    end
+
 	desc 'create [-b] NAME', 'Creates a new Cova app (-b to build it including tests)'
 	option :build, :type => :boolean, :aliases => :b
     def create (name)
@@ -107,9 +188,18 @@ class Cova < Thor
       		return false
       	end
 
-      	if _io_cpdir @dir_cova_home + "/cova/ios/xcode-template", dir + "/ios"
+      	if _io_cpdir @dir_cova_home + "/cova-ios/Cova", dir + "/ios"
+
+	    	Dir.chdir(@dir_cova_apps_home + "/" + name + "/ios")
+  		   	project  = Xcodeproj::Project.new "Cova.xcodeproj"
+			target = project.targets[0]
+   			target.name = name
+			project.targets[1].name = "#{name}Tests"
+			release_build_settings = target.build_configuration_list.build_configurations[0].build_settings
+			debug_build_settings = target.build_configuration_list.build_configurations[1].build_settings
+			project.save_as("Cova.xcodeproj")
+
       		if options[:build]
-		    	Dir.chdir(@dir_cova_apps_home + "/" + name + "/ios")
 		     	if not _cova_build_dependencies
 		     		_log_line "Attempted to build the app dependencies"
 		     		_log_line_error
@@ -117,10 +207,12 @@ class Cova < Thor
 	     		end
       			
 				_io_exec_xctool "test"
+				_io_open_app_source name
       			return true
       		end
 
     	  	_log_block_success
+			_io_open_app_source name
 	      	return true
       	end
 
@@ -145,7 +237,7 @@ class Cova < Thor
 
     	Dir.chdir(@dir_cova_apps_home + "/" + name + "/ios")
 		_log_block_start "Building app #{name}"
-     	if options[:dependencies] or not _io_isfile "cova.xcworkspace" or not _io_isdir "Pods"
+     	if options[:dependencies] or not _io_isfile "Cova.xcworkspace" or not _io_isdir "Pods"
 	     	if not _cova_build_dependencies
 	     		_log_block_error
 	     		return false
@@ -153,6 +245,7 @@ class Cova < Thor
 		end
 
 		_io_exec_xctool (options[:tests] ? "test" : "build")
+		_io_open_app_source name
     end
 
     no_commands do
@@ -170,8 +263,9 @@ class Cova < Thor
 				return false
 			end
 
+			_io_exec "pod repo update cova"
 			_io_exec "pod install"
-	     	return (_io_isfile "cova.xcworkspace" and _io_isdir "Pods")
+	     	return (_io_isfile "Cova.xcworkspace" and _io_isdir "Pods")
     	end
 	end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cova
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Dan Calinescu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-27 00:00:00 Z
+date: 2013-05-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: logger