dm-is-reflective 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e0cf6d64d700dd5f9892573cc43a1d19eb3ba2cd
-  data.tar.gz: 7c7647fd2e0a7c917aaf4b035432cff3849ad828
+SHA256:
+  metadata.gz: 972e519551e2031e811a3e88abca4ae417993dfd88c14c3470784f2abe5ddeaa
+  data.tar.gz: ffc5f2f1637e6fd97304a40533326361226661693038e0a30ef333f05ed522cd
 SHA512:
-  metadata.gz: f2551113619f6540170864bcb217550037d70e5f4887812c88501b8aa302174080b7244817596e47d45e7d9826b0d152a39cc040d352a2d7803795b33e5946b0
-  data.tar.gz: eb33bdb42e9c47d686a7f8cd99a8848f99260fa82053d751e070855de838f045aa4b146b5919fa469a77b9b8b3b71cfd1f7b9cbb59b658d37c2e6702e64c10f6
+  metadata.gz: 31ca16bc14df04ad99fc3b4141d5730e123e81fd64304b188f54cd576045856b8441dd14f537755d7a7dd846a6d99aafa0206a0c7cfd21bc32a4109097406b7f
+  data.tar.gz: 8cd3bb490db9d397b02ae9b1e78424547ad6cbd4885ccb991f527a372265104157b034bb5e3b74336f9ff1278bb207545d2eff1d269839fa88aef6572a807be6

data/.gitignore

@@ -1,7 +1,2 @@
-tmp
-pkg
-doc
-ann-*
-Gemfile.lock
-
+/pkg/
 *.rbc

data/.travis.yml

@@ -1,15 +1,28 @@
-before_install:
-  - 'git submodule update --init'
-  - mysql -e 'create database myapp_test;'
-  - psql -c 'create database myapp_test;' -U postgres
+sudo: false
+language: ruby
+
+install: 'gem install bundler; bundle install --retry=3'
+script: 'ruby -vr bundler/setup -S rake test'
 
-script: 'ruby -r bundler/setup -S rake test'
+matrix:
+  include:
+    - rvm: 2.2
+    - rvm: 2.3
+    - rvm: 2.4
+    - rvm: ruby-head
+    - rvm: jruby
+      env: JRUBY_OPTS=--debug
+    - rvm: rbx
 
-env:
-  - 'RBXOPT=-X19'
+  allow_failures:
+    - rvm: rbx
+    - rvm: jruby
 
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - rbx-head
-  - jruby-head
+addons:
+  postgresql: 9.3
+
+before_install:
+  - sudo apt-get update
+  - sudo apt-get install postgresql-server-dev-9.3 libpq-dev
+  - mysql -e 'create database myapp_test;'
+  - psql -c 'create database myapp_test;' -U postgres

data/CHANGES.md

@@ -1,5 +1,15 @@
 # CHANGES
 
+## dm-is-reflective 1.3.2 -- 2017-12-29
+
+* Prefix an underscore whenever the property begins with a number, which
+  cannot be used as a method name. See:
+  [#9](https://github.com/godfat/dm-is-reflective/pull/9)
+  Thanks Mischa Molhoek (@mmolhoek)
+* Don't create the model for PostgreSQL views. See:
+  [#10](https://github.com/godfat/dm-is-reflective/pull/10)
+  Thanks @philfine
+
 ## dm-is-reflective 1.3.1, 2013-05-22
 
 * Introduce `indices` method which would return all indices in the storage.

data/Gemfile

@@ -5,3 +5,10 @@ gemspec
 
 gem 'rake'
 gem 'bacon'
+
+gem 'simplecov', :require => false if ENV['COV']
+gem 'coveralls', :require => false if ENV['CI']
+
+platforms :rbx do
+  gem 'rubysl-singleton' # used in rake
+end

data/README.md

@@ -140,12 +140,15 @@ puts User.to_source
 
 * Andrew Kreps (@onewheelskyward)
 * Lin Jen-Shin (@godfat)
+* Mischa Molhoek (@mmolhoek)
+* @philfine
+* Sebastian Marr (@sebastianmarr)
 
 ## LICENSE:
 
 Apache License 2.0
 
-Copyright (c) 2008-2013, Lin Jen-Shin (godfat)
+Copyright (c) 2008-2017, Lin Jen-Shin (godfat)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Rakefile

@@ -1,28 +1,19 @@
-# encoding: utf-8
 
 begin
   require "#{dir = File.dirname(__FILE__)}/task/gemgem"
 rescue LoadError
-  sh "git submodule update --init"
-  exec Gem.ruby, "-S", "rake", *ARGV
+  sh 'git submodule update --init'
+  exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
 end
 
-Gemgem.dir = dir
-($LOAD_PATH << File.expand_path("#{Gemgem.dir}/lib" )).uniq!
+Gemgem.init(dir) do |s|
+  require     'dm-is-reflective/version'
+  s.name    = 'dm-is-reflective'
+  s.version = DmIsReflective::VERSION
 
-desc 'Generate gemspec'
-task 'gem:spec' do
-  Gemgem.spec = Gemgem.create do |s|
-    require     'dm-is-reflective/version'
-    s.name    = 'dm-is-reflective'
-    s.version = DmIsReflective::VERSION
-
-    %w[dm-core dm-do-adapter].each{ |g| s.add_runtime_dependency(g) }
-    %w[dm-migrations
-       dm-sqlite-adapter
-       dm-mysql-adapter
-       dm-postgres-adapter].each{ |g| s.add_development_dependency(g) }
-  end
-
-  Gemgem.write
+  %w[dm-core dm-do-adapter].each{ |g| s.add_runtime_dependency(g) }
+  %w[dm-migrations
+     dm-sqlite-adapter
+     dm-mysql-adapter
+     dm-postgres-adapter].each{ |g| s.add_development_dependency(g) }
 end

data/dm-is-reflective.gemspec

@@ -1,78 +1,79 @@
 # -*- encoding: utf-8 -*-
+# stub: dm-is-reflective 1.3.2 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "dm-is-reflective"
-  s.version = "1.3.1"
+  s.name = "dm-is-reflective".freeze
+  s.version = "1.3.2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2013-05-22"
-  s.description = "DataMapper plugin that helps you manipulate an existing database.\nIt creates mappings between existing columns and model's properties."
-  s.email = ["godfat (XD) godfat.org"]
-  s.executables = ["dm-is-reflective"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Lin Jen-Shin (godfat)".freeze]
+  s.date = "2017-12-29"
+  s.description = "DataMapper plugin that helps you manipulate an existing database.\nIt creates mappings between existing columns and model's properties.".freeze
+  s.email = ["godfat (XD) godfat.org".freeze]
+  s.executables = ["dm-is-reflective".freeze]
   s.files = [
-  ".gitignore",
-  ".gitmodules",
-  ".travis.yml",
-  "CHANGES.md",
-  "Gemfile",
-  "LICENSE",
-  "README.md",
-  "Rakefile",
-  "TODO.md",
-  "bin/dm-is-reflective",
-  "dm-is-reflective.gemspec",
-  "lib/dm-is-reflective.rb",
-  "lib/dm-is-reflective/adapters/data_objects_adapter.rb",
-  "lib/dm-is-reflective/adapters/mysql_adapter.rb",
-  "lib/dm-is-reflective/adapters/postgres_adapter.rb",
-  "lib/dm-is-reflective/adapters/sqlite_adapter.rb",
-  "lib/dm-is-reflective/reflective.rb",
-  "lib/dm-is-reflective/runner.rb",
-  "lib/dm-is-reflective/test.rb",
-  "lib/dm-is-reflective/version.rb",
-  "task/.gitignore",
-  "task/gemgem.rb",
-  "test/setup_db.sh",
-  "test/test_mysql.rb",
-  "test/test_postgres.rb",
-  "test/test_sqlite.rb",
-  "test/test_to_source.rb"]
-  s.homepage = "https://github.com/godfat/dm-is-reflective"
-  s.licenses = ["Apache License 2.0"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
-  s.summary = "DataMapper plugin that helps you manipulate an existing database."
+  ".gitignore".freeze,
+  ".gitmodules".freeze,
+  ".travis.yml".freeze,
+  "CHANGES.md".freeze,
+  "Gemfile".freeze,
+  "LICENSE".freeze,
+  "README.md".freeze,
+  "Rakefile".freeze,
+  "TODO.md".freeze,
+  "bin/dm-is-reflective".freeze,
+  "dm-is-reflective.gemspec".freeze,
+  "lib/dm-is-reflective.rb".freeze,
+  "lib/dm-is-reflective/adapters/data_objects_adapter.rb".freeze,
+  "lib/dm-is-reflective/adapters/mysql_adapter.rb".freeze,
+  "lib/dm-is-reflective/adapters/postgres_adapter.rb".freeze,
+  "lib/dm-is-reflective/adapters/sqlite_adapter.rb".freeze,
+  "lib/dm-is-reflective/reflective.rb".freeze,
+  "lib/dm-is-reflective/runner.rb".freeze,
+  "lib/dm-is-reflective/test.rb".freeze,
+  "lib/dm-is-reflective/version.rb".freeze,
+  "task/README.md".freeze,
+  "task/gemgem.rb".freeze,
+  "test/setup_db.sh".freeze,
+  "test/test_mysql.rb".freeze,
+  "test/test_postgres.rb".freeze,
+  "test/test_sqlite.rb".freeze,
+  "test/test_to_source.rb".freeze]
+  s.homepage = "https://github.com/godfat/dm-is-reflective".freeze
+  s.licenses = ["Apache License 2.0".freeze]
+  s.rubygems_version = "2.7.3".freeze
+  s.summary = "DataMapper plugin that helps you manipulate an existing database.".freeze
   s.test_files = [
-  "test/test_mysql.rb",
-  "test/test_postgres.rb",
-  "test/test_sqlite.rb",
-  "test/test_to_source.rb"]
+  "test/test_mysql.rb".freeze,
+  "test/test_postgres.rb".freeze,
+  "test/test_sqlite.rb".freeze,
+  "test/test_to_source.rb".freeze]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, [">= 0"])
-      s.add_runtime_dependency(%q<dm-do-adapter>, [">= 0"])
-      s.add_development_dependency(%q<dm-migrations>, [">= 0"])
-      s.add_development_dependency(%q<dm-sqlite-adapter>, [">= 0"])
-      s.add_development_dependency(%q<dm-mysql-adapter>, [">= 0"])
-      s.add_development_dependency(%q<dm-postgres-adapter>, [">= 0"])
+      s.add_runtime_dependency(%q<dm-core>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<dm-do-adapter>.freeze, [">= 0"])
+      s.add_development_dependency(%q<dm-migrations>.freeze, [">= 0"])
+      s.add_development_dependency(%q<dm-sqlite-adapter>.freeze, [">= 0"])
+      s.add_development_dependency(%q<dm-mysql-adapter>.freeze, [">= 0"])
+      s.add_development_dependency(%q<dm-postgres-adapter>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<dm-core>, [">= 0"])
-      s.add_dependency(%q<dm-do-adapter>, [">= 0"])
-      s.add_dependency(%q<dm-migrations>, [">= 0"])
-      s.add_dependency(%q<dm-sqlite-adapter>, [">= 0"])
-      s.add_dependency(%q<dm-mysql-adapter>, [">= 0"])
-      s.add_dependency(%q<dm-postgres-adapter>, [">= 0"])
+      s.add_dependency(%q<dm-core>.freeze, [">= 0"])
+      s.add_dependency(%q<dm-do-adapter>.freeze, [">= 0"])
+      s.add_dependency(%q<dm-migrations>.freeze, [">= 0"])
+      s.add_dependency(%q<dm-sqlite-adapter>.freeze, [">= 0"])
+      s.add_dependency(%q<dm-mysql-adapter>.freeze, [">= 0"])
+      s.add_dependency(%q<dm-postgres-adapter>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<dm-core>, [">= 0"])
-    s.add_dependency(%q<dm-do-adapter>, [">= 0"])
-    s.add_dependency(%q<dm-migrations>, [">= 0"])
-    s.add_dependency(%q<dm-sqlite-adapter>, [">= 0"])
-    s.add_dependency(%q<dm-mysql-adapter>, [">= 0"])
-    s.add_dependency(%q<dm-postgres-adapter>, [">= 0"])
+    s.add_dependency(%q<dm-core>.freeze, [">= 0"])
+    s.add_dependency(%q<dm-do-adapter>.freeze, [">= 0"])
+    s.add_dependency(%q<dm-migrations>.freeze, [">= 0"])
+    s.add_dependency(%q<dm-sqlite-adapter>.freeze, [">= 0"])
+    s.add_dependency(%q<dm-mysql-adapter>.freeze, [">= 0"])
+    s.add_dependency(%q<dm-postgres-adapter>.freeze, [">= 0"])
   end
 end

data/lib/dm-is-reflective/adapters/postgres_adapter.rb

@@ -5,7 +5,7 @@ module DmIsReflective::PostgresAdapter
   def storages
     sql = <<-SQL
       SELECT table_name FROM "information_schema"."tables"
-      WHERE table_schema = current_schema()
+      WHERE table_schema = current_schema() AND table_type = 'BASE TABLE'
     SQL
 
     select(Ext::String.compress_lines(sql))

data/lib/dm-is-reflective/reflective.rb

@@ -55,13 +55,19 @@ module DmIsReflective
 
         reflected = targets.each{ |target|
           case target
-          when Regexp;
-            break name if name.to_s =~ target
+          when Regexp
+            if name.to_s =~ target
+              if name.to_s =~ /^\d/
+                break :"_#{name}" # TODO: missing test for this
+              else
+                break name
+              end
+            end
 
-          when Symbol, String;
+          when Symbol, String
             break name if name == target.to_sym
 
-          when Class;
+          when Class
             break name if type == target
 
           else

data/lib/dm-is-reflective/runner.rb

@@ -73,8 +73,9 @@ module DmIsReflective::Runner
   end
 
   def help
-    maxn = options.transpose.first.map(&:size).max
-    maxd = options.transpose.last .map(&:size).max
+    optt = options.transpose
+    maxn = optt.first.map(&:size).max
+    maxd = optt.last .map(&:size).max
     "Usage: dm-is-reflective DATABASE_URI\n" +
     options.map{ |(name, desc)|
       if desc.empty?

data/lib/dm-is-reflective/version.rb

@@ -1,4 +1,4 @@
 
 module DmIsReflective
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/task/README.md

@@ -0,0 +1,54 @@
+# Gemgem
+
+## DESCRIPTION:
+
+Provided tasks:
+
+    rake clean        # Trash ignored files
+    rake gem:build    # Build gem
+    rake gem:install  # Install gem
+    rake gem:release  # Release gem
+    rake gem:spec     # Generate gemspec
+    rake test         # Run tests
+
+## REQUIREMENTS:
+
+* Tested with MRI (official CRuby), Rubinius and JRuby.
+
+## INSTALLATION:
+
+    git submodule add git://github.com/godfat/gemgem.git task
+
+And in Rakefile:
+
+``` ruby
+begin
+  require "#{__dir__}/task/gemgem"
+rescue LoadError
+  sh 'git submodule update --init --recursive'
+  exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
+end
+
+Gemgem.init(__dir__, :submodules => %w[your-dep]) do |s|
+  s.name    = 'your-gem'
+  s.version = '0.1.0'
+end
+```
+
+## LICENSE:
+
+Apache License 2.0 (Apache-2.0)
+
+Copyright (c) 2011-2017, Lin Jen-Shin (godfat)
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+<http://www.apache.org/licenses/LICENSE-2.0>
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/task/gemgem.rb

@@ -1,107 +1,150 @@
 
-require 'pathname'
-
 module Gemgem
   class << self
-    attr_accessor :dir, :spec
+    attr_accessor :dir, :spec, :submodules, :spec_create
   end
 
   module_function
+  def gem_tag    ; "#{spec.name}-#{spec.version}"     ; end
+  def gem_path   ; "#{pkg_dir}/#{gem_tag}.gem"        ; end
+  def spec_path  ; "#{dir}/#{spec.name}.gemspec"      ; end
+  def pkg_dir    ; "#{dir}/pkg"                       ; end
+  def escaped_dir; @escaped_dir ||= Regexp.escape(dir); end
+
+  def init dir, options={}, &block
+    self.dir = dir
+    ENV['RUBYLIB'] = "#{dir}/lib:#{ENV['RUBYLIB']}"
+    ENV['PATH']    = "#{dir}/bin:#{ENV['PATH']}"
+    self.submodules  = options[:submodules] || []
+    self.spec_create = block
+
+    $LOAD_PATH.unshift("#{dir}/lib", *submodules_libs)
+  end
+
   def create
-    yield(spec = Gem::Specification.new{ |s|
+    spec = Gem::Specification.new do |s|
       s.authors     = ['Lin Jen-Shin (godfat)']
       s.email       = ['godfat (XD) godfat.org']
 
       s.description = description.join
       s.summary     = description.first
-      s.license     = readme['LICENSE'].sub(/.+\n\n/, '').lines.first.strip
-
-      s.rubygems_version = Gem::VERSION
-      s.date             = Time.now.strftime('%Y-%m-%d')
-      s.files            = gem_files
-      s.test_files       = gem_files.grep(%r{^test/(.+?/)*test_.+?\.rb$})
-      s.executables      = Dir['bin/*'].map{ |f| File.basename(f) }
-      s.require_paths    = %w[lib]
-    })
+      s.license     = license
+
+      s.date        = Time.now.strftime('%Y-%m-%d')
+      s.files       = gem_files
+      s.test_files  = test_files
+      s.executables = bin_files
+    end
+    spec_create.call(spec)
     spec.homepage ||= "https://github.com/godfat/#{spec.name}"
-    spec
+    self.spec = spec
   end
 
-  def readme
-    path = %w[README.md README].find{ |name|
-      File.exist?("#{Gemgem.dir}/#{name}")
-    }
-    @readme ||=
-      if path
-        ps = "##{File.read(path)}".
-             scan(/((#+)[^\n]+\n\n.+?(?=(\n\n\2[^#\n]+\n)|\Z))/m).map(&:first)
-        ps.inject('HEADER' => ps.first){ |r, s, i|
-          r[s[/\w+/]] = s
-          r
-        }
-      else
-        {}
-      end
+  def gem_install
+    require 'rubygems/commands/install_command'
+    # read ~/.gemrc
+    Gem.use_paths(Gem.configuration[:gemhome], Gem.configuration[:gempath])
+    Gem::Command.extra_args = Gem.configuration[:gem]
+
+    # setup install options
+    cmd = Gem::Commands::InstallCommand.new
+    cmd.handle_options([])
+
+    # install
+    install = Gem::Installer.new(gem_path, cmd.options)
+    install.install
+    puts "\e[35mGem installed: \e[33m#{strip_path(install.gem_dir)}\e[0m"
   end
 
-  def description
-    @description ||= (readme['DESCRIPTION']||'').sub(/.+\n\n/, '').lines
+  def gem_spec
+    create
+    write
   end
 
-  def changes
-    path = %w[CHANGES.md CHANGES].find{ |name|
-      File.exist?("#{Gemgem.dir}/#{name}")
-    }
-    @changes ||=
-      if path
-        date = '\d+{4}\-\d+{2}\-\d{2}'
-        File.read(path).match(
-          /([^\n]+#{date}\n\n(.+?))(?=\n\n[^\n]+#{date}\n|\Z)/m)[1]
-      else
-        ''
-      end
+  def gem_build
+    require 'fileutils'
+    require 'rubygems/package'
+    gem = nil
+    Dir.chdir(dir) do
+      gem = Gem::Package.build(Gem::Specification.load(spec_path))
+      FileUtils.mkdir_p(pkg_dir)
+      FileUtils.mv(gem, pkg_dir) # gem is relative path, but might be ok
+    end
+    puts "\e[35mGem built: \e[33m#{strip_path("#{pkg_dir}/#{gem}")}\e[0m"
   end
 
-  def ann_md
-     "#{readme['HEADER'].sub(/([\w\-]+)/, "[\\1](#{spec.homepage})")}\n\n" \
-    "##{readme['DESCRIPTION'][/[^\n]+\n\n[^\n]+/]}\n\n"                    \
-    "### CHANGES:\n\n"                                                     \
-    "###{changes}\n\n"                                                     \
-    "##{readme['INSTALLATION']}\n\n"                                       +
-    if readme['SYNOPSIS'] then "##{readme['SYNOPSIS'][/[^\n]+\n\n[^\n]+/]}"
-    else '' end
+  def gem_release
+    sh_git('tag', gem_tag)
+    sh_git('push')
+    sh_git('push', '--tags')
+    sh_gem('push', gem_path)
   end
 
-  def ann_html
-    gem 'nokogiri'
-    gem 'kramdown'
+  def gem_check
+    unless git('status', '--porcelain').empty?
+      puts("\e[35mWorking copy is not clean.\e[0m")
+      exit(3)
+    end
+
+    ver = spec.version.to_s
 
-    IO.popen('kramdown', 'r+') do |md|
-      md.puts Gemgem.ann_md
-      md.close_write
-      require 'nokogiri'
-      html = Nokogiri::XML.parse("<gemgem>#{md.read}</gemgem>")
-      html.css('*').each{ |n| n.delete('id') }
-      html.root.children.to_html
+    if ENV['VERSION'].nil?
+      puts("\e[35mExpected "                                  \
+           "\e[33mVERSION\e[35m=\e[33m#{ver}\e[0m")
+      exit(1)
+
+    elsif ENV['VERSION'] != ver
+      puts("\e[35mExpected \e[33mVERSION\e[35m=\e[33m#{ver} " \
+           "\e[35mbut got\n         "                         \
+           "\e[33mVERSION\e[35m=\e[33m#{ENV['VERSION']}\e[0m")
+      exit(2)
     end
   end
 
-  def ann_email
-    "#{readme['HEADER'].sub(/([\w\-]+)/, "\\1 <#{spec.homepage}>")}\n\n" \
-    "#{readme['DESCRIPTION']}\n\n"                                       \
-    "#{readme['INSTALLATION']}\n\n"                                      +
-    if readme['SYNOPSIS'] then "##{readme['SYNOPSIS']}\n\n" else '' end  +
-    "## CHANGES:\n\n"                                                    \
-    "##{changes}\n\n"
+  def test
+    return if test_files.empty?
+
+    if ENV['COV'] || ENV['CI']
+      require 'simplecov'
+      if ENV['CI']
+        begin
+          require 'coveralls'
+          SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+        rescue LoadError => e
+          puts "Cannot load coveralls, skip: #{e}"
+        end
+      end
+      SimpleCov.start do
+        add_filter('test/')
+        add_filter('test.rb')
+        submodules_libs.each(&method(:add_filter))
+      end
+    end
+
+    test_files.each{ |file| require "#{dir}/#{file[0..-4]}" }
   end
 
-  def gem_tag
-    "#{spec.name}-#{spec.version}"
+  def clean
+    return if ignored_files.empty?
+
+    require 'fileutils'
+    trash = File.expand_path("~/.Trash/#{spec.name}")
+    puts "Move the following files into: \e[35m#{strip_path(trash)}\e[33m"
+
+    ignored_files.each do |file|
+      from = "#{dir}/#{file}"
+      to   = "#{trash}/#{File.dirname(file)}"
+      puts strip_path(from)
+
+      FileUtils.mkdir_p(to)
+      FileUtils.mv(from, to)
+    end
+
+    print "\e[0m"
   end
 
   def write
-    File.open("#{dir}/#{spec.name}.gemspec", 'w'){ |f|
-      f << split_lines(spec.to_ruby) }
+    File.open(spec_path, 'w'){ |f| f << split_lines(spec.to_ruby) }
   end
 
   def split_lines ruby
@@ -114,65 +157,139 @@ module Gemgem
     }
   end
 
+  def strip_path path
+    strip_home_path(strip_cwd_path(path))
+  end
+
+  def strip_home_path path
+    path.sub(/\A#{Regexp.escape(ENV['HOME'])}\//, '~/')
+  end
+
+  def strip_cwd_path path
+    path.sub(/\A#{Regexp.escape(Dir.pwd)}\//, '')
+  end
+
+  def submodules_libs
+    submodules.map{ |path| "#{dir}/#{path}/lib" }
+  end
+
+  def git *args
+    `git --git-dir=#{dir}/.git #{args.join(' ')}`
+  end
+
+  def sh_git *args
+    Rake.sh('git', "--git-dir=#{dir}/.git", *args)
+  end
+
+  def sh_gem *args
+    Rake.sh(Gem.ruby, '-S', 'gem', *args)
+  end
+
+  def glob path=dir
+    Dir.glob("#{path}/**/*", File::FNM_DOTMATCH)
+  end
+
+  def readme
+    @readme ||=
+      if (path = "#{Gemgem.dir}/README.md") && File.exist?(path)
+        ps = "##{File.read(path)}".
+             scan(/((#+)[^\n]+\n\n.+?(?=(\n\n\2[^#\n]+\n)|\Z))/m).map(&:first)
+        ps.inject('HEADER' => ps.first){ |r, s, i|
+          r[s[/\w+/]] = s
+          r
+        }
+      else
+        {}
+      end
+  end
+
+  def description
+    # JRuby String#lines is returning an enumerator
+    @description ||= (readme['DESCRIPTION']||'').sub(/.+\n\n/, '').lines.to_a
+  end
+
+  def license
+    readme['LICENSE'].sub(/.+\n\n/, '').lines.first.
+      split(/[()]/).map(&:strip).reject(&:empty?).last
+  end
+
   def all_files
-    @all_files ||= find_files(Pathname.new(dir)).map{ |file|
-      if file.to_s =~ %r{\.git/|\.git$}
-        nil
+    @all_files ||= fold_files(glob).sort
+  end
+
+  def fold_files files
+    files.inject([]){ |r, path|
+      if File.file?(path) && path !~ %r{/\.git(/|$)}  &&
+         (rpath = path[%r{^#{escaped_dir}/(.*$)}, 1])
+        r << rpath
+      elsif File.symlink?(path) # walk into symlinks...
+        r.concat(fold_files(glob(File.expand_path(path,
+                                                  File.readlink(path)))))
       else
-        file.to_s
+        r
       end
-    }.compact.sort
+    }
   end
 
   def gem_files
-    @gem_files ||= all_files - ignored_files
+    @gem_files ||= all_files.reject{ |f|
+      f =~ submodules_pattern ||
+        (f =~ ignored_pattern && !git_files.include?(f))
+    }
   end
 
-  def ignored_files
-    @ignored_file ||= all_files.select{ |path| ignore_patterns.find{ |ignore|
-      path =~ ignore && !git_files.include?(path)}}
+  def test_files
+    @test_files ||= gem_files.grep(%r{^test/(.+?/)*test_.+?\.rb$})
+  end
+
+  def bin_files
+    @bin_files ||= gem_files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   end
 
   def git_files
     @git_files ||= if File.exist?("#{dir}/.git")
-                     `git ls-files`.split("\n")
+                     git('ls-files').split("\n")
                    else
                      []
                    end
   end
 
-  # protected
-  def find_files path
-    path.children.select(&:file?).map{|file| file.to_s[(dir.size+1)..-1]} +
-    path.children.select(&:directory?).map{|dir| find_files(dir)}.flatten
+  def ignored_files
+    @ignored_files ||= all_files.grep(ignored_pattern)
+  end
+
+  def ignored_pattern
+    @ignored_pattern ||= if gitignore.empty?
+                           /^$/
+                         else
+                           Regexp.new(expand_patterns(gitignore).join('|'))
+                         end
   end
 
-  def ignore_patterns
-    @ignore_files ||= expand_patterns(
-      gitignore.split("\n").reject{ |pattern|
-        pattern.strip == ''
-      }).map{ |pattern| %r{^([^/]+/)*?#{Regexp.escape(pattern)}(/[^/]+)*?$} }
+  def submodules_pattern
+    @submodules_pattern ||= if submodules.empty?
+                              /^$/
+                            else
+                              Regexp.new(submodules.map{ |path|
+                                "^#{Regexp.escape(path)}/" }.join('|'))
+                            end
   end
 
   def expand_patterns pathes
-    pathes.map{ |path|
-      if path !~ /\*/
-        path
-      else
-        expand_patterns(
-          Dir[path] +
-          Pathname.new(File.dirname(path)).children.select(&:directory?).
-            map{ |prefix| "#{prefix}/#{File.basename(path)}" })
-      end
-    }.flatten
+    # http://git-scm.com/docs/gitignore
+    pathes.flat_map{ |path|
+      # we didn't implement negative pattern for now
+      Regexp.escape(path).sub(%r{^/}, '^').gsub(/\\\*/, '[^/]*')
+    }
   end
 
   def gitignore
-    if File.exist?(path = "#{dir}/.gitignore")
-      File.read(path)
-    else
-      ''
-    end
+    @gitignore ||= if File.exist?(path = "#{dir}/.gitignore")
+                     File.read(path).lines.
+                       reject{ |l| l == /^\s*(#|\s+$)/ }.map(&:strip)
+                   else
+                     []
+                   end
   end
 end
 
@@ -180,89 +297,42 @@ namespace :gem do
 
 desc 'Install gem'
 task :install => [:build] do
-  sh("#{Gem.ruby} -S gem install pkg/#{Gemgem.gem_tag}.gem")
+  Gemgem.gem_install
 end
 
 desc 'Build gem'
 task :build => [:spec] do
-  sh("#{Gem.ruby} -S gem build #{Gemgem.spec.name}.gemspec")
-  sh("mkdir -p pkg")
-  sh("mv #{Gemgem.gem_tag}.gem pkg/")
+  Gemgem.gem_build
+end
+
+desc 'Generate gemspec'
+task :spec do
+  Gemgem.gem_spec
 end
 
 desc 'Release gem'
 task :release => [:spec, :check, :build] do
-  sh("git tag #{Gemgem.gem_tag}")
-  sh("git push")
-  sh("git push --tags")
-  sh("#{Gem.ruby} -S gem push pkg/#{Gemgem.gem_tag}.gem")
+  Gemgem.gem_release
 end
 
 task :check do
-  ver = Gemgem.spec.version.to_s
-
-  if ENV['VERSION'].nil?
-    puts("\e[35mExpected "                                  \
-         "\e[33mVERSION\e[35m=\e[33m#{ver}\e[0m")
-    exit(1)
-
-  elsif ENV['VERSION'] != ver
-    puts("\e[35mExpected \e[33mVERSION\e[35m=\e[33m#{ver} " \
-         "\e[35mbut got\n         "                         \
-         "\e[33mVERSION\e[35m=\e[33m#{ENV['VERSION']}\e[0m")
-    exit(2)
-  end
+  Gemgem.gem_check
 end
 
 end # of gem namespace
 
-desc 'Run tests in memory'
+desc 'Run tests'
 task :test do
-  require 'bacon'
-  Bacon.extend(Bacon::TestUnitOutput)
-  Bacon.summary_on_exit
-  $LOAD_PATH.unshift('lib')
-  Dir['./test/**/test_*.rb'].each{ |file| require file[0..-4] }
-end
-
-desc 'Run tests with shell'
-task 'test:shell', :RUBY_OPTS do |t, args|
-  files = Dir['test/**/test_*.rb'].join(' ')
-
-  cmd = [Gem.ruby, args[:RUBY_OPTS],
-         '-I', 'lib', '-S', 'bacon', '--quiet', files]
-
-  sh(cmd.compact.join(' '))
-end
-
-desc 'Generate ann markdown'
-task 'ann:md' => ['gem:spec'] do
-  puts Gemgem.ann_md
-end
-
-desc 'Generate ann html'
-task 'ann:html' => ['gem:spec'] do
-  puts Gemgem.ann_html
-end
-
-desc 'Generate ann email'
-task 'ann:email' => ['gem:spec'] do
-  puts Gemgem.ann_email
-end
-
-desc 'Generate rdoc'
-task :doc => ['gem:spec'] do
-  sh("yardoc -o rdoc --main README.md" \
-     " --files #{Gemgem.spec.extra_rdoc_files.join(',')}")
+  Gemgem.test
 end
 
-desc 'Remove ignored files'
+desc 'Trash ignored files'
 task :clean => ['gem:spec'] do
-  trash = "~/.Trash/#{Gemgem.spec.name}/"
-  sh "mkdir -p #{trash}" unless File.exist?(File.expand_path(trash))
-  Gemgem.ignored_files.each{ |file| sh "mv #{file} #{trash}" }
+  Gemgem.clean
 end
 
 task :default do
-  puts `#{Gem.ruby} -S #{$PROGRAM_NAME} -T`
+  # Is there a reliable way to do this in the current process?
+  # It failed miserably before between Rake versions...
+  exec "#{Gem.ruby} -S #{$PROGRAM_NAME} -f #{Rake.application.rakefile} -T"
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: dm-is-reflective
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2017-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dm-do-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dm-migrations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dm-mysql-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dm-postgres-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |-
@@ -104,9 +104,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
-- .travis.yml
+- ".gitignore"
+- ".gitmodules"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -124,7 +124,7 @@ files:
 - lib/dm-is-reflective/runner.rb
 - lib/dm-is-reflective/test.rb
 - lib/dm-is-reflective/version.rb
-- task/.gitignore
+- task/README.md
 - task/gemgem.rb
 - test/setup_db.sh
 - test/test_mysql.rb
@@ -141,17 +141,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: DataMapper plugin that helps you manipulate an existing database.

data/task/.gitignore

@@ -1 +0,0 @@
-*.rbc