sequel-inline_schema 0.0.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6037f75d98e75ad634497e1000fdf8cac67cd388a366dc01d73e7a4f00897f15
-  data.tar.gz: 8c6d0fe5f0146d296e85a3e074cf28394e803104c93253e1f200c04274da3ba5
+  metadata.gz: '0586820d7a0cb25e530b431dee73a22dc205296a1cf15a945602f554ba9b3608'
+  data.tar.gz: 4646d1e2a538da9554864bb15db471b2eb9a2c6e920b8bdcbb462883d1724517
 SHA512:
-  metadata.gz: d5bf204ce162b8dae4e8780202f5031c2c7a48bf2f3f3eaa18552e2a346c9096a6c046a2e6c5232eb3f3f175314e332fa95d51c11a29711f848135d7f7701dd9
-  data.tar.gz: 2eed48961ec313876ecc72aa512d53f7cdca5ab0792fe93309c01d359d8dbe72489f02ce91e5250769580b1f00a8cae25f449219b77a5b8d8c207332605fc551
+  metadata.gz: 06013b428fbd164f5717a815391d65723033648ef301621b7d551ebcfb8e18c6c0c64a31678a0e36885f89ee3d7e3f3e717fbeab9722f2537dbfb9e26d16c37d
+  data.tar.gz: 92cf82542922e762fc32971cce5b16cdeebc6922940a019bc4b2e80ac8e01ae40a6cea8d2863d3da2fbd71761ee9022b5587fa6b3ac471a62a57cddf3f31129e

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-����&��ƒ��sȻc�9�&�gDX��n��%���i��,�,����.|���>E�Cs��*���&36h'���J����S5��|4j
+	�M1��7������i={�E�G�J�������,Ҕ�����U9�����S�Q��)Y�jZ9��C�`9銐$��2��ƥ�c����l
+�uW�������r�<r
�z
S�N|yq0�Y�\|`Y:�I�� M���x���a��l�&h�w��@��WV!=Q�h���k�w�S���b�X|�9y"#G�8®�pD�4�����#4��H

data/History.md

@@ -1,3 +1,15 @@
+# Release History for sequel-inline_schema
+
+---
+
+## v0.2.0 [2020-01-18] Michael Granger <ged@faeriemud.org>
+
+Improvements:
+
+- Fail on finding migrations with the same `name`. Thanks to
+  Alyssa Verkade <averkade@costar.com> for the patch.
+
+
 ## v0.0.1 [2018-07-19] Michael Granger <ged@FaerieMUD.org>
 
 Initial release.

data/README.md

@@ -1,7 +1,7 @@
 # sequel-inline_schema
 
 home
-: http://bitbucket.org/ged/sequel-inlineschema
+: https://hg.sr.ht/~ged/Sequel-InlineSchema
 
 github
 : https://github.com/ged/sequel-inlineschema
@@ -39,15 +39,20 @@ Examples and usage documentation are included there.
 ## Contributing
 
 You can check out the current development source with Mercurial via its
-[project page][bitbucket]. Or if you prefer Git, via [its Github
+[project page][sourcehut]. Or if you prefer Git, via [its Github
 mirror][github].
 
 After checking out the source, run:
 
-    $ rake newb
+    $ rake setup
 
-This task will install any missing dependencies, run the tests/specs,
-and generate the API documentation.
+This task will install any missing dependencies, and do any other necessary
+setup to start development.
+
+
+## Authors
+
+- Michael Granger <ged@faeriemud.org>
 
 
 ## License
@@ -76,10 +81,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 The rest is licensed under the same terms, but:
 
-Copyright (c) 2017-2018, Michael Granger
-
+Copyright (c) 2017-2020, Michael Granger
 
 
-[bitbucket]: http://bitbucket.org/ged/sequel-inlineschema
+[sourcehut]: https://hg.sr.ht/~ged/Sequel-InlineSchema
 [github]: https://github.com/ged/sequel-inlineschema
 

data/Rakefile

@@ -1,99 +1,9 @@
-#!/usr/bin/env rake
+#!/usr/bin/env ruby -S rake
 
-begin
-	require 'hoe'
-rescue LoadError
-	abort "This Rakefile requires hoe (gem install hoe)"
-end
-
-GEMSPEC = 'sequel-inline_schema.gemspec'
-
-
-Hoe.plugin :mercurial
-Hoe.plugin :signing
-Hoe.plugin :deveiate
-
-Hoe.plugins.delete :rubyforge
-
-hoespec = Hoe.spec 'sequel-inline_schema' do |spec|
-
-	spec.readme_file = 'README.md'
-	spec.history_file = 'History.md'
-	spec.urls = {
-		home:   'http://bitbucket.org/ged/sequel-inline_schema',
-		code:   'http://bitbucket.org/ged/sequel-inline_schema',
-		docs:   'http://deveiate.org/code/sequel-inline_schema',
-		github: 'http://github.com/ged/sequel-inline_schema',
-	}
-
-	spec.extra_rdoc_files = FileList[ '*.rdoc', '*.md' ]
-	spec.license 'BSD-3-Clause'
-
-	spec.developer 'Michael Granger', 'ged@FaerieMUD.org'
-
-	spec.dependency 'sequel', '~> 5.0'
-
-	spec.dependency 'hoe-deveiate',            '~> 0.9', :developer
-	spec.dependency 'simplecov',               '~> 0.13', :developer
-	spec.dependency 'rdoc-generator-fivefish', '~> 0.3', :developer
-
-	spec.require_ruby_version( '>=2.4.0' )
-	spec.hg_sign_tags = true if spec.respond_to?( :hg_sign_tags= )
-	spec.check_history_on_release = true if spec.respond_to?( :check_history_on_release= )
-
-	spec.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
-end
+require 'rake/deveiate'
 
-
-ENV['VERSION'] ||= hoespec.spec.version.to_s
-
-# Run the tests before checking in
-task 'hg:precheckin' => [ :check_history, :check_manifest, :gemspec, :spec ]
-
-task :test => :spec
-
-# Rebuild the ChangeLog immediately before release
-task :prerelease => 'ChangeLog'
-CLOBBER.include( 'ChangeLog' )
-
-desc "Build a coverage report"
-task :coverage do
-	ENV["COVERAGE"] = 'yes'
-	Rake::Task[:spec].invoke
-end
-CLOBBER.include( 'coverage' )
-
-
-# Use the fivefish formatter for docs generated from development checkout
-if File.directory?( '.hg' )
-	require 'rdoc/task'
-
-	Rake::Task[ 'docs' ].clear
-	RDoc::Task.new( 'docs' ) do |rdoc|
-
-		rdoc.markup = 'markdown'
-		rdoc.main = "README.md"
-		rdoc.rdoc_files.include( "*.md", "ChangeLog", "lib/**/*.rb" )
-
-		rdoc.generator = :fivefish
-		rdoc.title = 'sequel-inline_schema'
-		rdoc.rdoc_dir = 'doc'
-	end
+Rake::DevEiate.setup( 'sequel-inline_schema' ) do |project|
+	project.publish_to = 'deveiate:/usr/local/www/public/code'
+	project.required_ruby_version = '~> 2.4'
 end
 
-task :gemspec => GEMSPEC
-file GEMSPEC => [ __FILE__, 'Manifest.txt' ]
-task GEMSPEC do |task|
-	spec = $hoespec.spec
-	spec.files.delete( '.gemtest' )
-	spec.signing_key = nil
-	spec.cert_chain = ['certs/ged.pem']
-	spec.version = "#{spec.version.bump}.0.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"
-	File.open( task.name, 'w' ) do |fh|
-		fh.write( spec.to_ruby )
-	end
-end
-CLOBBER.include( GEMSPEC.to_s )
-
-task :default => :gemspec
-

data/lib/sequel/inline_schema.rb

@@ -7,10 +7,10 @@ require 'sequel/plugins/inline_schema'
 module Sequel::InlineSchema
 
 	# Package version
-	VERSION = '0.0.1'
+	VERSION = '0.2.0'
 
 	# Version control revision
-	REVISION = %q$Revision: fe2f291518ce $
+	REVISION = %q$Revision$
 
 end # Sequel::InlineSchema
 

data/lib/sequel/plugins/inline_migrations.rb

@@ -409,7 +409,12 @@ module Sequel::Plugins::InlineMigrations
 			migrations = self.all_migrating_model_classes.
 				collect( &:migrations ).
 				compact.
-				inject {|all, hash| all.merge(hash) }
+				inject do |all, hash|
+					all.merge( hash ) do |key, old, new|
+						# rely on the fact that `up` is user defined even for a change block
+						fail "found duplicate `names` for migrations at #{old.up.source_location[0]} and #{new.up.source_location[0]}"
+					end
+			end
 
 			return migrations.values.sort_by {|m| [m.name, m.model_class.name] }
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-inline_schema
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Granger
@@ -10,32 +10,31 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  XrxOxp8o0uOkU7FdLSGsyqJ2LzsR4obN
   -----END CERTIFICATE-----
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2020-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -52,47 +51,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: hoe-mercurial
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: hoe-deveiate
+  name: rake-deveiate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: hoe-highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -121,64 +106,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.16'
 description: |-
   This is a set of plugins for Sequel for declaring a model's table schema and
-  any migrations in the class itself (similar to the legacy `schema` plugin).
-
-  It has only really been tested with PostgreSQL, but patches that make it more generic are welcomed.
-
-  The two plugins are:
-
-  * Sequel::Plugins::InlineSchema
-  * Sequel::Plugins::InlineMigrations
-
-  Examples and usage documentation are included there.
+  any migrations in the class itself (similar to the legacy <code>schema</code> plugin).
 email:
-- ged@FaerieMUD.org
+- ged@faeriemud.org
 executables: []
 extensions: []
-extra_rdoc_files:
-- History.md
-- LICENSE.txt
-- Manifest.txt
-- README.md
+extra_rdoc_files: []
 files:
 - ".document"
-- ".editorconfig"
 - ".rdoc_options"
 - ".simplecov"
-- ChangeLog
 - History.md
 - LICENSE.txt
-- Manifest.txt
 - README.md
 - Rakefile
 - lib/sequel/inline_schema.rb
@@ -187,31 +128,29 @@ files:
 - spec/sequel/plugins/inline_migrations_spec.rb
 - spec/sequel/plugins/inline_schema_spec.rb
 - spec/spec_helper.rb
-homepage: http://bitbucket.org/ged/sequel-inline_schema
+homepage: https://hg.sr.ht/~ged/Sequel-InlineSchema
 licenses:
 - BSD-3-Clause
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "--main"
-- README.md
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: This is a set of plugins for Sequel for declaring a model's table schema
-  and any migrations in the class itself (similar to the legacy `schema` plugin)
+  and any migrations in the class itself (similar to the legacy <code>schema</code>
+  plugin).
 test_files: []

data/.editorconfig

@@ -1,14 +0,0 @@
-# http://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf
-insert_final_newline = true
-
-# Tab indentation
-[**.*]
-indent_style = tab
-

data/ChangeLog

@@ -1,48 +0,0 @@
-2018-07-10  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hgtags:
-	Added tag v0.0.1 for changeset 5f6554f4bd40
-	[8fe6f86ec7c7] [tip]
-
-	* .hgsigs:
-	Added signature for changeset f94a7b19d4de
-	[5f6554f4bd40] [v0.0.1]
-
-	* .hgignore, History.md, README.md, Rakefile, sequel-
-	inline_schema.gemspec:
-	Prep for first release.
-	[f94a7b19d4de]
-
-2017-09-28  Michael Granger  <ged@FaerieMUD.org>
-
-	* lib/sequel/plugins/inline_migrations.rb,
-	lib/sequel/plugins/inline_schema.rb:
-	Fix documentation formatting, add some more details about migrations
-	[f7de01d27012] [github/master]
-
-2017-09-27  Michael Granger  <ged@FaerieMUD.org>
-
-	* README.md:
-	Fix README links.
-	[81085384e8eb]
-
-	* lib/sequel/plugins/inline_schema.rb,
-	spec/sequel/plugins/inline_schema_spec.rb:
-	More documentation updates, add drop_table hooks.
-	[dc2231fc945a]
-
-	* .hgignore, README.md, lib/sequel/plugins/inline_migrations.rb,
-	lib/sequel/plugins/inline_schema.rb:
-	Documentation fixes/additions.
-	[4783fffe2ab9]
-
-	* .document, .editorconfig, .gems, .hgignore, .pryrc, .rdoc_options,
-	.ruby-gemset, .ruby-version, .simplecov, Gemfile, History.md,
-	LICENSE.txt, Manifest.txt, README.md, Rakefile, certs/ged.pem,
-	lib/sequel/inline_schema.rb,
-	lib/sequel/plugins/inline_migrations.rb,
-	lib/sequel/plugins/inline_schema.rb, sequel-inline_schema.gemspec,
-	spec/sequel/plugins/inline_migrations_spec.rb,
-	spec/sequel/plugins/inline_schema_spec.rb, spec/spec_helper.rb:
-	Initial implementation
-	[fe2f291518ce]

data/Manifest.txt

@@ -1,16 +0,0 @@
-.document
-.editorconfig
-.rdoc_options
-.simplecov
-ChangeLog
-History.md
-LICENSE.txt
-Manifest.txt
-README.md
-Rakefile
-lib/sequel/inline_schema.rb
-lib/sequel/plugins/inline_migrations.rb
-lib/sequel/plugins/inline_schema.rb
-spec/sequel/plugins/inline_migrations_spec.rb
-spec/sequel/plugins/inline_schema_spec.rb
-spec/spec_helper.rb