gena 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0aae731249981adfb88a04ec9198cb040af78cd
-  data.tar.gz: a3df22d7230b6f7aca67da17b1dad4ff14896fb1
+  metadata.gz: 9394c4d63919ceaf86b70b90e8338ab8927b7b41
+  data.tar.gz: 7028e23fd9c244d528e07ff1a5bbf7c51b36a8b5
 SHA512:
-  metadata.gz: aed64a6d719183eacf9ab288bc0e1307bab3b77a0efa8856efa2ddae3cfe8106658f040511f2708d6d1fb5dd0d4ece0ec43ac17b95def6e56381d78d37050009
-  data.tar.gz: a8a9add9f040ea237db43e93574ec47f376284ca7df547762d350ebc1e93dd64a011eca9cde756b535482765fa4ba29fde040af52e18ef1cab666cde45c83a72
+  metadata.gz: 9d3135276f6d6b0fdb7dc0e322d60d5beca16fe3e94875352f98d285985957f0b299ebb736456050e4c6770328cfc92c9b2c7bf5c81ccbf051284320a4adf01a
+  data.tar.gz: e48bde3e2dfe2b332c53e42951e7a7bd83e3c519c19733e66b25a739547cfdd7d81ae8a92453ad9faf755cb10052711522b4cb47cd7ab9793ca0ba03e4af2d46

data/bin/gena

@@ -6,12 +6,18 @@ unless system "which xc-resave >> /dev/null"
   raise "\nPlease install xc-resave utility first. Run: \n\nbrew install alexgarbarev/core/xc-resave\n\n"
 end
 
-TEMPLATES_FOLDER = "Templates"
-
+TEMPLATES_PROJECT_FOLDER = File.expand_path('Templates')
+TEMPLATES_SYSTEM_FOLDER = File.expand_path('~/.gena/templates')
 
 # Include all template code files
-Dir["#{TEMPLATES_FOLDER}/**/*.rb"].each do |file|
-  require "./#{file}"
+
+registered = []
+Dir["#{TEMPLATES_PROJECT_FOLDER}/**/*.rb", "#{TEMPLATES_SYSTEM_FOLDER}/**/*.rb"].each do |file|
+  template_name = file.split(File::SEPARATOR)[-2]
+  unless registered.include? template_name
+    registered << template_name
+    require file
+  end
 end
 
 cli = GenerateCli.new
@@ -36,6 +42,13 @@ end
 config = Generate::Config.new
 config.load_plist_config
 
+if options[:fetch]
+  FileUtils.rm_rf File.expand_path(TEMPLATES_SYSTEM_FOLDER)
+  FileUtils.mkdir_p File.expand_path(TEMPLATES_SYSTEM_FOLDER)
+  command = "git clone --depth 1 #{config.config['templates_url']} #{TEMPLATES_SYSTEM_FOLDER}"
+  exec command
+end
+
 template = Generate::BaseTemplate.new_from_options(options, config)
 
 unless template.class.generamba?
@@ -55,5 +68,4 @@ if options[:verbose]
   puts "#{cli_command}"
 end
 
-exec "#{cli_command}"
-
+exec "#{cli_command}"

data/lib/generate_cli.rb

@@ -25,6 +25,7 @@ class GenerateCli
       opts.on('-v', '--verbose') { options[:verbose] = true }
       opts.on('--tests', 'Generate tests if possible') {  options[:generate_tests] = true }
       opts.on('--cleanup', 'Removes temporary data instead of generation') { options[:cleanup] = true; return options; }
+      opts.on('--fetch', 'Fetches templates from remote repository') { options[:fetch] = true; return options; }
     end
 
     parser.parse!

data/lib/ramba_adapter.rb

@@ -19,7 +19,7 @@ class RambaAdapter
   end
 
   def delete_rambafile
-    FileUtils.rm("./#{RAMBAFILE_NAME}")
+    FileUtils.rm_f("./#{RAMBAFILE_NAME}")
   end
 
   def regenerate_default_template
@@ -62,7 +62,14 @@ class RambaAdapter
   end
 
   def template_directory(template)
-    "#{TEMPLATES_FOLDER}/#{template.class.template_name}"
+    project_path = "#{TEMPLATES_PROJECT_FOLDER}/#{template.class.template_name}"
+    if File.exists?(project_path)
+      puts 'Using project template'
+      project_path
+    else
+      puts 'Using system template'
+      "#{TEMPLATES_SYSTEM_FOLDER}/#{template.class.template_name}"
+    end
   end
 
   def copy_if_needed(src, dst)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gena
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Aleksey Garbarev