rim 2.11.1 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa768e00934069a19359c9ef30a4dd0a3986cb51
-  data.tar.gz: d0c318b897e3f4c270fae929b9584ee988c67be1
+  metadata.gz: 3e78a0d003362f835e65b8e86c9d60fdc6857042
+  data.tar.gz: 1cf4ec58e9249f76e1d1bbf53cc96a0a470f8e0e
 SHA512:
-  metadata.gz: 15942b97b6aeadace2073452c67380c95ffa034a967856770651c3461bec8e983f57d10f5e6009933565b830d99691909fa13d7260371a97de04c06e2b2acf22
-  data.tar.gz: 23c541b5bd9a0a831265715207582de4ab1678368883b5c2f2b2ac374aece3e7aee40458fba7afc9aa7db38e5fded4d456e2052c04928c6c6c187094566a6ff4
+  metadata.gz: c18b3a53de31d32bf9f5c42b0db95f4a4bc196d1fbae3dd8f2ba989bbca894825bf5da4321058f7e259c6164e2ecf71bb033281284c78a7acf9fadab1b9a5465
+  data.tar.gz: 905d83723eefeebbd2e06ef2274cb8e04fcc062e0b0134103bee2bc5b7f396fce842f4a32da35ee9194dfb8f8c2e8358a73cc40e7a05be91e457c40db620fcee

data/Changelog

@@ -1,3 +1,8 @@
+2.12.0
+Upgrade development_dependency for regtest to version 1.0.
+Add rake >0 and < 100 to default development_dependencies.
+Some internal improvements.
+
 2.11.1
 Fix including .gemspec file into gem.
 

data/Rakefile

@@ -22,4 +22,5 @@ Rim.setup do
 Goal is to have a project managing that just works on as many Ruby
 versions as possible and is easy to extend. Feel free to dislike it. ;)
   END
+  development_dependencies << %w(test-unit ~>3)
 end

data/lib/rim/core.rb

@@ -11,6 +11,9 @@ class Rim
 
   # Paths for require to load the lib (default: <code>['lib']</code>
   attr_accessor :require_paths
+
+  alias author authors
+  alias author= authors=
 end
 
 Rim.defaults do |r|

data/lib/rim/gem.rb

@@ -10,7 +10,7 @@ class Rim
   attr_accessor :email
 
   # License imformation
-  attr_accessor :license
+  attr_accessor :licenses
 
   # Project homepage
   attr_accessor :homepage
@@ -21,7 +21,7 @@ class Rim
   # Dependencies of the gem
   attr_accessor :dependencies
 
-  # Dependencies for development (default: <code>[%W(rim ~>#{Rim::VERSION.split(/\./)[0..1].join('.')})]</code>)
+  # Dependencies for development (default: <code>[%w(rake >0 <100), %W(rim ~>#{Rim::VERSION.scan(/[^.]+\.[^.]+/).first})]</code>)
   attr_accessor :development_dependencies
 
   # Required Ruby version
@@ -33,6 +33,9 @@ class Rim
   # Requirements (external to rubygems)
   attr_accessor :requirements
 
+  alias license licenses
+  alias license= licenses=
+
   protected
 
   def gem_spec
@@ -78,7 +81,7 @@ end
 
 Rim.defaults do
   gem_files filelist(/^README/i, /^Changelog/i, /^COPYING/i, /^LICENSE/i, /^Rakefile/i, /^Gemfile$/, '*.gemspec', 'bin/*', 'lib/**/*', 'test/**/*')
-  development_dependencies [%W(rim ~>#{Rim::VERSION.split(/\./)[0..1].join('.')})]
+  development_dependencies [%w(rake >0 <100),%W(rim ~>#{Rim::VERSION.scan(/[^.]+\.[^.]+/).first})]
   requirements []
 end
 
@@ -112,7 +115,6 @@ Rim.after_setup do
     gem_files_without_gemspec = gem_files.clone
     gem_files_without_gemspec.exclude('*.gemspec')
     file gemspec_file => gem_files_without_gemspec do
-      puts gem_files
       gem_files << gemspec_file
       File.write(gemspec_file, gem_spec)
     end

data/lib/rim/regtest.rb

@@ -13,6 +13,6 @@ end
 Rim.after_setup do
   if feature_loaded? 'rim/gem'
     self.gem_files += ::REGTEST_FILES
-    development_dependencies << %w(regtest ~>0.4)
+    development_dependencies << %w(regtest ~>1.0)
   end
 end

data/lib/rim.rb

@@ -9,7 +9,7 @@ require 'singleton'
 # versions as possible and is easy to extend. Feel free to dislike it. ;)
 class Rim
 
-  VERSION = '2.11.1'
+  VERSION = '2.12.0'
 
   begin
     require 'rake/dsl_definition'
@@ -25,7 +25,7 @@ class Rim
   def self.defaults(&blk)
     rim = Rim.instance
     if blk.arity < 1
-      rim.instance_eval &blk
+      rim.instance_eval(&blk)
     else
       yield rim
     end
@@ -38,7 +38,7 @@ class Rim
   def self.setup(&blk)
     rim = Rim.instance
     if blk.arity < 1
-      rim.instance_eval &blk
+      rim.instance_eval(&blk)
     else
       yield rim
     end
@@ -91,7 +91,7 @@ class Rim
 
   def self.execute_definitions
     @definitions.each do |blk|
-      Rim.instance.instance_eval &blk
+      Rim.instance.instance_eval(&blk)
     end
   end
 

data/regtest/execution.rb

@@ -1,11 +1,12 @@
 # -- encoding: utf-8 --
 require 'regtest'
 
+`rake clobber`
 `rake -T`.split(/\n/).map {|line| line.split(/#/).first.strip}.each do |cmd|
   next if cmd =~ /(regtest)|(irb)|(pry)|(ripl)/
   cmd.sub! /rake/, 'rake -n'
   Regtest.sample cmd do
-    res = `#{cmd} 2>&1`
+    res = `#{cmd} 2>&1`.gsub %r{(?<=pkg/rim-)(.+)(?=\.gem)}, 'x.x.x'
     res.split(/\n/).grep(/Execute/)
   end
 end

data/regtest/execution.yml

@@ -23,22 +23,30 @@ result:
 ---
 sample: rake -n gem
 result:
-- "** Execute (dry run) pkg/rim-2.4.0.gem"
-- "** Execute (dry run) gem:build"
+- "** Execute (dry run) gem:spec"
 - "** Execute (dry run) test"
+- "** Execute (dry run) pkg"
+- "** Execute (dry run) pkg/rim-x.x.x.gem"
+- "** Execute (dry run) gem:build"
 - "** Execute (dry run) gem"
 ---
 sample: rake -n gem:push
 result:
 - "** Execute (dry run) aspell:check"
 - "** Execute (dry run) git:check"
-- "** Execute (dry run) pkg/rim-2.4.0.gem"
-- "** Execute (dry run) gem:build"
+- "** Execute (dry run) gem:spec"
 - "** Execute (dry run) test"
+- "** Execute (dry run) pkg"
+- "** Execute (dry run) pkg/rim-x.x.x.gem"
+- "** Execute (dry run) gem:build"
 - "** Execute (dry run) gem"
 - "** Execute (dry run) version:check"
 - "** Execute (dry run) gem:push"
 ---
+sample: rake -n gem:spec
+result:
+- "** Execute (dry run) gem:spec"
+---
 sample: rake -n git:check
 result:
 - "** Execute (dry run) aspell:check"
@@ -54,9 +62,11 @@ sample: rake -n git:tag
 result:
 - "** Execute (dry run) aspell:check"
 - "** Execute (dry run) git:check"
-- "** Execute (dry run) pkg/rim-2.4.0.gem"
-- "** Execute (dry run) gem:build"
+- "** Execute (dry run) gem:spec"
 - "** Execute (dry run) test"
+- "** Execute (dry run) pkg"
+- "** Execute (dry run) pkg/rim-x.x.x.gem"
+- "** Execute (dry run) gem:build"
 - "** Execute (dry run) gem"
 - "** Execute (dry run) version:check"
 - "** Execute (dry run) gem:push"
@@ -68,34 +78,31 @@ result:
 ---
 sample: rake -n install
 result:
-- "** Execute (dry run) pkg/rim-2.4.0.gem"
-- "** Execute (dry run) gem:build"
+- "** Execute (dry run) gem:spec"
 - "** Execute (dry run) test"
+- "** Execute (dry run) pkg"
+- "** Execute (dry run) pkg/rim-x.x.x.gem"
+- "** Execute (dry run) gem:build"
 - "** Execute (dry run) gem"
 - "** Execute (dry run) install"
 ---
-sample: rake -n rdoc
-result:
-- "** Execute (dry run) doc/index.html"
-- "** Execute (dry run) rdoc"
----
-sample: rake -n release
+sample: rake -n prepare_release
 result:
 - "** Execute (dry run) aspell:check"
-- "** Execute (dry run) git:check"
-- "** Execute (dry run) pkg/rim-2.4.0.gem"
-- "** Execute (dry run) gem:build"
 - "** Execute (dry run) test"
-- "** Execute (dry run) gem"
+- "** Execute (dry run) gem:spec"
 - "** Execute (dry run) version:check"
-- "** Execute (dry run) gem:push"
-- "** Execute (dry run) git:tag"
-- "** Execute (dry run) release"
+- "** Execute (dry run) prepare_release"
+---
+sample: rake -n rdoc
+result:
+- "** Execute (dry run) doc/created.rid"
+- "** Execute (dry run) rdoc"
 ---
 sample: rake -n rerdoc
 result:
 - "** Execute (dry run) clobber_rdoc"
-- "** Execute (dry run) doc/index.html"
+- "** Execute (dry run) doc/created.rid"
 - "** Execute (dry run) rdoc"
 - "** Execute (dry run) rerdoc"
 ---
@@ -109,4 +116,5 @@ result:
 ---
 sample: rake -n version:check
 result:
+- "** Execute (dry run) gem:spec"
 - "** Execute (dry run) version:check"

data/regtest/global_deps.rb

@@ -2,5 +2,5 @@
 require 'regtest'
 
 Regtest.sample 'rake -P' do
-  `rake -P SELFTEST=true`
+  `rake -P SELFTEST=true`.gsub %r{(?<=pkg/rim-)(.+)(?=\.gem)}, 'x.x.x'
 end

data/regtest/global_deps.yml

@@ -11,7 +11,7 @@ result: |
   rake default
       test
   rake doc
-  rake doc/index.html
+  rake doc/created.rid
       README.rdoc
       lib/rim
       lib/rim.rb
@@ -38,11 +38,15 @@ result: |
       gem:build
       test
   rake gem:build
-      pkg/rim-2.4.0.gem
+      spec
+      test
+      pkg/rim-x.x.x.gem
   rake gem:push
       gem
       git:check
       version:check
+  rake gem:spec
+      rim.gemspec
   rake git:check
       aspell:check
   rake git:push
@@ -53,12 +57,33 @@ result: |
   rake install
       gem
   rake pkg
-  rake pkg/rim-2.4.0.gem
+  rake pkg/rim-x.x.x.gem
       pkg
+      rim.gemspec
+  rake prepare_release
+      aspell:check
+      test
+      version:check
+  rake rdoc
+      doc/created.rid
+  rake regtest
+  rake release
+      aspell:check
+      gem:push
+      gem:spec
+      git:check
+      git:tag
+      test
+      version:check
+  rake rerdoc
+      clobber_rdoc
+      rdoc
+  rake rim.gemspec
       README.rdoc
       Changelog
       LICENSE
       Rakefile
+      Gemfile
       lib/rim
       lib/rim.rb
       lib/rim/aspell.rb
@@ -80,19 +105,7 @@ result: |
       lib/rim/version.rb
       lib/rim/yard.rb
       test/test_helper_methods.rb
-  rake rdoc
-      doc/index.html
-  rake regtest
-  rake release
-      aspell:check
-      gem:push
-      git:check
-      git:tag
-      test
-      version:check
-  rake rerdoc
-      clobber_rdoc
-      rdoc
   rake test
   rake uninstall
   rake version:check
+      gem:spec

data/regtest/mod_deps.rb

@@ -15,12 +15,18 @@ Rim.setup do
 end
 END
 
+Changelog = <<-END
+0.0.1
+First Version
+END
+
 lib_path = File.expand_path('lib')
 
-Dir['lib/rim/*.rb'].each do |fn|
+Dir['lib/rim/*.rb'].sort.each do |fn|
   next if fn =~/rimrc/
   Regtest.sample fn do
     Dir.chdir(Dir.tmpdir) do
+      File.write 'Changelog', Changelog
       FileUtils.mkdir_p('test')
       FileUtils.touch('test/test.rb')
       File.open('Rakefile', 'w') do |f|

data/regtest/mod_deps.yml

@@ -28,17 +28,24 @@ result: |
   rake gem
       gem:build
   rake gem:build
+      spec
+      test
       pkg/xxx-0.0.1.gem
   rake gem:push
       gem
+  rake gem:spec
+      xxx.gemspec
   rake install
       gem
   rake pkg
   rake pkg/xxx-0.0.1.gem
       pkg
+      xxx.gemspec
+  rake uninstall
+  rake xxx.gemspec
+      Changelog
       Rakefile
       test/test.rb
-  rake uninstall
 ---
 sample: lib/rim/git.rb
 result: |
@@ -75,10 +82,10 @@ result: |
       clobber_rdoc
   rake clobber_rdoc
   rake doc
-  rake doc/index.html
+  rake doc/created.rid
       Rakefile
   rake rdoc
-      doc/index.html
+      doc/created.rid
   rake rerdoc
       clobber_rdoc
       rdoc
@@ -95,6 +102,7 @@ result: |
   rake clean
   rake clobber
       clean
+  rake prepare_release
   rake release
 ---
 sample: lib/rim/ripl.rb
@@ -130,22 +138,31 @@ result: |
       gem:build
       test
   rake gem:build
+      spec
+      test
       pkg/xxx-0.0.1.gem
   rake gem:push
       gem
+  rake gem:spec
+      xxx.gemspec
   rake info
   rake install
       gem
   rake pkg
   rake pkg/xxx-0.0.1.gem
       pkg
-      Rakefile
-      test/test.rb
+      xxx.gemspec
+  rake prepare_release
+      test
   rake release
       gem:push
       test
   rake test
   rake uninstall
+  rake xxx.gemspec
+      Changelog
+      Rakefile
+      test/test.rb
 ---
 sample: lib/rim/version.rb
 result: |

data/rim.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# stub: rim 2.11.1 ruby lib
+# stub: rim 2.12.0 ruby lib
 #
 # This file is automatically generated by rim.
 # PLEASE DO NOT EDIT IT DIRECTLY!
@@ -7,12 +7,12 @@
 
 Gem::Specification.new do |s|
   s.name = "rim"
-  s.version = "2.11.1"
+  s.version = "2.12.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jan Friedrich"]
-  s.date = "2017-08-19"
+  s.date = "2017-08-22"
   s.description = "Goal is to have a project managing that just works on as many Ruby\nversions as possible and is easy to extend. Feel free to dislike it. ;)\n"
   s.email = "janfri26@gmail.com"
   s.files = ["Changelog", "Gemfile", "LICENSE", "README.rdoc", "Rakefile", "lib/rim", "lib/rim.rb", "lib/rim/aspell.rb", "lib/rim/check_version.rb", "lib/rim/core.rb", "lib/rim/gem.rb", "lib/rim/git.rb", "lib/rim/info.rb", "lib/rim/irb.rb", "lib/rim/pry.rb", "lib/rim/rdoc.rb", "lib/rim/regtest.rb", "lib/rim/release.rb", "lib/rim/rimrc.rb", "lib/rim/ripl.rb", "lib/rim/rspec.rb", "lib/rim/test.rb", "lib/rim/tire.rb", "lib/rim/version.rb", "lib/rim/yard.rb", "regtest/execution.rb", "regtest/execution.yml", "regtest/global_deps.rb", "regtest/global_deps.yml", "regtest/mod_deps.rb", "regtest/mod_deps.yml", "rim.gemspec", "test/test_helper_methods.rb"]
@@ -25,14 +25,20 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rim>, ["~> 2.11"])
-      s.add_development_dependency(%q<regtest>, ["~> 0.4"])
+      s.add_development_dependency(%q<rake>, ["< 100", "> 0"])
+      s.add_development_dependency(%q<rim>, ["~> 2.12"])
+      s.add_development_dependency(%q<test-unit>, ["~> 3"])
+      s.add_development_dependency(%q<regtest>, ["~> 1.0"])
     else
-      s.add_dependency(%q<rim>, ["~> 2.11"])
-      s.add_dependency(%q<regtest>, ["~> 0.4"])
+      s.add_dependency(%q<rake>, ["< 100", "> 0"])
+      s.add_dependency(%q<rim>, ["~> 2.12"])
+      s.add_dependency(%q<test-unit>, ["~> 3"])
+      s.add_dependency(%q<regtest>, ["~> 1.0"])
     end
   else
-    s.add_dependency(%q<rim>, ["~> 2.11"])
-    s.add_dependency(%q<regtest>, ["~> 0.4"])
+    s.add_dependency(%q<rake>, ["< 100", "> 0"])
+    s.add_dependency(%q<rim>, ["~> 2.12"])
+    s.add_dependency(%q<test-unit>, ["~> 3"])
+    s.add_dependency(%q<regtest>, ["~> 1.0"])
   end
 end

metadata

@@ -1,43 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: rim
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 2.12.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-19 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '100'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '100'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.12'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: regtest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 description: |
   Goal is to have a project managing that just works on as many Ruby
   versions as possible and is easy to extend. Feel free to dislike it. ;)