gem_hadar 0.0.3 → 0.0.4

data/Rakefile

@@ -16,7 +16,7 @@ GemHadar do
   dependency  'spruz',  '~>0.2.10'
   dependency  'dslkit', '~>0.2.6'
   dependency  'sdoc',   '~>0.2.20'
-  dependency  'rcov',   '~>0.9.9'
+  #dependency  'rcov',   '~>0.9.9' # Doesn't work on all platforms
   dependency  'rake',   '~>0.9.2'
 
   install_library do

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/gem_hadar.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gem_hadar}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
@@ -21,26 +21,23 @@ Gem::Specification.new do |s|
     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.0.3"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 0.0.4"])
       s.add_runtime_dependency(%q<spruz>, ["~> 0.2.10"])
       s.add_runtime_dependency(%q<dslkit>, ["~> 0.2.6"])
       s.add_runtime_dependency(%q<sdoc>, ["~> 0.2.20"])
-      s.add_runtime_dependency(%q<rcov>, ["~> 0.9.9"])
       s.add_runtime_dependency(%q<rake>, ["~> 0.9.2"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 0.0.3"])
+      s.add_dependency(%q<gem_hadar>, ["~> 0.0.4"])
       s.add_dependency(%q<spruz>, ["~> 0.2.10"])
       s.add_dependency(%q<dslkit>, ["~> 0.2.6"])
       s.add_dependency(%q<sdoc>, ["~> 0.2.20"])
-      s.add_dependency(%q<rcov>, ["~> 0.9.9"])
       s.add_dependency(%q<rake>, ["~> 0.9.2"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 0.0.3"])
+    s.add_dependency(%q<gem_hadar>, ["~> 0.0.4"])
     s.add_dependency(%q<spruz>, ["~> 0.2.10"])
     s.add_dependency(%q<dslkit>, ["~> 0.2.6"])
     s.add_dependency(%q<sdoc>, ["~> 0.2.20"])
-    s.add_dependency(%q<rcov>, ["~> 0.9.9"])
     s.add_dependency(%q<rake>, ["~> 0.9.2"])
   end
 end

data/lib/gem_hadar.rb

@@ -2,15 +2,22 @@
 require 'rubygems'
 require 'spruz/xt'
 require 'rbconfig'
-include Config
+if defined?(::Config)
+  include ::Config
+else
+  include ::RbConfig
+end
 require 'rake'
 begin
   require 'rubygems/package_task'
 rescue LoadError
 end
+begin
+  require 'rcov/rcovtask'
+rescue LoadError
+end
 require 'rake/clean'
 require 'rake/testtask'
-require 'rcov/rcovtask'
 require 'dslkit/polite'
 require 'set'
 require 'gem_hadar/version'
@@ -20,7 +27,11 @@ def GemHadar(&block)
 end
 
 class GemHadar
-  include Config
+  if defined?(::Config)
+    include ::Config
+  else
+    include ::RbConfig
+  end
   include Rake::DSL
   extend DSLKit::DSLAccessor
 
@@ -278,7 +289,8 @@ EOT
 
   def test_task
     tt =  Rake::TestTask.new(:run_tests) do |t|
-      t.libs << test_dir << require_paths
+      t.libs << test_dir
+      t.libs.concat require_paths.to_a
       t.test_files = test_files
       t.verbose    = true
     end
@@ -287,19 +299,27 @@ EOT
   end
 
   def rcov_task
-    rt = Rcov::RcovTask.new(:run_rcov) do |t|
-      t.libs << test_dir << require_paths
-      t.test_files = test_files
-      t.verbose    = true
-      t.rcov_opts  = %W[-x '\\b#{test_dir}\/' -x '\\bgems\/']
+    if defined?(::Rcov)
+      rt = ::Rcov::RcovTask.new(:run_rcov) do |t|
+        t.libs << test_dir
+        t.libs.concat require_paths.to_a
+        t.test_files = test_files
+        t.verbose    = true
+        t.rcov_opts  = %W[-x '\\b#{test_dir}\/' -x '\\bgems\/']
+      end
+      desc 'Run the rcov code coverage tests'
+      task :rcov => [ (:compile if extensions.full?), rt.name ].compact
+    else
+      desc 'Run the rcov code coverage tests'
+      task :rcov => [ (:compile if extensions.full?) ].compact do
+        warn "rcov doesn't work for some reason"
+      end
     end
-    desc 'Run the rcov code coverage tests'
-    task :rcov => [ (:compile if extensions.full?), rt.name ].compact
   end
 
   def write_ignore_file 
     File.write('.gitignore') do |output|
-      output.puts *ignore
+      output.puts(*ignore)
     end
   end
 

data/lib/gem_hadar/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gem_hadar
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Florian Frank
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 23
         segments: 
         - 0
         - 0
-        - 3
-        version: 0.0.3
+        - 4
+        version: 0.0.4
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -82,26 +82,10 @@ dependencies:
         version: 0.2.20
   type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 9
-        - 9
-        version: 0.9.9
-  type: :runtime
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -113,7 +97,7 @@ dependencies:
         - 2
         version: 0.9.2
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 description: This library contains some useful functionality to support the development of Ruby Gems
 email: flori@ping.de
 executables: []