lib/generic_app.rb in generic_app-1.1.0 vs lib/generic_app.rb in generic_app-2.0.0

@@ -1,33 +1,55 @@
 #!/usr/bin/ruby
 
 require 'generic_app/version'
 require 'string_in_file'
 require 'line_containing'
+require 'remove_double_blank'
 
-ENV['DIR_MAIN'] = File.expand_path('../../', __FILE__)
-ENV['DIR_PARENT'] = File.expand_path('../../../', __FILE__)
+DIR_MAIN = File.expand_path('../../', __FILE__)
+DIR_PARENT = File.expand_path('../../../', __FILE__)
 
 #
 module GenericApp
   # Create app, stick with SQLite database in development
   def self.create_new(subdir_name, email)
     t1 = Thread.new { self.git_clone(subdir_name) }
     t1.join
+    self.remove_heroku_name(subdir_name)
     self.email_update(subdir_name, email)
+    self.remove_badges(subdir_name)
     self.git_init(subdir_name)
   end
 
+  def self.remove_heroku_name(subdir_name)
+    File.delete("#{subdir_name}/config/heroku_name.txt")
+  end
+
   def self.git_clone(subdir_name)
     puts '------------------------------------'
     puts 'Downloading the Generic App Template'
-    system("git clone https://github.com/jhsu802701/generic_app_template.git #{subdir_name}")
+    url_template = StringInFile.read("#{DIR_MAIN}/lib/generic_app/git_clone_url.txt")
+    system("git clone #{url_template} #{subdir_name}")
   end
 
   def self.email_update(subdir_name, email)
-    email_orig = '[e-mail]'
-    path_of_email = "#{subdir_name}/config/initializers/devise.rb"
-    StringInFile.replace(email_orig, email, path_of_email)
+    email_orig = '[e-mail]'
+    path_of_email_1 = "#{subdir_name}/config/initializers/devise.rb"
+    path_of_email_2 = "#{subdir_name}/app/views/static_pages/contact.html.erb"
+    path_of_email_3 = "#{subdir_name}/test/integration/static_pages_test.rb"
+    StringInFile.replace(email_orig, email, path_of_email_1)
+    StringInFile.replace(email_orig, email, path_of_email_2)
+    StringInFile.replace(email_orig, email, path_of_email_3)
+  end
+
+  def self.remove_badges(subdir_name)
+    path_readme = "#{subdir_name}/README.md"
+    line1 = 'BEGIN: continuous integration badges'
+    line2 = 'END: continuous integration badges'
+    LineContaining.delete_between(line1, line2, path_readme)
+    LineContaining.delete(line1, path_readme)
+    LineContaining.delete(line2, path_readme)
+    RemoveDoubleBlank.update(path_readme)
   end
 
   def self.git_init(subdir_name)
     puts '----------------'
     puts 'Initializing Git'