simrb 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7878b2a1a7e363b08799171e6153e01aba6f50b
-  data.tar.gz: e1c2104346c1b3b1ab527d29ce9dbfec531235e2
+  metadata.gz: a8e46048a5b380a679834372b2ca0fb4eb730c4a
+  data.tar.gz: 61d9324ba18be93ac0c7f64b5dc11ffbdfa64502
 SHA512:
-  metadata.gz: 82258cd78ad586d504d984e473405f8d53094766967ad499d4ffdd509807a27a07bf93beb9766505b572b845f8eaea3fe8305990b3d4f9a7b4608e92d22445af
-  data.tar.gz: 11796bc82ccc3d168e5cf35d511f5e6d544f9a811e5a9c6ee3d1c10a75c889d48d7b6d4eb988f972841357e21b2971fb07cdce65be2ec436f3bc800ccd827397
+  metadata.gz: ca52c0213a0456e04945da015492091c5e88be3a77c2e05adcc177b314f3f9b12f653dfce9c637d6a8b09dd02d1a052fc377c42100002c50cf078ceceb22fb69
+  data.tar.gz: 954cb84511891f77826c011e699acbccb87ebdec9c6fbebeec9b326aefe324dc047279a28dc596a317f79bbbc345d16fc982c2038b54ffa39e748de6842a6d2a

data/lib/simrb/comd.rb

@@ -61,7 +61,9 @@ module Simrb
 
 				# initialize config file
 				data = File.read(File.dirname(__FILE__) + Scfg[:name_overwrite])
+				data << "\nScfg[:created]\t\t\t= '#{Time.now}'"
 				data << "\nScfg[:key]\t\t\t\t= '#{Simrb.random(16)}'\n"
+
 				Simrb.path_write(Scfg[:name], data)
 
 				# create module if it is given,
@@ -131,64 +133,65 @@ module Simrb
 				puts "Initializing module completed"
 			end
 
-			# get a module from remote repository to local
-			# autually, this is a clone method of git
-			#
-			# == Example
+			# pull module or repository from remote
 			# 
-			# 	$ simrb get system
 			#
-			# or, more than one at same time
+			# == Example 01, pull out the module
+			# 
+			# 	$ simrb get simrb/www
 			#
-			# 	$ simrb get system test
+			# or, more than one at the same time
 			#
-			def get args
-				Simrb.root_dir_force
-
-				repo_dir = Simrb.addslash(Spath[:repo_dirs][0] + Spath[:repo_mods])
-				Simrb.path_write repo_dir
-
-				args.each do | name |
-					if Smods.keys.include? name
-						puts "The module #{name} is existing at local repository, hasn't got from remote"
-					else
-						path	= "#{Scfg[:source]}#{name}.git"
-						local	= "#{repo_dir}#{name}"
-						system("git clone #{path} #{local}")
-					end
-				end
-
-				puts "Implemented completely"
-			end
-
-			# pull whole remote repository from github
+			# 	$ simrb get simrb/www simrb/work
 			#
-			# == Example
 			#
-			# by default, that will pull the official repo
+			# == Example 02, pull out the repository with option '-r'
 			#
-			# 	$ simrb pull
+			# 	$ simrb pull -r
 			#
-			# add the option `-f` force to pulling
+			# add the option `-f` to force pulling and overwriting the origin repository in local
 			#
-			# 	$ simrb pull -f
+			# 	$ simrb pull -f -r
 			#
-			# or, specify the link you need in second parameter
+			# or, specify the save path with second parameter
 			#
-			# 	$ simrb pull repo ~/simrb_repo
+			# 	$ simrb pull simrb/test-repo ~/simrb_repo -r
 			#
 			def pull args = []
 				args, opts	= Simrb.input_format args
-				repo_name	= args[0] ? args[0] : Scfg[:main_repo]
-				from_repo	= Scfg[:source] + repo_name
-				to_repo 	= Simrb.addslash(args[1] ? args[1] : Spath[:repo_dirs][0])
-				ispull		= File.exist?(to_repo + repo_name + "/README.md") ? (opts[:f] ? true : false) : true
-
-				if ispull
-					Simrb.path_write to_repo
-					system("git clone #{from_repo}.git")
-					system("mv #{repo_name} #{to_repo}")
+
+				# pull the repo
+				if opts[:r]
+					repo_name	= args[0] ? args[0].split('/').last : Scfg[:main_repo]
+					full_name	= args[0] ? args[0] : "simrb/#{Scfg[:main_repo]}"
+					to_repo 	= Simrb.addslash(args[1] ? args[1] : Spath[:repo_dirs][0])
+					ispull		= File.exist?(to_repo + repo_name + "/README.md") ? (opts[:f] ? true : false) : true
+
+					if ispull
+						Simrb.path_write to_repo
+						system("git clone #{Scfg[:source]}#{full_name}.git")
+						system("mv #{repo_name} #{to_repo}")
+					end
+
+				# pull the module
+				else
+					Simrb.root_dir_force
+
+					repo_dir = Simrb.addslash(Spath[:repo_dirs][0] + Spath[:def_repo])
+					Simrb.path_write repo_dir
+
+					args.each do | full_name |
+						repo, name = full_name.split("/")
+						if Smods.keys.include? name
+							puts "The module #{name} is existing at local repository, hasn't got from remote"
+						else
+							path	= "#{Scfg[:source]}#{full_name}.git"
+							local	= "#{repo_dir}#{name}"
+							system("git clone #{path} #{local}")
+						end
+					end
 				end
+
 				puts "Implemented completely"
 			end
 

data/lib/simrb/info.rb

@@ -8,10 +8,10 @@ module Simrb
 		:name			=>	'simrb',
 		:created		=>	'2014-01-01',
 		:alias_name		=>	'3s',
-		:version		=>	'1.0.6',
+		:version		=>	'1.0.7',
 		:author			=>	'Linyu Deng',
 		:email			=>	'coolesting@gmail.com',
-		:homepage		=>	'https://github.com/simrb/simrb-help',
+		:homepage		=>	'https://github.com/simrb/help-gem',
 		:license		=>	'MIT',
 		:description	=>	'This is a command helper for simrb',
 		:summary		=>	'A utility of simrb',

data/lib/simrb/scfg.rb

@@ -6,7 +6,7 @@ Spath						= {
 	:repo_dirs				=> [(File.expand_path("~/.simrb") + '/')],
 
 	# default directory for saving the pulled module from remote
-	:repo_mods				=> 'simrb-mods/',
+	:def_repo				=> 'default-repo/',
 
 	# root directory path of project
 	:module					=> 'modules/',
@@ -14,6 +14,7 @@ Spath						= {
 	:db_dir					=> 'db/',
 	:upload_dir				=> 'db/upload/',
 	:backup_dir				=> 'db/backup/',
+	:download_dir			=> 'db/download/',
 	:tmp_dir				=> 'tmp/',
 	:cache_dir				=> 'tmp/cache/simrb/',
 	:install_lock			=> 'tmp/install.lock',
@@ -68,10 +69,11 @@ Scfg						= {
 	:bind 					=> '0.0.0.0',
 	:port					=> 3000,
 
-	:source					=> 'https://github.com/simrb/',
+	:source					=> 'https://github.com/',
 
 	# a default core repository for loading when the server booting
-	:main_repo				=> 'simrb-repo',
+	:main_repo				=> 'main-repo',
+	:test_repo				=> 'test-repo',
 
 	# options: development, production, test
 	:environment 			=> 'development',
@@ -101,7 +103,7 @@ Scfg						= {
 	],
 
 	:init_root_path			=> [
-		:db_dir, :upload_dir, :backup_dir,
+		:db_dir, :upload_dir, :backup_dir, :download_dir,
 		:tmp_dir, :log_dir, :module, :schema
 	],
 
@@ -116,5 +118,5 @@ Scfg						= {
 }
 
 # append the children repository
-Spath[:repo_dirs] << (Spath[:repo_dirs][0] + Spath[:repo_mods])
+Spath[:repo_dirs] << (Spath[:repo_dirs][0] + Spath[:def_repo])
 Spath[:repo_dirs] << (Spath[:repo_dirs][0] + Scfg[:main_repo] + '/')

data/lib/simrb/scfg_copy.rb

@@ -10,10 +10,16 @@ Scfg[:port]				= 3000
 # options: development, production, test
 Scfg[:environment]		= 'development'
 
-# Scfg[:module_require]	= ['base','data','view','file','admin','user']
+# Scfg[:module_require]	= [
+# 	'base','data','view','file','admin','user',
+# 	'custom_module',
+# ]
 
 # your directory path of local
 # Spath[:repo_dirs][0]	= (File.expand_path("~/.simrb") + '/')
 
-# add repository path like this
-# Spath[:repo_dirs] << "/home/yours"
+# append anthor repository to repo variable
+# Spath[:repo_dirs] << "/home/my/repo"
+#
+# or, overwrite those default repositories
+# Spath[:repo_dirs] = ["/home/my/repo1", "/home/my/repo2"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simrb
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Linyu Deng
@@ -87,7 +87,7 @@ files:
 - lib/simrb/scfg_copy.rb
 - lib/simrb/thin_start.rb
 - lib/simrb/tool_start.rb
-homepage: https://github.com/simrb/simrb-help
+homepage: https://github.com/simrb/help-gem
 licenses:
 - MIT
 metadata: {}