mordor 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmI5Mzc5YTZlMTZkYWE2YzBmNzA1NzBmMzJjOGU2MDQwNGMxNTkzOA==
-  data.tar.gz: !binary |-
-    ZDA3ODE3NDdiMjAwZGUxZjliMTY5Y2I4MjZkMmI5NTllMGI1NzI2OA==
+SHA1:
+  metadata.gz: 9b31b37b4ca1cfeb3b5b02163a31d90a896b3c69
+  data.tar.gz: 47803acd2973ecad32e3b64f3010104fdad5ad28
 SHA512:
-  metadata.gz: !binary |-
-    MDdhZmNjM2FiNmJlYmE1Y2VhNThjMDBiM2JiNmEyMTYyMzE4OTNmNmFhZjVj
-    ODQzZWIzZWJlNmZmN2RjMGVkYzIyNDE4OWRlYzg1YWZlOTBhYzBlMGJlNTA3
-    N2ExMmU4NDM4YzExMGM5ZDNmYjMxYjA1NDhiOGQ3MDdlNmE0ZWM=
-  data.tar.gz: !binary |-
-    NTg4MGZjZGQ5NTg5M2IwOWNlNGUxYmQwY2ViYzk0MzU3NTA5Zjk5ZjUzMTVm
-    NjQ0NWZiMjdhYzQzNTE2YzdiZjc1YTg5OGI4YzFjZDVkNmFmNjRkMTUxNGQ0
-    YTA4M2QzMTYwYzY1MTk1ZmIyMmE0YWE2MzFhNjA3NWIwOTRlODg=
+  metadata.gz: 0bc6e986c952c6cdfc8a6fc315c6d6c0a9c466825617ab36d5919e5ac22a0fff5551619cbef4a2262634bc3686bd5d421ea994e5f2b4b666a1ad3ec508cafe19
+  data.tar.gz: f033a37126af7b7b5908eb684a0b866c1c791e74462c51167d692d09957448df4933808ec7ea626de6175045aab4a4f34677bc6132c56130881d2a17c36e90e5

data/.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: ruby
 cache: bundler
 bundler_args: --without optional
@@ -5,18 +6,30 @@ bundler_args: --without optional
 jdk:
   - oraclejdk7
 
+env:
+  global:
+    - MONGODB_VERSION=3.4.4
+
 services:
+  - docker
   - mongodb
 
-rvm:
-  - 1.9.3
-  - 2.1.6
-  - 2.2.2
-  - jruby-19mode
-  - rbx-19mode
-  - rbx-2.5.3
+before_install:
+  - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-$MONGODB_VERSION.tgz
+  - tar xfz mongodb-linux-x86_64-$MONGODB_VERSION.tgz
+  - export PATH=`pwd`/mongodb-linux-x86_64-$MONGODB_VERSION/bin:$PATH
+  - mkdir -p data/db
+  - mongod --dbpath=data/db &
+  - sleep 3
 
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode
-    - rvm: rbx-2.5.3
+#rvm:
+#  - 2.2.2
+#  - 2.2.5
+#  - jruby-19mode
+#  - rbx-19mode
+#  - rbx-2.5.3
+#
+#matrix:
+#  allow_failures:
+#    - rvm: rbx-19mode
+#    - rvm: rbx-2.5.3

data/Rakefile

@@ -3,7 +3,7 @@ require "bundler"
 
 Bundler.setup
 
-load('tasks/github-gem.rake')
+load('./tasks/github-gem.rake')
 
 task :default  => :spec
 

data/lib/mordor/version.rb

@@ -1,3 +1,3 @@
 module Mordor
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/mordor.gemspec

@@ -17,16 +17,21 @@ Gem::Specification.new do |s|
   s.homepage = 'http://www.nedap.com'
 
   s.add_runtime_dependency 'extlib'
-  s.add_runtime_dependency 'json'
+  s.add_runtime_dependency 'json', '~> 1.8.5'
   s.add_runtime_dependency 'mongo', '< 2.0'
 
   s.add_development_dependency 'rack-test'
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake', '< 11.0'
   s.add_development_dependency 'rspec', '~> 2.0', '< 2.99'
 
-  s.add_runtime_dependency 'bson_ext' unless RUBY_PLATFORM == 'java'
   s.extensions << 'ext/mkrf_conf.rb'
 
+  if defined? JRUBY_VERSION
+    s.platform = 'java'
+  else
+    s.add_runtime_dependency('bson_ext')
+  end
+
   # The files and test_files directives are set automatically by the release script.
   # Do not change them by hand, but make sure to add the files to the git repository.
   s.files = %w(.gitignore .travis.yml CHANGES.md Gemfile Guardfile LICENSE README.md Rakefile ext/mkrf_conf.rb lib/mordor.rb lib/mordor/collection.rb lib/mordor/config.rb lib/mordor/resource.rb lib/mordor/version.rb mordor.gemspec spec/mordor/collection_spec.rb spec/mordor/connection_spec.rb spec/mordor/resource_spec.rb spec/spec.opts spec/spec_helper.rb tasks/github-gem.rake)

data/tasks/github-gem.rake

@@ -182,11 +182,11 @@ module GithubGem
     def build_task
       sh "gem build -q #{gemspec_file}"
       Dir.mkdir('pkg') unless File.exist?('pkg')
-      sh "mv #{gemspec.name}-#{gemspec.version}.gem pkg/#{gemspec.name}-#{gemspec.version}.gem"
+      sh "mv #{gem_package_filename}.gem pkg/#{gem_package_filename}.gem"
     end
 
     def newest_version
-      `#{git} tag`.split("\n").map { |tag| tag.split('-').last }.compact.map { |v| Gem::Version.new(v) }.max || Gem::Version.new('0.0.0')
+      `#{git} tag`.split("\n").map { |tag| tag.split('v').last }.compact.map { |v| Gem::Version.new(v) }.max || Gem::Version.new('0.0.0')
     end
 
     def next_version(increment = nil)
@@ -267,7 +267,7 @@ module GithubGem
     end
 
     def gemcutter_release_task
-      sh "gem", 'push', "pkg/#{gemspec.name}-#{gemspec.version}.gem"
+      sh "gem", 'push', "pkg/#{gem_package_filename}.gem"
     end
 
     # Gem release task.
@@ -289,6 +289,14 @@ module GithubGem
       FileList[test_pattern].any?
     end
 
+    def gem_package_filename
+      "#{gemspec.name}-#{gemspec.version}#{platform_suffix}"
+    end
+
+    def platform_suffix
+      "-#{gemspec.platform}" unless gemspec.platform == 'ruby'
+    end
+
     # Loads the gemspec file
     def load_gemspec!
       @gemspec = eval(File.read(@gemspec_file))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mordor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jan-Willem Koelewijn
@@ -15,111 +15,109 @@ dependencies:
   name: extlib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.5
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! '    Small gem to add MongoDB Resources, resources have attributes
-  that translate into document fields. When an attribute is declared, finders for
-  the attribute are added to the Resource automatically
-
-'
+description: "    Small gem to add MongoDB Resources, resources have attributes that
+  translate into document fields. When an attribute is declared, finders for the attribute
+  are added to the Resource automatically\n"
 email:
 - janwillem.koelewijn@nedap.com
 - dirkjan.bussink@nedap.com
@@ -128,8 +126,8 @@ extensions:
 - ext/mkrf_conf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - Guardfile
@@ -158,17 +156,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: mordor