docile 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10cb56eaa668d186cedb1bab3bdda31a84ef4f13
-  data.tar.gz: 19a69dac94f84a2976212184093cc3a26df2c05c
+  metadata.gz: 4df64881f4215d866d038e00f55d5b1ca2a45cb2
+  data.tar.gz: 26a8de33f8bf657873666a2754bf09f605334e9d
 SHA512:
-  metadata.gz: af34a724f7dc51c9d539c4bdca6e0bb711ead40b9487434eb3dc6b8a06444dea5e258262dc6d4032e5ea3c2fe66c0b58e594f350b5a7ecd2bad7fc947c904904
-  data.tar.gz: 1df5d786c840df1e52b6809a6e884d0a916662278a1dd7a625e41508e15c92990c920b6c99a30af82dd233b20b880504f5f2707e201019ee9a809598b75a0369
+  metadata.gz: 75669d4f578d70ba4c8be7dd6c19676041506e0f9408ba26ea0b1ad7931cf59636ccf36a4363ae709a1476464caba5ca1c429b07233dda7d797d5007f3c0af10
+  data.tar.gz: e0e0e7364436ce92f4ab5efc52c2782e5da098d302652ca8698d74bcccc27c695b269c04ced3d224eec1a5b3833ba91c44232a2cc4c55fe061504246a715ef49

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 cache: bundler
 rvm:
+  - ruby-head
   - 2.1.2
   - 2.1.1
   - 2.1.0
@@ -9,6 +10,12 @@ rvm:
   - 1.9.2
   - 1.8.7
   - ree
-  - jruby-18mode
+  - jruby-head
   - jruby-19mode
+  - jruby-18mode
   - rbx-2
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+  fast_finish: true

data/HISTORY.md

@@ -1,5 +1,11 @@
 # HISTORY
 
+## [v1.1.5 (Jun 15, 2014)](http://github.com/ms-ati/docile/compare/v1.1.4...v1.1.5)
+
+  - as much as possible, loosen version restrictions on development dependencies
+  - clarify gemspec settings as much as possible
+  - bump rspec dependency to 3.0.x
+
 ## [v1.1.4 (Jun 11, 2014)](http://github.com/ms-ati/docile/compare/v1.1.3...v1.1.4)
 
   - Special thanks to Ken Dreyer  (@ktdreyer):

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rake/clean'
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require File.expand_path('on_what', File.dirname(__FILE__))
 
 # Default task for `rake` is to run rspec
 task :default => [:spec]
@@ -11,12 +12,13 @@ RSpec::Core::RakeTask.new
 # Configure `rake clobber` to delete all generated files
 CLOBBER.include('pkg', 'doc', 'coverage')
 
-# Only configure yard doc generation when *not* on Travis
-if ENV['CI'] != 'true'
-  require "github/markup"
-  require "redcarpet"
-  require "yard"
-  require "yard/rake/yardoc_task"
+# To limit needed compatibility with versions of dependencies, only configure
+#   yard doc generation when *not* on Travis, JRuby, or 1.8
+if !on_travis? && !on_jruby? && !on_1_8?
+  require 'github/markup'
+  require 'redcarpet'
+  require 'yard'
+  require 'yard/rake/yardoc_task'
 
   YARD::Rake::YardocTask.new do |t|
     OTHER_PATHS = %w()

data/docile.gemspec

@@ -1,36 +1,43 @@
+require File.expand_path('on_what', File.dirname(__FILE__))
 $:.push File.expand_path('../lib', __FILE__)
 require 'docile/version'
 
 Gem::Specification.new do |s|
   s.name        = 'docile'
   s.version     = Docile::VERSION
-  s.authors     = ['Marc Siegel']
-  s.email       = %w(msiegel@usainnov.com)
+  s.author      = 'Marc Siegel'
+  s.email       = 'marc@usainnov.com'
   s.homepage    = 'https://ms-ati.github.io/docile/'
   s.summary     = 'Docile keeps your Ruby DSLs tame and well-behaved'
   s.description = 'Docile turns any Ruby object into a DSL. Especially useful with the Builder pattern.'
   s.license     = 'MIT'
 
-  s.rubyforge_project = 'docile'
-
+  # Files included in the gem
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w(lib)
 
-  # Running rspec tests from rake
-  s.add_development_dependency 'rake', '>= 10.1.1'
-  s.add_development_dependency 'rspec', '~> 2.14.0'
-  s.add_development_dependency 'mime-types', '~> 1.25.1'
+  # Specify oldest supported Ruby version
+  s.required_ruby_version = '>= 1.8.7'
+
+  # Run rspec tests from rake
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec', '~> 3.0.0'
+
+  # NOTE: needed for Travis builds on 1.8, but can't yet reproduce failure locally
+  s.add_development_dependency 'mime-types', '~> 1.25.1' if on_1_8?
 
-  if !(defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
+  # To limit needed compatibility with versions of dependencies, only configure
+  #   yard doc generation when *not* on Travis, JRuby, or 1.8
+  if !on_travis? && !on_jruby? && !on_1_8?
     # Github flavored markdown in YARD documentation
     # http://blog.nikosd.com/2011/11/github-flavored-markdown-in-yard.html
     s.add_development_dependency 'yard'
-    s.add_development_dependency 'redcarpet', '2.3.0' # because 1.8
+    s.add_development_dependency 'redcarpet'
     s.add_development_dependency 'github-markup'
   end
 
-  # Coveralls test coverage tool
+  # Coveralls test coverage tool, basically hosted SimpleCov
   s.add_development_dependency 'coveralls'
 end

data/lib/docile/version.rb

@@ -1,4 +1,4 @@
 module Docile
   # The current version of this library
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 end

data/on_what.rb

@@ -0,0 +1,14 @@
+# NOTE: Very simple tests for what system we are on, extracted for sharing
+#   between Rakefile, gemspec, and spec_helper. Not for use in actual library.
+
+def on_travis?
+  ENV['CI'] == 'true'
+end
+
+def on_jruby?
+  (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
+end
+
+def on_1_8?
+  RUBY_VERSION.start_with? '1.8'
+end

data/spec/docile_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'singleton'
 
 describe Docile do
 

data/spec/spec_helper.rb

@@ -1,9 +1,11 @@
+require File.expand_path('on_what', File.dirname(File.dirname(__FILE__)))
+
 begin
   require 'simplecov'
   require 'coveralls'
 
   # On Ruby 1.9+ use SimpleCov and publish to Coveralls.io
-  if !RUBY_VERSION.start_with? '1.8'
+  if !on_1_8?
     SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
       SimpleCov::Formatter::HTMLFormatter,
       Coveralls::SimpleCov::Formatter
@@ -26,12 +28,3 @@ $LOAD_PATH.unshift lib_dir unless $LOAD_PATH.include? lib_dir
 
 # Require Docile again, now with coverage enabled on 1.9+
 require 'docile'
-
-require 'singleton'
-require 'rspec'
-
-RSpec.configure do |config|
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docile
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Marc Siegel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,42 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.14.0
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.25.1
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +56,16 @@ dependencies:
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
@@ -110,8 +96,7 @@ dependencies:
         version: '0'
 description: Docile turns any Ruby object into a DSL. Especially useful with the Builder
   pattern.
-email:
-- msiegel@usainnov.com
+email: marc@usainnov.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -133,6 +118,7 @@ files:
 - lib/docile/execution.rb
 - lib/docile/fallback_context_proxy.rb
 - lib/docile/version.rb
+- on_what.rb
 - spec/docile_spec.rb
 - spec/spec_helper.rb
 homepage: https://ms-ati.github.io/docile/
@@ -147,15 +133,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: docile
-rubygems_version: 2.2.0
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Docile keeps your Ruby DSLs tame and well-behaved