ore 0.9.0 → 0.9.1

data/ChangeLog.md

@@ -1,3 +1,13 @@
+### 0.9.1 / 2012-05-20
+
+* Require thor ~> 0.14.
+
+#### Templates
+
+* Use the newer `RDoc::Task` in the [rdoc] template.
+  * Require rdoc ~> 3.0.
+* Simplify the `.rvmrc` file in the [rvmrc] template.
+
 ### 0.9.0 / 2012-04-28
 
 * Removed the ore-core dependency.

data/README.md

@@ -76,7 +76,7 @@ Additional templates can also be installed from Git:
 
 ## Requirements
 
-* [thor](http://github.com/wycats/thor) ~> 0.14.3
+* [thor](http://github.com/wycats/thor) ~> 0.14
 
 ## Install
 
@@ -96,6 +96,11 @@ Generate a new project using previously installed templates:
 
     $ mine my_project --bundler --rspec --yard --templates mini_test
 
+Set your github username, so `mine` can generate GitHub project URLs:
+
+    $ git config github.user foobar
+    $ mine my_project
+
 Install a custom template:
 
     $ ore install git://github.com/ruby-ore/mini_test.git

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

@@ -1,5 +1,19 @@
+<%- if bundler? -%>
 require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
+RDoc::Task.new do |rdoc|
   rdoc.title = <%= @name.dump %>
 end
+<%- else -%>
+begin
+  gem 'rdoc', '<%= @development_dependencies['rdoc'] %>'
+  require 'rdoc/task'
+
+  RDoc::Task.new do |rdoc|
+    rdoc.title = <%= @name.dump %>
+  end
+rescue LoadError => e
+  warn e.message
+  warn "Run `gem install rdoc` to install 'rdoc/task'."
+end
+<%- end -%>
 task :doc => :rdoc

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

@@ -6,3 +6,6 @@ ignore:
 
 variables:
   markup: :rdoc
+
+development_dependencies:
+  rdoc: ~> 3.0

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

@@ -14,5 +14,5 @@ rescue LoadError => e
 end
 <%- end -%>
 
-task :test => :spec
+task :test    => :spec
 task :default => :spec

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

@@ -1,46 +1 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# 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 -%>"
-
-#
-# First we attempt to load the desired environment directly from the environment
-# file, this is very fast and efficicent compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-#
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]] ; then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create  "$environment_id"
-fi
-<%- if bundler? -%>
-
-#
-# If you use bundler and would like to run bundle each time you enter the
-# directory you can uncomment the following code.
-#
-
-# 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
-fi
-
-# Bundle while reducing excess noise.
-printf "Bundling your gems this may take a few minutes on a fresh clone.\n"
-bundle | grep -v 'Using' | grep -v 'complete' | sed '/^$/d'
-<%- end -%>
+rvm use --create @<%= @name %>

data/gemspec.yml

@@ -1,5 +1,5 @@
 name: ore
-version: 0.9.0
+version: 0.9.1
 summary: Mine beautiful RubyGems from Ore
 description:
   Ore is a flexible Ruby project generator. Unlike other Ruby project
@@ -27,7 +27,7 @@ post_install_message: |
   **************************************************************************
 
 dependencies:
-  thor: ~> 0.14.3
+  thor: ~> 0.14
 
 development_dependencies:
   rubygems-tasks: ~> 0.2

data/spec/generator_spec.rb

@@ -246,6 +246,10 @@ describe Generator do
       @generator.disabled_templates.should include(:yard)
     end
 
+    it "should add 'rdoc' as a development dependency" do
+      @gemspec.should have_development_dependency('rdoc')
+    end
+
     it "should set @markup to :rdoc" do
       @generator.instance_variable_get('@markup').should == :rdoc
     end
@@ -296,6 +300,10 @@ describe Generator do
       @path.should have_file('.document')
     end
 
+    it "should add 'yard' as a development dependency" do
+      @gemspec.should have_development_dependency('yard')
+    end
+
     context ".document" do
       it "should not include 'lib/**/*.rb'" do
         document.should_not include('lib/**/*.rb')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ore
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2012-05-21 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.3
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.3
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Mine beautiful RubyGems from Ore