mrd 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a85fe439b91ca1806126a922e387d1660e6f36f6
-  data.tar.gz: 1a59b7a533dc5df2c6d006e52d0628d71a896de2
+  metadata.gz: 364fd55cd8c15cc660400b7969a23a987fabc6f3
+  data.tar.gz: 9c950b027b1f0c3bfb3cf74ad860f7c3e5df4e55
 SHA512:
-  metadata.gz: ce8721449dea7d66a1720dcb231a32f2fc3db9436e8f1440e3dc884a5d878078178a84381c2a56dcdcaa89aa7e6271fae36b461239a6d6d4a7775a0ac0aa74a4
-  data.tar.gz: 84a9f5f563ac2408bb744c5347b24e089a678ece9b8d00e4738fd46d97012746565c9eab68daab366b1d991c18c00954e312f47f7040abff5efca85b2db82d9b
+  metadata.gz: e501413fcf0ec244a7e9cdce72a4860c29191044c6817836db452086119a9e781973ef7204c730a59704abe6b1e1e1798252752163130eb6ec86649f4c668a4c
+  data.tar.gz: 2c874b52b711949c399c8ba72aad9774f91e904f6e4a58abd0db731b7828028350f27a6004168dcc2173b2dca7aa4002ce15d55e24c435905a44519359df848d

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source ENV.fetch('GEM_SOURCE', 'https://rubygems.org')
 
 # Specify your gem's dependencies in mrd.gemspec
 gemspec

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    mrd (0.0.5)
+    mrd (0.0.6)
       term-ansicolor
 
 GEM
-  remote: https://rubygems.org/
+  remote: http://yarp.dev/
   specs:
     rake (10.1.0)
     term-ansicolor (1.2.2)
       tins (~> 0.8)
-    tins (0.8.3)
+    tins (0.9.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -37,6 +37,7 @@ Then, if using Rails, point your `database.yml` to the temporary SQL server:
     Usage:  [options]
         -v, --verbose                    Run verbosely
         -s, --size SIZE                  Size of RAM disk in MB (default 1024)
+        -p, --port PORT                  Run MySQL listening on specified port
         -l, --log                        Create mysql.log
 
 ## Contributing

data/bin/mrd

@@ -107,12 +107,14 @@ class App
     include Runner
 
     attr :socket
+    attr :port
 
-    def initialize(ramdisk, log = false)
+    def initialize(ramdisk, log = false, port = 0)
       @ramdisk = ramdisk
       @install_db = find_command! %w(mysql_install_db5 mysql_install_db)
       @mysqld     = find_command! %w(mysqld_safe5 mysqld_safe)
       @log        = log
+      @port       = port
     end
 
     def start
@@ -121,6 +123,13 @@ class App
         fd.write %Q{
           [client]
           socket = #{socket}
+        }.gsub(/^\s+/,'')
+        if @port > 0
+          fd.write %Q{
+            port = #{port}
+          }.gsub(/^\s+/,'')
+        end
+        fd.write %Q{
           [mysqld]
           socket = #{socket}
           thread_concurrency = 4
@@ -133,7 +142,12 @@ class App
             log_output = FILE
             general_log = 1
             general_log_file = "#{@ramdisk.mountpoint}/mysql.log"
-          }
+          }.gsub(/^\s+/,'')
+        end
+        if @port > 0
+          fd.write %Q{
+            port = #{port}
+          }.gsub(/^\s+/,'')
         end
       end
 
@@ -145,8 +159,14 @@ class App
 
       # Start server in another thread
       Logger.info 'Starting MySQL server'
-      @thread = Thread.new do 
-        run!("#{@mysqld} --defaults-file='#{configfile}' --socket='#{socket}' --datadir='#{@ramdisk.mountpoint}' --pid-file='#{pidfile}' --skip-networking")
+      @thread = Thread.new do
+        command = "#{@mysqld} --defaults-file='#{configfile}' --datadir='#{@ramdisk.mountpoint}' --pid-file='#{pidfile}' --socket='#{socket}'"
+        if @port > 0
+          command += " --port=#{port}"
+        else
+          command += " --skip-networking"
+        end
+        run!(command)
       end
 
       # Wait for PID file
@@ -202,7 +222,7 @@ class App
 
 
   def initialize(argv)
-    @options = OpenStruct.new(:verbose => false, :size => 1024, :log => false)
+    @options = OpenStruct.new(:verbose => false, :size => 1024, :log => false, :port => 0)
     option_parser.parse(argv)
 
     Logger.level = options.verbose ? 
@@ -213,7 +233,7 @@ class App
 
   def main
     @ramdisk = Ramdisk.new(options.size)
-    @server = MySQLServer.new(@ramdisk, options.log)
+    @server = MySQLServer.new(@ramdisk, options.log, options.port)
     rd,wr = IO.pipe
 
     if pid = Process.fork
@@ -249,6 +269,7 @@ class App
     # Log and wait for user input
     Logger.info "MySQL is now running."
     Logger.info "A query log can be found at '#{@ramdisk.mountpoint}/mysql.log'" if options.log
+    Logger.info "MySQL is listening on port '#{options.port}'" if options.port > 0
     Logger.info "Configure you client to use the root user, no password, and the socket at '#{@server.socket}'."
     Logger.info "Just close this terminal or press ^C when you no longer need it."
     wait_forever
@@ -285,6 +306,10 @@ class App
       opts.on("-l", "--log", "Create mysql.log") do |v|
         options.log = v
       end
+
+      opts.on("-p", "--port PORT", Integer,  "Run MySQL listening on specified port") do |v|
+        options.port = v
+      end
     end
   end 
 

data/lib/mrd/version.rb

@@ -1,3 +1,3 @@
 module Mrd
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mrd
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake