rim 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e36d2436b1aa607d1c650ad7ccc4307cd6d7863
-  data.tar.gz: 3e50060fb3e55f52fa12d75b59b71f9ee8a0f57e
+  metadata.gz: 4b0366340d71fc86c59131841d62e387cb1f3825
+  data.tar.gz: 2d760648443255dd884b7ff647d0496b6b6a2bfa
 SHA512:
-  metadata.gz: 3744ff51d7fcd3e4233d41b0b2d89d9418607cb7d1778d6952e085111bb5c7cdcb7058dfbba3f0c449843bf342b79b53b492e127bac02f941cd16f88cb8d0cad
-  data.tar.gz: accf9d5582c9dc6b7ba3baa97ed0d3748fdad8384427e0f3a99cc554e7a0d8009501b9f74d3a3d1cafea54c49d70e476973face9d0415dbe481dae50d7045642
+  metadata.gz: c733a35c48943edcf0c50d73cadfb61b86b409ae0a621a571cb0d374e69c9ebb417792e7643c9bd063c281d189c9a3356f67340e83d9d4faa7b2a7549e73ead8
+  data.tar.gz: 5c66773615b8a3de33dd62cb715d2a83da3391d020499bb25f1a419761779126b86159efe179602914a30da204acff3c4633c009001d78a7e19cf2c03eb3b66b

data/Changelog

@@ -1,3 +1,7 @@
+2.0.1
+Better internal dependency management.
+Removing Rim#prepend_dep again, it can be solved with multistage dependencies.
+
 2.0.0
 Using gem standard to describe versions in dependencies,
 this breaks backwards compatibility.

data/lib/rim/aspell.rb

@@ -31,6 +31,9 @@ Rim.after_setup do
       fail "There are spelling errors in #{error_files.join(', ')}" unless error_files.empty?
     end
   end
+  if feature_loaded? 'rim/git'
+    task 'git:check' => 'aspell:check'
+  end
   if feature_loaded? 'rim/release'
     task :release => 'aspell:check'
   end

data/lib/rim/check_version.rb

@@ -14,6 +14,9 @@ Rim.after_setup do
     fail "No version information in #{changelog}"
   end
   end
+  if feature_loaded? 'rim/gem'
+    task :gem => :check_version
+  end
   if feature_loaded? 'rim/release'
     task :release => :check_version
   end

data/lib/rim/gem.rb

@@ -101,7 +101,7 @@ Rim.after_setup do
     end
 
     if feature_loaded? 'rim/release'
-      task :release => :gem
+      task :release => 'gem:push'
     end
   end
 

data/lib/rim/git.rb

@@ -31,10 +31,12 @@ Rim.after_setup do
         end
       end
     end
+    if feature_loaded? 'rim/gem'
+      task :gem => 'git:check'
+      task 'git:tag' => 'gem:push'
+    end
     if feature_loaded? 'rim/release'
-      task :release => 'git:check' do
-        invoke 'git:tag'
-      end
+      task :release => %w(git:check git:tag)
     end
   end
 end

data/lib/rim/release.rb

@@ -1,8 +1,6 @@
 Rim.after_setup do
-  desc "Release version #{version}"
-  task :release do
-    if feature_loaded? 'rim/gem'
-      invoke 'gem:push'
-    end
+  if version
+    desc "Release version #{version}"
   end
+  task :release
 end

data/lib/rim/test.rb

@@ -22,10 +22,10 @@ Rim.after_setup do
     task :default => :test
 
     if feature_loaded? 'rim/gem'
-      prepend_dep :test, :gem
+      task :gem => :test
     end
     if feature_loaded? 'rim/release'
-      prepend_dep :test, :release
+      task :release => :test
     end
   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.0.0'
+  VERSION = '2.0.1'
 
   begin
     require 'rake/dsl_definition'
@@ -75,12 +75,7 @@ class Rim
   # Helper method to check if a module is already required
   # Example: feature_loaded?('rim/release')
   def feature_loaded? name
-    ! $LOADED_FEATURES.grep(%r(/#{name}\.rb$)).empty?
-  end
-
-  # Helper method to prepend dependencies of tasks
-  def prepend_dep dep, t
-    task(t).prerequisites.unshift(dep)
+    ! $LOADED_FEATURES.grep(%r((^|/)#{name}\.rb$)).empty?
   end
 
   private

data/test/test_helper_methods.rb

@@ -35,14 +35,4 @@ class TestHelperMethods < Test::Unit::TestCase
     assert_equal true, @rim.feature_loaded?('net/http')
   end
 
-  require 'rake'
-  require 'rake/dsl_definition'
-  include Rake::DSL
-
-  def test_prepend_dep
-    t = task :a => :b
-    @rim.prepend_dep :c, :a
-    assert_equal [:c, :b], task(:a).prerequisites.map {|e| e.to_sym}
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rim
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rim