declare_schema 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c1bc236be22c712ca8a65ef4ed294301fc7d2021167dd0e2501066abe30b3ba
-  data.tar.gz: b41b86f51293569be553bab41fc245601ad82f98f4546af8d5d9d46601070fe3
+  metadata.gz: 04233cec7c3c0cbcabde6b7731bc106bca8f416409c765af38eb5320d119824c
+  data.tar.gz: fc3f6b420e002fa41fd69c2c07e7013b3de4098b6033f9fc1dfc09947b9897ae
 SHA512:
-  metadata.gz: 3a7b1808736b5f6c1ed69eb88a6afa7a69dbc6fcb014fbd5afb23734abd177348440caf5394ba941e66f6473011fae7543ce5b1e43b81ec8231ab3abfc369627
-  data.tar.gz: b96afd3ecfc86d51a795e43f5b04859d7e45c7869ffcf9f21a6a8a63da05e8499dd03b66e4e951b967f0e4feb8d21c2c0cf6aa88e952e53b3254c12ab541e0eb
+  metadata.gz: 89dfe6be533b57ee00b598fe3e5ed39005fb613e0b9b873623c780debe024cf3e10044114d902db6c26bb471e94212732a709d380383a2411d60b87d76e180aa
+  data.tar.gz: 71e59b6eddc79a1a2dccac6c8fecaa4d6c41cb99032311df9ec595a2c2c8098a845dd5409eb245d3489ad7a6135be88b78f27a511fda348200f7c120a964c8d4

data/.travis.yml

@@ -0,0 +1,37 @@
+---
+dist: trusty
+os: linux
+language: ruby
+cache: bundler
+rvm:
+  - 2.4.5
+  - 2.5.8
+  - 2.6.5
+  - 2.7.1
+  - ruby-head
+gemfile:
+  - gemfiles/rails_4.gemfile
+  - gemfiles/rails_5.gemfile
+  - gemfiles/rails_6.gemfile
+jobs:
+  fast_finish: false
+  exclude:
+    - gemfile: gemfiles/rails_4.gemfile
+      rvm: 2.7.1
+    - gemfile: gemfiles/rails_5.gemfile
+      rvm: 2.4.5
+    - gemfile: gemfiles/rails_6.gemfile
+      rvm: 2.4.5
+  allow_failures:
+    - rvm: ruby-head
+before_install:
+  - rm -f /home/travis/.rvm/rubies/ruby-2.*/lib/ruby/gems/2.*/specifications/default/bundler-2.*.gemspec
+  - echo y | rvm @global do gem install bundler -v 1.17.3 --force --default
+  - gem install bundler -v 1.17.3 --force --default
+  - gem install bundler -v 1.17.3
+install:
+  - bundle --version
+  - bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
+script:
+  - bundle exec rake test:prepare_testapp[force]
+  - bundle exec rake test:all < test_responses.txt

data/CHANGELOG.md

@@ -1,11 +1,17 @@
-# CHANGELOG for `declarative_schema`
+# CHANGELOG for `declare_schema`
 
 Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.1.0] - Unreleased
+## [0.1.2] - 2020-09-29
+### Changed
+- Added travis support and created 2 specs as a starting point.
+
+
+## [0.1.1] - 2020-09-24
 ### Added
-- Initial version from https://github.com/Invoca/declare_schema v4.0.0.
+- Initial version from https://github.com/Invoca/hobo_fields v4.1.0.
 
-[0.1.0]: https://github.com/Invoca/declarative_schema/tree/v0.1.0
+[0.1.2]: https://github.com/Invoca/declare_schema/compare/v0.1.1...v0.1.2
+[0.1.1]: https://github.com/Invoca/declare_schema/tree/v0.1.1

data/Gemfile

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-source 'https://gem.fury.io/invoca'
 
 gemspec
 

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    declare_schema (0.1.1)
+    declare_schema (0.1.2)
       rails (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
-  remote: https://gem.fury.io/invoca/
   specs:
     actioncable (5.2.4.4)
       actionpack (= 5.2.4.4)

data/Rakefile

@@ -29,7 +29,7 @@ namespace "test" do
   desc "Run the doctests"
   task :doctest do |_t|
     files = Dir['test/*.rdoctest'].sort.map { |f| File.expand_path(f) }.join(' ')
-    system("#{RUBYDOCTEST} #{files}") or exit(1)
+    system("#{RUBYDOCTEST} --trace --verbose #{files}") or exit(1)
   end
 
   desc "Prepare a rails application for testing"

data/gemfiles/rails_4.gemfile

@@ -1,25 +1,23 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
-source "https://gem.fury.io/invoca"
 
 gem "appraisal"
+gem "bundler", "< 2"
+gem "climate_control", "~> 0.2"
 gem "pry"
 gem "pry-byebug"
 gem "rails", "~> 4.2"
 gem "responders"
+gem "rspec"
+gem "rubocop"
 gem "rubydoctest"
 gem "sqlite3", "~> 1.3.0"
-gem "test_overrides"
 gem "yard"
 
 group :testapp do
   gem "bootsnap", ">= 1.1.0", require: false
-  gem "kramdown"
   gem "listen"
-  gem "RedCloth"
 end
 
 gemspec path: "../"

data/gemfiles/rails_5.gemfile

@@ -1,25 +1,23 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
-source "https://gem.fury.io/invoca"
 
 gem "appraisal"
+gem "bundler", "< 2"
+gem "climate_control", "~> 0.2"
 gem "pry"
 gem "pry-byebug"
 gem "rails", "~> 5.2"
 gem "responders"
+gem "rspec"
+gem "rubocop"
 gem "rubydoctest"
 gem "sqlite3"
-gem "test_overrides"
 gem "yard"
 
 group :testapp do
   gem "bootsnap", ">= 1.1.0", require: false
-  gem "kramdown"
   gem "listen"
-  gem "RedCloth"
 end
 
 gemspec path: "../"

data/gemfiles/rails_6.gemfile

@@ -1,25 +1,23 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
-source "https://gem.fury.io/invoca"
 
 gem "appraisal"
+gem "bundler", "< 2"
+gem "climate_control", "~> 0.2"
 gem "pry"
 gem "pry-byebug"
 gem "rails", "~> 6.0"
 gem "responders"
+gem "rspec"
+gem "rubocop"
 gem "rubydoctest"
 gem "sqlite3"
-gem "test_overrides"
 gem "yard"
 
 group :testapp do
   gem "bootsnap", ">= 1.1.0", require: false
-  gem "kramdown"
   gem "listen"
-  gem "RedCloth"
 end
 
 gemspec path: "../"

data/lib/declare_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeclareSchema
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/generators/declare_schema/migration/migration_generator.rb

@@ -3,6 +3,7 @@
 require 'rails/generators/migration'
 require 'rails/generators/active_record'
 require 'generators/declare_schema/support/thor_shell'
+require_relative '../../../declare_schema/model/field_spec'
 
 module DeclareSchema
   class MigrationGenerator < Rails::Generators::Base

data/lib/generators/declare_schema/migration/migrator.rb

@@ -218,13 +218,18 @@ module Generators
         end
 
         def always_ignore_tables
-          # TODO: figure out how to do this in a sane way and be compatible with 2.2 and 2.3 - class has moved
-          if defined?(CGI::Session::ActiveRecordStore::Session) &&
-             defined?(ActionController::Base) &&
-             ActionController::Base.session_store == CGI::Session::ActiveRecordStore
-            sessions_table = CGI::Session::ActiveRecordStore::Session.table_name
-          end
-          ['schema_info', 'schema_migrations', 'simple_sesions', sessions_table].compact
+          sessions_table =
+            begin
+              if defined?(CGI::Session::ActiveRecordStore::Session) &&
+                 defined?(ActionController::Base) &&
+                 ActionController::Base.session_store == CGI::Session::ActiveRecordStore
+                CGI::Session::ActiveRecordStore::Session.table_name
+              end
+            rescue
+              nil
+            end
+
+          ['schema_info', 'schema_migrations', 'ar_internal_metadata', sessions_table].compact
         end
 
         def generate

data/test/generators.rdoctest

@@ -2,7 +2,7 @@ doctest: prepare testapp environment
 doctest_require: 'prepare_testapp'
 
 doctest: generate declare_schema:model
->> Rails::Generators.invoke 'declare_schema:model', %w(alpha/beta one:string two:integer)
+>> begin; Rails::Generators.invoke 'declare_schema:model', %w(alpha/beta one:string two:integer); rescue => ex; $stderr.puts "#{ex.class}: #{ex}\n#{ex.backtrace.join("\n")}"; end
 
 
 doctest: model file exists
@@ -43,16 +43,18 @@ doctest: fixture file exists
 
 
 doctest: generate declare_schema:migration
->> require_relative "#{Rails.root}/app/models/alpha.rb" if Rails::VERSION::MAJOR > 5
->> require_relative "#{Rails.root}/app/models/alpha/beta.rb" if Rails::VERSION::MAJOR > 5
+>> puts "#{Rails.root}/app/models/alpha.rb"
+>> require "#{Rails.root}/app/models/alpha.rb" if Rails::VERSION::MAJOR > 4
+>> require "#{Rails.root}/app/models/alpha/beta.rb" if Rails::VERSION::MAJOR > 4
 >> Rails::Generators.invoke 'declare_schema:migration', %w(-n -m)
 
 doctest: schema.rb file exists
+>> system("ls -al db")
 >> File.exist? 'db/schema.rb'
 => true
 
 doctest: db file exists
->> File.exist? 'db/development.sqlite3'
+>> File.exist?("db/development.sqlite3") || File.exist?("db/test.sqlite3")
 => true
 
 doctest: Alpha::Beta class exists

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-24 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -35,11 +35,10 @@ files:
 - ".dependabot/config.yml"
 - ".github/workflows/gem_release.yml"
 - ".gitignore"
-- ".jenkins/Jenkinsfile"
-- ".jenkins/ruby_build_pod.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
+- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile

data/.jenkins/Jenkinsfile

@@ -1,72 +0,0 @@
-#!/usr/bin/groovy
-@Library('jenkins-pipeline@v0.5.1')
-import com.invoca.ci.*;
-
-pipeline {
-  agent {
-    kubernetes {
-      defaultContainer 'ruby'
-      yamlFile '.jenkins/ruby_build_pod.yml'
-    }
-  }
-
-  environment {
-    GITHUB_TOKEN         = credentials('github_token')
-    BUNDLE_GEM__FURY__IO = credentials('gemfury_deploy_token')
-  }
-
-  stages {
-    stage('Setup') {
-      steps {
-        updateGitHubStatus('clean-build', 'pending', "Running unit tests")
-        sh 'bundle install'
-        sh 'bundle exec appraisal install'
-      }
-    }
-
-    stage("Current Unit Tests") {
-      steps {
-        sh 'bundle exec rake test:prepare_testapp[force]'
-        sh 'bundle exec rake test:all < test_responses.txt'
-      }
-    }
-
-    stage("Rails 4 Appraisal") {
-      steps {
-        sh 'bundle exec appraisal rails-4 rake test:prepare_testapp[force]'
-        sh 'bundle exec appraisal rails-4 rake test:all < test_responses.txt'
-      }
-    }
-
-    stage("Rails 5 Appraisal") {
-      steps {
-        sh 'bundle exec appraisal rails-5 rake test:prepare_testapp[force]'
-        sh 'bundle exec appraisal rails-5 rake test:all < test_responses.txt'
-      }
-    }
-
-    stage("Rails 6 Appraisal") {
-      steps {
-        sh 'bundle exec appraisal rails-6 rake test:prepare_testapp[force]'
-        sh 'bundle exec appraisal rails-6 rake test:all < test_responses.txt'
-      }
-    }
-  }
-
-  post {
-    success { updateGitHubStatus('clean-build', 'success', "Unit tests passed") }
-    failure { updateGitHubStatus('clean-build', 'failure', "Unit tests failed") }
-  }
-}
-
-void updateGitHubStatus(String context, String status, String description) {
-  gitHubStatus([
-    repoSlug:    'Invoca/declare_schema',
-    sha:         env.GIT_COMMIT,
-    description: description,
-    context:     context,
-    targetURL:   env.RUN_DISPLAY_URL,
-    token:       env.GITHUB_TOKEN,
-    status:      status
-  ])
-}

data/.jenkins/ruby_build_pod.yml

@@ -1,19 +0,0 @@
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  labels:
-    jenkins/declare_schema: 'true'
-  namespace: jenkins
-  name: declare_schema
-spec:
-  containers:
-  - name: ruby
-    image: ruby:2.6.5
-    tty: true
-    resources:
-      requests:
-        memory: "100Mi"
-    command:
-      - cat