rim 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3584fd8b1f8edaba64ad5898875ffba5a1246a58
-  data.tar.gz: f4a37986299c3eb521a76c1ad1ff3b0c1a9d81b8
+  metadata.gz: db109798d47e515d75644d53362ae3a3458bce11
+  data.tar.gz: 6e7d5ea38d7850dbbffa7715b32159a8e3fca91d
 SHA512:
-  metadata.gz: 00a19fb439a66a8570a538c190088dcd04f771052016075fe0a4a7c04f0f8e34e0e4ffbbf19bfe7299219db2684ed42c23349b84bb2f25e94a3300a7a07a1ad6
-  data.tar.gz: e6d3516b60326e820a87fd9032cf73eca4bf25c56b1596fe6e857ad4e07dc7d905ddec77ae27c9410d65eb4266ad2323dd3f6e59837e5e64bf22b68700707eb3
+  metadata.gz: bd4d1233a45b41163cc6dd951c21113b993bc36a45caac87842236523ef089000fd92a3f25bc3382c67dc712283fcbdcc97916313390f5758c32a36222bda295
+  data.tar.gz: e2403c6f6d86df13407b862deb25fa26c9eee7cf161075b2a18b3c71d6ef7df1a1da4c02de8b04692b662bfbe2a23a885885106a320a47dd93b0effc8a57f273

data/Changelog

@@ -1,3 +1,7 @@
+2.2.0
+Renaming task check_version -> version:check.
+New options aspell_encoding and aspell_word_list.
+
 2.1.0
 New module rim/tire to load a good set of defaults.
 Expand FileList instances in info task.
@@ -43,7 +47,7 @@ Make git tasks independent from current
 locale and push tags.
 
 1.6.1
-New option test_reqiure_paths for test task.
+New option test_require_paths for test task.
 
 1.6.0
 New task: pry

data/Rakefile

@@ -1,7 +1,6 @@
 $:.unshift File.dirname(__FILE__) + '/lib'
 require 'rim'
 require 'rim/aspell'
-require 'rim/check_version'
 require 'rim/gem'
 require 'rim/git'
 require 'rim/info'
@@ -9,6 +8,7 @@ require 'rim/rdoc'
 require 'rim/regtest'
 require 'rim/release'
 require 'rim/test'
+require 'rim/version'
 
 Rim.setup do
   name 'rim'

data/lib/rim/aspell.rb

@@ -1,30 +1,38 @@
 # -- encoding: utf-8 --
 class Rim
+  # Encoding odf spell checked files (default: 'UTF-8')
+  attr_accessor :aspell_encoding
+
   # Files to check via aspell (default: /^README/i, /^Changelog/i)
   attr_accessor :aspell_files
 
   # Language for aspell (default: 'en')
   attr_accessor :aspell_lang
+
+  # File to store the word list of the project (default: './.aspell.pws')
+  attr_accessor :aspell_word_list
 end
 
 Rim.defaults do
+  aspell_encoding 'UTF-8'
   aspell_files filelist(/^README/i, /^Changelog/i)
   aspell_lang 'en'
+  aspell_word_list './.aspell.pws'
 end
 
 Rim.after_setup do
-  desc 'Check files via aspell'
+  desc 'Interactive spelling check via aspell'
   task :aspell do
     aspell_files.each do |fn|
-      sh "aspell -c -x -l #{aspell_lang} #{fn}"
+      sh "aspell -c -x --encoding=#{aspell_encoding} -l #{aspell_lang} -p #{aspell_word_list} #{fn}"
     end
   end
   namespace :aspell do
-    desc 'Test if there are no spellcheck errors'
+    desc 'Check if there are no spellcheck errors'
     task :check do
       error_files = []
       aspell_files.each do |fn|
-        unless `aspell list -l #{aspell_lang} < #{fn}`.empty?
+        unless `aspell list --encoding=#{aspell_encoding} -l #{aspell_lang} -p #{aspell_word_list} < #{fn}`.empty?
           error_files << fn
         end
       end

data/lib/rim/version.rb

@@ -0,0 +1,25 @@
+# -- encoding: utf-8 --
+Rim.after_setup do
+  namespace :version do
+    changelog = filelist(/^Changelog/i).first
+    desc "Check if version in #{changelog} is equal to Rim#version."
+    task :check do
+      line = File.open(changelog) do |f|
+        f.readline
+      end
+      if line =~ /^(\d+\.\d+(?:\.\d+)+)/
+        if $1 != version
+          fail "Version error (#{changelog}: #$1, Rim#version: #{version})"
+        end
+      else
+        fail "No version information in #{changelog}"
+      end
+    end
+  end
+  if feature_loaded? 'rim/gem'
+    task :gem => 'version:check'
+  end
+  if feature_loaded? 'rim/release'
+    task :release => 'version:check'
+  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.1.0'
+  VERSION = '2.2.0'
 
   begin
     require 'rake/dsl_definition'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rim
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rim
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: regtest
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,6 @@ files:
 - Rakefile
 - lib/rim.rb
 - lib/rim/aspell.rb
-- lib/rim/check_version.rb
 - lib/rim/core.rb
 - lib/rim/gem.rb
 - lib/rim/git.rb
@@ -66,6 +65,7 @@ files:
 - lib/rim/ripl.rb
 - lib/rim/test.rb
 - lib/rim/tire.rb
+- lib/rim/version.rb
 - test/test_helper_methods.rb
 homepage: http://gitorious.org/rim
 licenses:

data/lib/rim/check_version.rb

@@ -1,23 +0,0 @@
-# -- encoding: utf-8 --
-Rim.after_setup do
-  changelog = filelist(/^Changelog/i).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
-      fail "Version error (#{changelog}: #$1, setup: #{version})"
-    end
-  else
-    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
-end