rim 2.6.3 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a64e3070f71b7855c5bd63eb175895c207eea0c2
-  data.tar.gz: 755273c4e3cfbb0eeb069272bb3dedefb23564e9
+  metadata.gz: d981ada26e193d1e32642c87b67d44111eb7a8a5
+  data.tar.gz: 7335584ff994c9579f661cf7e71662e31296375c
 SHA512:
-  metadata.gz: 8f66ec9a4cd2e4defbf96019e016e23d862407649dfecf0d566ab2db2918c3df6b437858b1d5eb90c02f0cf2b44584301fd1ad166b4ea94548c2ee12f89c1139
-  data.tar.gz: 11d3af2995b32d2cc244ac3563b1adddf2fbf557db52df17b0ee6133cb194316bb72127b33927a85d061350748acbddcb5cb5edf16fca0518c9852a7fc1e7498
+  metadata.gz: 933d9459b17dd224bd8e25d946c062320490e2959b10ce904063aa4d422655e4931ce1c77c1c700ff9178d0c704050d0cb1d3a7a9f82974415f8081bafb49801
+  data.tar.gz: fb4681aa17e7bc6b0bf6ca09ac0523062f88b2556a22d091eefa989c7c777d18980c273b48981a7e009c85fc1eb915b63471cb98923764139d6fd89934236331

data/Changelog

@@ -1,3 +1,7 @@
+2.7.0
+Check version in gemspec file in version:check task if gem is used and improve error messages.
+Fix disclaimer for gemspec.
+
 2.6.3
 Execute interactive aspell only for files with errors.
 

data/lib/rim/gem.rb

@@ -33,6 +33,8 @@ class Rim
   # Requirements (external to rubygems)
   attr_accessor :requirements
 
+  protected
+
   def gem_spec
     spec = Gem::Specification.new do |s|
       s.authors = authors
@@ -58,7 +60,7 @@ class Rim
     end
     disclaimer = <<-END
     #
-    # This file is automatic generated by rim.
+    # This file is automatically generated by rim.
     # PLEASE DO NOT EDIT IT DIRECTLY!
     # Change instead the values in Rim.setup in Rakefile.
 
@@ -66,6 +68,11 @@ class Rim
     disclaimer.gsub!(/^\s+/, '')
     spec.to_ruby.sub(/^$/, disclaimer)
   end
+
+  def gemspec_file
+    "#{name}.gemspec"
+  end
+
 end
 
 Rim.defaults do
@@ -79,7 +86,6 @@ Rim.after_setup do
   require 'rubygems/package'
 
   gem_file = "pkg/#{name}-#{version}.gem"
-  gemspec_file = "#{name}.gemspec"
 
   directory 'pkg'
 

data/lib/rim/version.rb

@@ -2,8 +2,14 @@
 Rim.after_setup do
   namespace :version do
     changelog = filelist(/^Changelog/i).first
-    desc "Check if version in #{changelog} is equal to Rim#version."
+    fail 'No Changelog file found' unless changelog
+    if feature_loaded? 'rim/gem'
+      desc "Check if Rim#version is equal to version in #{changelog} and #{gemspec_file}."
+    else
+      desc "Check if Rim#version is equal to version in #{changelog}."
+    end
     task :check do
+      # changelog
       line = File.open(changelog) do |f|
         f.readline
       end
@@ -14,6 +20,21 @@ Rim.after_setup do
       else
         fail "No version information in #{changelog}"
       end
+      # gemspec
+      fail 'No gemspec file found' unless File.exist? gemspec_file
+      re = /s\.version ?= ['"](\d+\.\d+\.\d+.*)['"]/o
+      match = File.readlines(gemspec_file).grep(re)
+      case match.size
+      when 1
+        match[0] =~ re
+        if $1 != version
+          fail "Version error (#{gemspec_file}: #$1, Rim#version: #{version})\nTry rake gem:spec"
+        end
+      when 0
+        fail "No version information in #{gemspec_file}"
+      else
+        fail "More than one version information in #{gemspec_file}"
+      end
     end
   end
   if feature_loaded? 'rim/gem'

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.6.3'
+  VERSION = '2.7.0'
 
   begin
     require 'rake/dsl_definition'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rim
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.7.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rim
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: regtest
   requirement: !ruby/object:Gem::Requirement
@@ -96,8 +96,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A simple project / gem manager
 test_files: []
+has_rdoc: