gem_hadar 0.1.1 → 0.1.2

data/Rakefile

@@ -13,7 +13,7 @@ GemHadar do
   ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock'
   readme      'README.rdoc'
 
-  dependency  'tins',  '~>0.3'
+  dependency  'tins',  '>=0.3.3'
   dependency  'dslkit', '~>0.2'
   dependency  'sdoc',   '~>0.2.20'
   dependency  'rake',   '~>0.9.2'

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/gem_hadar.gemspec

@@ -2,40 +2,40 @@
 
 Gem::Specification.new do |s|
   s.name = "gem_hadar"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2011-09-27"
+  s.date = "2011-11-30"
   s.description = "This library contains some useful functionality to support the development of Ruby Gems"
   s.email = "flori@ping.de"
-  s.extra_rdoc_files = ["README.rdoc", "lib/gem_hadar.rb", "lib/gem_hadar/version.rb"]
+  s.extra_rdoc_files = ["README.rdoc", "lib/gem_hadar/version.rb", "lib/gem_hadar.rb"]
   s.files = [".gitignore", "Gemfile", "LICENSE", "README.rdoc", "Rakefile", "VERSION", "gem_hadar.gemspec", "lib/gem_hadar.rb", "lib/gem_hadar/version.rb"]
   s.homepage = "http://github.com/flori/gem_hadar"
   s.rdoc_options = ["--title", "GemHadar - Library for the development of Ruby Gems", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.11"
   s.summary = "Library for the development of Ruby Gems"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.0"])
-      s.add_runtime_dependency(%q<tins>, ["~> 0.3"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.1"])
+      s.add_runtime_dependency(%q<tins>, [">= 0.3.3"])
       s.add_runtime_dependency(%q<dslkit>, ["~> 0.2"])
       s.add_runtime_dependency(%q<sdoc>, ["~> 0.2.20"])
       s.add_runtime_dependency(%q<rake>, ["~> 0.9.2"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 0.1.0"])
-      s.add_dependency(%q<tins>, ["~> 0.3"])
+      s.add_dependency(%q<gem_hadar>, ["~> 0.1.1"])
+      s.add_dependency(%q<tins>, [">= 0.3.3"])
       s.add_dependency(%q<dslkit>, ["~> 0.2"])
       s.add_dependency(%q<sdoc>, ["~> 0.2.20"])
       s.add_dependency(%q<rake>, ["~> 0.9.2"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 0.1.0"])
-    s.add_dependency(%q<tins>, ["~> 0.3"])
+    s.add_dependency(%q<gem_hadar>, ["~> 0.1.1"])
+    s.add_dependency(%q<tins>, [">= 0.3.3"])
     s.add_dependency(%q<dslkit>, ["~> 0.2"])
     s.add_dependency(%q<sdoc>, ["~> 0.2.20"])
     s.add_dependency(%q<rake>, ["~> 0.9.2"])

data/lib/gem_hadar.rb

@@ -1,4 +1,3 @@
-
 require 'rubygems'
 require 'rbconfig'
 if defined?(::RbConfig)
@@ -6,19 +5,7 @@ if defined?(::RbConfig)
 else
   include ::Config
 end
-begin
-  require 'simplecov'
-rescue LoadError
-end
 require 'rake'
-begin
-  require 'rubygems/package_task'
-rescue LoadError
-end
-begin
-  require 'rcov/rcovtask'
-rescue LoadError
-end
 require 'tins/xt'
 require 'tins/secure_write'
 require 'rake/clean'
@@ -26,6 +13,10 @@ require 'rake/testtask'
 require 'dslkit/polite'
 require 'set'
 require 'gem_hadar/version'
+require_maybe 'simplecov'
+require_maybe 'rubygems/package_task'
+require_maybe 'rcov/rcovtask'
+require_maybe 'rspec/core/rake_task'
 
 def GemHadar(&block)
   GemHadar.new(&block).create_all_tasks
@@ -107,6 +98,16 @@ class GemHadar
     end
   end
 
+  dsl_accessor :spec_dir
+
+  dsl_accessor :spec_pattern do
+    if spec_dir
+      "#{spec}{,/*/**}/*_spec.rb"
+    else
+      'spec{,/*/**}/*_spec.rb'
+    end
+  end
+
   dsl_accessor :doc_files do
     FileList[File.join('lib/**/*.rb')] + FileList[File.join('ext/**/*.c')]
   end
@@ -328,11 +329,24 @@ EOT
     task :test => [ (:compile if extensions.full?), tt.name ].compact
   end
 
+  def spec_task
+    if defined?(::RSpec::Core::RakeTask)
+      st =  RSpec::Core::RakeTask.new(:run_specs) do |t|
+        t.ruby_opts ||= ''
+        t.ruby_opts << ' -I' << ([ spec_dir ] + require_paths.to_a).uniq * ':'
+        t.pattern = spec_pattern
+        t.verbose = true
+      end
+      task :spec => [ (:compile if extensions.full?), st.name ].compact
+    end
+  end
+
   def rcov_task
     if defined?(::Rcov)
       rt = ::Rcov::RcovTask.new(:run_rcov) do |t|
         t.libs << test_dir
         t.libs.concat require_paths.to_a
+        t.libs.uniq!
         t.test_files = test_files
         t.verbose    = true
         t.rcov_opts  = %W[-x '\\b#{test_dir}\/' -x '\\bgems\/']
@@ -376,14 +390,23 @@ EOT
   end
 
   def write_gemfile
-    secure_write('Gemfile') do |output|
-      output.puts <<EOT
+     default_gemfile =<<EOT
 # vim: set filetype=ruby et sw=2 ts=2:
 
 source :rubygems
 
 gemspec
 EOT
+    current_gemfile = File.exist?('Gemfile') && File.read('Gemfile')
+    case current_gemfile
+    when false
+      secure_write('Gemfile') do |output|
+        output.write default_gemfile
+      end
+    when default_gemfile
+      ;;
+    else
+      warn "INFO: Current Gemfile differs from default Gemfile."
     end
   end
 
@@ -444,6 +467,7 @@ EOT
       rcov_task
       simplecov_task
     end
+    spec_task
     package_task
     install_library_task
     version_tag_task

data/lib/gem_hadar/version.rb

@@ -1,6 +1,6 @@
 class GemHadar
   # GemHadar version
-  VERSION         = '0.1.1'
+  VERSION         = '0.1.2'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem_hadar
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-27 00:00:00.000000000Z
+date: 2011-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
-  requirement: &2152703320 !ruby/object:Gem::Requirement
+  requirement: &2165316680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :development
   prerelease: false
-  version_requirements: *2152703320
+  version_requirements: *2165316680
 - !ruby/object:Gem::Dependency
   name: tins
-  requirement: &2152702860 !ruby/object:Gem::Requirement
+  requirement: &2165316240 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152702860
+  version_requirements: *2165316240
 - !ruby/object:Gem::Dependency
   name: dslkit
-  requirement: &2152702420 !ruby/object:Gem::Requirement
+  requirement: &2165315820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2152702420
+  version_requirements: *2165315820
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &2152701960 !ruby/object:Gem::Requirement
+  requirement: &2165315400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.2.20
   type: :runtime
   prerelease: false
-  version_requirements: *2152701960
+  version_requirements: *2165315400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152701500 !ruby/object:Gem::Requirement
+  requirement: &2165314980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152701500
+  version_requirements: *2165314980
 description: This library contains some useful functionality to support the development
   of Ruby Gems
 email: flori@ping.de
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
-- lib/gem_hadar.rb
 - lib/gem_hadar/version.rb
+- lib/gem_hadar.rb
 files:
 - .gitignore
 - Gemfile
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Library for the development of Ruby Gems