ore 0.8.0 → 0.8.1

data/ChangeLog.md

@@ -1,3 +1,12 @@
+### 0.8.1 / 2011-07-11
+
+* Generated `.gemspec` file:
+  * Fixed a redundancy.
+  * Load the `version.rb` file, after populating `$LOAD_PATH`.
+* Generated `Rakefile`:
+  * Use `warn` instead of `STDERR.puts`.
+* Losen generated `yard` dependency to `~> 0.7`.
+
 ### 0.8.0 / 2011-06-18
 
 * Added the `markup`, `date`, `year`, `month` and `day` keywords to

data/README.md

@@ -16,7 +16,9 @@ templates to be installed from Git repositories.
 
 * Stores project metadata in **one YAML file** (`gemspec.yml`).
 * Generates a **pure Ruby** `.gemspec` supporting:
-  * Git
+  * [Git](http://git-scm.com/)
+  * [Mercurial (Hg)](http://mercurial.selenic.com/)
+  * [SubVersion (SVN)](http://subversion.tigris.org/)
   * `gemspec.yml`
   * `VERSION` or `version.rb` files
 * Provides many builtin templates:
@@ -47,7 +49,7 @@ templates to be installed from Git repositories.
 The `gemspec.yml` file used to build Ore:
 
     name: ore
-    version: 0.8.0
+    version: 0.8.1
     summary: Mine raw RubyGems from YAML.
     description:
       Ore is a simple RubyGem building solution. Ore handles the

data/Rakefile

@@ -7,8 +7,8 @@ begin
 
   Ore::Tasks.new
 rescue LoadError => e
-  STDERR.puts e.message
-  STDERR.puts "Run `gem install ore-tasks` to install 'ore/tasks'."
+  warn e.message
+  warn "Run `gem install ore-tasks` to install 'ore/tasks'."
 end
 
 begin

data/bin/mine

@@ -5,7 +5,7 @@ require 'rubygems'
 begin
   require 'ore/generator'
 rescue LoadError => e
-  STDERR.puts 'Could not load "ore/generator"'
+  warn 'Could not load "ore/generator"'
   exit -1
 end
 

data/bin/ore

@@ -5,7 +5,7 @@ require 'rubygems'
 begin
   require 'ore/cli'
 rescue LoadError => e
-  STDERR.puts 'Could not load "ore/cli"'
+  warn 'Could not load "ore/cli"'
   exit -1
 end
 

data/data/ore/templates/base/Rakefile.erb

@@ -6,16 +6,16 @@ require 'rubygems'
 begin
   require 'bundler'
 rescue LoadError => e
-  STDERR.puts e.message
-  STDERR.puts "Run `gem install bundler` to install Bundler."
+  warn e.message
+  warn "Run `gem install bundler` to install Bundler."
   exit e.status_code
 end
 
 begin
   Bundler.setup(:development)
 rescue Bundler::BundlerError => e
-  STDERR.puts e.message
-  STDERR.puts "Run `bundle install` to install missing gems."
+  warn e.message
+  warn "Run `bundle install` to install missing gems."
   exit e.status_code
 end
 

data/data/ore/templates/base/[name].gemspec.erb

@@ -3,6 +3,8 @@
 require 'yaml'
 
 Gem::Specification.new do |gemspec|
+  root = File.dirname(__FILE__)
+  lib_dir = File.join(root,'lib')
   files = if File.directory?('.git')
             `git ls-files`.split($/)
           elsif File.directory?('.hg')
@@ -23,12 +25,12 @@ Gem::Specification.new do |gemspec|
   }
 
   version = {
-    :file => 'lib/<%= @namespace_dir %>/version.rb',
+    :file => '<%= @namespace_dir %>/version',
     :constant => '<%= @namespace %>::VERSION'
   }
 
   defaults = {
-    'name' => File.basename(File.dirname(__FILE__)),
+    'name' => File.basename(root),
     'files' => files,
     'executables' => filter_files['bin/*'].map { |path| File.basename(path) },
     'test_files' => filter_files['{test/{**/}*_test.rb,spec/{**/}*_spec.rb}'],
@@ -37,11 +39,13 @@ Gem::Specification.new do |gemspec|
 
   metadata = defaults.merge(YAML.load_file('gemspec.yml'))
 
-  gemspec.name = metadata.fetch('name',defaults[:name])
+  gemspec.name = metadata['name']
   gemspec.version = if metadata['version']
                       metadata['version']
-                    elsif File.file?(version[:file])
-                      require File.join('.',version[:file])
+                    else
+                      $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
+
+                      require version[:file]
                       eval(version[:constant])
                     end
 

data/data/ore/templates/bin/bin/[name].erb

@@ -9,8 +9,8 @@ if File.directory?(File.join(root_dir,'.git'))
     begin
       Bundler.setup(:default)
     rescue Bundler::BundlerError => e
-      STDERR.puts e.message
-      STDERR.puts "Run `bundle install` to install missing gems"
+      warn e.message
+      warn "Run `bundle install` to install missing gems"
       exit e.status_code
     end
   end

data/data/ore/templates/jeweler_tasks/_tasks.erb

@@ -7,8 +7,8 @@ begin
   gem 'ore', '<%= @ore_core_dependency %>'
   require 'ore/specification'
 rescue LoadError
-  STDERR.puts e.message
-  STDERR.puts "Run `gem install ore` to install Ore."
+  warn e.message
+  warn "Run `gem install ore` to install Ore."
 end
 
 begin
@@ -17,6 +17,6 @@ begin
 
   Jeweler::Tasks.new(Ore::Specification.new)
 rescue LoadError
-  STDERR.puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
+  warn 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
 end
 <%- end -%>

data/data/ore/templates/ore_tasks/_tasks.erb

@@ -8,7 +8,7 @@ begin
 
   Ore::Tasks.new
 rescue LoadError => e
-  STDERR.puts e.message
-  STDERR.puts "Run `gem install ore-tasks` to install 'ore/tasks'."
+  warn e.message
+  warn "Run `gem install ore-tasks` to install 'ore/tasks'."
 end
 <%- end -%>

data/data/ore/templates/test_unit/test/helper.rb.erb

@@ -4,16 +4,16 @@ require 'rubygems'
 begin
   require 'bundler'
 rescue LoadError => e
-  STDERR.puts e.message
-  STDERR.puts "Run `gem install bundler` to install Bundler."
+  warn e.message
+  warn "Run `gem install bundler` to install Bundler."
   exit e.status_code
 end
 
 begin
   Bundler.setup(:default, :development, :test)
 rescue Bundler::BundlerError => e
-  STDERR.puts e.message
-  STDERR.puts "Run `bundle install` to install missing gems."
+  warn e.message
+  warn "Run `bundle install` to install missing gems."
   exit e.status_code
 end
 

data/data/ore/templates/yard/template.yml

@@ -2,4 +2,4 @@ disable:
   - rdoc
 
 variables:
-  yard_dependency: ~> 0.7.0
+  yard_dependency: ~> 0.7

data/gemspec.yml

@@ -1,5 +1,5 @@
 name: ore
-version: 0.8.0
+version: 0.8.1
 summary: Mine raw RubyGems from YAML
 description:
   Ore is a flexible Ruby project generator. Unlike other Ruby project

data/ore.gemspec

@@ -1,15 +1,131 @@
-# -*- encoding: utf-8 -*-
-
-begin
-  Ore::Specification.new do |gemspec|
-    # custom logic here
-  end
-rescue NameError
-  begin
-    require 'ore/specification'
-    retry
-  rescue LoadError
-    STDERR.puts "The '#{__FILE__}' file requires Ore."
-    STDERR.puts "Run `gem install ore-core` to install Ore."
+# encoding: utf-8
+
+require 'yaml'
+
+Gem::Specification.new do |gemspec|
+  root = File.dirname(__FILE__)
+  lib_dir = File.join(root,'lib')
+  files = if File.directory?('.git')
+            `git ls-files`.split($/)
+          elsif File.directory?('.hg')
+            `hg manifest`.split($/)
+          elsif File.directory?('.svn')
+            `svn ls -R`.split($/).select { |path| File.file?(path) }
+          else
+            Dir['{**/}{.*,*}'].select { |path| File.file?(path) }
+          end
+
+  filter_files = lambda { |paths|
+    case paths
+    when Array
+      (files & paths)
+    when String
+      (files & Dir[paths])
+    end
+  }
+
+  version = {
+    :file => 'ore/version.rb',
+    :constant => 'Ore::VERSION'
+  }
+
+  defaults = {
+    'name' => File.basename(File.dirname(__FILE__)),
+    'files' => files,
+    'executables' => filter_files['bin/*'].map { |path| File.basename(path) },
+    'test_files' => filter_files['{test/{**/}*_test.rb,spec/{**/}*_spec.rb}'],
+    'extra_doc_files' => filter_files['*.{txt,rdoc,md,markdown,tt,textile}'],
+  }
+
+  metadata = defaults.merge(YAML.load_file('gemspec.yml'))
+
+  gemspec.name = metadata['name']
+  gemspec.version = if metadata['version']
+                      metadata['version']
+                    else
+                      $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
+
+                      require version[:file]
+                      eval(version[:constant])
+                    end
+
+  gemspec.summary = metadata.fetch('summary',metadata['description'])
+  gemspec.description = metadata.fetch('description',metadata['summary'])
+
+  case metadata['license']
+  when Array
+    gemspec.licenses = metadata['license']
+  when String
+    gemspec.license = metadata['license']
+  end
+
+  case metadata['authors']
+  when Array
+    gemspec.authors = metadata['authors']
+  when String
+    gemspec.author = metadata['authors']
+  end
+
+  gemspec.email = metadata['email']
+  gemspec.homepage = metadata['homepage']
+
+  case metadata['require_paths']
+  when Array
+    gemspec.require_paths = metadata['require_paths']
+  when String
+    gemspec.require_path = metadata['require_paths']
+  end
+
+  gemspec.files = filter_files[metadata['files']]
+
+  gemspec.executables = metadata['executables']
+  gemspec.extensions = metadata['extensions']
+
+  if Gem::VERSION < '1.7.'
+    gemspec.default_executable = gemspec.executables.first
+  end
+
+  gemspec.test_files = filter_files[metadata['test_files']]
+
+  unless gemspec.files.include?('.document')
+    gemspec.extra_rdoc_files = metadata['extra_doc_files']
+  end
+
+  gemspec.post_install_message = metadata['post_install_message']
+  gemspec.requirements = metadata['requirements']
+
+  if gemspec.respond_to?(:required_ruby_version=)
+    gemspec.required_ruby_version = metadata['required_ruby_version']
+  end
+
+  if gemspec.respond_to?(:required_rubygems_version=)
+    gemspec.required_rubygems_version = metadata['required_ruby_version']
+  end
+
+  parse_versions = lambda { |versions|
+    case versions
+    when Array
+      versions.map { |v| v.to_s }
+    when String
+      versions.split(/,\s*/)
+    end
+  }
+
+  if metadata['dependencies']
+    metadata['dependencies'].each do |name,versions|
+      gemspec.add_dependency(name,parse_versions[versions])  
+    end
+  end
+
+  if metadata['runtime_dependencies']
+    metadata['runtime_dependencies'].each do |name,versions|
+      gemspec.add_runtime_dependency(name,parse_versions[versions])  
+    end
+  end
+
+  if metadata['development_dependencies']
+    metadata['development_dependencies'].each do |name,versions|
+      gemspec.add_development_dependency(name,parse_versions[versions])  
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: ore
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - Postmodern
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-18 00:00:00 Z
+date: 2011-07-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ore-core