rubybench_runner 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca15668599b749d7424f2af741069ee545fe8896858c4c672fcf09c79472ee95
-  data.tar.gz: 71201b051732cc8cf52865e8bc0a86406eb9059e2fbd9cf89678f674d17016a0
+  metadata.gz: 334483648fd77a009b7b9ba01e47f83ba9b078d1734260d85bc7f8a6c7e837de
+  data.tar.gz: 97b942643361581ef850ae4b2acf73e7bc2986c664ea9239232a0b8d5bd4e379
 SHA512:
-  metadata.gz: b4f64c8f8020652216c1be336580b4e8d4d7e5e7e605658fd631ee34fdd9338b8fd756b29273307aabb68c77445bb8578ed608289c9c7d062e42c5bcc3d01bfa
-  data.tar.gz: 645cfc04e1f8b679bb799be1cb50a5379b165113c56309517809830928534421a062cbe60834bfe93833b5668ad314a67bc01e94cb982558478cdf979ceb8b39
+  metadata.gz: a3a989c8eeaa9d260b976476a2d01185a40b4111f5d35172d3dff4a944237b4a61097af78c2a665ea4fa6a25ca85b05e2349a79f5f8cd628db0b5ebad9e7a100
+  data.tar.gz: 8b22f02267a6f54c14b2772dfb35a77d13351882d0bb14ebf031a54b1381a54dd36e2909f091390924889c82a1b0cb789332664cf3c9d77ae77c67f5b74a9512

data/Gemfile.lock

@@ -10,11 +10,9 @@ GEM
     byebug (11.0.1)
     jaro_winkler (1.5.2)
     minitest (5.11.3)
-    mysql2 (0.5.2)
     parallel (1.17.0)
     parser (2.6.3.0)
       ast (~> 2.4.0)
-    pg (1.1.4)
     rainbow (3.0.0)
     rake (10.5.0)
     rubocop (0.71.0)
@@ -31,11 +29,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.0)
   byebug
   minitest (~> 5.0)
-  mysql2 (= 0.5.2)
-  pg (= 1.1.4)
   rake (~> 10.0)
   rubocop (~> 0.70)
   rubybench_runner!

data/exe/rubybench_runner

@@ -25,7 +25,7 @@ OptionParser.new do |opts|
 
     Available options:
   BANNER
-  opts.on("--db=DB", "Select database to use for the benchmarks. Valud options are: `postgres` and `mysql`") do |v|
+  opts.on("--db=DB", "Select database to use for the benchmarks. Valid options are: `postgres` and `mysql`") do |v|
     v = v.strip.downcase
     pg_options = %w{pg postgres postgresql}
     mysql_options = %w{mysql mysql2}

data/lib/rubybench_runner/base_runner.rb

@@ -40,10 +40,10 @@ module RubybenchRunner
       create_tmpdir
       cleanup(before: true)
       check_dependencies
-      download_script
       write_gemfile
       bundle_install
       setup_db
+      download_script
       run_benchmarks
       process_results
       print_results
@@ -112,12 +112,52 @@ module RubybenchRunner
     end
 
     def check_dependencies
-      return if opts.skip_dependencies_check
+      return if opts.skip_dependencies_check || !require_db?
+
+      if opts.db == "postgres"
+        require_gem 'pg'
+      elsif opts.db == "mysql2"
+        require_gem 'mysql2'
+      end
+
       log("Checking dependencies...")
-      RubybenchRunner::DependenciesChecker.check
+      RubybenchRunner::DependenciesChecker.check(pg: opts.db == "postgres", mysql: opts.db == "mysql2")
     end
 
     def setup_db
+      return if !require_db?
+
+      log("Checking database...")
+      config = RubybenchRunner::Configurations.new(mysql_map: true)
+      if opts.db == "postgres"
+        conn_config = config["postgres"]
+        rubybench_db = conn_config[:dbname]
+        conn_config[:dbname] = "postgres"
+        conn = PG.connect(conn_config)
+        begin
+          res = conn.exec("SELECT 1 FROM pg_database WHERE datname = '#{rubybench_db}'")
+          if !res.first
+            conn.exec("CREATE DATABASE #{rubybench_db}")
+            log("Created PostgreSQL database with the name '#{rubybench_db}'")
+          end
+        ensure
+          conn.close
+        end
+      elsif opts.db == "mysql2"
+        conn_config = config["mysql2"]
+        rubybench_db = conn_config[:database]
+        conn_config[:database] = "mysql"
+        client = Mysql2::Client.new(conn_config)
+        begin
+          res = client.query("SHOW DATABASES LIKE '#{rubybench_db}'")
+          if !res.first
+            client.query("CREATE DATABASE #{rubybench_db}")
+            log("Created MySQL database with the name '#{rubybench_db}'")
+          end
+        ensure
+          client.close
+        end
+      end
     end
 
     def run_benchmarks
@@ -224,10 +264,40 @@ module RubybenchRunner
 
     def normalize_url(url)
       if url =~ /^(https?:\/\/github.com)/
-        url.sub($1, "https://raw.githubusercontent.com").sub("/blob", "")
+        url.sub($1, "https://raw.githubusercontent.com").sub("/blob/", "/")
       else
         url
       end
     end
+
+    # small hack for dynamically installing/requiring gems.
+    # some benchmarks don't require db at all
+    # so having mysql2 and pg in the gemspec file means
+    # everyone must have postgres and mysql installed on
+    # their machine in order to use this gem.
+    # this hack allows us to not require mysql/postgres
+    # until the user tries to run a benchmark that needs db.
+    # --
+    # source https://stackoverflow.com/a/36570445
+
+    def require_gem(gem_name)
+      require 'rubygems/commands/install_command'
+      Gem::Specification::find_by_name(gem_name)
+    rescue Gem::LoadError
+      log("Installing the '#{opts.db}' gem...")
+      install_gem(gem_name)
+    ensure
+      log("Using the '#{opts.db}' gem...")
+      require gem_name
+    end
+
+    def install_gem(gem_name)
+      cmd = Gem::Commands::InstallCommand.new
+      cmd.handle_options [gem_name]     
+
+      cmd.execute
+    rescue Gem::SystemExitException => e
+      puts "FAILURE: #{e.exit_code} -- #{e.message}" if e.exit_code != 0
+    end
   end
 end

data/lib/rubybench_runner/configurations.rb

@@ -8,17 +8,17 @@ module RubybenchRunner
     }
     DEFAULTS = {
       postgres: {
-        user: "postgres",
+        user: nil,
         dbname: "rubybench",
-        host: "localhost",
-        port: 5432,
+        host: nil,
+        port: nil,
         password: nil
       },
       mysql2: {
-        user: "root",
+        user: nil,
         dbname: "rubybench",
-        host: "localhost",
-        port: 3306,
+        host: nil,
+        port: nil,
         password: nil
       },
       config_version: CONFIG_VERSION
@@ -28,11 +28,6 @@ module RubybenchRunner
       if !File.exists?(CONFIG_PATH)
         File.write(CONFIG_PATH, YAML.dump(DEFAULTS))
       end
-
-      if !config_changed?
-        puts "Error: You haven't configured how RubybenchRunner should connect to the database servers on your machine. Please update the #{CONFIG_PATH} file to have the right configurations."
-        exit 1
-      end
     end
 
     def [](key)

data/lib/rubybench_runner/dependencies_checker.rb

@@ -3,31 +3,40 @@ module RubybenchRunner
   CURRENT_PG_VERSION = "9.6"
   CURRENT_MYSQL_VERSION = "5.6.24"
 
-  class MissingDependency < StandardError; end
   class DependenciesChecker
-    def self.check
-      check_pg
-      check_mysql
+    def self.check(pg:, mysql:)
+      check_pg if pg
+      check_mysql if mysql
     end
 
     def self.check_pg
-      output = `pg_config --version`.strip
-      output =~ /^PostgreSQL ([\d.]+)/
-      version = $1
-      if version != CURRENT_PG_VERSION
-        warn("PostgreSQL", version, CURRENT_PG_VERSION)
+      config = RubybenchRunner::Configurations.new[:postgres]
+      config = config.merge(dbname: "postgres")
+      conn = PG.connect(config)
+      begin
+        output = conn.parameter_status("server_version")
+        output =~ /^([\d.]+) \(/
+        version = $1
+        if version != CURRENT_PG_VERSION
+          warn("PostgreSQL", version, CURRENT_PG_VERSION)
+        end
+      ensure
+        conn.close
       end
-    rescue Errno::ENOENT
-      raise MissingDependency.new("Postgres doesn't seem to be installed on your system. Please install it and run the benchmarks again")
     end
 
     def self.check_mysql
-      version = `mysql_config --version`.strip
-      if version != CURRENT_MYSQL_VERSION
-        warn("MySQL", version, CURRENT_MYSQL_VERSION)
+      config = RubybenchRunner::Configurations.new(mysql_map: true)[:mysql2]
+      config = config.merge(database: "mysql")
+      client = Mysql2::Client.new(config)
+      begin
+        version = client.info[:version]
+        if version != CURRENT_MYSQL_VERSION
+          warn("MySQL", version, CURRENT_MYSQL_VERSION)
+        end
+      ensure
+        client.close
       end
-    rescue Errno::ENOENT
-      raise MissingDependency.new("MySQL doesn't seem to be installed on your system. Please install it and run the benchmarks again")
     end
 
     def self.warn(program, installed, recommended)

data/lib/rubybench_runner/rails_runner.rb

@@ -14,53 +14,14 @@ module RubybenchRunner
       config = OpenStruct.new(raw_config[opts.db.to_sym])
       url = "#{opts.db}://#{config.user}"
       url += ":#{config.password}" if config.password
-      url += "@"
-      if config.host && config.port
-        url += "#{config.host}:#{config.port}"
-      end
+      url += "@#{config.host}" if config.host
+      url += ":#{config.port}" if config.port
       url += "/#{config.dbname}"
       with_prep_statement = opts.wps == true
       url += "?prepared_statements=#{with_prep_statement}"
       @db_url = url
     end
 
-    def setup_db
-      return if !require_db?
-      log("Checking database...")
-      config = RubybenchRunner::Configurations.new(mysql_map: true)
-      if opts.db == "postgres"
-        require 'pg'
-        conn_config = config["postgres"]
-        rubybench_db = conn_config[:dbname]
-        conn_config[:dbname] = "postgres"
-        conn = PG.connect(conn_config)
-        begin
-          res = conn.exec("SELECT 1 FROM pg_database WHERE datname = '#{rubybench_db}'")
-          if !res.first
-            conn.exec("CREATE DATABASE #{rubybench_db}")
-            log("Created PostgreSQL database with the name '#{rubybench_db}'")
-          end
-        ensure
-          conn.close
-        end
-      elsif opts.db == "mysql2"
-        require 'mysql2'
-        conn_config = config["mysql2"]
-        rubybench_db = conn_config[:database]
-        conn_config[:database] = "mysql"
-        client = Mysql2::Client.new(conn_config)
-        begin
-          res = client.query("SHOW DATABASES LIKE '#{rubybench_db}'")
-          if !res.first
-            client.query("CREATE DATABASE #{rubybench_db}")
-            log("Created MySQL database with the name '#{rubybench_db}'")
-          end
-        ensure
-          client.close
-        end
-      end
-    end
-
     def benchmark_name
       @benchmark_name ||= "Rails"
     end
@@ -85,7 +46,12 @@ module RubybenchRunner
 
     def require_db?
       filename = @script_url.split("/")[-1]
-      filename.match?(/activerecord|scaffold/)
+      res = filename.match?(/activerecord|scaffold/)
+      if res && !opts.db
+        puts "This benchmark requires database to run. Please specify the `--db` option (see --help for details)"
+        exit 1
+      end
+      res
     end
   end
 end

data/lib/rubybench_runner/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubybenchRunner
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/rubybench_runner.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'rubybench_runner'
   spec.version       = RubybenchRunner::VERSION
 
-  spec.summary       = 'Gem to run rubybench.org benchmarks locally'
+  spec.summary       = 'CLI tool to run rubybench.org benchmarks locally'
   spec.homepage      = 'https://github.com/ruby-bench/rubybench_runner'
   spec.license       = 'MIT'
   spec.authors       = ['Osama Sayegh']
@@ -23,10 +23,6 @@ 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'
-  spec.add_development_dependency 'pg', '1.1.4'
-  spec.add_development_dependency 'mysql2', '0.5.2'
-
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rubybench_runner
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Osama Sayegh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2019-06-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.4
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.5.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -196,5 +154,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Gem to run rubybench.org benchmarks locally
+summary: CLI tool to run rubybench.org benchmarks locally
 test_files: []