gem_hadar 0.0.2 → 0.0.3

data/.gitignore

@@ -1,3 +1,3 @@
-.*.sw[pon]
 pkg
 Gemfile.lock
+.*.sw[pon]

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/gem_hadar.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gem_hadar}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
   s.date = %q{2011-07-16}
   s.description = %q{This library contains some useful functionality to support the development of Ruby Gems}
   s.email = %q{flori@ping.de}
-  s.extra_rdoc_files = ["README.rdoc"]
+  s.extra_rdoc_files = ["README.rdoc", "lib/gem_hadar.rb", "lib/gem_hadar/version.rb"]
   s.files = [".gitignore", "Gemfile", "LICENSE", "README.rdoc", "Rakefile", "VERSION", "gem_hadar.gemspec", "lib/gem_hadar.rb", "lib/gem_hadar/version.rb"]
   s.homepage = %q{http://github.com/flori/gem_hadar}
   s.rdoc_options = ["--title", "GemHadar - Library for the development of Ruby Gems", "--main", "README.rdoc"]
@@ -21,14 +21,14 @@ 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.2"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 0.0.3"])
       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.2"])
+      s.add_dependency(%q<gem_hadar>, ["~> 0.0.3"])
       s.add_dependency(%q<spruz>, ["~> 0.2.10"])
       s.add_dependency(%q<dslkit>, ["~> 0.2.6"])
       s.add_dependency(%q<sdoc>, ["~> 0.2.20"])
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rake>, ["~> 0.9.2"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 0.0.2"])
+    s.add_dependency(%q<gem_hadar>, ["~> 0.0.3"])
     s.add_dependency(%q<spruz>, ["~> 0.2.10"])
     s.add_dependency(%q<dslkit>, ["~> 0.2.6"])
     s.add_dependency(%q<sdoc>, ["~> 0.2.20"])

data/lib/gem_hadar.rb

@@ -12,6 +12,7 @@ require 'rake/clean'
 require 'rake/testtask'
 require 'rcov/rcovtask'
 require 'dslkit/polite'
+require 'set'
 require 'gem_hadar/version'
 
 def GemHadar(&block)
@@ -59,16 +60,28 @@ class GemHadar
     has_to_be_set :description
   end
 
-  dsl_accessor :require_path, 'lib'
+  dsl_accessor :require_paths do Set['lib'] end
+
+  def require_path(path = nil)
+    if path
+      self.require_paths = Set[path]
+    else
+      require_paths.first
+    end
+  end
 
   dsl_accessor :readme
 
   dsl_accessor :title
 
-  dsl_accessor :ignore_files do @ignore_files = [] end
+  dsl_accessor :ignore_files do Set[] end
 
   dsl_accessor :test_dir
 
+  dsl_accessor :bindir
+
+  dsl_accessor :executables do Set[] end
+
   dsl_accessor :test_files do
     if test_dir
       FileList[File.join(test_dir, '**/*.rb')]
@@ -77,6 +90,16 @@ class GemHadar
     end
   end
 
+  dsl_accessor :doc_files do
+    FileList[File.join('lib/**/*.rb')] + FileList[File.join('ext/**/*.c')]
+  end
+
+  dsl_accessor :extensions do FileList['ext/**/extconf.rb'] end
+
+  dsl_accessor :make do
+    ENV['MAKE'] || %w[gmake make].find { |c| system(c, '-v') }
+  end
+
   dsl_accessor :files do
     `git ls-files`.split("\n")
   end
@@ -110,7 +133,7 @@ class GemHadar
   def install_library(&block)
     @install_library_block = lambda do
       desc 'Install executable/library into site_ruby directories'
-      task :install, &block
+      task :install => :prepare_install, &block
     end
   end
 
@@ -134,7 +157,7 @@ class GemHadar
     if args.empty?
       ignore_files
     else
-      ignore_files.push(*args)
+      args.each { |a| ignore_files << a }
     end
   end
 
@@ -163,6 +186,9 @@ class GemHadar
       s.description = description
       s.files       = files
       s.test_files  = test_files
+      extensions.full? { |e| s.extensions = e }
+      bindir.full? { |b| s.bindir = b }
+      executables.full?(:to_a) { |e| s.executables = e }
 
       s.add_development_dependency('gem_hadar', "~>#{VERSION}")
       for d in @development_dependencies
@@ -172,7 +198,7 @@ class GemHadar
         s.add_dependency(*d)
       end
 
-      s.require_path = require_path
+      s.require_paths = require_paths.to_a
 
       if title
         s.rdoc_options << '--title' << title
@@ -183,7 +209,7 @@ class GemHadar
         s.rdoc_options << '--main' << readme
         s.extra_rdoc_files << readme
       end
-
+      s.extra_rdoc_files.concat doc_files
     end
   end
 
@@ -242,7 +268,7 @@ EOT
       else
         cmd << " --title '#{name.camelize} - #{summary}'"
       end
-      cmd << ' ' << Dir['lib/**/*.rb'] * ' '
+      cmd << ' ' << doc_files * ' '
       if readme
         cmd << " #{readme}"
       end
@@ -251,25 +277,29 @@ EOT
   end
 
   def test_task
-    Rake::TestTask.new do |t|
-      t.libs << test_dir
+    tt =  Rake::TestTask.new(:run_tests) do |t|
+      t.libs << test_dir << require_paths
       t.test_files = test_files
       t.verbose    = true
     end
+    desc 'Run the tests'
+    task :test => [ (:compile if extensions.full?), tt.name ].compact
   end
 
   def rcov_task
-    Rcov::RcovTask.new do |t|
-      t.libs << test_dir
+    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\/']
     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
 
@@ -299,6 +329,23 @@ EOT
     end
   end
 
+  def compile_task
+    for file in extensions
+      dir = File.dirname(file)
+      clean File.join(dir, 'Makefile'), File.join(dir, '*.{bundle,o,so}')
+    end
+    desc "Compile extensions: #{extensions * ', '}"
+    task :compile do
+      for file in extensions
+        dir, file = File.split(file)
+        cd dir do
+          ruby file
+          sh make
+        end
+      end
+    end
+  end
+
   def create_all_tasks
     default_task
     build_task
@@ -315,6 +362,12 @@ EOT
     version_tag_task
     write_ignore_file
     write_gemfile
+    if extensions.full?
+      compile_task
+      task :prepare_install => :compile
+    else
+      task :prepare_install
+    end
     self
   end
 end

data/lib/gem_hadar/version.rb

@@ -1,6 +1,6 @@
 class GemHadar
   # GemHadar version
-  VERSION         = '0.0.2'
+  VERSION         = '0.0.3'
   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: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Florian Frank
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 0
         - 0
-        - 2
-        version: 0.0.2
+        - 3
+        version: 0.0.3
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -122,6 +122,8 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
+- lib/gem_hadar.rb
+- lib/gem_hadar/version.rb
 files: 
 - .gitignore
 - Gemfile