ore 0.6.0 → 0.7.0

data/ChangeLog.md

@@ -1,3 +1,15 @@
+### 0.7.0 / 2011-02-19
+
+* Require ore-core ~> 0.1, >= 0.1.2.
+* Added {Ore::Template::Helpers#git?}.
+* Added {Ore::Template::Helpers#bin?}.
+* Added the `bin` template and `--bin` option to {Ore::Generator}.
+* Enable `--ore-tasks` by default.
+* Allow `--jeweler-tasks` to disable `--ore-tasks`.
+* Relax ore-tasks dependency to `~> 0.4`.
+* Relax rspec dependency to `~> 2.4`.
+* Relax ore-core dependency to `~> 0.1`.
+
 ### 0.6.0 / 2011-02-12
 
 * Require ore-core ~> 0.1.2.

data/README.md

@@ -2,7 +2,7 @@
 
 * [Source](http://github.com/ruby-ore/ore)
 * [Issues](http://github.com/ruby-ore/ore/issues)
-* [Documentation](http://rubydoc.info/gems/ore/file/README.md)
+* [Documentation](http://rubydoc.info/gems/ore/frames)
 * [Email](mailto:postmodern.mod3 at gmail.com)
 * IRC: irc.freenode.net #ruby-ore
 
@@ -24,8 +24,18 @@ the developer to keep all of the project information in a single YAML file.
 
         require 'ore/specification'
         
-        Ore::Specification.new do |gemspec|
-          # custom logic here
+        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."
+          end
         end
 
 * Provides an **extendable** project **generator** that supports
@@ -33,7 +43,7 @@ the developer to keep all of the project information in a single YAML file.
 
 ## Requirements
 
-* [ore-core](http://github.com/ruby-ore/ore-core) ~> 0.1.2
+* [ore-core](http://github.com/ruby-ore/ore-core) ~> 0.1, >= 0.1.2
 * [thor](http://github.com/wycats/thor) ~> 0.14.3
 
 ## Install
@@ -45,7 +55,7 @@ the developer to keep all of the project information in a single YAML file.
 The `gemspec.yml` file used to build Ore:
 
     name: ore
-    version: 0.5.0
+    version: 0.7.0
     summary: Mine raw RubyGems from YAML.
     description:
       Ore is a simple RubyGem building solution. Ore handles the
@@ -62,7 +72,7 @@ The `gemspec.yml` file used to build Ore:
       **************************************************************************
       Generate a new Ruby library:
       
-          $ mine my_library --ore-tasks --rspec
+          $ mine my_library --rspec
       
       Build the library:
       
@@ -75,12 +85,12 @@ The `gemspec.yml` file used to build Ore:
       **************************************************************************
     
     dependencies:
-      ore-core: ~> 0.1.2
+      ore-core: ~> 0.1, >= 0.1.2
       thor: ~> 0.14.3
     
     development_dependencies:
-      ore-tasks: ~> 0.4.0
-      rspec: ~> 2.4.0
+      ore-tasks: ~> 0.4
+      rspec: ~> 2.4
       yard: ~> 0.6.1
 
 For a complete refrence to the `gemspec.yml` file, please see the

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'ore-tasks', '~> 0.4.0'
+  gem 'ore-tasks', '~> 0.4'
   require 'ore/tasks'
 
   Ore::Tasks.new
@@ -12,7 +12,7 @@ rescue LoadError => e
 end
 
 begin
-  gem 'rspec', '~> 2.4.0'
+  gem 'rspec', '~> 2.4'
   require 'rspec/core/rake_task'
 
   RSpec::Core::RakeTask.new

data/data/ore/templates/base/README.md.erb

@@ -3,7 +3,7 @@
 <%- if @homepage -%>
 * [Homepage](<%= @homepage %>)
 <%- end -%>
-* [Documentation](http://rubydoc.info/gems/<%= @name %>)
+* [Documentation](http://rubydoc.info/gems/<%= @name %>/frames)
 <%- if @safe_email -%>
 * [Email](mailto:<%= @safe_email %>)
 <%- end -%>
@@ -24,7 +24,7 @@
 
     $ gem install <%= @name %>
 
-<%- if @bin -%>
+<%- if bin? -%>
 ## Synopsis
 
     $ <%= @name %>

data/data/ore/templates/base/README.rdoc.erb

@@ -3,7 +3,7 @@
 <%- if @homepage -%>
 * {Homepage}[<%= @homepage %>]
 <%- end -%>
-* {Documentation}[http://rubydoc.info/gems/<%= @name %>]
+* {Documentation}[http://rubydoc.info/gems/<%= @name %>/frames]
 <%- if @safe_email -%>
 * {Email}[mailto:<%= @safe_email %>]
 <%- end -%>
@@ -24,7 +24,7 @@
 
   $ gem install <%= @name %>
 
-<%- if @bin -%>
+<%- if bin? -%>
 == Synopsis
 
   $ <%= @name %>

data/data/ore/templates/base/README.tt.erb

@@ -3,7 +3,7 @@ h1. <%= @name %>
 <%- if @homepage -%>
 * "Homepage":<%= @homepage %>
 <%- end -%>
-* "Documentation":http://rubydoc.info/gems/<%= @name %>
+* "Documentation":http://rubydoc.info/gems/<%= @name %>/frames
 <%- if @safe_email -%>
 * "Email":mailto:<%= @safe_email %>
 <%- end -%>
@@ -26,7 +26,7 @@ h2. Install
 bc.
 $ gem install <%= @name %>
 
-<%- if @bin -%>
+<%- if bin? -%>
 h2. Synopsis
 
 bc.

data/data/ore/templates/base/template.yml

@@ -1,2 +1,2 @@
 variables:
-  ore_core_dependency: ~> 0.1.0
+  ore_core_dependency: ~> 0.1

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

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+<%- if (bundler? && git?) -%>
+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'
+
+    begin
+      Bundler.setup(:default)
+    rescue Bundler::BundlerError => e
+      STDERR.puts e.message
+      STDERR.puts "Run `bundle install` to install missing gems"
+      exit e.status_code
+    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/jeweler_tasks/template.yml

@@ -1,2 +1,5 @@
+disables:
+  - ore_tasks
+
 variables:
   jeweler_dependency: ~> 1.5.0

data/data/ore/templates/ore_tasks/template.yml

@@ -1,2 +1,2 @@
 variables:
-  ore_tasks_dependency: ~> 0.4.0
+  ore_tasks_dependency: ~> 0.4

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

@@ -1,4 +1,5 @@
 disable:
   - test_unit
+
 variables:
-  rspec_dependency: ~> 2.4.0
+  rspec_dependency: ~> 2.4

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

@@ -1,4 +1,5 @@
 disable:
   - rdoc
+
 variables:
   yard_dependency: ~> 0.6.0

data/gemspec.yml

@@ -1,5 +1,5 @@
 name: ore
-version: 0.6.0
+version: 0.7.0
 summary: Mine raw RubyGems from YAML
 description:
   Ore is a simple RubyGem building solution. Ore handles the
@@ -16,7 +16,7 @@ post_install_message: |
   **************************************************************************
   Generate a new Ruby library:
   
-      $ mine my_library --ore-tasks --rspec
+      $ mine my_library --rspec
   
   Build the library:
   
@@ -29,10 +29,10 @@ post_install_message: |
   **************************************************************************
 
 dependencies:
-  ore-core: ~> 0.1.2
+  ore-core: ~> 0.1, >= 0.1.2
   thor: ~> 0.14.3
 
 development_dependencies:
-  ore-tasks: ~> 0.4.0
-  rspec: ~> 2.4.0
+  ore-tasks: ~> 0.4
+  rspec: ~> 2.4
   yard: ~> 0.6.1

data/lib/ore/generator.rb

@@ -62,6 +62,7 @@ module Ore
         :description => 'TODO: Description',
         :license => 'MIT',
         :authors => [ENV['USER']],
+        :ore_tasks => true,
         :rdoc => true,
         :rspec => true,
         :git => true
@@ -312,7 +313,9 @@ module Ore
         template.each_file(@markup) do |dest,file|
           unless generated.include?(dest)
             path = interpolate(dest)
+
             copy_file file, path
+            chmod path, File.stat(file).mode
 
             generated << dest
           end
@@ -322,11 +325,12 @@ module Ore
         template.each_template(@markup) do |dest,file|
           unless generated.include?(dest)
             path = interpolate(dest)
-
             @current_template_dir = File.dirname(dest)
+
             template file, path
-            @current_template_dir = nil
+            chmod path, File.stat(file).mode
 
+            @current_template_dir = nil
             generated << dest
           end
         end

data/lib/ore/template/helpers.rb

@@ -37,6 +37,18 @@ module Ore
         return output_buffer.join(separator)
       end
 
+      #
+      # Determines if Git is enabled.
+      #
+      # @return [Boolean]
+      #   Specifies whether Git was enabled.
+      #
+      # @since 0.7.0
+      #
+      def git?
+        options.git?
+      end
+
       #
       # Determines if a template was enabled.
       #
@@ -47,6 +59,18 @@ module Ore
         @enabled_templates.include?(name.to_sym)
       end
 
+      #
+      # Determines whether the project will have a bin script.
+      #
+      # @return [Boolean]
+      #   Specifies whether the project will have a bin script.
+      #
+      # @since 0.7.0
+      #
+      def bin?
+        enabled?(:bin)
+      end
+
       #
       # Determines if the project will contain RDoc documented.
       #

data/spec/generator_spec.rb

@@ -75,8 +75,8 @@ describe Generator do
         subject['homepage'].should_not be_empty
       end
 
-      it "should have 'ore' as a development dependency" do
-        subject['development_dependencies'].should have_key('ore-core')
+      it "should have 'ore-tasks' as a development dependency" do
+        subject['development_dependencies'].should have_key('ore-tasks')
       end
     end
 
@@ -105,6 +105,26 @@ describe Generator do
     end
   end
 
+  context "bin" do
+    let(:name) { 'script-project' }
+
+    before(:all) do
+      generate!(name, :bin => true)
+    end
+
+    it "should add a 'bin/' directory" do
+      @path.join('bin').should be_directory
+    end
+
+    it "should add a bin/script-project file" do
+      @path.join('bin',name).should be_file
+    end
+
+    it "should make the bin/script-project file executable" do
+      @path.join('bin',name).should be_executable
+    end
+  end
+
   context "gem test" do
     let(:name) { 'gem_test_project' }
 

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-gem 'rspec', '~> 2.4.0'
+gem 'rspec', '~> 2.4'
 require 'rspec'
 
 gem 'ore-core', '~> 0.1.0'

metadata

@@ -2,7 +2,7 @@
 name: ore
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Postmodern
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-12 00:00:00 -08:00
+date: 2011-02-19 00:00:00 -08:00
 default_executable: ore
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,6 +20,9 @@ dependencies:
     none: false
     requirements: 
     - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.1"
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 0.1.2
   type: :runtime
@@ -43,7 +46,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: "0.4"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -54,7 +57,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.4.0
+        version: "2.4"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -107,6 +110,7 @@ files:
 - data/ore/templates/base/lib/[namespace_path].rb.erb
 - data/ore/templates/base/lib/[namespace_path]/version.rb.erb
 - data/ore/templates/base/template.yml
+- data/ore/templates/bin/bin/[name].erb
 - data/ore/templates/bundler/Gemfile.erb
 - data/ore/templates/bundler/_development_dependencies.erb
 - data/ore/templates/bundler/_gitignore.erb
@@ -161,7 +165,7 @@ post_install_message: |
   **************************************************************************
   Generate a new Ruby library:
   
-      $ mine my_library --ore-tasks --rspec
+      $ mine my_library --rspec
   
   Build the library:
   
@@ -192,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ore
-rubygems_version: 1.5.0
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Mine raw RubyGems from YAML