bench_bloc 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 520cffeffd2d5dddf61b90a031c5b30989064fff2db5a149b6fa7bf01c3bd09e
-  data.tar.gz: 75f44b181cbe5ffb56d86f6348a888e074dd2ee6772dfba94eb25e2241ddf611
+  metadata.gz: 2d58e13de32553297da5456ce97444c29c58b2771a0c4080714c6c08557cb231
+  data.tar.gz: fab6d9c3adda345068a3527d01688671459a5f4535e7b5d21ca763a85aa7d479
 SHA512:
-  metadata.gz: ac717d9b240d34388bcbc88d7b0109ef079b720cd59633de6bd0e17d6608b10c10ca92de980e21110ba0e12fc590f382f638bc3b782aa903654fc8e893846507
-  data.tar.gz: 7ad41b93f60a0bfec04f10f98f356ab721950bca8e3adc2b3fd5f8daeafae3e01303b176fd01cccbdcdaede679ac52976398d4d1235fd3251356e72fbb0f8752
+  metadata.gz: e2f60f261281bf39c8d0178e631d2c9834ad10ca463a08c1213ba78d8bf73ddcab23b7fa87eb06e0827e278e46eb947fbce8373fafaf3b5a4076dd7c4bc379fc
+  data.tar.gz: 0d6f30b7e49b98c8ba06b4c7e891a8bf902d1ba60ac432538e0fdb7bc6972586e8d56aafb4b6f449a9434574462e5fc4c3104f1b10d16046409dd898dc602141

data/.gitignore

@@ -9,4 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
-bench_bloc-*.gem
+bench_bloc-*.gem
+benchmarks.log

data/lib/bench_bloc/helpers/benchmark_helpers.rb

@@ -0,0 +1,41 @@
+module BenchBloc::BenchmarkHelpers
+  def bm_log_results results, title
+    results.sort! { |a,b| b.real <=> a.real }
+    formatted_results = results.map { |res| bm_format_result(res) }
+    header = "\n---\n\t#{title}\n"
+    summary = "\tTotal Time: #{bm_summarize_real_time(results).round(2)} seconds\n\n"
+    final_results = header + summary + formatted_results.join("\n")
+    write_to_log final_results
+  end
+
+  def write_to_log results
+    if defined?(Rails)
+      Logger.new("#{__dir__}/log/benchmarks.log")
+      log.info(results)
+    else
+      f = File.new("benchmarks.log", "w")
+      f.puts(results)
+      f.close
+    end
+  end
+
+  def bm_summarize_real_time results
+    results.inject(0) do |agg, res|
+      agg + res.real
+    end
+  end
+
+  def bm_format_result result
+    "\t\t#{result.label}\n\t\t\t#{result.real.round(2)} seconds"
+  end
+
+  def bm_run_results new_task, to_profs
+    Benchmark.bm do |x|
+      to_profs.each do |tp|
+        x.report(new_task[:label].call(tp)) do
+          new_task[:prof].call(tp)
+        end
+      end
+    end
+  end
+end

data/lib/bench_bloc/helpers/rake_helpers.rb

@@ -0,0 +1,94 @@
+require 'optparse'
+require 'rake'
+module BenchBloc::RakeHelpers
+  def bench_tasks
+    Rake.application.tasks.select do |task|
+      task.name.starts_with?("bench_bloc") &&
+      !task.name.ends_with?("_util") &&
+      task.name != "bench_bloc:all"
+    end
+  end
+
+  def option_parser
+    OptionParser.new do |opts|
+      opts.banner = "Usage: rake bench_bloc:* [options]"
+      opts.on("-r", "--ruby-prof", "Print a RubyProf report") do |rp|
+        @options[:ruby_prof] = rp
+      end
+    end
+  end
+
+  def put_namespace key, namespace
+    namespace key do
+      namespace.keys.each do |ns_key|
+        if is_task? namespace[ns_key]
+          put_task ns_key, namespace[ns_key]
+        else
+          put_namespace ns_key, namespace[ns_key]
+        end
+      end
+    end
+  end
+
+  # TODO: Add a ruby-prof method here if argument is passed
+  def put_task key, new_task
+    desc new_task[:desc]
+    task key => :environment do
+      to_profs = [new_task[:to_prof].call].flatten
+      bm_results = bm_run_results new_task, to_profs
+      bm_log_results bm_results, new_task[:desc]
+      # run ruby-prof
+      # format_ruby_prof(run_ruby_prof(new_task[:prof], tp)) if @options[:ruby_prof] == true
+    end
+  end
+
+  def is_task? obj
+    obj.keys.any?(:to_prof)
+  end
+
+  def put_options_parser_task
+    desc "Options parser for bench tasks"
+    task parse_options_util: :environment do
+      @options = {}
+      option_parser.parse!
+      option_parser.parse!
+    end
+  end
+
+  def put_clear_tests_task
+    desc "Clear Tests"
+    task clear_tests_util: :environment do
+      at_exit do
+        test_ts = Timesheet.where("general_remarks LIKE '%BENCHTEST%'")
+        puts "Clearing #{test_ts.count} test timesheets"
+        test_ts.destroy_all
+      end
+    end
+  end
+
+  def put_all_task
+    desc "Run all benchmarks"
+    task all: :environment do
+      bench_tasks.each(&:execute)
+      Rake::Task["bench_bloc:clear_tests_util"].invoke
+    end
+  end
+
+  def add_bench_hooks
+    bench_tasks.each do |task|
+    Rake::Task[task.name]
+      .enhance(['bench_bloc:parse_options_util', 'bench_bloc:clear_tests_util'])
+    end
+  end
+
+  def put_bloc_namespaces bloc
+    bloc.keys.each do |key|
+      namespace :bench_bloc do
+        put_namespace key, bloc[key]
+        put_options_parser_task
+        put_clear_tests_task
+        put_all_task
+      end
+    end
+  end
+end

data/lib/bench_bloc/helpers/ruby_prof_helpers.rb

@@ -0,0 +1,20 @@
+# TODO: turn into a module
+def run_ruby_prof lam, args
+#   RubyProf.start
+#     lam.call args
+#   RubyProf.end
+end
+
+def format_ruby_prof res
+#   "Formatted Ruby Prof Results: #{res}"
+end
+
+def log_ruby_prof_results
+  # prof = RubyProf::Profile.new()
+  # prof.exclude_common_methods!
+  # validator = ValidationRules::TsValidatorService.new(ts)
+  # complex_rules = validator.get_complex_validation_rules
+  # binding.pry
+  # results = prof.profile { validator.run_complex_vr(complex_rules[0]) }
+  # log_prof_results results
+end

data/lib/bench_bloc/tasks/gen_bench_bloc.rake

@@ -2,84 +2,16 @@
 require 'rake'
 require 'pry'
 require 'benchmark'
-require 'bench_bloc'
-require 'bench_bloc/rake_helper.rb'
+require 'bench_bloc/helpers/benchmark_helpers'
+require 'bench_bloc/helpers/rake_helpers.rb'
 
 # TODO: Look recursively in folders using 'bench_bloc/**/*.bloc.rb
-CONFIG_FILES=FileList["bench_bloc/*.bloc.rb"]
+BLOC_FILES=FileList["bench_bloc/*.bloc.rb"]
 
-def put_namespace key, namespace
-  namespace key do
-    namespace.keys.each do |ns_key|
-      if is_task? namespace[ns_key]
-        put_task ns_key, namespace[ns_key]
-      else
-        put_namespace ns_key, namespace[ns_key]
-      end
-    end
-  end
+BLOC_FILES.each do |f|
+  bloc = eval File.read(f)
+  put_bloc_namespaces bloc
 end
 
-# TODO: Add a ruby-prof method here if argument is passed
-def put_task key, new_task
-  desc new_task[:desc]
-  task key => :environment do
-    to_profs = [new_task[:to_prof].call].flatten
-    results = Benchmark.bm do |x|
-      to_profs.each do |tp|
-        x.report(new_task[:label].call(tp)) do
-          new_task[:prof].call(tp)
-        end
-      end
-    end
-    log_results results, "Benchmark Complex Validation Rules on Small Timesheet"
-  end
-  # format_ruby_prof(run_ruby_prof(new_task[:prof], tp)) if @options[:ruby_prof] == true
-end
-
-# def run_ruby_prof lam, args
-#   RubyProf.start
-#     lam.call args
-#   RubyProf.end
-# end
-
-# def format_ruby_prof res
-#   "Formatted Ruby Prof Results: #{res}"
-# end
-
-def is_task? obj
-  obj.keys.any?(:to_prof)
-end
-
-CONFIG_FILES.each do |f|
-  config = eval File.read(f)
-  config.keys.each do |key|
-    namespace :bench_bloc do
-      put_namespace key, config[key]
-      desc "Options parser for bench tasks"
-      task parse_options_util: :environment do
-        @options = {}
-        option_parser.parse!
-        option_parser.parse!
-      end
-      desc "Clear Tests"
-      task clear_tests_util: :environment do
-        at_exit do
-          test_ts = Timesheet.where("general_remarks LIKE '%BENCHTEST%'")
-          puts "Clearing #{test_ts.count} test timesheets"
-          test_ts.destroy_all
-        end
-      end
-      desc "Run all benchmarks"
-      task all: :environment do
-        bench_tasks.each(&:execute)
-        Rake::Task["bench_bloc:clear_tests_util"].invoke
-      end
-    end
-  end
-end
+add_bench_hooks
 
-bench_tasks.each do |task|
-  Rake::Task[task.name]
-    .enhance(['bench_bloc:parse_options_util', 'bench_bloc:clear_tests_util'])
-end

data/lib/bench_bloc/version.rb

@@ -1,3 +1,3 @@
 module BenchBloc
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/bench_bloc.rb

@@ -1,36 +1,12 @@
 require 'bench_bloc/version'
-require 'optparse'
+require 'bench_bloc/helpers/benchmark_helpers'
+require 'bench_bloc/helpers/rake_helpers'
+require 'bench_bloc/helpers/ruby_prof_helpers'
 require 'bench_bloc/railtie' if defined?(Rails)
 
 module BenchBloc
   class Error < StandardError; end
-
-  def log_results results, title
-    log = Logger.new("../log/benchmarks.log")
-    results.sort! { |a,b| b.real <=> a.real }
-    formatted_results = results.map { |res| format_result(res) }
-    header = "\n---\n\t#{title}\n"
-    summary = "\tTotal Time: #{summarize_real_time(results).round(2)} seconds\n\n"
-    log.info(header + summary + formatted_results.join("\n"))
-  end
-
-  def log_ruby_prof_results
-    # prof = RubyProf::Profile.new()
-    # prof.exclude_common_methods!
-    # validator = ValidationRules::TsValidatorService.new(ts)
-    # complex_rules = validator.get_complex_validation_rules
-    # binding.pry
-    # results = prof.profile { validator.run_complex_vr(complex_rules[0]) }
-    # log_prof_results results
-  end
-
-  def summarize_real_time results
-    results.inject(0) do |agg, res|
-      agg + res.real
-    end
-  end
-
-  def format_result result
-    "\t\t#{result.label}\n\t\t\t#{result.real.round(2)} seconds"
-  end
+  include BenchBloc::BenchmarkHelpers
+  include BenchBloc::RakeHelpers
+  include BenchBloc::RubyProfHelpers
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bench_bloc
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Jeremy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-12 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,8 +72,10 @@ files:
 - bin/console
 - bin/setup
 - lib/bench_bloc.rb
+- lib/bench_bloc/helpers/benchmark_helpers.rb
+- lib/bench_bloc/helpers/rake_helpers.rb
+- lib/bench_bloc/helpers/ruby_prof_helpers.rb
 - lib/bench_bloc/railtie.rb
-- lib/bench_bloc/rake_helper.rb
 - lib/bench_bloc/tasks/gen_bench_bloc.rake
 - lib/bench_bloc/version.rb
 homepage: https://github.com/jdpaterson/bench_bloc

data/lib/bench_bloc/rake_helper.rb

@@ -1,16 +0,0 @@
-def bench_tasks
-  Rake.application.tasks.select do |task|
-    task.name.starts_with?("bench_bloc") &&
-    !task.name.ends_with?("_util") &&
-    task.name != "bench_bloc:all"
-  end
-end
-
-def option_parser
-  OptionParser.new do |opts|
-    opts.banner = "Usage: rake bench_bloc:* [options]"
-    opts.on("-r", "--ruby-prof", "Print a RubyProf report") do |rp|
-      @options[:ruby_prof] = rp
-    end
-  end
-end