miguel 0.1.0.pre6 → 0.1.0.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46b9b8bd87e9bbcb4d68e8a4b0687709dd477b4a
-  data.tar.gz: d5386b82cf60542e68e3bacfce52407d4242dd25
+  metadata.gz: c9d433cde1f5c11fbaa6f05447d646c48164a9ae
+  data.tar.gz: fc5cdeef2a2ddd96b23fdc815dbfd4e7befd91d8
 SHA512:
-  metadata.gz: 9aae54cd7492a54b558931ccecb008d07559db82d3864b690bd27dde855864eaac4e3d72d9dfaff22a5d7de0f2fc732a65a63e5eed7b291e0e2a68296fa2e7b3
-  data.tar.gz: 59015a5b44a5f50c107ddda26d7f5369f08b732c8f0c8baaa64406c5dd6d9feb834655d3fde72a72d1d9098813460c6d2e3956cd92d4e67b6d2dd105c324fb78
+  metadata.gz: e3f618e52170198078448a50a0fb7673958a5ed3ef7e01eb42226035008e7219d61e5851d7c4b7ceed82bb5e0c878ca95c6cc5b813fbf09684af94e28eaaacb7
+  data.tar.gz: dd7b64ea4f90f82af8112405a268690311f2ad6d82fce7beab3c7c042394dbf1d0d482c91c8e24b9c12a493e22c3d72f4cb70248158c31adb9d914295486b337

data/.gitignore

@@ -1,2 +1,3 @@
 *~
 /miguel-*.gem
+/coverage

data/lib/miguel/command.rb

@@ -165,7 +165,7 @@ module Miguel
       elsif File.exist?( name )
         config = load_db_config( name )
         Sequel.connect( config )
-      elsif name =~ /:\/\//
+      elsif name =~ /:/
         Sequel.connect( name )
       else
         fail "Database config #{name} not found."

data/lib/miguel/schema.rb

@@ -548,7 +548,7 @@ module Miguel
       # not the default :Integer, and :integer can't be specified for compound keys,
       # so we have to use the callback to set the type only at correct times.
       # Furthermore, Postgres's autoincrementing serials only work with Integer,
-      # so we set the type only as long as the unsigned keys are not requested.
+      # so we set the type only as long as the unsigned keys are requested.
 
       unsigned_keys = !! opts[ :unsigned_keys ]
 

data/miguel.gemspec

@@ -4,7 +4,7 @@ require File.expand_path( '../lib/miguel/version', __FILE__ )
 
 Gem::Specification.new do |s|
   s.name        = 'miguel'
-  s.version     = Miguel::VERSION + '.pre6'
+  s.version     = Miguel::VERSION + '.pre7'
   s.summary     = 'Database migrator and migration generator for Sequel.'
   s.description = <<EOT
 This gem makes it easy to create and maintain an up-to-date database schema
@@ -13,7 +13,7 @@ EOT
 
   s.author      = 'Patrik Rak'
   s.email       = 'patrik@raxoft.cz'
-  s.homepage    = 'http://rubygems.org/gems/miguel'
+  s.homepage    = 'https://github.com/raxoft/miguel'
   s.license     = 'MIT'
 
   s.files       = `git ls-files`.split( "\n" )

data/test/coverage.rb

@@ -0,0 +1,9 @@
+# Enable coverage testing in external command.
+
+require 'simplecov'
+SimpleCov.start do
+  command_name ENV[ 'COVERAGE_COMMAND_NAME' ] || "#{$PROGRAM_NAME} #{ARGV.join( ' ' )}"
+  formatter SimpleCov::Formatter::SimpleFormatter
+end
+
+# EOF #

data/test/data/jruby.yml

@@ -0,0 +1,15 @@
+# Database configuration for JRuby.
+
+development:
+  adapter: jdbc
+  url: 'jdbc:sqlite::memory:'
+
+mysql:
+  adapter: jdbc
+  url: 'jdbc:mysql://localhost/miguel_test?user=travis&password='
+
+postgres:
+  adapter: jdbc
+  url: 'jdbc:postgresql://localhost/miguel_test?user=postgres'
+
+# EOF #

data/test/helper.rb

@@ -2,11 +2,21 @@
 
 # Test coverage if enabled.
 
+def jruby?
+  defined?( RUBY_ENGINE ) and RUBY_ENGINE == 'jruby'
+end
+
+if ENV[ 'COVERAGE' ]
+  require 'simplecov'
+  SimpleCov.start
+end
+
 begin
-  require "codeclimate-test-reporter"
+  require 'codeclimate-test-reporter'
   CodeClimate::TestReporter.start
+  ENV[ 'COVERAGE' ] = 'on'
 rescue LoadError
-end
+end unless jruby?
 
 # Setup helpers.
 
@@ -16,6 +26,10 @@ SEQ_COUNT = Dir[ "#{DATA_DIR}/seq_*.rb" ].count
 
 class Bacon::Context
 
+  def database_config
+    jruby? ? 'jruby.yml' : 'db.yml'
+  end
+
   def data( name )
     "#{DATA_DIR}/#{name}"
   end

data/test/test_command.rb

@@ -19,7 +19,7 @@ describe Miguel::Command do
   end
 
   def with_tempfile( content = nil, extension = 'rb' )
-    f = Tempfile.new( [ 'miguel', ".#{extension}" ] )
+    f = Tempfile.new( [ 'miguel', "-#{content ? content.hash : 'new'}.#{extension}" ] )
     if content
       f.write( content )
       f.flush
@@ -31,9 +31,17 @@ describe Miguel::Command do
     f.unlink
   end
 
+  def sequence_number
+    @sequence_number = @sequence_number.to_i + 1
+  end
+
   def run( *args )
+    if ENV[ 'COVERAGE' ]
+      coverage = %w[ -r ./test/coverage ]
+      ENV[ 'COVERAGE_COMMAND_NAME' ] = "Command Test ##{sequence_number}"
+    end
     out = err = nil
-    Open3.popen3( 'ruby', 'bin/miguel', *args ) do |i, o, e, t|
+    Open3.popen3( 'ruby', *coverage, 'bin/miguel', *args ) do |i, o, e, t|
       yield i if block_given?
       i.close
       out = o.read
@@ -79,57 +87,59 @@ describe Miguel::Command do
   end
 
   should 'show changes needed to migrate from one schema to another' do
-    schema = 'sqlite://'
-    SEQ_COUNT.times do |i|
-      new_schema = data( "seq_#{i}.rb" )
-      out = test( 'diff', '-m', 'full', schema, new_schema )
-      match_file( out, "seq_#{i}.txt" )
-      schema = new_schema
+    with_tempfile( nil, 'db' ) do |path|
+      schema = jruby? ? "jdbc:sqlite:#{path}" : "sqlite://#{path}"
+      SEQ_COUNT.times do |i|
+        new_schema = data( "seq_#{i}.rb" )
+        out = test( 'diff', '-m', 'full', schema, new_schema )
+        match_file( out, "seq_#{i}.txt" )
+        schema = new_schema
+      end
     end
   end
 
   should 'apply schema to the database' do
-    test( 'apply', '--env', 'mysql', data( 'db.yml' ), data( 'schema.rb' ), '--force' ).should.not.be.empty
-    test( 'apply', '--env', 'mysql', data( 'db.yml' ), data( 'schema.rb' ), '--force' ).should.match /\ANo changes are necessary\.\Z/
+    test( 'apply', '--env', 'mysql', data( database_config ), data( 'schema.rb' ), '--force' ).should.not.be.empty
+    test( 'apply', '--env', 'mysql', data( database_config ), data( 'schema.rb' ), '--force' ).should.match /\ANo changes are necessary\.\Z/
   end
 
   should 'be able to clear the entire database' do
-    test( 'apply', '--env', 'mysql', data( 'db.yml' ), data( 'schema.rb' ), '--force' )
-    test( 'clear', '--env', 'mysql', data( 'db.yml' ), '--force' ).should.not.be.empty
-    test( 'clear', '--env', 'mysql', data( 'db.yml' ), '--force' ).should.match /\ANo changes are necessary\.\Z/
+    test( 'apply', '--env', 'mysql', data( database_config ), data( 'schema.rb' ), '--force' )
+    test( 'clear', '--env', 'mysql', data( database_config ), '--force' ).should.not.be.empty
+    test( 'clear', '--env', 'mysql', data( database_config ), '--force' ).should.match /\ANo changes are necessary\.\Z/
   end
 
   should 'require confirmation before changing the database' do
-    out, err = run( 'apply', '--env', 'mysql', data( 'db.yml' ), data( 'schema.rb' ) )
+    out, err = run( 'apply', '--env', 'mysql', data( database_config ), data( 'schema.rb' ) )
     out.should.match /^Confirm \(yes or no\)\?/
     err.should.match /\AOK, aborting\.\Z/
 
-    out, err = run( 'apply', '--env', 'mysql', data( 'db.yml' ), data( 'schema.rb' ) ) do |input|
+    out, err = run( 'apply', '--env', 'mysql', data( database_config ), data( 'schema.rb' ) ) do |input|
       input.write 'blah'
     end
     out.should.match /^Confirm \(yes or no\)\?/
     out.should.match /Please answer 'yes' or 'no'\.$/
     err.should.match /\AOK, aborting\.\Z/
 
-    out, err = run( 'apply', '--env', 'mysql', data( 'db.yml' ), data( 'schema.rb' ) ) do |input|
+    out, err = run( 'apply', '--env', 'mysql', data( database_config ), data( 'schema.rb' ) ) do |input|
       input.write 'no'
     end
     out.should.match /^Confirm \(yes or no\)\?/
     out.should.not.match /Please answer 'yes' or 'no'\.$/
     err.should.match /\AOK, aborting\.\Z/
 
-    out, err = run( 'apply', '--env', 'mysql', data( 'db.yml' ), data( 'schema.rb' ) ) do |input|
+    out, err = run( 'apply', '--env', 'mysql', data( database_config ), data( 'schema.rb' ) ) do |input|
       input.write 'yes'
     end
     out.should.match /^Confirm \(yes or no\)\?/
     out.should.match /OK, those changes were applied\./
     err.should.be.empty
 
-    out, err = run( 'clear', '--env', 'mysql', data( 'db.yml' ) )
+    out, err = run( 'clear', '--env', 'mysql', data( database_config ) )
     out.should.match /^Confirm \(yes or no\)\?/
     err.should.match /\AOK, aborting\.\Z/
 
-    out, err = run( 'clear', '--env', 'mysql', data( 'db.yml' ) ) do |input|
+    out, err = run( 'clear', '--env', 'mysql', data( database_config ) ) do |input|
       input.write 'yes'
     end
     out.should.match /^Confirm \(yes or no\)\?/
@@ -138,19 +148,19 @@ describe Miguel::Command do
   end
 
   should 'show no changes when told so' do
-    test( 'apply', '--env', 'mysql', data( 'db.yml' ), data( 'schema.rb' ), '--force', '--quiet' ).should.be.empty
-    test( 'apply', '--env', 'mysql', data( 'db.yml' ), data( 'schema.rb' ), '--force', '--quiet' ).should.be.empty
-    test( 'clear', '--env', 'mysql', data( 'db.yml' ), '--force', '--quiet' ).should.be.empty
-    test( 'clear', '--env', 'mysql', data( 'db.yml' ), '--force', '--quiet' ).should.be.empty
+    test( 'apply', '--env', 'mysql', data( database_config ), data( 'schema.rb' ), '--force', '--quiet' ).should.be.empty
+    test( 'apply', '--env', 'mysql', data( database_config ), data( 'schema.rb' ), '--force', '--quiet' ).should.be.empty
+    test( 'clear', '--env', 'mysql', data( database_config ), '--force', '--quiet' ).should.be.empty
+    test( 'clear', '--env', 'mysql', data( database_config ), '--force', '--quiet' ).should.be.empty
   end
 
   should 'log SQL commands to stdout when requested' do
-    test( 'show', '--env', 'mysql', data( 'db.yml' ), '--echo' ).should.match /SHOW FULL TABLES/
+    test( 'show', '--env', 'mysql', data( database_config ), '--echo' ).should.match /SHOW FULL TABLES/
   end
 
   should 'log SQL commands to given file when requested' do
     with_tempfile do |path|
-      test( 'show', '--env', 'mysql', data( 'db.yml' ), '--log', path )
+      test( 'show', '--env', 'mysql', data( database_config ), '--log', path )
       File.read( path ).should.match /SHOW FULL TABLES/
     end
   end

data/test/test_importer.rb

@@ -38,7 +38,7 @@ describe Miguel::Importer do
   end
 
   def databases
-    YAML.load_file( data( 'db.yml' ) ).map do |env, config|
+    YAML.load_file( data( database_config ) ).map do |env, config|
       Sequel.connect( config )
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miguel
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre6
+  version: 0.1.0.pre7
 platform: ruby
 authors:
 - Patrik Rak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -94,7 +94,6 @@ files:
 - ".travis.yml"
 - README.md
 - Rakefile
-- TODO
 - bin/miguel
 - examples/db.yml
 - examples/schema.rb
@@ -106,7 +105,9 @@ files:
 - lib/miguel/schema.rb
 - lib/miguel/version.rb
 - miguel.gemspec
+- test/coverage.rb
 - test/data/db.yml
+- test/data/jruby.yml
 - test/data/schema.rb
 - test/data/schema.txt
 - test/data/schema_bare.txt
@@ -128,7 +129,7 @@ files:
 - test/test_importer.rb
 - test/test_migrator.rb
 - test/test_schema.rb
-homepage: http://rubygems.org/gems/miguel
+homepage: https://github.com/raxoft/miguel
 licenses:
 - MIT
 metadata: {}

data/TODO

@@ -1 +0,0 @@
-add tests