Skip to content

Commit

Permalink
wip version 0.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
seuros committed Jun 27, 2020
1 parent 4ca0564 commit ccf2edf
Show file tree
Hide file tree
Showing 58 changed files with 1,573 additions and 1,557 deletions.
4 changes: 4 additions & 0 deletions .rubocop.yml
@@ -0,0 +1,4 @@
require:
- rubocop-minitest
- rubocop-performance

48 changes: 9 additions & 39 deletions .travis.yml
@@ -1,44 +1,14 @@
language: ruby
cache: bundler
before_install: gem install bundler
install: bundle install
script: "bundle exec rake test"
rvm:
- ruby-head
- 2.7
- 2.6
- 2.5
- 2.4
env:
- "ACTIVERECORD=5.0 DRY_TYPES=0.13"
- "ACTIVERECORD=5.0 DRY_TYPES=0.14"
- "ACTIVERECORD=5.0 DRY_TYPES=0.15"
- "ACTIVERECORD=5.0 DRY_TYPES=1.0"
- "ACTIVERECORD=5.0 DRY_TYPES=1.1"
- "ACTIVERECORD=5.0 DRY_TYPES=1.2"
- "ACTIVERECORD=5.1 DRY_TYPES=0.13"
- "ACTIVERECORD=5.1 DRY_TYPES=0.14"
- "ACTIVERECORD=5.1 DRY_TYPES=0.15"
- "ACTIVERECORD=5.1 DRY_TYPES=1.0"
- "ACTIVERECORD=5.1 DRY_TYPES=1.1"
- "ACTIVERECORD=5.1 DRY_TYPES=1.2"
- "ACTIVERECORD=5.2 DRY_TYPES=0.13"
- "ACTIVERECORD=5.2 DRY_TYPES=0.14"
- "ACTIVERECORD=5.2 DRY_TYPES=0.15"
- "ACTIVERECORD=5.2 DRY_TYPES=1.0"
- "ACTIVERECORD=5.2 DRY_TYPES=1.1"
- "ACTIVERECORD=5.2 DRY_TYPES=1.2"
- "ACTIVERECORD=6.0 DRY_TYPES=0.13"
- "ACTIVERECORD=6.0 DRY_TYPES=0.14"
- "ACTIVERECORD=6.0 DRY_TYPES=0.15"
- "ACTIVERECORD=6.0 DRY_TYPES=1.0"
- "ACTIVERECORD=6.0 DRY_TYPES=1.1"
- "ACTIVERECORD=6.0 DRY_TYPES=1.2"
gemfile:
- Gemfile
matrix:
fast_finish: true
allow_failures:
- rvm: ruby-head
exclude:
- {rvm: 2.4, env: "ACTIVERECORD=6.0 DRY_TYPES=0.13"}
- {rvm: 2.4, env: "ACTIVERECORD=6.0 DRY_TYPES=0.14"}
- {rvm: 2.4, env: "ACTIVERECORD=6.0 DRY_TYPES=0.15"}
- {rvm: 2.4, env: "ACTIVERECORD=6.0 DRY_TYPES=1.0"}
- {rvm: 2.4, env: "ACTIVERECORD=6.0 DRY_TYPES=1.1"}
- {rvm: 2.4, env: "ACTIVERECORD=6.0 DRY_TYPES=1.2"}
- gemfiles/6.0.gemfile
- gemfiles/5.2.gemfile
- gemfiles/5.1.gemfile

20 changes: 20 additions & 0 deletions Appraisals
@@ -0,0 +1,20 @@
appraise "6.0" do
gem 'dry-types'
gem 'activerecord', '6.0'
gem 'sqlite3', '~> 1.4'
gem "representable", github: "trailblazer/representable"
end

appraise "5.2" do
gem 'dry-types'
gem 'activerecord', '5.2'
gem 'sqlite3', '~> 1.3.13'
gem "representable", github: "trailblazer/representable"
end

appraise "5.1" do
gem 'dry-types'
gem 'activerecord', '5.1'
gem 'sqlite3', '~> 1.3.13'
gem "representable", github: "trailblazer/representable"
end
5 changes: 5 additions & 0 deletions CHANGES.md
@@ -1,3 +1,8 @@
# 0.5.0
* Drop support for legacy version of dry-types
* Remove Disposable::Twin::Struct
* Removal of nilify option

# 0.4.7

* Deprecation warning for nilify options for dry-v >= 1.x
Expand Down
9 changes: 3 additions & 6 deletions Gemfile
Expand Up @@ -2,9 +2,6 @@ source "https://rubygems.org"
gemspec
gem "minitest-line"

{ "dry-types" => ENV['DRY_TYPES'], "activerecord" => ENV['ACTIVERECORD']}.each do |gem_name, dependency|
next if dependency.nil?
gem gem_name, dependency
end

gem "sqlite3", ENV.fetch('ACTIVERECORD', '5.2').to_f >= 6 ? '~> 1.4' : '~> 1.3.0'
gem "appraisal", "~> 2.3"
gem 'rubocop-minitest', require: false
gem 'rubocop-performance', require: false
2 changes: 1 addition & 1 deletion LICENSE.txt
@@ -1,4 +1,4 @@
Copyright (c) 2013 Nick Sutterer
Copyright (c) 2013-2020 Nick Sutterer

MIT License

Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Expand Up @@ -6,4 +6,4 @@ Rake::TestTask.new(:test) do |test|
test.libs << 'test'
test.test_files = FileList['test/**/*_test.rb']
test.verbose = true
end
end
6 changes: 2 additions & 4 deletions disposable.gemspec
Expand Up @@ -20,12 +20,10 @@ Gem::Specification.new do |spec|
spec.add_dependency "declarative", ">= 0.0.9", "< 1.0.0"
spec.add_dependency "declarative-builder", "< 0.2.0"
spec.add_dependency "declarative-option", "< 0.2.0"
spec.add_dependency "representable", ">= 2.4.0", "<= 3.1.0"
spec.add_dependency "representable"#, ">= 3.1.0.beta"

spec.add_development_dependency "bundler"#, "~> 1.3"
spec.add_development_dependency "bundler"
spec.add_development_dependency "rake"
spec.add_development_dependency "minitest"
spec.add_development_dependency "activerecord"#, "4.2.5"
spec.add_development_dependency "dry-types"# "~> 0.6"
# spec.add_development_dependency "database_cleaner"
end
14 changes: 14 additions & 0 deletions gemfiles/5.1.gemfile
@@ -0,0 +1,14 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "minitest-line"
gem "appraisal", "~> 2.3"
gem "rubocop-minitest", require: false
gem "rubocop-performance", require: false
gem "dry-types"
gem "activerecord", "5.1"
gem "sqlite3", "~> 1.3.13"
gem "representable", github: "trailblazer/representable"

gemspec path: "../"
121 changes: 121 additions & 0 deletions gemfiles/5.1.gemfile.lock
@@ -0,0 +1,121 @@
GIT
remote: https://github.com/trailblazer/representable.git
revision: fa537cbfd8ba7202e9542db67fd82011d382772c
specs:
representable (3.1.0.beta1)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
uber (< 0.2.0)

PATH
remote: ..
specs:
disposable (0.5.0.beta1)
declarative (>= 0.0.9, < 1.0.0)
declarative-builder (< 0.2.0)
declarative-option (< 0.2.0)
representable
uber (< 0.2.0)

GEM
remote: https://rubygems.org/
specs:
activemodel (5.1.0)
activesupport (= 5.1.0)
activerecord (5.1.0)
activemodel (= 5.1.0)
activesupport (= 5.1.0)
arel (~> 8.0)
activesupport (5.1.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
appraisal (2.3.0)
bundler
rake
thor (>= 0.14.0)
arel (8.0.0)
ast (2.4.1)
concurrent-ruby (1.1.6)
declarative (0.0.10)
declarative-builder (0.1.0)
declarative-option (< 0.2.0)
declarative-option (0.1.0)
dry-configurable (0.11.6)
concurrent-ruby (~> 1.0)
dry-core (~> 0.4, >= 0.4.7)
dry-equalizer (~> 0.2)
dry-container (0.7.2)
concurrent-ruby (~> 1.0)
dry-configurable (~> 0.1, >= 0.1.3)
dry-core (0.4.9)
concurrent-ruby (~> 1.0)
dry-equalizer (0.3.0)
dry-inflector (0.2.0)
dry-logic (1.0.6)
concurrent-ruby (~> 1.0)
dry-core (~> 0.2)
dry-equalizer (~> 0.2)
dry-types (1.4.0)
concurrent-ruby (~> 1.0)
dry-container (~> 0.3)
dry-core (~> 0.4, >= 0.4.4)
dry-equalizer (~> 0.3)
dry-inflector (~> 0.1, >= 0.1.2)
dry-logic (~> 1.0, >= 1.0.2)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
minitest (5.14.1)
minitest-line (0.6.5)
minitest (~> 5.0)
parallel (1.19.2)
parser (2.7.1.4)
ast (~> 2.4.1)
rainbow (3.0.0)
rake (13.0.1)
regexp_parser (1.7.1)
rexml (3.2.4)
rubocop (0.86.0)
parallel (~> 1.10)
parser (>= 2.7.0.1)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7)
rexml
rubocop-ast (>= 0.0.3, < 1.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.1.0)
parser (>= 2.7.0.1)
rubocop-minitest (0.9.0)
rubocop (>= 0.74)
rubocop-performance (1.6.1)
rubocop (>= 0.71.0)
ruby-progressbar (1.10.1)
sqlite3 (1.3.13)
thor (1.0.1)
thread_safe (0.3.6)
tzinfo (1.2.7)
thread_safe (~> 0.1)
uber (0.1.0)
unicode-display_width (1.7.0)

PLATFORMS
ruby

DEPENDENCIES
activerecord (= 5.1)
appraisal (~> 2.3)
bundler
disposable!
dry-types
minitest
minitest-line
rake
representable!
rubocop-minitest
rubocop-performance
sqlite3 (~> 1.3.13)

BUNDLED WITH
2.1.4
14 changes: 14 additions & 0 deletions gemfiles/5.2.gemfile
@@ -0,0 +1,14 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "minitest-line"
gem "appraisal", "~> 2.3"
gem "rubocop-minitest", require: false
gem "rubocop-performance", require: false
gem "dry-types"
gem "activerecord", "5.2"
gem "sqlite3", "~> 1.3.13"
gem "representable", github: "trailblazer/representable"

gemspec path: "../"

0 comments on commit ccf2edf

Please sign in to comment.