foobar_templates 2.0.1.rc2 → 2.0.1.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef1e2cd0e959fef6c0ac4f5e4475675f8ea8c9b4c60d818ff3606ca94d2638a7
-  data.tar.gz: e5d6e2ef6a066ad687a0509eb80d199f7d381307bf4ea2470f8f45f9c6eca274
+  metadata.gz: c933bd134506713bc01168f73ba617aeb22f7d3dc10a472455da258189136528
+  data.tar.gz: 0a5bcd41cff0ef149b6950e5a6868e444eaff671e7eef5043cf89ea5f24f917c
 SHA512:
-  metadata.gz: 59087e7c7d265a35bc574ef126d11ff253b3c4970ce156e1d3edc0bbfb67d73f39f0894498f6594f9eb2e63e1fc7307803fe9e243bfe000fae7bc985d14b3484
-  data.tar.gz: cd0ee89ddd0b52b6ab18c222deb7af07a933cc253428861ffd6e276943b9f70225e95ca8a95e4a502a89989358596d372020d75628fe532bfab9c048fe70f336
+  metadata.gz: a036cca148228d0cd1b6d7f1f8d0d81249108dd1aa4b029d146838b64b26ea018857a9f4a175f3e8c9bbc229f77035a68c4bc7dadbacae0e0a8b2ffaf38c3143
+  data.tar.gz: fa889a9eb2be2514d2b1347458b624491a460e1f7bc7faf25e7577a62da623e85ca29ec31b4ecb6633a4042d5ba75b66e37c72a21b2b3c67a88ef1a9c77ba3b9

data/bin/foobar_templates

@@ -29,6 +29,10 @@ parser = OptionParser.new do |opts|
     exit
   end
 
+  opts.on("-p", "--performance", "Show performance metrics for template generation") do
+    options[:performance] = true
+  end
+
   opts.on("--install-public-templates", "Install public templates") do
     FoobarTemplates.install_public_templates
     exit

data/lib/foobar_templates/cli/template_generator.rb

@@ -23,53 +23,67 @@ module FoobarTemplates::CLI
     end
 
     def config
-      @config ||= build_interpolation_config
+      @config ||= time_it("build_interpolation_config") { build_interpolation_config }
     end
 
     def run
-      puts "Beginning run" if $TRACE
-      raise_project_with_that_name_already_exists! if File.exist?(target)
+      time_it("TOTAL run") do
+        puts "Beginning run" if $TRACE
+        raise_project_with_that_name_already_exists! if File.exist?(target)
 
-      puts "ensure_safe_project_name" if $TRACE
-      ensure_safe_project_name(name, config[:constant_array])
+        puts "ensure_safe_project_name" if $TRACE
+        time_it("ensure_safe_project_name") do
+          ensure_safe_project_name(name, config[:constant_array])
+        end
 
-      puts "run_name_validation" if $TRACE
-      run_name_validation
+        puts "run_name_validation" if $TRACE
+        time_it("run_name_validation") { run_name_validation }
 
-      template_src = match_template_src
+        template_src = time_it("match_template_src") { match_template_src }
 
-      puts "dynamically_generate_template_directories" if $TRACE
-      time_it("dynamically_generate_template_directories") do
-        @template_directories = dynamically_generate_template_directories
-      end
+        puts "dynamically_generate_template_directories" if $TRACE
+        @template_directories = time_it("dynamically_generate_template_directories") do
+          dynamically_generate_template_directories
+        end
 
-      puts "dynamically_generate_templates_files" if $TRACE
-      templates = dynamically_generate_templates_files
+        puts "dynamically_generate_templates_files" if $TRACE
+        templates = time_it("dynamically_generate_templates_files") do
+          dynamically_generate_templates_files
+        end
 
-      puts "Creating new project folder '#{name}'\n\n"
-      create_template_directories(@template_directories, target)
+        puts "Creating new project folder '#{name}'\n\n"
+        time_it("create_template_directories") do
+          create_template_directories(@template_directories, target)
+        end
 
-      templates.each do |src, dst|
-        template("#{template_src}/#{src}", target.join(dst), config)
-      end
+        time_it("write_template_files") do
+          templates.each do |src, dst|
+            template("#{template_src}/#{src}", target.join(dst), config)
+          end
+        end
 
-      Dir.chdir(target) do
-        if @configurator.always_perform_git_init || !inside_git_work_tree?
-          `git init`
+        time_it("git_init_and_add") do
+          Dir.chdir(target) do
+            if @configurator.always_perform_git_init || !inside_git_work_tree?
+              `git init`
+            end
+            `git add .`
+          end
         end
-        `git add .`
-      end
 
-      if @tconf[:bootstrap_command]
-        puts "Executing bootstrap_command"
-        cmd = safe_gsub_template_variables(@tconf[:bootstrap_command])
-        puts cmd
-        Dir.chdir(target) do
-          `#{cmd}`
+        if @tconf[:bootstrap_command]
+          puts "Executing bootstrap_command"
+          cmd = safe_gsub_template_variables(@tconf[:bootstrap_command])
+          puts cmd
+          time_it("bootstrap_command") do
+            Dir.chdir(target) do
+              `#{cmd}`
+            end
+          end
         end
-      end
 
-      puts "\nComplete."
+        puts "\nComplete."
+      end
     end
 
     def build_interpolation_config
@@ -84,7 +98,9 @@ module FoobarTemplates::CLI
       git_user_email = `git config user.email`.chomp
 
       # Resolve domain values from ~/.foobar/config, prompting if needed
-      required_domains = scan_template_for_required_domains
+      required_domains = time_it("scan_template_for_required_domains") do
+        scan_template_for_required_domains
+      end
       prompt_for_missing_domains(required_domains)
 
       registry_domain = @configurator.domain('registry_domain')
@@ -202,14 +218,11 @@ module FoobarTemplates::CLI
 
     def scan_template_for_required_domains
       all_placeholders = DOMAIN_PLACEHOLDERS.values.flatten
-      pattern = Regexp.union(all_placeholders)
       found_placeholders = Set.new
 
-      Dir.glob("#{@template_src}/**/*", File::FNM_DOTMATCH).each do |f|
+      template_relative_paths.each do |rel|
+        f = File.join(@template_src, rel)
         next unless File.file?(f)
-        base_path = f[@template_src.length+1..-1]
-        next if base_path.nil?
-        next if base_path.start_with?(".git" + File::SEPARATOR) || base_path == ".git"
         next if binary_file?(f)
 
         content = File.read(f)
@@ -296,7 +309,9 @@ module FoobarTemplates::CLI
     # .git directory and any gitignored paths. Ignored directories are pruned
     # during traversal so their (potentially huge) contents are never walked.
     def template_relative_paths
-      @template_relative_paths ||= collect_non_ignored_paths(@template_src)
+      @template_relative_paths ||= time_it("collect_non_ignored_paths") do
+        collect_non_ignored_paths(@template_src)
+      end
     end
 
     # Breadth-first walk that prunes ignored directories. One batched
@@ -476,11 +491,18 @@ Exiting...
     end
 
     def time_it(label = nil)
+      return yield unless performance?
+
       start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      yield
+      result = yield
       end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       elapsed_ms = ((end_time - start_time) * 1000).round(2)
       puts "#{label || 'Elapsed'}: #{elapsed_ms} ms"
+      result
+    end
+
+    def performance?
+      @options[:performance]
     end
 
     # This checks to see that the gem_name is a valid ruby gem name and will 'work'

data/lib/foobar_templates/version.rb

@@ -1,3 +1,3 @@
 module FoobarTemplates
-  VERSION = "2.0.1.rc2"
+  VERSION = "2.0.1.rc4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobar_templates
 version: !ruby/object:Gem::Version
-  version: 2.0.1.rc2
+  version: 2.0.1.rc4
 platform: ruby
 authors:
 - TheNotary
@@ -130,9 +130,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/TheNotary/foobar_templates/issues
-  changelog_uri: https://github.com/TheNotary/foobar_templates/releases/tag/v2.0.1.rc2
+  changelog_uri: https://github.com/TheNotary/foobar_templates/releases/tag/v2.0.1.rc4
   documentation_uri: https://github.com/TheNotary/foobar_templates
-  source_code_uri: https://github.com/TheNotary/foobar_templates/tree/v2.0.1.rc2
+  source_code_uri: https://github.com/TheNotary/foobar_templates/tree/v2.0.1.rc4
 rdoc_options: []
 require_paths:
 - lib