ore 0.9.4 → 0.10.0

data/ChangeLog.md

@@ -1,3 +1,21 @@
+### 0.10.0 / 2012-10-14
+
+* Require thor ~> 0.15.
+* Strip the `ore-` prefix from the template name in {Ore::Template.register}.
+* Allow {Ore::Generator#disable_template} to disable templates that are not
+  installed.
+
+#### Templates
+
+* Added the [mini_test] template.
+* Moved the `rvmrc` template out into the [rvm] template.
+* Moved the `jeweler_tasks` template out into the [jeweler] template.
+* Removed the `gem_test` template.
+
+#### CLI
+
+* Added a `--version` option to the `ore` command.
+
 ### 0.9.4 / 2012-07-23
 
 * Do not initialize the repository, if .git or .hg directories already exist.
@@ -337,13 +355,14 @@
 [gemspec]: https://github.com/ruby-ore/ore/tree/master/data/ore/templates/gemspec
 [gemspec_yml]: https://github.com/ruby-ore/ore/tree/master/data/ore/templates/gemspec_yml
 [gem\_package\_task]: https://github.com/ruby-ore/ore/tree/master/data/ore/templates/gem_package_task
-[gem_test]: https://github.com/ruby-ore/ore/tree/master/data/ore/templates/gem_test
 [git]: https://github.com/ruby-ore/ore/tree/master/data/ore/templates/git
 [hg]: https://github.com/ruby-ore/ore/tree/master/data/ore/templates/hg
-[jeweler_tasks]: https://github.com/ruby-ore/ore/tree/master/data/ore/templates/jeweler_tasks
 [rdoc]: https://github.com/ruby-ore/ore/tree/master/data/ore/templates/rdoc
 [rspec]: https://github.com/ruby-ore/ore/tree/master/data/ore/templates/rspec
 [rubygems_tasks]: https://github.com/ruby-ore/ore/tree/master/data/ore/templates/rubygems_tasks
-[rvmrc]: https://github.com/ruby-ore/ore/tree/master/data/ore/templates/rvmrc
 [test_unit]: https://github.com/ruby-ore/ore/tree/master/data/ore/templates/test_unit
+[mini_test]: https://github.com/ruby-ore/ore/tree/master/data/ore/templates/mini_test
 [yard]: https://github.com/ruby-ore/ore/tree/master/data/ore/templates/yard
+
+[rvm]: https://github.com/ruby-ore/rvm
+[jeweler_tasks]: https://github.com/ruby-ore/jeweler_tasks

data/README.md

@@ -28,13 +28,9 @@ Ore generates a pure-Ruby gemspec by default. Ore can also generate a
 ### Tasks
 
 Ore supports generating projects using [Gem::Tasks][rubygems_tasks],
-[Bundler::GemHelper][bundler], [Jeweler::Tasks][jeweler] and even
-[Gem::PackageTask][gem_package_task].
+[Bundler::GemHelper][bundler] and even [Gem::PackageTask][gem_package_task].
 
-    $ mine my-project [--rubygems-tasks |
-                       --bundler-tasks  |
-                       --jeweler-tasks  |
-                       --gem-package-task]
+    $ mine my-project [--rubygems-tasks | --bundler-tasks  | --gem-package-task]
 
 ### Bundler
 
@@ -42,12 +38,6 @@ Ore can also generate a [Bundler][bundler] project.
 
     $ mine my-project --bundler
 
-### RVM
-
-Ore also includes an [.rvmrc] template.
-
-    $ mine my-project --rvmrc
-
 ### Markup
 
 Ore supports [RDoc][rdoc], [Markdown][markdown] and [Textile][textile] markup.
@@ -63,20 +53,21 @@ documentation.
 
 ### Testing
 
-Ore supports generating [RSpec][rspec] or [Test::Unit][test_unit] tests.
+Ore supports generating [RSpec][rspec], [MiniTest][mini_test] or
+[Test::Unit][test_unit] tests.
 
-    $ mine my-project [--test-unit | --rspec]
+    $ mine my-project [--test-unit | --mini-test | --rspec]
 
 ### Custom Templates
 
 Additional templates can also be installed from Git:
 
-    $ ore install git://github.com/ruby-ore/mini_test.git
-    $ mine my-project --mini-test
+    $ ore install git://github.com/ruby-ore/rbenv.git
+    $ mine my-project --rbenv
 
 ## Requirements
 
-* [thor](http://github.com/wycats/thor) ~> 0.14
+* [thor](https://github.com/wycats/thor#readme) ~> 0.15
 
 ## Install
 
@@ -94,7 +85,7 @@ Generate a new customized project:
 
 Generate a new project using previously installed templates:
 
-    $ mine my_project --bundler --rspec --yard --templates mini_test
+    $ mine my_project --bundler --rspec --yard --templates rbenv
 
 Set your github username, so `mine` can generate GitHub project URLs:
 
@@ -103,7 +94,7 @@ Set your github username, so `mine` can generate GitHub project URLs:
 
 Install a custom template:
 
-    $ ore install git://github.com/ruby-ore/mini_test.git
+    $ ore install git://github.com/ruby-ore/rbenv.git
 
 List installed templates:
 
@@ -111,7 +102,7 @@ List installed templates:
 
 Remove a previously installed template:
 
-    $ ore remove mini_test
+    $ ore remove rbenv
 
 Add default generator options to `~/.ore/options.yml`:
 
@@ -136,12 +127,11 @@ See {file:LICENSE.txt} for license information.
 [gemspec.yml]: https://github.com/ruby-ore/ore/blob/master/gemspec.yml
 [rubygems_tasks]: https://github.com/postmodern/rubygems-tasks#readme
 [bundler]: http://gembundler.com/
-[jeweler]: https://github.com/technicalpickles/jeweler#readme
 [gem_package_task]: http://rubygems.rubyforge.org/rubygems-update/Gem/PackageTask.html
-[.rvmrc]: https://rvm.io/workflow/rvmrc/#project
 [rdoc]: http://rdoc.rubyforge.org/
 [markdown]: http://daringfireball.net/projects/markdown/
 [textile]: http://textile.sitemonks.com/
 [yard]: http://yardoc.org/
 [rspec]: http://rspec.info/
 [test_unit]: http://test-unit.rubyforge.org/
+[mini_test]: https://github.com/seattlerb/minitest#readme

data/Rakefile

@@ -25,7 +25,7 @@ task :test => :spec
 task :default => :spec
 
 begin
-  gem 'yard', '~> 0.7'
+  gem 'yard', '~> 0.8'
   require 'yard'
   
   YARD::Rake::YardocTask.new

data/bin/mine

@@ -5,8 +5,7 @@ require 'rubygems'
 begin
   require 'ore/generator'
 rescue LoadError => e
-  warn 'Could not load "ore/generator"'
-  exit -1
+  abort 'Could not load "ore/generator"'
 end
 
 Ore::Generator.start

data/bin/ore

@@ -5,8 +5,7 @@ require 'rubygems'
 begin
   require 'ore/cli'
 rescue LoadError => e
-  warn 'Could not load "ore/cli"'
-  exit -1
+  abort 'Could not load "ore/cli"'
 end
 
 Ore::CLI.start

data/data/ore/templates/mini_test/template.yml

@@ -0,0 +1,3 @@
+disable:
+  - test_unit
+  - rspec

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

@@ -0,0 +1,26 @@
+require 'rubygems'
+<%- if bundler? -%>
+
+begin
+  require 'bundler'
+rescue LoadError => e
+  STDERR.puts e.message
+  STDERR.puts "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."
+  exit e.status_code
+end
+
+<%- end -%>
+require 'minitest/unit'
+
+class MiniTest::Unit::TestCase
+end
+
+MiniTest::Unit.autorun

data/data/ore/templates/mini_test/test/test_[name].rb.erb

@@ -0,0 +1,12 @@
+require 'helper'
+require '<%= @namespace_path %>'
+
+class Test<%= @namespace %> < MiniTest::Unit::TestCase
+
+  def test_version
+    version = <%= @namespace %>.const_get('VERSION')
+
+    assert(!version.empty?, 'should have a VERSION constant')
+  end
+
+end

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

@@ -1,5 +1,6 @@
 disable:
   - test_unit
+  - mini_test
 
 development_dependencies:
   rspec: ~> 2.4

data/data/ore/templates/test_unit/template.yml

@@ -1,2 +1,3 @@
 disable:
+  - mini_test
   - rspec

data/gemspec.yml

@@ -1,5 +1,4 @@
 name: ore
-version: 0.9.4
 summary: Mine beautiful RubyGems from Ore
 description:
   Ore is a flexible Ruby project generator. Unlike other Ruby project
@@ -27,9 +26,9 @@ post_install_message: |
   **************************************************************************
 
 dependencies:
-  thor: ~> 0.14
+  thor: ~> 0.15
 
 development_dependencies:
   rubygems-tasks: ~> 0.2
   rspec: ~> 2.4
-  yard: ~> 0.7
+  yard: ~> 0.8

data/lib/ore/cli.rb

@@ -1,4 +1,5 @@
 require 'ore/config'
+require 'ore/version'
 
 require 'thor'
 require 'fileutils'
@@ -11,6 +12,9 @@ module Ore
     map '-u' => :update
     map '-r' => :remove
 
+    # add a --version option
+    map '--version' => :version
+
     desc 'list', 'List installed Ore templates'
 
     #
@@ -86,5 +90,14 @@ module Ore
       FileUtils.rm_rf(path)
     end
 
+    desc 'version', 'Prints the version'
+
+    #
+    # Prints {Ore::VERSION}.
+    #
+    def version
+      puts "ore #{Ore::VERSION}"
+    end
+
   end
 end

data/lib/ore/generator.rb

@@ -157,15 +157,13 @@ module Ore
 
       return false if @disabled_templates.include?(name)
 
-      unless (template_dir = Template.templates[name])
-        say "Unknown template #{name}", :red
-        exit -1
-      end
+      if (template_dir = Template.templates[name])
+        source_paths.delete(template_dir)
 
-      source_paths.delete(template_dir)
+        @templates.delete_if { |template| template.path == template_dir }
+        @enabled_templates.delete(name)
+      end
 
-      @templates.delete_if { |template| template.path == template_dir }
-      @enabled_templates.delete(name)
       @disabled_templates << name
       return true
     end
@@ -211,11 +209,11 @@ module Ore
       @project_dir = File.basename(@root)
       @name        = (options.name || @project_dir)
 
-      @scm = if File.directory?(File.join(@root,'.git'))    then :git
+      @scm = if    File.directory?(File.join(@root,'.git')) then :git
              elsif File.directory?(File.join(@root,'.hg'))  then :hg
              elsif File.directory?(File.join(@root,'.svn')) then :svn
-             elsif options.hg?  then :hg
-             elsif options.git? then :git
+             elsif options.hg?                              then :hg
+             elsif options.git?                             then :git
              end
 
       case @scm
@@ -264,12 +262,9 @@ module Ore
                        "https://#{@uri.host}#{@uri.path}/issues"
                      end
 
-      @markup, @markup_ext = if options.markdown?
-                               [:markdown, 'md']
-                             elsif options.textile?
-                               [:textile, 'tt']
-                             else
-                               [:rdoc, 'rdoc']
+      @markup, @markup_ext = if    options.markdown? then [:markdown, 'md']
+                             elsif options.textile?  then [:textile, 'tt']
+                             else                         [:rdoc, 'rdoc']
                              end
 
       @date  = Date.today

data/lib/ore/template/template.rb

@@ -52,7 +52,7 @@ module Ore
         raise(StandardError,"#{path.dump} is must be a directory")
       end
 
-      name = File.basename(path).to_sym
+      name = File.basename(path).sub(/^ore-/,'').to_sym
 
       self.templates[name] = path
       return name

data/lib/ore/version.rb

@@ -0,0 +1,4 @@
+module Ore
+  # ore version
+  VERSION = '0.10.0'
+end

data/spec/generator_spec.rb

@@ -203,18 +203,6 @@ describe Generator do
     end
   end
 
-  context "gem test" do
-    let(:name) { 'gem_test_project' }
-
-    before(:all) do
-      generate!(name, :gem_test => true)
-    end
-
-    it "should add a .gemtest file" do
-      @path.should have_file('.gemtest')
-    end
-  end
-
   context "bundler" do
     let(:name) { 'bundled_project' }
 
@@ -407,6 +395,10 @@ gemspec
       generate!(name, :test_unit => true)
     end
 
+    it "should disable the mini_test template" do
+      @generator.disabled_templates.should include(:mini_test)
+    end
+
     it "should disable the rspec template" do
       @generator.disabled_templates.should include(:rspec)
     end
@@ -420,7 +412,35 @@ gemspec
     end
 
     it "should add a single test_*.rb file" do
-      @path.should have_file('test','test_test_unit_project.rb')
+      @path.should have_file('test',"test_#{name}.rb")
+    end
+  end
+
+  context "mini_test" do
+    let(:name) { 'mini_test_project' }
+
+    before(:all) do
+      generate!(name, :mini_test => true)
+    end
+
+    it "should disable the test_unit template" do
+      @generator.disabled_templates.should include(:test_unit)
+    end
+
+    it "should disable the rspec template" do
+      @generator.disabled_templates.should include(:rspec)
+    end
+
+    it "should create the test/ directory" do
+      @path.should have_directory('test')
+    end
+
+    it "should create the test/helper.rb file" do
+      @path.should have_file('test','helper.rb')
+    end
+
+    it "should add a single test_*.rb file" do
+      @path.should have_file('test',"test_#{name}.rb")
     end
   end
 
@@ -435,6 +455,10 @@ gemspec
       @generator.disabled_templates.should include(:test_unit)
     end
 
+    it "should disable the mini_test template" do
+      @generator.disabled_templates.should include(:mini_test)
+    end
+
     it "should not create the test/ directory" do
       @path.should_not have_directory('test')
     end
@@ -472,38 +496,6 @@ gemspec
     end
   end
 
-  context "jeweler tasks" do
-    let(:name) { 'jewelery_project' }
-
-    before(:all) do
-      generate!(name, :jeweler_tasks => true)
-    end
-
-    it "should disable the rubygems_tasks template" do
-      @generator.disabled_templates.should include(:rubygems_tasks)
-    end
-
-    it "should disable the bundler_tasks template" do
-      @generator.disabled_templates.should include(:bundler_tasks)
-    end
-
-    it "should add 'jeweler' as a development dependency" do
-      @gemspec.should have_development_dependency('jeweler')
-    end
-  end
-
-  context "jeweler tasks with bundler" do
-    let(:name) { 'bundled_jewelery_project' }
-
-    before(:all) do
-      generate!(name, :bundler => true, :jeweler_tasks => true)
-    end
-
-    it "should add 'jeweler' as a development dependency" do
-      @gemspec.should have_development_dependency('jeweler')
-    end
-  end
-
   context "rubygems-tasks" do
     let(:name) { 'rubygems_tasks_project' }
 
@@ -511,10 +503,6 @@ gemspec
       generate!(name, :rubygems_tasks => true)
     end
 
-    it "should disable the jeweler_tasks template" do
-      @generator.disabled_templates.should include(:jeweler_tasks)
-    end
-
     it "should disable the bundler_tasks template" do
       @generator.disabled_templates.should include(:bundler_tasks)
     end
@@ -543,10 +531,6 @@ gemspec
       generate!(name, :bundler_tasks => true)
     end
 
-    it "should disable the jeweler_tasks template" do
-      @generator.disabled_templates.should include(:jeweler_tasks)
-    end
-
     it "should disable the rubygems_tasks template" do
       @generator.disabled_templates.should include(:rubygems_tasks)
     end
@@ -567,10 +551,6 @@ gemspec
       @generator.disabled_templates.should include(:rubygems_tasks)
     end
 
-    it "should disable the jeweler_tasks template" do
-      @generator.disabled_templates.should include(:jeweler_tasks)
-    end
-
     it "should disable the bundler_tasks template" do
       @generator.disabled_templates.should include(:bundler_tasks)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ore
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 description: Ore is a flexible Ruby project generator. Unlike other Ruby project generators,
   Ore provides many builtin templates and allows custom templates to be installed
   from Git repositories.
@@ -119,7 +119,6 @@ files:
 - data/ore/templates/bundler_tasks/template.yml
 - data/ore/templates/gem_package_task/_tasks.erb
 - data/ore/templates/gem_package_task/template.yml
-- data/ore/templates/gem_test/.gemtest
 - data/ore/templates/gemspec/[name].gemspec.erb
 - data/ore/templates/gemspec/template.yml
 - data/ore/templates/gemspec_yml/[name].gemspec.erb
@@ -129,8 +128,9 @@ files:
 - data/ore/templates/git/template.yml
 - data/ore/templates/hg/.hgignore.erb
 - data/ore/templates/hg/template.yml
-- data/ore/templates/jeweler_tasks/_tasks.erb
-- data/ore/templates/jeweler_tasks/template.yml
+- data/ore/templates/mini_test/template.yml
+- data/ore/templates/mini_test/test/helper.rb.erb
+- data/ore/templates/mini_test/test/test_[name].rb.erb
 - data/ore/templates/rdoc/.document
 - data/ore/templates/rdoc/_tasks.erb
 - data/ore/templates/rdoc/template.yml
@@ -141,7 +141,6 @@ files:
 - data/ore/templates/rspec/template.yml
 - data/ore/templates/rubygems_tasks/_tasks.erb
 - data/ore/templates/rubygems_tasks/template.yml
-- data/ore/templates/rvmrc/.rvmrc.erb
 - data/ore/templates/test_unit/_tasks.erb
 - data/ore/templates/test_unit/template.yml
 - data/ore/templates/test_unit/test/helper.rb.erb
@@ -166,6 +165,7 @@ files:
 - lib/ore/template/helpers.rb
 - lib/ore/template/interpolations.rb
 - lib/ore/template/template.rb
+- lib/ore/version.rb
 - ore.gemspec
 - spec/gemspec_examples.rb
 - spec/generator_spec.rb

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

@@ -1,13 +0,0 @@
-<%- if bundler? -%>
-require 'jeweler'
-Jeweler::Tasks.new(Gem::Specification.load('<%= @name %>.gemspec'))
-<%- else -%>
-begin
-  gem 'jeweler', '<%= @development_dependencies['jeweler'] %>'
-  require 'jeweler'
-
-  Jeweler::Tasks.new(Gem::Specification.load('<%= @name %>.gemspec'))
-rescue LoadError
-  warn 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
-end
-<%- end -%>

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

@@ -1,6 +0,0 @@
-disable:
-  - rubygems_tasks
-  - bundler_tasks
-
-development_dependencies:
-  jeweler: ~> 1.5.0  

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

@@ -1 +0,0 @@
-rvm use --create @<%= @name %>