rim 1.0.2 → 1.1.0

data/Changelog

@@ -1,3 +1,7 @@
+1.1.0 New tasks: git:tag and check_version
+
+1.0.2 Fix typo in email
+
 1.0.1 First working public release
 
 1.0.0 First public release (yanked, because defect)

data/lib/rim/check_version.rb

@@ -0,0 +1,19 @@
+# -- encoding: utf-8 --
+require 'rim/release'
+Rim.after_setup do
+  changelog = filelist(/^Changelog/).first
+  desc "Check version in #{changelog} with Rim#version."
+  task :check_version do
+  line = File.open(changelog) do |f|
+    f.readline
+  end
+  if line =~ /^(\d+\.\d+(?:\.\d+)+)/
+    if $1 != version
+      raise "Version error (#{changelog}: #$1, setup: #{version})"
+    end
+  else
+    raise "No version information in #{changelog}"
+  end
+  end
+  task :release => :check_version
+end

data/lib/rim/gem.rb

@@ -1,4 +1,5 @@
 # -- encoding: utf-8 --
+require 'rim/release'
 class Rim
   # Gem version
   attr_accessor :version
@@ -50,12 +51,15 @@ Rim.after_setup do
     task_object = klass.new(spec) do |pkg|
     end
 
-    desc 'Push the gem to rubygems.org'
-    task :release => [:test, :gem] do
-      gem_filename = format('%s/%s.gem', task_object.package_dir, task_object.name)
-      puts "Push #{gem_filename} to rubygems.org"
-      system "gem push #{gem_filename}"
+    namespace :gem do
+      desc 'Push the gem to rubygems.org'
+      task :push => [:clean, :test, :gem] do
+        gem_filename = format('%s/%s.gem', task_object.package_dir, task_object.name)
+        puts "Push #{gem_filename} to rubygems.org"
+        sh "gem push #{gem_filename}"
+      end
     end
+    task :release => :gem
   end
 
 end

data/lib/rim/git.rb

@@ -1,14 +1,19 @@
 # -- encoding: utf-8 --
-require 'rim'
+require 'rim/release'
 
 Rim.after_setup do
   if Dir.exist?('.git')
+    tag_name = "v#{version}"
     namespace :git do
-      desc 'tag version'
+      desc "Create git tag #{tag_name}"
       tag_task = task :tag do
-        puts "git tag v#{version}"
+        cmd = "git tag #{tag_name}"
+        puts cmd
+        sh cmd
       end
     end
-    task :post_release => 'git:tag'
+    task :release do
+      invoke 'git:tag'
+    end
   end
 end

data/lib/rim/release.rb

@@ -0,0 +1,7 @@
+Rim.after_setup do
+  task :release
+    desc "Release version #{version}"
+    task :release => [:clean, :test] do
+      invoke 'gem:push'
+    end
+end

data/lib/rim.rb

@@ -6,6 +6,8 @@ require 'singleton'
 # Rim a super simple ruby project / gem manager
 class Rim
 
+  VERSION = '1.1.0'
+
   begin
     require 'rake/dsl_definition'
     include Rake::DSL
@@ -32,6 +34,11 @@ class Rim
     @definitions << blk
   end
 
+  # Invoke task +name+ if defined raise an error otherwise.
+  def invoke name
+    Rake::Task[name].invoke
+  end
+
   # Helper method to generate Rake::FileList objects.
   # Main difference between Rake::FileList.new and this method is
   # the possibility to use Regexp objects as parameters.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rim
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -21,12 +21,14 @@ files:
 - README.rdoc
 - Changelog
 - LICENSE
+- 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/rdoc.rb
+- lib/rim/release.rb
 - lib/rim/test.rb
 - lib/rim.rb
 - test/test_helper_methods.rb