bench_bloc 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2970be47e52ee530bbb07311f9803822b131b622387a92ed7466c9aec3b0ba36
-  data.tar.gz: 9f08eee57d653e12b434cb4cd5e1898a46d528ac297ec030ddcc469e889b3d56
+  metadata.gz: 339f07511f017128a7c7142b2c996c0a1130336dbbcbe23896d8eb48205d01b8
+  data.tar.gz: afa0caf488fd3784a1a73f1b392ebf08b72a5da194c182111ebfb9b71e63f0a6
 SHA512:
-  metadata.gz: a89f3492876b64adca86fbb6e668a047f5e39d2441965edf5f6213061fe99608264aa750c775626bb94cea94d13dc4874216d6ceb89876da057fdc08127a7086
-  data.tar.gz: 3387d9b7090682d90dedf1607ac3320e3f1d46287a12acda57ee884cc15b1723897831968d6a84f27b59571755a5c0c6f6b1581b244cbedc4371ac61a61b4f3d
+  metadata.gz: 3b0126270b0c82e7d67d21bfe49e751cd0d36cd38cef8b9e2e4cf46546ac290c54ca7210702647a371db8f309a201268b257afcfa4d64c0f53318b10e3221665
+  data.tar.gz: fe4dd940274998f9aa3d007a6e88a88925dc87fff74e086f94efb0d9baf2eaacf45f3c9009ea27156853373c50ae1370dfbb5c874cd20699174483b3b6a1d958

data/.ruby-version

@@ -0,0 +1 @@
+2.6.3

data/Gemfile.lock

@@ -1,17 +1,124 @@
 PATH
   remote: .
   specs:
-    bench_bloc (0.1.13)
+    bench_bloc (0.1.14)
+      ruby-prof
 
 GEM
   remote: https://rubygems.org/
   specs:
+    actioncable (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.2.1)
+      actionview (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.2.1)
+      activesupport (= 6.0.2.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.2.1)
+      activesupport (= 6.0.2.1)
+      globalid (>= 0.3.6)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activestorage (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      marcel (~> 0.3.1)
+    activesupport (6.0.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
+    builder (3.2.4)
     coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.6)
     diff-lcs (1.3)
+    erubi (1.9.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    loofah (2.4.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
     method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.0)
+    nio4r (2.5.2)
+    nokogiri (1.10.7)
+      mini_portile2 (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
+    rack (2.1.1)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.2.1)
+      actioncable (= 6.0.2.1)
+      actionmailbox (= 6.0.2.1)
+      actionmailer (= 6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actiontext (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      bundler (>= 1.3.0)
+      railties (= 6.0.2.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
     rake (10.5.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -25,17 +132,43 @@ GEM
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
+    rspec-rails (3.9.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+      rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
+    ruby-prof (1.1.0)
+    sprockets (4.0.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.6)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bench_bloc!
-  bundler (~> 2.0.2)
+  bundler (~> 2.1.4)
   pry
+  rails
   rake (~> 10.0)
   rspec (~> 3.0)
+  rspec-rails
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/bench_bloc.gemspec

@@ -35,8 +35,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.0.2"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "rails"
+  spec.add_development_dependency "rspec-rails"
+  spec.add_runtime_dependency "ruby-prof"
 end

data/lib/bench_bloc.rb

@@ -3,11 +3,16 @@ require 'bench_bloc/bloc/bloc_namespace'
 require 'bench_bloc/bloc/bloc_task'
 require 'bench_bloc/formatter/formatter'
 require 'bench_bloc/formatter/benchmark'
+require 'bench_bloc/formatter/ruby_prof'
 require 'bench_bloc/logger/logger'
+require 'bench_bloc/logger/ruby_prof'
 require 'bench_bloc/railtie' if defined?(Rails)
+require 'bench_bloc/raker/raker'
 require 'bench_bloc/version'
+require 'ruby-prof'
 
 
 module BenchBloc
   class Error < StandardError; end
+  include BenchBloc::Raker
 end

data/lib/bench_bloc/bloc/bloc.rb

@@ -12,7 +12,8 @@ module BenchBloc
       bloc_namespaces.push(
         Bloc::Namespace.new(
           :bench_bloc,
-          bloc_hash
+          bloc_hash,
+          true
         )
       )
     end
@@ -27,13 +28,13 @@ module BenchBloc
       bench_bloc_namespace
         .bloc_namespaces
         .find { |bn| namespace_key == bn.namespace_key }
-    end   
+    end
 
     private
     def is_task? obj
       obj.keys.any?(:profile)
     end
-    
+
     def bench_bloc_namespace
       bloc_namespaces[0]
     end

data/lib/bench_bloc/bloc/bloc_namespace.rb

@@ -1,15 +1,15 @@
 module BenchBloc
   class Bloc::Namespace < BenchBloc::Bloc
-    attr_reader :bloc_namespaces, :bloc_tasks, :namespace_key
-    def initialize namespace_key, bloc_hash
+    attr_reader :bloc_namespaces, :bloc_tasks, :namespace_key, :add_all_task
+    def initialize namespace_key, bloc_hash, add_all_task=false
       super(bloc_hash)
       @namespace_key = namespace_key
-      @bloc_namespaces, @bloc_tasks = [], []      
+      @bloc_namespaces, @bloc_tasks, @add_all_task = [], [], add_all_task
       put_namespace
     end
 
     def put_namespace
-      bloc_hash.keys.each do |bh_key|        
+      bloc_hash.keys.each do |bh_key|
         if is_task? bloc_hash[bh_key]
           bloc_tasks.push(
             BenchBloc::Bloc::Task.new(
@@ -36,6 +36,7 @@ module BenchBloc
         bloc_namespaces.each do |bn|
           bn.rake_namespace
         end
+        put_all_task if @add_all_task
       end
     end
 

data/lib/bench_bloc/bloc/bloc_task.rb

@@ -1,21 +1,33 @@
-require 'bench_bloc'
+# require 'bench_bloc'
 module BenchBloc
   class Bloc::Task < BenchBloc::Bloc
-    attr_reader :description, 
-                :label, 
-                :namespace, 
-                :profile, 
-                :title, 
+    attr_reader :description,
+                :label,
+                :namespace,
+                :profile,
+                :title,
                 :to_profile
-    
+                :ruby_prof
+
     def initialize namespace, bloc_task
       super(bloc_task)
       @namespace = namespace
       parse_bloc_task bloc_task
     end
 
-    # TODO: Put into a TaskRunner class
-    def run_task
+    def rake_task
+      desc description
+      task namespace => :environment do
+        BenchBloc::Logger.new(run_benchmark, description).log_results
+        BenchBloc::Logger::RubyProf
+          .new(run_ruby_prof, description)
+          .log_results if @ruby_prof == true
+      end
+    end
+
+    private
+
+    def run_benchmark
       Benchmark.bm do |x|
         [to_profile.call].flatten.each do |otp|
           x.report(label.call(otp)) do
@@ -25,23 +37,21 @@ module BenchBloc
       end
     end
 
-    def rake_task
-      desc description
-      task namespace => :environment do
-        BenchBloc::Logger.new(run_task, description).log_results
-        # run ruby-prof
-        # format_ruby_prof(run_ruby_prof(new_task[:prof], tp)) if @options[:ruby_prof] == true
+    def run_ruby_prof
+      rp_profile = RubyProf::Profile.new
+      result = rp_profile.profile do
+        @profile.call
       end
     end
 
-    private 
-    
     def parse_bloc_task bloc_task
       @description = bloc_task[:description]
-      @label = bloc_task[:label]      
+      @label = bloc_task[:label]
       @profile = bloc_task[:profile]
       @title = bloc_task[:title]
       @to_profile = bloc_task[:to_profile]
+      @ruby_prof = bloc_task[:ruby_prof] || false
     end
   end
+
 end

data/lib/bench_bloc/formatter/ruby_prof.rb

@@ -0,0 +1,7 @@
+module BenchBloc
+  class Formatter::RubyProf < BenchBloc::Formatter
+    def format_results
+      results
+    end
+  end
+end

data/lib/bench_bloc/logger/ruby_prof.rb

@@ -0,0 +1,25 @@
+require 'ruby-prof'
+module BenchBloc
+  class Logger::RubyProf < BenchBloc::Logger
+    def log_results
+      formatted_results = BenchBloc::Formatter::RubyProf
+                          .new(results, title)
+                          .format_results
+      write_to_log formatted_results
+    end
+
+    def write_to_log results
+      if defined?(Rails)
+        printer = ::RubyProf::FlatPrinter.new(results)
+        File.open("#{Rails.root}/log/bench_bloc_ruby-prof.log", 'w') { |file|
+          printer.print(file)
+        }
+      else
+        printer = ::RubyProf::FlatPrinter.new(results)
+        File.open("log/bench_bloc_ruby-prof.log", "w") { |file|
+          printer.print(file)
+        }
+      end
+    end
+  end
+end

data/lib/bench_bloc/raker/raker.rb

@@ -1,55 +1,20 @@
-module BenchBloc
-  class Raker
-    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_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
+require 'rake'
+module BenchBloc::Raker
+  include Rake::DSL
+  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 add_bench_hooks
-      bench_tasks.each do |task|
-      Rake::Task[task.name]
-        .enhance(['bench_bloc:parse_options_util', 'bench_bloc:clear_tests_util'])
-      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
+
 end

data/lib/bench_bloc/tasks/gen_bench_bloc.rake

@@ -13,5 +13,3 @@ BLOC_FILES.each do |f|
   bench_bloc.rake_bloc
 end
 
-# add_bench_hooks
-

data/lib/bench_bloc/version.rb

@@ -1,3 +1,3 @@
 module BenchBloc
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bench_bloc
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Jeremy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-18 00:00:00.000000000 Z
+date: 2020-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Use a hash syntax to automatically generate rake tasks which run benchmarks
   on given blocks of code
 email:
@@ -76,6 +118,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -87,16 +130,15 @@ files:
 - bin/console
 - bin/setup
 - lib/bench_bloc.rb
-- lib/bench_bloc/bloc.rb
 - lib/bench_bloc/bloc/bloc.rb
 - lib/bench_bloc/bloc/bloc_namespace.rb
 - lib/bench_bloc/bloc/bloc_task.rb
-- lib/bench_bloc/bloc_namespace.rb
-- lib/bench_bloc/bloc_task.rb
 - lib/bench_bloc/formatter/benchmark.rb
 - lib/bench_bloc/formatter/formatter.rb
+- lib/bench_bloc/formatter/ruby_prof.rb
 - lib/bench_bloc/helpers/ruby_prof_helpers.rb
 - lib/bench_bloc/logger/logger.rb
+- lib/bench_bloc/logger/ruby_prof.rb
 - lib/bench_bloc/railtie.rb
 - lib/bench_bloc/raker/raker.rb
 - lib/bench_bloc/tasks/gen_bench_bloc.rake

data/lib/bench_bloc/bloc.rb

@@ -1,42 +0,0 @@
-require 'rake'
-module BenchBloc
-  # Responsible for generating rake tasks from a hash and/or creating child Blocs
-  class Bloc
-    include Rake::DSL
-    attr_accessor :bloc_hash, :bloc_namespaces
-    def initialize bloc_hash
-      @bloc_hash, @bloc_namespaces = bloc_hash, []
-    end
-
-    def generate_bloc
-      bloc_namespaces.push(
-        Bloc::Namespace.new(
-          :bench_bloc,
-          bloc_hash
-        )
-      )
-    end
-
-    def rake_bloc
-      bloc_namespaces.each do |bn|
-        bn.rake_namespace
-      end
-    end
-
-    def [](namespace_key)
-      bench_bloc_namespace
-        .bloc_namespaces
-        .find { |bn| namespace_key == bn.namespace_key }
-    end
-
-    private
-    def is_task? obj
-      obj.keys.any?(:to_profile)
-    end
-
-    def bench_bloc_namespace
-      bloc_namespaces[0]
-    end
-
-  end
-end

data/lib/bench_bloc/bloc_namespace.rb

@@ -1,43 +0,0 @@
-module BenchBloc
-  class Bloc::Namespace < BenchBloc::Bloc
-    attr_reader :bloc_namespaces, :bloc_tasks, :namespace_key
-    def initialize namespace_key, bloc_hash
-      super(bloc_hash)
-      @namespace_key = namespace_key
-      @bloc_namespaces, @bloc_tasks = [], []
-      put_namespace
-    end
-
-    def put_namespace
-      bloc_hash.keys.each do |bh_key|
-        if is_task? bloc_hash[bh_key]
-          bloc_tasks.push(
-            BenchBloc::Bloc::Task.new(
-              bh_key,
-              bloc_hash[bh_key]
-            )
-          )
-        else
-          bloc_namespaces.push(
-            Bloc::Namespace.new(
-              bh_key,
-              bloc_hash[bh_key]
-            )
-          )
-        end
-      end
-    end
-
-    def rake_namespace
-      namespace namespace_key do
-        bloc_tasks.each do |bt|
-          bt.rake_task
-        end
-        bloc_namespaces.each do |bn|
-          bn.rake_namespace
-        end
-      end
-    end
-
-  end
-end

data/lib/bench_bloc/bloc_task.rb

@@ -1,37 +0,0 @@
-module BenchBloc
-  class Bloc::Task < BenchBloc::Bloc
-    attr_reader :description,
-                :label,
-                :namespace,
-                :profile,
-                :title,
-                :to_profile
-
-    def initialize namespace, bloc_task
-      super(bloc_task)
-      @namespace = namespace
-      parse_bloc_task bloc_task
-    end
-
-    def rake_task
-      desc description
-      task namespace => :environment do
-        to_profs = [to_profile.call].flatten
-        bm_results = bm_run_results self, to_profs
-        bm_log_results bm_results, description
-        # run ruby-prof
-        # format_ruby_prof(run_ruby_prof(new_task[:prof], tp)) if @options[:ruby_prof] == true
-      end
-    end
-
-    private
-
-    def parse_bloc_task bloc_task
-      @description = bloc_task[:description]
-      @label = bloc_task[:label]
-      @profile = bloc_task[:profile]
-      @title = bloc_task[:title]
-      @to_profile = bloc_task[:to_profile]
-    end
-  end
-end