rim 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4c1b1ac9350cda5c632b3e3bd91c5ed165dc0a3
-  data.tar.gz: 9e070410875bf0bd6b838e098b64e523b72cef28
+  metadata.gz: ba3a64044bed81c4ba9e3f046fe85623fc9633b1
+  data.tar.gz: 8e3b38db48ed26354d0c5b9c2faed5c76fec4de0
 SHA512:
-  metadata.gz: 6795df6e403bbedc271a0227367d9eef159752597f7d294e597ef7db28ff80e09d9c2953021126513af8a369fdbc81dec6235ecd7b21b361ebb4b901602e2241
-  data.tar.gz: 486bae4b40e581db2394e8793aa09c99fbf92f405c0bb64f8fe4968e784c7954a7a13ebadf45fb6df8967fb80bff07031813a846e6ef057ba4a166cfdb25ba0a
+  metadata.gz: e4f98cd6f7d5367d30fab3899d7aceef972dbe807f677b38a3711c15cd4b5035b70b1cfe3534f5365b2b1db1050f21d03850831bfe75d140e86c6af6d7867c4f
+  data.tar.gz: 13bdfc0af503ea6f00bc908bdcff856c5e95abf7f6f92d76cf8e936c5ab6c38340bc7b3f79ef1c8c473abf0001eb9dd18e297c8c305dfe951f07e5f3e41b3e96

data/Changelog

@@ -1,5 +1,10 @@
+2.3.0
+Complete rewrite of gem specific tasks to make them lazy.
+New option Rim#regtest_files.
+Include regtest files in gem.
+
 2.2.1
-Adding rim/check_version again with a fail message to avoid approve
+Adding rim/check_version again with a fail message to approve
 backwards compatibility.
 
 2.2.0

data/Rakefile

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

data/lib/rim/gem.rb

@@ -40,69 +40,67 @@ Rim.defaults do
   requirements []
 end
 
-Rim.after_setup do
-  klass = nil
-  begin
-    require 'rubygems/package_task'
-    klass = Gem::PackageTask
-  rescue LoadError
-    require 'rake/gempackagetask'
-    klass = Rake::GemPackageTask
-  end
+directory 'pkg'
+CLOBBER << 'pkg'
 
-  if klass
-    task :gem do
-      puts "Building #{name}-#{version}.gem"
-    end
 
-    spec = Gem::Specification.new do |s|
-      s.authors = authors
-      s.email = email
-      s.platform = Gem::Platform::RUBY
-      s.description = description
-      s.license = license if license
-      s.homepage = homepage
-      s.name = name
-      s.summary = summary
-      s.version = version
-      s.require_paths = require_paths
-      s.files = gem_files
-      s.required_ruby_version = ruby_version if ruby_version
-      s.post_install_message = install_message
-      s.requirements = Array(requirements)
-      Array(dependencies).each do |dep|
-        s.add_dependency *Array(dep)
-      end
-      Array(development_dependencies).each do |dep|
-        s.add_development_dependency *Array(dep)
+Rim.after_setup do
+
+  require 'rubygems/package'
+
+  gem_file = "pkg/#{name}-#{version}.gem"
+
+  desc "Build the gem file #{gem_file}"
+  task :gem => 'gem:build'
+
+  namespace :gem do
+
+    task :build => 'pkg' do
+      spec = Gem::Specification.new do |s|
+        s.authors = authors
+        s.email = email
+        s.platform = Gem::Platform::RUBY
+        s.description = description
+        s.license = license if license
+        s.homepage = homepage
+        s.name = name
+        s.summary = summary
+        s.version = version
+        s.require_paths = Array(require_paths)
+        s.files = Array(gem_files)
+        s.required_ruby_version = ruby_version if ruby_version
+        s.post_install_message = install_message
+        s.requirements = Array(requirements)
+        Array(dependencies).each do |dep|
+          s.add_dependency *Array(dep)
+        end
+        Array(development_dependencies).each do |dep|
+          s.add_development_dependency *Array(dep)
+        end
       end
+      Gem::Package.build spec
+      mv File.basename(gem_file), 'pkg'
     end
 
-    task_object = klass.new(spec) do |pkg|
+    desc "Push the gem #{name} version #{version} to rubygems.org"
+    task :push => :gem do
+      sh "gem push #{gem_file}"
     end
 
-    gem_filename = format('%s/%s.gem', task_object.package_dir, task_object.name)
-
-    namespace :gem do
-      desc 'Push the gem to rubygems.org'
-      task :push => :gem do
-        sh "gem push #{gem_filename}"
-      end
-    end
+  end
 
-    desc "Install #{gem_filename}"
-    task :install => :gem do
-      sh "gem install #{gem_filename}"
-    end
+  desc "Install version #{version}"
+  task :install => :gem do
+    sh "gem install #{gem_file}"
+  end
 
-    desc "Uninstall gem #{name} version #{version}"
-    task :uninstall do
-      sh "gem uninstall --version #{version} #{name}"
-    end
+  desc "Uninstall version #{version}"
+  task :uninstall do
+    sh "gem uninstall --version #{version} #{name}"
+  end
 
-    if feature_loaded? 'rim/release'
-      task :release => 'gem:push'
-    end
+  if feature_loaded? 'rim/release'
+    task :release => 'gem:push'
   end
 
 end

data/lib/rim/regtest.rb

@@ -1,2 +1,18 @@
 # -- encoding: utf-8 --
 require 'regtest/task'
+
+class Rim
+  # Files to handle with regtest (default: <tt>REGTEST_FILES</tt>)
+  attr_accessor :regtest_files
+end
+
+Rim.defaults do
+  regtest_files ::REGTEST_FILES
+end
+
+Rim.after_setup do
+  if feature_loaded? 'rim/gem'
+    self.gem_files += ::REGTEST_FILES
+    development_dependencies << %w(regtest ~>0.4)
+  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.2.1'
+  VERSION = '2.3.0'
 
   begin
     require 'rake/dsl_definition'

data/regtest/execution.rb

@@ -0,0 +1,14 @@
+# -- encoding: utf-8 --
+require 'regtest'
+
+`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.split(/\n/).grep(/Execute/)
+  end
+end
+
+
+

data/regtest/global_deps.rb

@@ -0,0 +1,6 @@
+# -- encoding: utf-8 --
+require 'regtest'
+
+Regtest.sample 'rake -P' do
+  `rake -P SELFTEST=true`
+end

data/regtest/mod_deps.rb

@@ -0,0 +1,35 @@
+# -- encoding: utf-8 --
+require 'regtest'
+require 'fileutils'
+require 'tmpdir'
+
+RakefileHeader = <<-END
+require 'rim'
+END
+
+RakefileFooter = <<-END
+
+Rim.setup do
+  name 'xxx'
+  version '0.0.1'
+end
+END
+
+lib_path = File.expand_path('lib')
+
+Dir['lib/rim/*.rb'].each do |fn|
+  next if fn =~/rimrc/
+  Regtest.sample fn do
+    Dir.chdir(Dir.tmpdir) do
+      FileUtils.mkdir_p('test')
+      FileUtils.touch('test/test.rb')
+      File.open('Rakefile', 'w') do |f|
+        f.write RakefileHeader
+        mod = File.basename(fn, '.rb')
+        f.write "require 'rim/#{mod}'\n"
+        f.write RakefileFooter
+      end
+      `rake -I #{lib_path} -P -- SELFTEST=true`
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rim
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rim
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: regtest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 description: |
   Goal is to have a project managing that just works on many Ruby
   versions as possible and is easy to extend. Feel free to dislike it. ;)
@@ -67,6 +67,9 @@ files:
 - lib/rim/test.rb
 - lib/rim/tire.rb
 - lib/rim/version.rb
+- regtest/execution.rb
+- regtest/global_deps.rb
+- regtest/mod_deps.rb
 - test/test_helper_methods.rb
 homepage: http://gitorious.org/rim
 licenses: