cova 0.1.0 → 0.1.1

data/bin/cova

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
 
-require "fileutils"
-require "thor"
-require "xcodeproj"
-require "colorize"
-require "cova"
+require 'rubygems'
+
+require 'logger'
+require 'colorize'
+require 'fileutils'
+require 'thor'
+require 'cocoapods'
+require 'covalog'
+require 'covaio'
+require 'covamain'
 
 Cova.start

data/lib/cova.rb

@@ -1,312 +1,12 @@
-COVA_REPO="git://github.com/dancali/cova.git"
-XCTOOL_REPO="git://github.com/facebook/xctool.git"
-COVA_MODS_REPO="git://github.com/dancali/cova-mods.git"
-
-class Cova < Thor
-
-	  no_commands do
-
-	  	def _msg(msg)
-	  		print msg.black + "  ...  "
-	  	end
-
-	  	def _info(msg)
-	  		puts
-	  		puts msg.blue
-	  		puts
-	  	end
-
-	  	def _ok
-	  		print "[ ".black
-	  		print "OK".green
-	  		print " ]".black
-	  		puts
-	  	end
-
-	  	def _error
-	  		print "[".black
-	  		print "FAIL".red
-	  		print "]".black
-	  		puts
-	  	end
-	  		
-	  	def _success
-	  		puts
-	  		print "=".black * 9
-	  		print " SUCCESS ".green
-	  		puts "=".black * 9
-	  		puts
-	  	end
-
-	  	def _fail
-	  		puts
-	  		print "=".black * 8
-	  		print " FAILED ".red
-	  		puts "=".black * 8
-	  		puts
-	  	end
-
-	  	def _start(msg)
-	  		puts
-	  		print "=".black * 3
-	  		print " " + msg.black + " "
-	  		puts "=".black * 3
-	  		puts
-	  	end
-
-	  	def _cmd(cmd)
-			pipe = IO.popen(cmd)
-			puts cmd.blue
-			while (line = pipe.gets)
-			  print line.black		
-			end
-	  	end
-
-	  	def _covadir
-			File.expand_path("~/.cova")
-	  	end
-
-	  	def _covamodsdir
-			user_home_dir = File.expand_path("~/.cocoapods/cova")
-	  	end
-
-	  	def _builddir
-			File.expand_path("~/Library/Developer/Xcode/DerivedData")
-	  	end
-
-	  	def _init
-		  	user_home_dir = File.expand_path("~")
-		  	cova_dir = user_home_dir + "/.cova"
-		  	cocoapods_cova_dir = user_home_dir + "/.cocoapods/cova"
-
-		  	_start "Initializing Cova"
-
-	  		if File.directory?(cova_dir)
-			  	_msg "Cleaning up previous installation"
-			  	FileUtils.rm_r cova_dir, :force => true	  	
-			  	if File.directory?(cova_dir)
-			  		_error
-		  			_fail
-			  		exit
-			  	else
-			  		_ok
-			  		if File.directory?(cocoapods_cova_dir)
-				  		_msg "Cleaning Cova Mods"
-				  		FileUtils.rm_r cocoapods_cova_dir
-				  		if File.directory?(cocoapods_cova_dir)
-				  			_error
-				  			_fail
-				  			exit
-				  		else
-				  			_ok
-				  		end
-				  	end	
-				end
-	  		end
-
-		  	_msg "Preparing to install Cova in #{cova_dir}"
-	  		FileUtils.mkdir cova_dir
-	  		if File.directory?(cova_dir)
-	  			_ok
-				FileUtils.cd cova_dir
-  				_cmd ("git clone #{XCTOOL_REPO}")
-  				if File.directory?(cova_dir + "/xctool")
-	  				_cmd ("git clone #{COVA_REPO}")
-	  				if File.directory?(cova_dir + "/cova")
-	  					_cmd "pod repo add cova #{COVA_MODS_REPO}"
-		  				if File.directory?(cocoapods_cova_dir)
-		  					status
-			  				_success
-			  				puts
-			  				puts "Congrats! Cove is now installed. Enjoy Cova and build the next great app sensation!".green
-			  				puts
-			  				puts "For more info visit the homepage: http://cova.io".black
-			  				puts
-		  				else
-			  				_msg "Could not create Cova Mods home"
-			  				_error
-			  				_error
-		  					exit
-		  				end
-		  			else
-		  				_msg "cova did not clone correctly"
-		  				_error
-						_fail
-		  				exit		  				
-		  			end
-	  			else
-	  				_msg "xctool did not clone correctly"
-	  				_error
-					_fail
-	  				exit
-  				end	
-	  		else
-	  			_error
-	  			_fail
-	  			exit
-	  		end
-	  	end
-
-	  	def _build
-	  		_start "Building"
-	  		if File.exist?('cova.xcworkspace')
-				_cmd (_covadir + "/xctool/xctool.sh -workspace cova.xcworkspace -scheme cova -configuration Debug -sdk iphonesimulator")
-				_success
-			else
-				_msg "Expecting cova.xcworkspace"
-				_error
-				_fail
-				exit
-			end	
-	  	end
-
-	  	def _buildall
-			_start "Building with dependencies"
-	     	_msg "Looking for Podfile"
-    	 	if File.exist?('Podfile')
-     			_ok
-     			_cmd "pod install"
-     			_build
-			else
-				_error
-				_msg "Expecting Podfile"
-				_error
-				_fail
-				exit
-			end	
-	  	end
-
-	  end
-
-	  desc 'status', 'Checks the status of a Cova installation'
-	  def status
-	  	_start "Checking if Cova is installed"
-	  	cova_dir = _covadir
-	  	if File.directory?(cova_dir)
-	  		_msg "Found Cova in #{cova_dir}"
-	  		_ok
-	  	else
-	  		puts "Expecting Cova in #{cova_dir} not found".red
-	  		_fail
-	  		return false
-	  	end
-
-	  	cova_mods_dir = _covamodsdir
-	  	if File.directory?(cova_mods_dir)
-	  		_msg "Found Cova Mods in #{cova_mods_dir}"
-	  		_ok
-	  		_success
-	  	else
-	  		puts "Expected Cova Mods in #{cova_mods_dir} not found".red
-	  		return false
-	  	end
-
-	  	return true
-	  end
-
-	  desc 'uninstall', 'Completely uninstalls Cova'
-	  def uninstall
-
-	  	_start "Uninstalling Cova"
-
-		cova_dir = _covadir
-		_msg "Removing Cova from #{cova_dir}"
-		FileUtils.rm_r cova_dir, :force => true
-	  	if File.directory?(cova_dir)
-	  		_error
-			_fail
-	  		exit
-	  	else
-	  		_ok
-	  	end
-
-	  	cova_mods_dir = _covamodsdir
-		_msg "Removing Cova Mods from #{cova_mods_dir}"
-		FileUtils.rm_r cova_mods_dir, :force => true	  		
-	  	if File.directory?(cova_mods_dir)
-	  		_error
-			_fail
-	  		exit
-	  	else
-	  		_ok
-		  	_success
-	  	end
-	  end
-
-	  desc 'install', 'Installs Cova from scratch'
-	  option :force, :type => :boolean, :aliases => :f
-	  def install
-	  	user_home_dir = File.expand_path("~")
-	  	cova_dir = user_home_dir + "/.cova"
-
-	  	if File.directory?(cova_dir)
-	  		if  options[:force]
-		  		_init
-		  	else
-		  		_info "Cova is already installed. Run install -f to force a re-install"		  		
-		  	end
-	  	else
-	  		_init
-	  	end
-	  end
-
-      desc 'create NAME', 'Creates a new Cova app'
-	  option :build, :type => :boolean, :aliases => :b
-      def create (name)
-
-      		_start "Creating app #{name}"
-
-      		if status
-  				app_home = File.expand_path("./#{name}")
-				if File.directory?(app_home)
-					_msg "Cannot create directory #{app_home} as it already exists"
-					_error
-					_fail
-					exit
-				end
-
-  				_msg "Creating app home in #{app_home}"
-  				FileUtils.mkdir app_home
-				if File.directory?(app_home)
-  					_ok
-  					_msg "Adding Xcode project"
-  					cova_dir = _covadir
-
-  					FileUtils.cp_r cova_dir + "/cova/ios/xcode-template", app_home + "/ios"
-  					if File.directory?(app_home + "/ios/cova")
-						_ok
-				      	 if  options[:build]
-				      		FileUtils.cd app_home + "/ios"
-							_buildall
- 						 else
- 					      	_success
- 						 end
-					else
-						_error
-						_fail
-						_exit
-					end  						
-  				else
-  					_error
-					_fail
-  					exit
-  			    end
-  			else
-  				_msg "Cova not installed. Run install -f to install it"
-  				_error
-  				_fail
-  				exit
-  			end
-      end
-
-     desc 'build', 'Builds an existing Cova app'
-	 option :dependencies, :type => :boolean, :aliases => :d
-     def build
-     	if  options[:dependencies]
-	     	_buildall
-		else
-			_build
-		end
-     end
-
-end
+require 'rubygems'
+
+require 'logger'
+require 'colorize'
+require 'fileutils'
+require 'thor'
+require 'cocoapods'
+require 'covalog'
+require 'covaio'
+require 'covamain'
+
+Cova.start

data/lib/covaio.rb

@@ -0,0 +1,116 @@
+module CovaIO
+
+		def _io_init
+			@dir_user_home 			= File.expand_path("~")
+			@dir_cova_home 			= File.expand_path("~/.cova")
+			@dir_cova_mods_home 	= File.expand_path("~/.cocoapods/cova")
+			@dir_cocoapods_home 	= File.expand_path("~/.cocoapods")
+			@dir_xctool_home 		= File.expand_path("~/.cova/xctool")
+			@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_mods			= "git://github.com/dancali/cova-mods.git"
+			@repo_xctool			= "git://github.com/facebook/xctool.git"
+		end
+
+		def _io_exec(cmd)
+			pipe = IO.popen(cmd)
+			puts cmd.blue
+			while (line = pipe.gets)
+			  print line.black		
+			end
+		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}"
+		end
+
+		def _io_pod_add_repo(name, repo)
+			_io_exec("pod repo add #{name} #{repo}")
+			return _io_isdir(@dir_cocoapods_home + "/" + name)
+		end
+
+		def _io_isdir(dir,expected=true)
+			_log_line (expected ? "Expecting #{dir} to exist" : "Ensuring #{dir} does not exist")
+			if File.directory?(dir)
+				expected ? _log_line_ok : _log_line_error
+		  		return true
+		  	end		  	
+
+		  	if expected
+			  	_log_line_error
+			else
+				_log_line_ok
+			end
+		  	return false
+		end
+
+		def _io_isfile(file,expected=true)
+			_log_line (expected ? "Expecting #{file} to exist" : "Ensuring #{file} does not exist")
+			if File.exist?(file)
+				expected ? _log_line_ok : _log_line_error
+		  		return true
+		  	end		  	
+
+		  	if expected
+			  	_log_line_error
+			else
+				_log_line_ok
+			end
+		  	return false
+		end
+
+		def _io_app_exists(name)
+			return File.directory?(@dir_cova_apps_home + "/" + name)
+		end
+
+		def _io_ls(dir)
+			Dir.foreach(dir) {|entry| puts "#{entry}" unless (entry =='.' || entry == '..') }
+		end
+
+		def _io_clone_repo (repo, dir)
+			pwd = Dir.pwd
+			Dir.chdir(dir)
+			_io_exec "git clone #{repo}"
+			Dir.chdir(pwd)
+			return _io_isdir(dir + "/" + File.basename(repo, ".*"))
+		end
+
+		def _io_rmdir(dir)
+			_log_line "Removing #{dir}"
+			if File.directory?(dir)
+				`rm -rf #{dir}`
+			  	if File.directory?(dir)
+			  		_log_line_error
+			  		return false
+				end
+			end
+			_log_line_ok
+			return true
+		end
+
+		def _io_lndir(src, targ)
+			if _io_isdir src and not _io_isdir targ, false
+				`ln -s #{src} #{targ}`
+				return _io_isdir targ
+			end
+
+			return false
+		end
+
+		def _io_cpdir(src, targ)
+			if _io_isdir src and not _io_isdir targ, false
+				`cp -r #{src} #{targ}`
+				return _io_isdir targ
+			end
+			return false
+		end
+
+		def _io_mkdir(dir)
+			_log_line "Creating #{dir}"
+			`mkdir #{dir}`
+			File.directory?(dir) ? _log_line_ok : _log_line_error
+			return File.directory?(dir)
+		end
+end

data/lib/covalog.rb

@@ -0,0 +1,50 @@
+module CovaLog
+
+	def _log_line(msg)
+		print msg.black + "  ...  "
+	end
+
+	def _log_line_ok
+		print "[ ".black
+		print "OK".green
+		print " ]".black
+		puts
+	end
+
+	def _log_line_error
+		print "[".black
+		print "FAIL".red
+		print "]".black
+		puts
+	end
+		
+	def _log_info(msg)
+		puts
+		puts msg.blue
+		puts
+	end
+
+	def _log_block_start(msg)
+		puts
+		print "=".black * 3
+		print " " + msg.black + " "
+		puts "=".black * 3
+		puts
+	end
+
+	def _log_block_success
+		puts
+		print "=".black * 9
+		print " SUCCESS ".green
+		puts "=".black * 9
+		puts
+	end
+
+	def _log_block_error
+		puts
+		print "=".black * 8
+		print " FAILED ".red
+		puts "=".black * 8
+		puts
+	end
+end

data/lib/covamain.rb

@@ -0,0 +1,176 @@
+class Cova < Thor
+
+	include CovaLog
+	include CovaIO
+
+	def initialize(*args)
+	  super
+	  _io_init
+	end
+
+	desc 'status', 'Checks the status of a Cova installation'
+	def status
+	   _log_block_start "Checking if Cova is installed"
+	   if _io_isdir(@dir_cova_home) and _io_isdir(@dir_cova_mods_home)
+	   		_log_block_success
+	   		return true
+	   end
+	   _log_block_error
+	   _cova_prompt_install
+	   return false
+	end
+
+	desc 'uninstall', 'Completely uninstalls Cova'
+	def uninstall
+	   _log_block_start "Uninstalling Cova"
+	   _io_rmdir(@dir_cova_home)
+	   _io_rmdir(@dir_cova_mods_home)
+	   if _io_isdir(@dir_cova_home, false) or _io_isdir(@dir_cova_mods_home, false)
+	   		_log_block_error
+	   		return false
+	   end
+	   _log_block_success
+	   return true
+	end
+
+	desc 'install', 'Installs Cova from scratch'
+	def install
+	  _log_block_start "Installing Cova"
+
+	  if _io_isdir(@dir_cova_home, false) or _io_isdir(@dir_cova_mods_home, false)
+		  _log_info "It looks like Cova is already installed. Please uninstall it first before installing again."	  	 
+		  _log_block_error
+		  return false
+	  end
+
+	  if _io_mkdir @dir_cova_home and _io_mkdir @dir_cova_apps_home
+	  	  if _io_clone_repo @repo_xctool, @dir_cova_home and _io_clone_repo @repo_cova, @dir_cova_home
+	  	  	  _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
+		  	  return true
+		  end
+	  end
+
+	  _log_block_error
+	  return false
+	end
+
+	desc 'list', 'List all exisiting apps'
+	def list
+		if not _cova_installed
+			_cova_prompt_install
+			return false
+		end
+
+		_io_ls @dir_cova_apps_home
+		return true
+    end
+
+	desc 'find NAME', 'Looks for an app'
+	def find(name)
+		if not _cova_installed
+			_cova_prompt_install
+			return false
+		end
+
+		_log_line "Searching for app #{name}"
+		if _io_app_exists name
+			_log_line_ok
+			return true
+		end
+
+		_log_line_error
+		return false
+    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)
+
+		if not _cova_installed
+			_cova_prompt_install
+			return false
+		end
+
+      	appname = name.strip.delete(' ')
+      	_log_block_start "Creating Cova app #{appname}"
+      	dir = Dir.pwd + "/" + appname
+
+      	if _io_isdir dir, false or _io_app_exists appname or not _io_mkdir dir or not _io_lndir dir, @dir_cova_apps_home + "/" + appname
+      		_log_block_error
+      		return false
+      	end
+
+      	if _io_cpdir @dir_cova_home + "/cova/ios/xcode-template", dir + "/ios"
+      		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
+	    	 		return false
+	     		end
+      			
+				_io_exec_xctool "test"
+      			return true
+      		end
+
+    	  	_log_block_success
+	      	return true
+      	end
+
+		_log_block_error
+      	return false
+    end
+
+    desc 'build [-d][-t] NAME', 'Builds an app (-d to build dependencies, -t to build and run tests)'
+	option :dependencies, :type => :boolean, :aliases => :d
+	option :tests, :type => :boolean, :aliases => :t
+    def build (name)
+    	if not _cova_installed
+			_cova_prompt_install
+			return false
+		end
+
+    	if not _io_app_exists name
+    		_log_line "App #{name} does not exist"
+    		_log_line_error
+    		return false
+    	end
+
+    	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 not _cova_build_dependencies
+	     		_log_block_error
+	     		return false
+	     	end
+		end
+
+		_io_exec_xctool (options[:tests] ? "test" : "build")
+    end
+
+    no_commands do
+
+    	def _cova_prompt_install
+		   _log_info "Looks like Cova is not installed yet. Please run [cova install] now"
+    	end
+
+    	def _cova_installed
+    		return (File.directory?(@dir_cova_home) and File.directory?(@dir_cova_mods_home))
+    	end
+
+    	def _cova_build_dependencies
+			if not _io_isfile "Podfile"
+				return false
+			end
+
+			_io_exec "pod install"
+	     	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: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Dan Calinescu
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-25 00:00:00 Z
+date: 2013-05-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: fileutils
+  name: logger
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -46,7 +46,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: xcodeproj
+  name: colorize
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,7 +60,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: colorize
+  name: xcodeproj
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -83,6 +83,9 @@ extra_rdoc_files: []
 
 files: 
 - lib/cova.rb
+- lib/covaio.rb
+- lib/covalog.rb
+- lib/covamain.rb
 - bin/cova
 homepage: http://cova.io
 licenses: