ore 0.8.1 → 0.9.0

data/data/ore/templates/bundler/template.yml

@@ -1,2 +1,7 @@
-variables:
-  bundler_dependency: ~> 1.0.0
+ignore:
+  - Gemfile.lock
+  - vendor/cache/*.gem
+
+development_dependencies:
+  bundler: ~> 1.0
+  rake: ~> 0.8

data/data/ore/templates/bundler_tasks/_tasks.erb

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/data/ore/templates/bundler_tasks/template.yml

@@ -0,0 +1,6 @@
+enable:
+  - bundler
+
+disable:
+  - rubygems_tasks
+  - jeweler_tasks

data/data/ore/templates/gem_package_task/_tasks.erb

@@ -0,0 +1,5 @@
+require 'rubygems/package_task'
+Gem::PackageTask.new(Gem::Specification.load('<%= @name %>.gemspec')) do |pkg|
+  pkg.need_tar = true
+  pkg.need_zip = false
+end

data/data/ore/templates/gem_package_task/template.yml

@@ -0,0 +1,4 @@
+disable:
+  - rubygems_tasks
+  - jeweler_tasks
+  - bundler_tasks

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

@@ -0,0 +1,45 @@
+# -*- encoding: utf-8 -*-
+
+require File.expand_path('../lib/<%= @namespace_path %>/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.name          = <%= @name.inspect %>
+  gem.version       = <%= @namespace %>::VERSION
+  gem.summary       = %q{<%= @summary %>}
+  gem.description   = %q{<%= @description %>}
+  gem.license       = <%= @license.inspect %>
+  gem.authors       = <%= @authors.inspect %>
+  gem.email         = [<%= @email.inspect %>]
+  gem.homepage      = <%= @homepage.inspect %>
+
+<%- if git? -%>
+  gem.files         = `git ls-files`.split($/)
+<%- elsif hg? -%>
+  gem.files         = `hg manifest`.split($/)
+<%- elsif svn? -%>
+  gem.files         = `svn ls -R`.split($/).select { |path| File.file?(path) }
+<%- else -%>
+  gem.files         = Dir['{**/}{.*,*}'].select { |path| File.file?(path) }
+<%- end -%>
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+<%- unless @dependencies.empty? -%>
+
+<%-   @dependencies.each do |name,version| -%>
+  gem.add_dependency <%= name.inspect %>, <%= version.inspect %>
+<%-   end -%>
+<%- end -%>
+
+<%- if bundler? -%>
+  gem.add_development_dependency "bundler", <%= @development_dependencies['bundler'].inspect %>
+<%-   if yard? -%>
+  gem.add_development_dependency "yard", <%= @development_dependencies['yard'].inspect %>
+<%-   end -%>
+<%- else -%>
+<%-   unless @development_dependencies.empty? -%>
+<%-     @development_dependencies.each do |name,version| -%>
+  gem.add_development_dependency <%= name.inspect %>, <%= version.inspect %>
+<%-     end -%>
+<%-   end -%>
+<%- end -%>end

data/data/ore/templates/gemspec/template.yml

@@ -0,0 +1,2 @@
+disable:
+  - gemspec_yml

data/data/ore/templates/{base → gemspec_yml}/[name].gemspec.erb

@@ -3,43 +3,45 @@
 require 'yaml'
 
 Gem::Specification.new do |gemspec|
-  root = File.dirname(__FILE__)
+  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
+<%- if git? -%>
+  files   = `git ls-files`.split($/)
+<%- elsif hg? -%>
+  files   = `hg manifest`.split($/)
+<%- elsif svn? -%>
+  files   = `svn ls -R`.split($/).select { |path| File.file?(path) }
+<%- else -%>
+  files   = Dir['{**/}{.*,*}'].select { |path| File.file?(path) }
+<%- end -%>
 
   filter_files = lambda { |paths|
-    case paths
-    when Array
-      (files & paths)
-    when String
-      (files & Dir[paths])
-    end
+    files & case paths
+            when Array
+              paths
+            when String
+              Dir[paths]
+            end
   }
 
   version = {
-    :file => '<%= @namespace_dir %>/version',
+    :file     => '<%= @namespace_path %>/version',
     :constant => '<%= @namespace %>::VERSION'
   }
 
   defaults = {
-    '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}'],
-    'extra_doc_files' => filter_files['*.{txt,rdoc,md,markdown,tt,textile}'],
+    'name'            => File.basename(root),
+    'files'           => files,
+    'require_paths'   => ['ext', 'lib'].select { |dir| File.directory?(dir) },
+    'executables'     => filter_files['bin/*'].map { |path| File.basename(path) },
+    'test_files'      => filter_files['{test/{**/}*_test.rb,spec/{**/}*_spec.rb}'],
+    'doc_files'       => filter_files['*.{txt,rdoc,md,markdown,tt,textile}'],
+    'extra_doc_files' => filter_files['*.{txt,rdoc,md,markdown,tt,textile}']
   }
 
   metadata = defaults.merge(YAML.load_file('gemspec.yml'))
 
-  gemspec.name = metadata['name']
+  gemspec.name    = metadata['name']
   gemspec.version = if metadata['version']
                       metadata['version']
                     else
@@ -49,50 +51,29 @@ Gem::Specification.new do |gemspec|
                       eval(version[:constant])
                     end
 
-  gemspec.summary = metadata.fetch('summary',metadata['description'])
+  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.licenses = Array(metadata['license'])
+  gemspec.authors  = Array(metadata['authors'])
 
-  gemspec.email = metadata['email']
+  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']
+  gemspec.require_paths = Array(metadata['require_paths'])
+  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.test_files       = filter_files[metadata['test_files']]
+  gemspec.extra_rdoc_files = Array(metadata['extra_doc_files'])
 
   gemspec.post_install_message = metadata['post_install_message']
-  gemspec.requirements = metadata['requirements']
+  gemspec.requirements         = metadata['requirements']
 
   if gemspec.respond_to?(:required_ruby_version=)
     gemspec.required_ruby_version = metadata['required_ruby_version']

data/data/ore/templates/gemspec_yml/gemspec.yml.erb

@@ -0,0 +1,41 @@
+name: <%= @name %>
+summary: <%= yaml_escape @summary %>
+description: <%= yaml_escape @description %>
+<%- if @license -%>
+license: <%= @license %>
+<%- end -%>
+<%- if @authors.length > 1 -%>
+authors:
+<%-   @authors.each do |name| -%>
+ - <%= name %>
+<%-   end -%>
+<%- else -%>
+authors: <%= @authors.first %>
+<%- end -%>
+<%- if @email -%>
+email: <%= @email %>
+<%- end -%>
+homepage: <%= @homepage %>
+<%= includes :gemspec, '' -%>
+<%- unless @dependencies.empty? -%>
+
+dependencies:
+<%-   @dependencies.each do |name,version| -%>
+  <%= name %>: <%= version %>
+<%-   end -%>
+<%- end -%>
+
+<%- if bundler? -%>
+development_dependencies:
+  bundler: <%= @development_dependencies['bundler'] %>
+  <%- if yard? -%>
+  yard: <%= @development_dependencies['yard'] %>
+  <%- end -%>
+<%- else -%>
+<%-   unless @development_dependencies.empty? -%>
+development_dependencies:
+<%-     @development_dependencies.each do |name,version| -%>
+  <%= name %>: <%= version %>
+<%-     end -%>
+<%-   end -%>
+<%- end -%>

data/data/ore/templates/gemspec_yml/template.yml

@@ -0,0 +1,2 @@
+disable:
+  - gemspec

data/data/ore/templates/git/.gitignore.erb

@@ -0,0 +1,3 @@
+<%- @ignore.each do |pattern| -%>
+<%=   pattern %>
+<%- end -%>

data/data/ore/templates/git/template.yml

@@ -0,0 +1,2 @@
+disable:
+  - hg

data/data/ore/templates/hg/.hgignore.erb

@@ -0,0 +1,3 @@
+<%- @ignore.each do |pattern| -%>
+<%=   pattern %>
+<%- end -%>

data/data/ore/templates/hg/template.yml

@@ -0,0 +1,2 @@
+disable:
+  - git

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

@@ -1,21 +1,12 @@
 <%- if bundler? -%>
-require 'ore/specification'
 require 'jeweler'
-Jeweler::Tasks.new(Ore::Specification.new)
+Jeweler::Tasks.new(Gem::Specification.load('<%= @name %>.gemspec'))
 <%- else -%>
 begin
-  gem 'ore', '<%= @ore_core_dependency %>'
-  require 'ore/specification'
-rescue LoadError
-  warn e.message
-  warn "Run `gem install ore` to install Ore."
-end
-
-begin
-  gem 'jeweler', '<%= @jeweler_dependency %>'
+  gem 'jeweler', '<%= @development_dependencies['jeweler'] %>'
   require 'jeweler'
 
-  Jeweler::Tasks.new(Ore::Specification.new)
+  Jeweler::Tasks.new(Gem::Specification.load('<%= @name %>.gemspec'))
 rescue LoadError
   warn 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
 end

data/data/ore/templates/jeweler_tasks/template.yml

@@ -1,5 +1,6 @@
 disable:
-  - ore_tasks
+  - rubygems_tasks
+  - bundler_tasks
 
-variables:
-  jeweler_dependency: ~> 1.5.0
+development_dependencies:
+  jeweler: ~> 1.5.0  

data/data/ore/templates/rdoc/_tasks.erb

@@ -1,4 +1,4 @@
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   rdoc.title = <%= @name.dump %>
 end

data/data/ore/templates/rdoc/template.yml

@@ -1,5 +1,8 @@
 disable:
   - yard
 
+ignore:
+  - html/
+
 variables:
   markup: :rdoc

data/data/ore/templates/rspec/_tasks.erb

@@ -3,7 +3,7 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
 <%- else -%>
 begin
-  gem 'rspec', '<%= @rspec_dependency %>'
+  gem 'rspec', '<%= @development_dependencies['rspec'] %>'
   require 'rspec/core/rake_task'
 
   RSpec::Core::RakeTask.new

data/data/ore/templates/rspec/spec/spec_helper.rb.erb

@@ -1,5 +1,5 @@
 <%- unless bundler? -%>
-gem 'rspec', '<%= @rspec_dependency %>'
+gem 'rspec', '<%= @development_dependencies['rspec'] %>'
 <%- end -%>
 require 'rspec'
 require '<%= @namespace_path %>/version'

data/data/ore/templates/rspec/template.yml

@@ -1,5 +1,5 @@
 disable:
   - test_unit
 
-variables:
-  rspec_dependency: ~> 2.4
+development_dependencies:
+  rspec: ~> 2.4

data/data/ore/templates/rubygems_tasks/_tasks.erb

@@ -0,0 +1,14 @@
+<%- if bundler? -%>
+require 'rubygems/tasks'
+Gem::Tasks.new
+<%- else -%>
+begin
+  gem 'rubygems-tasks', '<%= @development_dependencies['rubygems-tasks'] %>'
+  require 'rubygems/tasks'
+
+  Gem::Tasks.new
+rescue LoadError => e
+  warn e.message
+  warn "Run `gem install rubygems-tasks` to install 'rubygems/tasks'."
+end
+<%- end -%>

data/data/ore/templates/rubygems_tasks/template.yml

@@ -0,0 +1,7 @@
+disable:
+  - gem_package_task
+  - jeweler_tasks
+  - bundler_tasks
+
+development_dependencies:
+  rubygems-tasks: ~> 0.2

data/data/ore/templates/rvmrc/.rvmrc.erb

@@ -5,14 +5,14 @@
 
 # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
 environment_id="<%= if defined?(::RUBY_ENGINE)
-          if RUBY_ENGINE == 'ruby'
-            RUBY_VERSION
-          else
-            RUBY_ENGINE
-          end
-        else
-          RUBY_VERSION
-        end -%>@<%= @name -%>"
+                      if RUBY_ENGINE == 'ruby'
+                        RUBY_VERSION
+                      else
+                        RUBY_ENGINE
+                      end
+                    else
+                      RUBY_VERSION
+                    end -%>@<%= @name -%>"
 
 #
 # First we attempt to load the desired environment directly from the environment
@@ -34,16 +34,10 @@ fi
 # directory you can uncomment the following code.
 #
 
-# Ensure that ore-core is installed.
-if [[ `gem list -i ore-core` -ne "true" ]]; then
-  printf "The rubygem 'ore-core' is not installed, installing it now.\n"
-  gem install ore-core --version <%= @ore_core_dependency.dump %>
-fi
-
 # Ensure that Bundler is installed, install it if it is not.
 if ! command -v bundle ; then
   printf "The rubygem 'bundler' is not installed, installing it now.\n"
-  gem install bundler --version <%= @bundler_dependency.dump %>
+  gem install bundler
 fi
 
 # Bundle while reducing excess noise.

data/data/ore/templates/yard/_gemfile_development.erb

@@ -4,4 +4,3 @@
 <%- when :textile -%>
   gem 'RedCloth'
 <%- end -%>
-  gem 'yard', '<%= @yard_dependency %>'

data/data/ore/templates/yard/_tasks.erb

@@ -3,7 +3,7 @@ require 'yard'
 YARD::Rake::YardocTask.new  
 <%- else -%>
 begin
-  gem 'yard', '<%= @yard_dependency %>'
+  gem 'yard', '<%= @development_dependencies['yard'] %>'
   require 'yard'
 
   YARD::Rake::YardocTask.new