rack-datamapper 0.3.2 → 0.3.3

data/Rakefile

@@ -4,29 +4,38 @@ require 'rubygems'
 
 require 'spec'
 require 'spec/rake/spectask'
-require 'pathname'
-require 'yard'
 
-desc "Run specs"
-Spec::Rake::SpecTask.new('spec')
+BUILD_DIR = 'target'
 
+desc 'clean up'
 task :clean do
-  sh "rm -r pkg"
+  FileUtils.rm_rf(BUILD_DIR)
 end
 
 desc 'Package as a gem.'
 task :package do
-  sh "gem build rack_datamapper.gemspec" 
-  sh "mkdir -p pkg"
-  sh "mv rack-datamapper-*.gem pkg"
+  require 'fileutils'
+  gemspec = Dir['*.gemspec'].first
+  Kernel.system("#{RUBY} -S gem build #{gemspec}")
+  FileUtils.mkdir_p(BUILD_DIR)
+  gem = Dir['*.gem'].first
+  FileUtils.mv(gem, File.join(BUILD_DIR,"#{gem}"))
+  puts File.join(BUILD_DIR,"#{gem}")
 end
 
 desc 'Install the package as a gem.'
-task :install => [:clean, :package] do
-  gem = Dir['pkg/*.gem'].first
-  sh "gem install --local #{gem} --no-ri --no-rdoc"
+task :install => [:package] do
+  gem = Dir[File.join(BUILD_DIR, '*.gem')].first
+  extra = ENV['GEM_HOME'].nil? && ENV['GEM_PATH'].nil? ? "--user-install" : ""
+  Kernel.system("#{RUBY} -S gem install --local #{gem} --no-ri --no-rdoc #{extra}")
 end
 
-YARD::Rake::YardocTask.new
+desc 'Run specifications'
+Spec::Rake::SpecTask.new(:spec) do |t|
+  if File.exists?(File.join('spec','spec.opts'))
+    t.spec_opts << '--options' << File.join('spec','spec.opts')
+  end
+  t.spec_files = Dir.glob(File.join('spec','**','*_spec.rb'))
+end
 
 # vim: syntax=Ruby

data/lib/rack_datamapper.rb

@@ -1,9 +1,8 @@
-require 'pathname'
-require 'extlib/pathname'
 require 'dm-core'
 
-require Pathname(__FILE__).dirname / 'rack_datamapper' / 'version'
-require Pathname(__FILE__).dirname / 'rack_datamapper' / 'identity_maps'
-require Pathname(__FILE__).dirname / 'rack_datamapper' / 'restful_transactions'
-require Pathname(__FILE__).dirname / 'rack_datamapper' / 'transaction_boundaries'
-require Pathname(__FILE__).dirname / 'rack_datamapper' / 'session' / 'datamapper'
+base = File.join(File.dirname(__FILE__),'rack_datamapper')
+require File.join(base, 'version')
+require File.join(base, 'identity_maps')
+require File.join(base, 'restful_transactions')
+require File.join(base, 'transaction_boundaries')
+require File.join(base, 'session', 'datamapper')

data/lib/rack_datamapper/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module DataMapper
-    VERSION = '0.3.2'.freeze
+    VERSION = '0.3.3'.freeze
   end
 end

data/spec/spec.opts

@@ -0,0 +1 @@
+--colour

data/spec/spec_helper.rb

@@ -1,11 +1,11 @@
-require 'pathname'
 require 'rubygems'
+require 'pathname'
 $LOAD_PATH << Pathname(__FILE__).dirname.parent.expand_path + 'lib'
 require 'rack_datamapper'
 require 'dm-core/version'
 require 'dm-migrations'
 require 'dm-transactions'
-p DataMapper::VERSION
+
 def load_driver(name, default_uri)
   return false if ENV['ADAPTER'] != name.to_s
 
@@ -22,6 +22,8 @@ end
 
 ENV['ADAPTER'] ||= 'sqlite3'
 
-HAS_SQLITE3  = load_driver(:sqlite3,  'sqlite3::memory:')
-HAS_MYSQL    = load_driver(:mysql,    'mysql://localhost/dm_core_test')
-HAS_POSTGRES = load_driver(:postgres, 'postgres://postgres@localhost/dm_core_test')
+unless defined? HAS_SQLITE3
+  HAS_SQLITE3  = load_driver(:sqlite3,  'sqlite3::memory:')
+  HAS_MYSQL    = load_driver(:mysql,    'mysql://localhost/dm_core_test')
+  HAS_POSTGRES = load_driver(:postgres, 'postgres://postgres@localhost/dm_core_test')
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rack-datamapper
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  prerelease: false
+  segments: 
+    - 0
+    - 3
+    - 3
+  version: 0.3.3
 platform: ruby
 authors: 
   - mkristian
@@ -14,64 +19,87 @@ default_executable:
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: dm-core
-    type: :runtime
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 0
+              - 0
             version: 1.0.0
-      version: 
+    type: :runtime
+    version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: rack
-    type: :runtime
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 0
             version: "1.0"
-      version: 
+    type: :runtime
+    version_requirements: *id002
   - !ruby/object:Gem::Dependency 
     name: dm-migrations
-    type: :development
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 0
+              - 0
             version: 1.0.0
-      version: 
+    type: :development
+    version_requirements: *id003
   - !ruby/object:Gem::Dependency 
     name: dm-transactions
-    type: :development
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 0
+              - 0
             version: 1.0.0
-      version: 
+    type: :development
+    version_requirements: *id004
   - !ruby/object:Gem::Dependency 
     name: dm-sqlite-adapter
-    type: :development
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 0
+              - 0
             version: 1.0.0
-      version: 
+    type: :development
+    version_requirements: *id005
   - !ruby/object:Gem::Dependency 
     name: rspec
-    type: :development
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 3
+              - 0
             version: 1.3.0
-      version: 
+    type: :development
+    version_requirements: *id006
 description: this collection of plugins helps to add datamapper functionality to Rack. there is a IdentityMaps plugin which wrappes the request and with it all database actions are using that identity map. the transaction related plugin TransactionBoundaries and RestfulTransactions wrappes the request into a transaction. for using datamapper to store session data there is the DatamapperStore.
 email: 
   - m.kristian@web.de
@@ -83,8 +111,8 @@ extra_rdoc_files:
   - History.txt
   - README.txt
 files: 
-  - History.txt
   - MIT-LICENSE
+  - History.txt
   - README.txt
   - Rakefile
   - lib/softhashmap.jar
@@ -93,13 +121,21 @@ files:
   - lib/rack_datamapper/transaction_boundaries.rb
   - lib/rack_datamapper/restful_transactions.rb
   - lib/rack_datamapper/identity_maps.rb
+  - lib/rack_datamapper/version.rb.errors
   - lib/rack_datamapper/version.rb
   - lib/rack_datamapper/session/datamapper.rb
   - lib/rack_datamapper/session/abstract/store.rb
+  - spec/identity_maps_spec.rb
+  - spec/transaction_boundaries_spec.rb
+  - spec/spec_helper.rb
+  - spec/restful_transactions_spec.rb
+  - spec/spec.opts
+  - spec/datamapper_session_spec.rb
+  - spec/datamapper_store_spec.rb
 has_rdoc: true
 homepage: http://github.com/mkristian/rack_datamapper
-licenses: []
-
+licenses: 
+  - MIT-LICENSE
 post_install_message: 
 rdoc_options: 
   - --main
@@ -110,25 +146,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+          - 0
         version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+          - 0
         version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rack-datamapper
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: this collection of plugins helps to add datamapper functionality to Rack
 test_files: 
   - spec/identity_maps_spec.rb
   - spec/transaction_boundaries_spec.rb
-  - spec/spec_helper.rb
   - spec/restful_transactions_spec.rb
   - spec/datamapper_session_spec.rb
   - spec/datamapper_store_spec.rb