test-mysqld 0.0.0 → 0.0.1

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/lib/test/mysqld.rb

@@ -4,35 +4,49 @@ require "tmpdir"
 
 module Test
   class Mysqld
+    def self.auto_start
+      @@auto_start ||= false
+    end
+
+    def self.auto_start=(value)
+      @@auto_start = !!value
+    end
+
+    def self.database
+      @@database ||= 'test'
+    end
+
+    def self.database=(database)
+      @@database = database
+    end
+
     def initialize(options={})
       parse_options options
       raise "mysqld is alread running (#{mycnf["pid-file"]})" if FileTest.exist? mycnf["pid-file"]
-      if options[:auto_start]
-        setup
-        start
-      end
       setup
+      start if options[:auto_start] || self.class.auto_start
     end
 
     def dsn(options={})
       options.tap do |option|
-        options[:port] ||= mycnf["port"] if mycnf["port"]
-        if options[:port]
-          options[:host] ||= mycnf["bind-address"] || "127.0.0.1"
-        else
-          options[:socket] ||= mycnf["socket"]
-        end
+        options[:host]     ||= mycnf["bind-address"] if mycnf["bind-address"]
+        options[:port]     ||= mycnf["port"]
+        options[:socket]   ||= mycnf["socket"]
         options[:username] ||= "root"
-        options[:database] ||= "test"
+        options[:database] ||= self.class.database
       end
     end
 
+    def mycnf_file
+      File.open(base_dir + '/etc/my.cnf', 'rb'){ |f| f.read }
+    end
+
     def setup
       File.open(base_dir + '/etc/my.cnf', 'wb') do |f|
         f.puts "[mysqld]"
         mycnf.each do |key, val|
-          if val.nil? or val.empty?
-            f.puts "#{val}"
+          if val.nil?
+            f.puts "#{key}"
           else
             f.puts "#{key}=#{val}"
           end
@@ -103,6 +117,7 @@ module Test
       @mycnf["socket"]   ||= base_dir + '/tmp/mysql.sock'
       @mycnf["datadir"]  ||= base_dir + '/var'
       @mycnf["pid-file"] ||= base_dir + '/tmp/mysql.pid'
+      @mycnf["port"]     ||= 13306
 
       @mysqld           = options[:mysqld] || find_mysqld
       @mysql_install_db = options[:mysql_install_db] || find_mysql_install_db
@@ -135,7 +150,7 @@ module Test
 
     def create_database
       connection = mysql2_or_mysql_connection
-      connection.query("CREATE DATABASE IF NOT EXISTS test")
+      connection.query("CREATE DATABASE IF NOT EXISTS #{connection.escape self.class.database}")
       connection.close
     end
 
@@ -168,7 +183,9 @@ module Test
       end
       if defined? ::Mysql
         opts = dsn :database => 'mysql'
-        Mysql.new(opts[:username], nil, opts[:host], opts[:port], opts[:database], opts[:socket], opts[:flags])
+        conn = Mysql.new(opts[:host], opts[:username], opts[:password], opts[:database], opts[:port], opts[:socket], opts[:flags])
+        def conn.escape(str); escape_string str; end
+        conn
       else
         nil
       end

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'test-mysqld'
+require 'test/mysqld'
 require 'spec'
 require 'spec/autorun'
 
 Spec::Runner.configure do |config|
-  
+
 end

data/spec/test-mysqld_spec.rb

@@ -1,7 +1,30 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "TestMysqld" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+describe Test::Mysqld do
+  describe ".auto_start" do
+    subject { Test::Mysqld }
+    its(:auto_start) { should be_false }
+
+    context "after set true" do
+      before { Test::Mysqld.auto_start = true }
+      its(:auto_start) { should be_true }
+    end
+
+    describe "should be true or false" do
+      it "set Integer" do
+        Test::Mysqld.auto_start = 1
+        Test::Mysqld.auto_start.should be_true
+      end
+
+      it "set String" do
+        Test::Mysqld.auto_start = "false"
+        Test::Mysqld.auto_start.should be_true
+      end
+
+      it "set nil" do
+        Test::Mysqld.auto_start = nil
+        Test::Mysqld.auto_start.should be_false
+      end
+    end
   end
 end

data/test-mysqld.gemspec

@@ -0,0 +1,52 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{test-mysqld}
+  s.version = "0.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["miyucy"]
+  s.date = %q{2011-05-19}
+  s.description = %q{port of Test::mysqld (mysqld runner for tests)}
+  s.email = %q{miyucy@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/test/mysqld.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/test-mysqld_spec.rb",
+    "test-mysqld.gemspec"
+  ]
+  s.homepage = %q{http://github.com/miyucy/test-mysqld}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{port of Test::mysqld}
+  s.test_files = [
+    "spec/spec_helper.rb",
+    "spec/test-mysqld_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: test-mysqld
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 29
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 0
-  version: 0.0.0
+  - 1
+  version: 0.0.1
 platform: ruby
 authors: 
 - miyucy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 +09:00
+date: 2011-05-19 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,7 +45,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -54,13 +53,14 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/test-mysqld_spec.rb
+- test-mysqld.gemspec
 has_rdoc: true
 homepage: http://github.com/miyucy/test-mysqld
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -84,10 +84,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: port of Test::mysqld
 test_files: 
-- spec/test-mysqld_spec.rb
 - spec/spec_helper.rb
+- spec/test-mysqld_spec.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC