dm-is-predefined 0.3.0 → 0.3.1

data/.document

@@ -0,0 +1,3 @@
+-
+ChangeLog.md
+LICENSE.txt

data/.rspec

@@ -0,0 +1 @@
+--colour --format documentation

data/.yardopts

@@ -1 +1 @@
---markup markdown --title 'dm-predefined Documentation' --protected --files ChangeLog.md,LICENSE.txt
+--markup markdown --title 'dm-is-predefined Documentation' --protected

data/ChangeLog.md

@@ -1,3 +1,9 @@
+### 0.3.1 / 2011-02-28
+
+* Require dm-core ~> 1.0.
+* Switched from Jeweler to [Ore](http://github.com/ruby-ore/ore#readme).
+* Upgraded to RSpec2.
+
 ### 0.3.0 / 2010-07-08
 
 * Require DataMapper 1.0.0.

data/Gemfile

@@ -1,97 +1,142 @@
-source 'http://rubygems.org'
-dm = 'git://github.com/datamapper'
-
-group :runtime do
-  # We bundle both AS and extlib while extlib compatibility needs to be kept
-  # around. require 'dm-core' will ensure that only one is activated at any
-  # time though. This is done by trying to require AS components and
-  # fallback to requiring extlib in case a LoadError was rescued when
-  # requiring AS code.
-  #
-  # Due to bundle exec activating all groups in the Gemfile, it's
-  # recommended to run
-  #
-  #     bundle install --without quality
-  #
-  # to have a development environment that is able to run the specs.
-  # The problem is that metric_fu activates active_support=2.2.3 if we
-  # comment out the gem 'activesupport' declaration - have a look below for
-  # why we would want to do that (and a bit later, for why that's actually
-  # not *strictly* necessary, but recommended)
-  #
-  # To run the specs using AS, leave this Gemfile as it is and just run:
-  #
-  #     bundle install --without qality
-  #     ADAPTERS=sqlite3 bundle exec rake spec # or whatever adapter
-  #
-  # To run the specs using extlib, comment out the: gem 'activesupport' line
-  # and run:
-  #
-  #     bundle install --without quality
-  #     ADAPTERS=sqlite3 bundle exec rake spec # or whatever adapter
-  #
-  # If you want to run the quality tasks as provided by metric_fu and
-  # related gems, you have to run:
-  #
-  #     bundle install
-  #     bundle exec rake metrics:all
-  #
-  # Switch back to a bundle without quality gems before trying to run the
-  # specs again:
-  #
-  #     bundle install --without quality
-  #     ADAPTERS=sqlite3 bundle exec rake spec # or whatever adapter
-  #
-  # It was mentioned above that all this is not *strictly* necessary, and
-  # this is true. Currently dm-core does the following as the first require
-  # when checking for AS:
-  #
-  #     require 'active_support/core_ext/object/singleton_class'
-  #
-  # Because this method is not present in activesupport <= 3.0.0.beta,
-  # dm-core's feature detection will actually do the "right thing" and fall
-  # back to extlib. However, since this is not the case for all dm-more gems
-  # as well, the safest thing to do is to respect the more tedious workflow
-  # for now, as it will at least be guaranteed to work the same for both
-  # dm-core and dm-more.
-  #
-  # Note that this won't be an issue anymore once we dropped support for
-  # extlib completely, or bundler folks decide to support something like
-  # "bundle exec --without=foo rake spec" (which probably is not going to
-  # happen anytime soon).
-  #
-
-  if ENV['EXTLIB']
-    gem 'extlib', '~> 0.9.15'
-  else
-    gem 'activesupport', '~> 3.0.0.beta3', :require => 'active_support'
-  end
+# If you're working on more than one datamapper gem at a time, then it's
+# recommended to create a local Gemfile and use this instead of the git
+# sources. This will make sure that you are  developing against your
+# other local datamapper sources that you currently work on. Gemfile.local
+# will behave identically to the standard Gemfile apart from the fact that
+# it fetches the datamapper gems from local paths. This means that you can
+# use the same environment variables, like ADAPTER(S) or PLUGIN(S) when
+# running
+# bundle commands. Gemfile.local is added to .gitignore, so you don't need
+# to worry about accidentally checking local development paths into git.
+# In order to create a local Gemfile, all you need to do is run:
+#
+#   bundle exec rake local_gemfile
+#
+# This will give you a Gemfile.local file that points to your local clones
+# of the various datamapper gems. It's assumed that all datamapper repo
+# clones reside in the same directory. You can use the Gemfile.local like
+# so for running any bundle command:
+#
+#   BUNDLE_GEMFILE=Gemfile.local bundle foo
+#
+# You can also specify which adapter(s) should be part of the bundle by
+# setting an environment variable. This of course also works when using the
+# Gemfile.local
+#
+#   bundle foo                        # dm-sqlite-adapter
+#
+#   ADAPTER=mysql bundle foo          # dm-mysql-adapter
+#
+#   ADAPTERS=sqlite,mysql bundle foo  # dm-sqlite-adapter, dm-mysql-adapter
+#
+# Of course you can also use the ADAPTER(S) variable when using the
+# Gemfile.local and running specs against selected adapters.
+#
+# For easily working with adapters supported on your machine, it's
+# recommended that you first install all adapters that you are planning to
+# use or work on by doing something like
+#
+#   ADAPTERS=sqlite,mysql,postgres bundle install
+#
+# This will clone the various repositories and make them available to
+# bundler. Once you have them installed you can easily switch between
+# adapters for the various development tasks. Running something like
+#
+#   ADAPTER=mysql bundle exec rake spec
+#
+# will make sure that the dm-mysql-adapter is part of the bundle, and will
+# be used when running the specs.
+#
+# You can also specify which plugin(s) should be part of the bundle by
+# setting an environment variable. This also works when using the
+# Gemfile.local
+#
+#   bundle foo                                 # dm-migrations
+#
+#   PLUGINS=dm-validations bundle foo          # dm-migrations,
+#                                              # dm-validations
+#
+#   PLUGINS=dm-validations,dm-types bundle foo # dm-migrations,
+#                                              # dm-validations,
+#                                              # dm-types
+#
+# Of course you can combine the PLUGIN(S) and ADAPTER(S) env vars to run
+# specs for certain adapter/plugin combinations.
+#
+# Finally, to speed up running specs and other tasks, it's recommended to
+# run
+#
+#   bundle lock
+#
+# after running 'bundle install' for the first time. This will make
+# 'bundle exec' run a lot faster compared to the unlocked version. With an
+# unlocked bundle you would typically just run 'bundle install' from time
+# to time to fetch the latest sources from upstream. When you locked your
+# bundle, you need to run
+#
+#   bundle install --relock
+#
+# to make sure to fetch the latest updates and then lock the bundle again.
+# Gemfile.lock is added to the .gitignore file, so you don't need to worry
+# about accidentally checking it into version control.
+
+source :rubygems
 
-  gem 'dm-core',	'~> 1.0.0'
+DATAMAPPER = 'http://github.com/datamapper'
+DM_VERSION = '~> 1.0'
+DO_VERSION = '~> 0.10.2'
+DM_DO_ADAPTERS = %w[sqlite postgres mysql oracle sqlserver]
+RAILS = 'http://github.com/rails/rails.git'
+
+if ENV['EXTLIB']
+  gem 'extlib',         '~> 0.9.15', :git => "#{DATAMAPPER}/extlib.git",
+                                     :require => nil
+else
+  gem 'activesupport',  '~> 3.0.4', :require => nil
+  gem 'i18n',           '~> 0.5.0'
 end
 
+gem 'dm-core',	DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
+
 group :development do
-  gem 'rake',		'~> 0.8.7'
-  gem 'jeweler',	'~> 1.4.0', :git => 'git://github.com/technicalpickles/jeweler.git'
+  gem 'rake',		    '~> 0.8.7'
+
+  gem 'ore-tasks',	'~> 0.4'
+  gem 'rspec',      '~> 2.4'
+
+  gem 'kramdown',   '~> 0.12.0'
+  gem 'yard',		    '~> 0.6.0'
 end
 
-group :doc do
-  case RUBY_PLATFORM
-  when 'java'
-    gem 'maruku',	'~> 0.6.0'
-  else
-    gem 'rdiscount',	'~> 1.6.3'
+group :datamapper do
+  # We need this because we want to pin these dependencies to their git
+  # master sources
+
+  adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
+  adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[ in_memory ]
+
+  if (do_adapters = DM_DO_ADAPTERS & adapters).any?
+    options = {}
+    options[:git] = "#{DATAMAPPER}/do.git" if ENV['DO_GIT'] == 'true'
+
+    gem 'data_objects',  DO_VERSION, options.dup
+
+    do_adapters.each do |adapter|
+      adapter = 'sqlite3' if adapter == 'sqlite'
+      gem "do_#{adapter}", DO_VERSION, options.dup
+    end
+
+    gem 'dm-do-adapter', DM_VERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"
   end
 
-  gem 'yard',		'~> 0.5.3'
-end
+  adapters.each do |adapter|
+    gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
+  end
 
-group :test do
-  gem 'data_objects',		'~> 0.10.2'
-  gem 'do_sqlite3',		'~> 0.10.2'
-  gem 'dm-do-adapter',		'~> 1.0.0'
-  gem 'dm-sqlite-adapter',	'~> 1.0.0'
-  gem 'dm-migrations',		'~> 1.0.0'
-end
+  plugins = ENV['PLUGINS'] || ENV['PLUGIN']
+  plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
 
-gem 'rspec',	'~> 1.3.0', :group => [:development, :test]
+  plugins.each do |plugin|
+    gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"
+  end
+end

data/LICENSE.txt

@@ -1,6 +1,4 @@
-(The MIT License)
-
-Copyright (c) 2008-2010 Hal Brodigan
+Copyright (c) 2008-2011 Hal Brodigan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,8 +1,9 @@
 # dm-is-predefined
 
-* [github.com/postmodern/dm-is-predefined](http://github.com/postmodern/dm-is-predefined)
-* [github.com/postmodern/dm-is-predefined/issues](http://github.com/postmodern/dm-is-predefined/issues)
-* Postmodern (postmodern.mod3 at gmail.com)
+* [Source](http://github.com/postmodern/dm-is-predefined)
+* [Issues](http://github.com/postmodern/dm-is-predefined/issues)
+* [Documentation](http://rubydoc.info/gems/dm-is-predefined/frames)
+* [Email](mailto:postmodern.mod3 at gmail.com)
 
 ## Description
 
@@ -47,7 +48,7 @@ A DataMapper plugin for adding predefined resources to Models.
 
 ## Requirements
 
-* [dm-core](http://github.com/datamapper/dm-core/) ~> 1.0.0
+* [dm-core](http://github.com/datamapper/dm-core/) ~> 1.0
 
 ## Install
 
@@ -55,5 +56,6 @@ A DataMapper plugin for adding predefined resources to Models.
 
 ## License
 
-See {file:LICENSE.txt} for license information.
+Copyright (c) 2008-2011 Hal Brodigan
 
+See {file:LICENSE.txt} for license information.

data/Rakefile

@@ -1,8 +1,15 @@
 require 'rubygems'
-require 'bundler'
 
 begin
-  Bundler.setup(:development, :doc)
+  require 'bundler'
+rescue LoadError => e
+  STDERR.puts e.message
+  STDERR.puts "Run `gem install bundler` to install Bundler."
+  exit e.status_code
+end
+
+begin
+  Bundler.setup(:development)
 rescue Bundler::BundlerError => e
   STDERR.puts e.message
   STDERR.puts "Run `bundle install` to install missing gems"
@@ -10,24 +17,12 @@ rescue Bundler::BundlerError => e
 end
 
 require 'rake'
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  gem.name = 'dm-is-predefined'
-  gem.license = 'MIT'
-  gem.summary = %Q{A DataMapper plugin for adding predefined resources to Models.}
-  gem.description = %Q{A DataMapper plugin for adding predefined resources to Models.}
-  gem.email = 'postmodern.mod3@gmail.com'
-  gem.homepage = 'http://github.com/postmodern/dm-is-predefined'
-  gem.authors = ['Postmodern']
-  gem.has_rdoc = 'yard'
-end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs += ['lib', 'spec']
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.spec_opts = ['--options', '.specopts']
-end
+require 'ore/tasks'
+Ore::Tasks.new
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
 task :default => :spec
 
 require 'yard'

data/dm-is-predefined.gemspec

@@ -1,75 +1,15 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = %q{dm-is-predefined}
-  s.version = "0.3.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Postmodern"]
-  s.date = %q{2010-06-10}
-  s.description = %q{A DataMapper plugin for adding predefined resources to Models.}
-  s.email = %q{postmodern.mod3@gmail.com}
-  s.extra_rdoc_files = [
-    "ChangeLog.md",
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-    ".specopts",
-    ".yardopts",
-    "ChangeLog.md",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "dm-is-predefined.gemspec",
-    "lib/dm-is-predefined.rb",
-    "lib/dm-is-predefined/is/exceptions/unknown_resource.rb",
-    "lib/dm-is-predefined/is/predefined.rb",
-    "spec/integration/models/test_model.rb",
-    "spec/integration/predefined_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.has_rdoc = %q{yard}
-  s.homepage = %q{http://github.com/postmodern/dm-is-predefined}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A DataMapper plugin for adding predefined resources to Models.}
-  s.test_files = [
-    "spec/integration/models/test_model.rb",
-    "spec/integration/predefined_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0.beta3"])
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.4.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3.0"])
-    else
-      s.add_dependency(%q<activesupport>, ["~> 3.0.0.beta3"])
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
-      s.add_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_dependency(%q<jeweler>, ["~> 1.4.0"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.0"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, ["~> 3.0.0.beta3"])
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
-    s.add_dependency(%q<rake>, ["~> 0.8.7"])
-    s.add_dependency(%q<jeweler>, ["~> 1.4.0"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.0"])
+begin
+  Ore::Specification.new do |gemspec|
+    # custom logic here
+  end
+rescue NameError
+  begin
+    require 'ore/specification'
+    retry
+  rescue LoadError
+    STDERR.puts "The '#{__FILE__}' file requires Ore."
+    STDERR.puts "Run `gem install ore-core` to install Ore."
   end
 end
-

data/gemspec.yml

@@ -0,0 +1,18 @@
+name: dm-is-predefined
+version: 0.3.1
+summary: DataMapper plugin for adding predefined resources to models.
+description:
+  A DataMapper plugin for adding predefined resources to Models.
+
+license: MIT
+authors: Postmodern
+email: postmodern.mod3@gmail.com
+homepage: http://github.com/postmodern/dm-is-predefined
+has_yard: true
+
+dependencies:
+  dm-core: ~> 1.0
+
+development_dependencies:
+  bundler: ~> 1.0.0
+  yard: ~> 0.6.0

data/spec/spec_helper.rb

@@ -1,15 +1,4 @@
-require 'rubygems'
-require 'bundler'
-
-begin
-  Bundler.setup(:runtime, :test)
-rescue Bundler::BundlerError => e
-  STDERR.puts e.message
-  STDERR.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-require 'spec'
+require 'rspec'
 require 'dm-core/spec/setup'
 require 'dm-core/spec/lib/adapter_helpers'
 
@@ -17,6 +6,6 @@ require 'dm-is-predefined'
 
 DataMapper::Spec.setup
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.extend(DataMapper::Spec::Adapters::Helpers)
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-predefined
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors: 
 - Postmodern
@@ -14,106 +10,64 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 -07:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: dm-core
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        - beta3
-        version: 3.0.0.beta3
+        version: "1.0"
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: dm-core
+  name: bundler
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: yard
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
-  type: :development
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
-  type: :development
-  prerelease: false
-  version_requirements: *id005
 description: A DataMapper plugin for adding predefined resources to Models.
-email: postmodern.mod3@gmail.com
+email: 
+- postmodern.mod3@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
+- README.md
 - ChangeLog.md
 - LICENSE.txt
-- README.md
 files: 
-- .gitignore
-- .specopts
+- .document
+- .rspec
 - .yardopts
 - ChangeLog.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - dm-is-predefined.gemspec
+- gemspec.yml
 - lib/dm-is-predefined.rb
 - lib/dm-is-predefined/is/exceptions/unknown_resource.rb
 - lib/dm-is-predefined/is/predefined.rb
@@ -134,26 +88,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 76076225
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: dm-is-predefined
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: A DataMapper plugin for adding predefined resources to Models.
+summary: DataMapper plugin for adding predefined resources to models.
 test_files: 
-- spec/integration/models/test_model.rb
 - spec/integration/predefined_spec.rb
-- spec/spec_helper.rb

data/.gitignore

@@ -1,10 +0,0 @@
-doc
-pkg
-tmp/*
-.bundle
-.DS_Store
-.yardoc
-*.db
-*.log
-*.swp
-*~

data/.specopts

@@ -1 +0,0 @@
---colour --format specdoc

data/VERSION

@@ -1 +0,0 @@
-0.3.0