fidius-common 0.0.4beta0 → 0.0.5

data/.gitignore

@@ -5,3 +5,4 @@ pkg/*
 doc/
 .yardoc/
 coverage/
+*.sqlite3

data/fidius-common.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_development_dependency 'simplecov', '>= 0.4.0'
   s.add_runtime_dependency 'activesupport', '>= 3.0.0'
+  s.add_runtime_dependency 'activerecord', '>= 3.0.0'
+  s.add_runtime_dependency 'sqlite3'
 
   s.rdoc_options << '--title' << s.name <<
                     '--main'  << 'README.md' << '--show-hash' <<

data/lib/fidius-common/version.rb

@@ -2,7 +2,7 @@ module FIDIUS
   module Common
 
     # Current version number
-    VERSION = "0.0.4beta0"
+    VERSION = "0.0.5"
 
   end # module Common
 end # module FIDIUS

data/test/t_helper.rb

@@ -1,4 +1,3 @@
 require 'simplecov'
 SimpleCov.start
 require 'test/unit'
-

data/test/test_yamldb/database.yml

@@ -0,0 +1,5 @@
+test_db:
+  adapter: sqlite3
+  database: test/test_yamldb/test_db.sqlite3
+  pool: 5
+  timeout: 5000

data/test/test_yamldb/db-install.rb

@@ -0,0 +1,101 @@
+require 'active_record'
+require 'logger'
+
+
+module DbInstall
+  def self.migrate migrations_path, db_config_path
+    @CFG_D = db_config_path
+
+    self.connection_data
+
+    begin
+      self.drop_database @connection_data['test_db']
+    rescue
+      puts "DB drop: Could not find database #{@connection_data['database']}"
+    end
+
+    self.create_database @connection_data['test_db']
+
+    self.with_db do
+      ActiveRecord::Migrator.migrate(migrations_path, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+    end
+  end
+
+  def connection_data
+    @connection_data ||= YAML.load_file("#{@CFG_D}/database.yml")
+  end
+
+  def with_db &block
+    begin
+      ActiveRecord::Base.establish_connection(connection_data['test_db'])
+      ActiveRecord::Base.logger = Logger.new(STDOUT)
+      ActiveRecord::Base.logger.level = Logger::WARN
+      yield connection_data
+    rescue
+      raise
+    ensure
+      ActiveRecord::Base.connection.disconnect!
+    end
+  end
+
+  # copied and modified activerecord-3.0.4/lib/active_record/railties/database.rake
+  def drop_database(config)
+    case config['adapter']
+    when /sqlite/
+      FileUtils.rm (config['database'])
+    when /mysql/
+      ActiveRecord::Base.establish_connection(config)
+      ActiveRecord::Base.connection.drop_database config['database']
+    when 'postgresql'
+      ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
+      ActiveRecord::Base.connection.drop_database config['database']
+    end
+  end
+
+  # dito
+  def create_database(config)
+    case config['adapter']
+
+    when /mysql/
+      require 'mysql'
+      @charset   = ENV['CHARSET']   || 'utf8'
+      @collation = ENV['COLLATION'] || 'utf8_unicode_ci'
+      creation_options = {:charset => (config['charset'] || @charset), :collation => (config['collation'] || @collation)}
+      error_class = config['adapter'] =~ /mysql2/ ? Mysql2::Error : Mysql::Error
+      access_denied_error = 1045
+      begin
+        ActiveRecord::Base.establish_connection(config.merge('database' => nil))
+        ActiveRecord::Base.connection.create_database(config['database'], creation_options)
+        ActiveRecord::Base.establish_connection(config)
+      rescue error_class => sqlerr
+        if sqlerr.errno == access_denied_error
+          print "#{sqlerr.error}. \nPlease provide the root password for your mysql installation\n>"
+          root_password = $stdin.gets.strip
+          grant_statement = "GRANT ALL PRIVILEGES ON #{config['database']}.* " \
+          "TO '#{config['username']}'@'localhost' " \
+          "IDENTIFIED BY '#{config['password']}' WITH GRANT OPTION;"
+          ActiveRecord::Base.establish_connection(config.merge('database' => nil, 'username' => 'root', 'password' => root_password))
+          ActiveRecord::Base.connection.create_database(config['database'], creation_options)
+          ActiveRecord::Base.connection.execute grant_statement
+          ActiveRecord::Base.establish_connection(config)
+        else
+          $stderr.puts sqlerr.error
+          $stderr.puts "Couldn't create database for #{config.inspect}, charset: #{config['charset'] || @charset}, collation: #{config['collation'] || @collation}"
+          $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config['charset']
+        end
+      end
+    when 'postgresql'
+      @encoding = config['encoding'] || ENV['CHARSET'] || 'utf8'
+      begin
+        ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
+        ActiveRecord::Base.connection.create_database(config['database'], config.merge('encoding' => @encoding))
+        ActiveRecord::Base.establish_connection(config)
+      rescue Exception => e
+        $stderr.puts e, *(e.backtrace)
+        $stderr.puts "Couldn't create database for #{config.inspect}"
+      end
+    end
+
+  end
+
+end

data/test/test_yamldb/migrations/20110415111241_create_abcs.rb

@@ -0,0 +1,16 @@
+class CreateAbcs < ActiveRecord::Migration
+  def self.up
+    create_table :abcs do |t|
+      t.string :a
+      t.integer :b
+      t.string :c
+
+      t.timestamps
+    end
+
+  end
+
+  def self.down
+    drop_table :abcs
+  end
+end

data/test/test_yamldb/migrations/20110415111333_create_defs.rb

@@ -0,0 +1,16 @@
+class CreateDefs < ActiveRecord::Migration
+  def self.up
+    create_table :defs do |t|
+      t.integer :d
+      t.string :e
+      t.integer :f
+
+      t.timestamps
+    end
+
+  end
+
+  def self.down
+    drop_table :defs
+  end
+end

data/test/test_yamldb/migrations/20110421151300_create_default_abcs.rb

@@ -0,0 +1,9 @@
+class CreateDefaultAbcs < ActiveRecord::Migration
+  def self.up
+    Abc.find_or_create_by_a_and_b_and_c(:a => 'TestA', :b => 1, :c => "TestC")
+  end
+
+  def self.down
+    Abc.first.destroy!
+  end
+end

data/test/test_yamldb/migrations/20110421151500_create_default_defs.rb

@@ -0,0 +1,9 @@
+class CreateDefaultDefs < ActiveRecord::Migration
+  def self.up
+    Def.find_or_create_by_d_and_e_and_f(:d => 2, :e => 'TestD', :f => 3)
+  end
+
+  def self.down
+    Def.first.destroy!
+  end
+end

data/test/test_yamldb/models/abc.rb

@@ -0,0 +1,2 @@
+class Abc < ActiveRecord::Base
+end

data/test/test_yamldb/models/def.rb

@@ -0,0 +1,2 @@
+class Def < ActiveRecord::Base
+end

data/test/test_yamldb.rb

@@ -0,0 +1,40 @@
+require 't_helper'
+require 'fidius-common/yamldb'
+require 'sqlite3'
+require 'fileutils'
+
+require 'test_yamldb/db-install'
+require 'test_yamldb/models/abc'
+require 'test_yamldb/models/def'
+
+BASE_DIR = File.join('test','test_yamldb')
+MIGRATIONS = File.join(BASE_DIR, 'migrations')
+DB_CONFIG = File.join(BASE_DIR, 'database.yml')
+EXPORT_DIR = File.join(BASE_DIR, 'test_db')
+TEST_DB = File.join(BASE_DIR, 'test_db.sqlite3')
+
+include DbInstall
+
+class YamlDbTest < Test::Unit::TestCase
+
+  def setup
+    DbInstall.migrate(MIGRATIONS, BASE_DIR)
+
+    FIDIUS::Common::Db.export(DB_CONFIG, 'test_db', BASE_DIR, false)
+  end
+
+  def test_export
+    assert(File.exists?(EXPORT_DIR))
+    assert(File.exists?(File.join(EXPORT_DIR, 'test_db.yml')))
+    assert(File.exists?(File.join(EXPORT_DIR, 'schema.rb')))
+  end
+
+  def test_import
+    FIDIUS::Common::Db.import(DB_CONFIG, 'test_db', EXPORT_DIR)
+  end
+
+  def teardown
+    FileUtils.rm_r EXPORT_DIR if File.exists? EXPORT_DIR
+    FileUtils.rm TEST_DB if File.exists? TEST_DB
+  end
+end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fidius-common
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 4beta0
-  version: 0.0.4beta0
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Dominik Menke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 +02:00
+date: 2011-04-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,34 @@ dependencies:
         version: 3.0.0
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: |-
   Common useful libraries and methods for the FIDIUS C&C server, the FIDIUS 'architecture' and maybe other components.
   
@@ -80,6 +108,15 @@ files:
 - test/t_helper.rb
 - test/test_iphelper.rb
 - test/test_json_addon.rb
+- test/test_yamldb.rb
+- test/test_yamldb/database.yml
+- test/test_yamldb/db-install.rb
+- test/test_yamldb/migrations/20110415111241_create_abcs.rb
+- test/test_yamldb/migrations/20110415111333_create_defs.rb
+- test/test_yamldb/migrations/20110421151300_create_default_abcs.rb
+- test/test_yamldb/migrations/20110421151500_create_default_defs.rb
+- test/test_yamldb/models/abc.rb
+- test/test_yamldb/models/def.rb
 has_rdoc: true
 homepage: ""
 licenses: []
@@ -114,13 +151,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: ""