ore 0.9.3 → 0.9.4

data/ChangeLog.md

@@ -1,3 +1,14 @@
+### 0.9.4 / 2012-07-23
+
+* Do not initialize the repository, if .git or .hg directories already exist.
+
+#### Templates
+
+* List all development dependencies in the [gemspec] and [gemspec_yml]
+  templates.
+  * Sort dependencies alphabetically.
+* Require `bundler/setup` in the [bin] script, if Bundler is enabled.
+
 ### 0.9.3 / 2012-05-28
 
 * Added the following template variables to {Ore::Generator}:

data/GemspecYML.md

@@ -227,22 +227,6 @@ More than one version can be specified for each dependency:
        - 1.2.3
        - 1.3.1
 
-## runtime_dependencies
-
-The purely runtime-dependencies for a project can be specified like so:
-
-    runtime_dependencies:
-      foo: ~> 0.1.0
-      bar: 1.2.3
-
-More than one version can be specified for each dependency:
-
-    runtime_dependencies:
-      foo: ~> 0.1.0, >= 0.0.7
-      bar:
-       - 1.2.3
-       - 1.3.1
-
 ## development_dependencies
 
 The purely developmental-dependencies for a project can be specified

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

@@ -8,7 +8,7 @@ begin
 rescue LoadError => e
   warn e.message
   warn "Run `gem install bundler` to install Bundler."
-  exit e.status_code
+  exit -1
 end
 
 begin

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

@@ -1,21 +1,16 @@
 #!/usr/bin/env ruby
 
-<%- if (bundler? && (git? || hg?)) -%>
-root_dir = File.expand_path(File.join(File.dirname(__FILE__),'..'))
-if File.directory?(File.join(root_dir,'.git'))
-  Dir.chdir(root_dir) do |path|
-    require 'bundler'
-
+<%- if (bundler? && (git? || hg? || svn?)) -%>
+root = File.expand_path(File.join(File.dirname(__FILE__),'..'))
+if File.directory?(File.join(root,'.<%= @scm %>'))
+  Dir.chdir(root) do
     begin
-      Bundler.setup(:default)
-    rescue Bundler::BundlerError => e
+      require 'bundler/setup'
+    rescue LoadError => e
       warn e.message
-      warn "Run `bundle install` to install missing gems"
-      exit e.status_code
+      warn "Run `gem install bundler` to install Bundler"
+      exit -1
     end
   end
-
-  lib_dir = File.join(root_dir,'lib')
-  $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
 end
 <%- end -%>

data/data/ore/templates/bundler/Gemfile.erb

@@ -1,27 +1,17 @@
 source :rubygems
 <%- includes(:gemfile_prelude,'') do |prelude| -%>
 
-<%= prelude %>
+<%= prelude -%>
 <%- end -%>
 
 gemspec
 <%- includes(:gemfile,'') do |gemfile| -%>
 
-<%= gemfile %>
-<%- end -%>
-<%- unless @dependencies.empty? -%>
-
-<%-   @dependencies.each do |name,version| -%>
-  gem '<%= name %>',  '<%= version %>'
-<%-   end -%>
+<%= gemfile -%>
 <%- end -%>
+<%- includes(:gemfile_development,'') do |gemfile| -%>
 
 group :development do
-<%= includes(:gemfile_development,'') -%>
-<%- unless @development_dependencies.empty? -%>
-
-<%-   @development_dependencies.each do |name,version| -%>
-  gem '<%= name %>',  '<%= version %>'
-<%-   end -%>
-<%- end -%>
+<%= gemfile -%>
 end
+<%- end -%>

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

@@ -28,20 +28,13 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 <%- unless @dependencies.empty? -%>
 
-<%-   @dependencies.each do |name,version| -%>
+<%-   @dependencies.sort.each do |name,version| -%>
   gem.add_dependency '<%= name %>', '<%= version %>'
 <%-   end -%>
 <%- end -%>
 
-<%- if bundler? -%>
-  gem.add_development_dependency 'bundler', '<%= @development_dependencies['bundler'] %>'
-<%-   if yard? -%>
-  gem.add_development_dependency 'yard', '<%= @development_dependencies['yard'] %>'
-<%-   end -%>
-<%- else -%>
-<%-   unless @development_dependencies.empty? -%>
-<%-     @development_dependencies.each do |name,version| -%>
+<%- unless @development_dependencies.empty? -%>
+<%-   @development_dependencies.sort.each do |name,version| -%>
   gem.add_development_dependency '<%= name%>', '<%= version %>'
-<%-     end -%>
 <%-   end -%>
 <%- end -%>end

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

@@ -20,22 +20,14 @@ homepage: <%= @homepage %>
 <%- unless @dependencies.empty? -%>
 
 dependencies:
-<%-   @dependencies.each do |name,version| -%>
+<%-   @dependencies.sort.each do |name,version| -%>
   <%= name %>: <%= version %>
 <%-   end -%>
 <%- end -%>
 
-<%- if bundler? -%>
+<%- unless @development_dependencies.empty? -%>
 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| -%>
+<%-   @development_dependencies.sort.each do |name,version| -%>
   <%= name %>: <%= version %>
-<%-     end -%>
 <%-   end -%>
 <%- end -%>

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

@@ -9,6 +9,6 @@ begin
   Gem::Tasks.new
 rescue LoadError => e
   warn e.message
-  warn "Run `gem install rubygems-tasks` to install 'rubygems/tasks'."
+  warn "Run `gem install rubygems-tasks` to install Gem::Tasks."
 end
 <%- end -%>

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

@@ -5,4 +5,4 @@ ignore:
   - doc/
 
 development_dependencies:
-  yard: ~> 0.7
+  yard: ~> 0.8

data/gemspec.yml

@@ -1,5 +1,5 @@
 name: ore
-version: 0.9.3
+version: 0.9.4
 summary: Mine beautiful RubyGems from Ore
 description:
   Ore is a flexible Ruby project generator. Unlike other Ruby project

data/lib/ore/generator.rb

@@ -83,13 +83,17 @@ module Ore
       in_root do
         case @scm
         when :git
-          run 'git init' unless File.directory?('.git')
-          run 'git add .'
-          run 'git commit -m "Initial commit."'
+          unless File.directory?('.git')
+            run 'git init'
+            run 'git add .'
+            run 'git commit -m "Initial commit."'
+          end
         when :hg
-          run 'hg init' unless File.directory?('.hg')
-          run 'hg add .'
-          run 'hg commit -m "Initial commit."'
+          unless File.directory?('.hg')
+            run 'hg init'
+            run 'hg add .'
+            run 'hg commit -m "Initial commit."'
+          end
         when :svn
           @ignore.each do |pattern|
             run "svn propset svn:ignore #{pattern.dump}"

data/spec/generator_spec.rb

@@ -230,6 +230,15 @@ describe Generator do
       @gemspec.should have_development_dependency('bundler')
     end
 
+    it "should not have any dependencies in the Gemfile" do
+      gemfile = (@path + 'Gemfile').read
+      gemfile.should eq(<<-GEMFILE)
+source :rubygems
+
+gemspec
+      GEMFILE
+    end
+
     it "should add 'Gemfile.lock' to the .gitignore file" do
       gitignore.should include('Gemfile.lock')
     end
@@ -458,8 +467,8 @@ describe Generator do
       generate!(name, :bundler => true, :rspec => true)
     end
 
-    it "should not add 'rspec' as a development dependency" do
-      @gemspec.should_not have_development_dependency('rspec')
+    it "should add 'rspec' as a development dependency" do
+      @gemspec.should have_development_dependency('rspec')
     end
   end
 
@@ -490,8 +499,8 @@ describe Generator do
       generate!(name, :bundler => true, :jeweler_tasks => true)
     end
 
-    it "should not add 'jeweler' as a development dependency" do
-      @gemspec.should_not have_development_dependency('jeweler')
+    it "should add 'jeweler' as a development dependency" do
+      @gemspec.should have_development_dependency('jeweler')
     end
   end
 
@@ -522,8 +531,8 @@ describe Generator do
       generate!(name, :bundler => true, :rubygems_tasks => true)
     end
 
-    it "should not add 'rubygems-tasks' as a development dependency" do
-      @gemspec.should_not have_development_dependency('rubygems-tasks')
+    it "should add 'rubygems-tasks' as a development dependency" do
+      @gemspec.should have_development_dependency('rubygems-tasks')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ore
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor