ore 0.2.3 → 0.3.0

data/.document

@@ -1,4 +1,3 @@
 -
 ChangeLog.md
-GemspecYML.md
 LICENSE.txt

data/ChangeLog.md

@@ -1,3 +1,13 @@
+### 0.3.0 / 2010-11-07
+
+* Split all non-CLI and non-Generator related code out into
+  [ore-core](http://github.com/ruby-ore/ore-core).
+* {Ore::Generator}:
+  * Added {Ore::Template::Helpers#jeweler_tasks?}.
+  * Added {Ore::Template::Helpers#ore_tasks?}.
+  * Do not include `ore-core` as a development dependency if either
+    `--bundler` or `--ore-tasks` is enabled.
+
 ### 0.2.3 / 2010-11-01
 
 * Fixed path interpolation on Windows:
@@ -13,23 +23,23 @@
 
 ### 0.2.2 / 2010-10-30
 
-* Added {Ore::Project#root}.
+* Added `Ore::Project#root`.
 
 ### 0.2.1 / 2010-10-29
 
 * Ignore 'ruby' and 'java' from namespace directories returned from
-  {Ore::Naming#namespace_dirs_of}.
+  `Ore::Naming#namespace_dirs_of`.
 * Ignore 'ruby' and 'java' from module names returned from
-  {Ore::Naming#modules_of}.
+  `Ore::Naming#modules_of`.
 
 ### 0.2.0 / 2010-10-27
 
-* Added {Ore::Project#requirements}.
-* Added {Ore::Settings#set_requirements!}.
+* Added `Ore::Project#requirements`.
+* Added `Ore::Settings#set_requirements!`.
 * Added {Ore::Template::InvalidTemplate}.
 * Added {Ore::Template::Directory#load!}.
 * Suppress `no rubyforge_project specified` warnings by setting the
-  `rubyforge_project` to the project name in {Ore::Project#to_gemspec}.
+  `rubyforge_project` to the project name in `Ore::Project#to_gemspec`.
 * Do not add extra dependencies to the `gemspec.yml` file when generating
   a Bundler enabled project. Extra dependencies will be added to the
   `Gemfile` and controlled by Bundler.
@@ -44,7 +54,7 @@
 * Increased documentation coverage.
 * Make sure {Ore::Config.builtin_templates} and
   {Ore::Config.installed_templates} only yield valid directories.
-* Ensure that {Ore::Settings} handles versions as Strings.
+* Ensure that `Ore::Settings` handles versions as Strings.
 * Fixed two typos.
 
 ### 0.1.3 / 2010-10-25
@@ -65,17 +75,17 @@
 
 * Initial release:
   * Added {Ore::Config}.
-  * Added {Ore::Naming}.
-  * Added {Ore::DocumentFile}.
-  * Added {Ore::Versions}:
-    * Added {Ore::Versions::Version}.
-    * Added {Ore::Versions::VersionConstant}.
-    * Added {Ore::Versions::VersionFile}.
-  * Added {Ore::Project}:
-    * Added {Ore::Checks}.
-    * Added {Ore::Defaults}.
-    * Added {Ore::Settings}.
-  * Added {Ore::Specification}.
+  * Added `Ore::Naming`.
+  * Added `Ore::DocumentFile`.
+  * Added `Ore::Versions`:
+    * Added `Ore::Versions::Version`.
+    * Added `Ore::Versions::VersionConstant`.
+    * Added `Ore::Versions::VersionFile`.
+  * Added `Ore::Project`:
+    * Added `Ore::Checks`.
+    * Added `Ore::Defaults`.
+    * Added `Ore::Settings`.
+  * Added `Ore::Specification`.
   * Added {Ore::Template}:
     * Added {Ore::Template::Directory}.
     * Added {Ore::Template::Interpolations}.

data/README.md

@@ -15,7 +15,6 @@ the developer to keep all of the project information in a single YAML file.
 ## Features
 
 * Stores project information in **one YAML file** (`gemspec.yml`).
-* Has only **one** dependency ([thor](http://github.com/wycats/thor)).
 * **Does not** impose a development workflow onto the developer. One could
   even use Ore with `Jeweler::Tasks`.
 * **Can** load the project version from:
@@ -34,6 +33,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.0
 * [thor](http://github.com/wycats/thor) ~> 0.14.3
 
 ## Install
@@ -45,7 +45,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.2.0
+    version: 0.3.0
     summary: Mine raw RubyGems from YAML.
     description:
       Ore is a simple RubyGem building solution. Ore handles the
@@ -56,18 +56,20 @@ The `gemspec.yml` file used to build Ore:
     license: MIT
     authors: Postmodern
     email: postmodern.mod3@gmail.com
-    homepage: http://github.com/postmodern/ore
+    homepage: http://github.com/ruby-ore/ore
     has_yard: true
     
     dependencies:
+      ore-core: ~> 0.1.0
       thor: ~> 0.14.3
     
     development_dependencies:
-      yard: ~> 0.6.1
+      ore-tasks: ~> 0.2.0
       rspec: ~> 2.0.0
+      yard: ~> 0.6.1
 
-For a complete refrence to the `gemspec.yml` file, please see
-{file:GemspecYML.md}.
+For a complete refrence to the `gemspec.yml` file, please see the
+[GemspecYML Reference](http://rubydoc.info/gems/ore-core/file/GemspecYML.html)
 
 ## Synopsis
 

data/Rakefile

@@ -1,6 +1,16 @@
 require 'rubygems'
 require 'rake'
 
+begin
+  gem 'ore-tasks', '~> 0.2.0'
+  require 'ore/tasks'
+
+  Ore::Tasks.new
+rescue LoadError => e
+  STDERR.puts e.message
+  STDERR.puts "Run `gem install ore-tasks` to install 'ore/tasks'."
+end
+
 begin
   gem 'rspec', '~> 2.0.0'
   require 'rspec/core/rake_task'

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

@@ -6,5 +6,5 @@ begin
   end
 rescue NameError
   STDERR.puts "The '<%= @name %>.gemspec' file requires Ore."
-  STDERR.puts "Run `gem install ore` to install Ore."
+  STDERR.puts "Run `gem install ore-core` to install Ore."
 end

data/data/ore/templates/base/_gemfile.erb

@@ -1 +1 @@
-  gem 'ore',  '<%= @ore_dependency %>'
+  gem 'ore-core',  '<%= @ore_dependency %>'

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

@@ -19,7 +19,7 @@ homepage: <%= @homepage %>
 <%= includes :gemspec, '' -%>
 
 development_dependencies:
-<%- unless bundler? -%>
-  ore: <%= @ore_dependency %>
+<%- unless (bundler? || ore_tasks?) -%>
+  ore-core: <%= @ore_dependency %>
 <%- end -%>
 <%= includes :dependencies, '' -%>

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

@@ -1,2 +1,2 @@
 data:
-  ore_dependency: ~> 0.2.0
+  ore_dependency: ~> 0.1.0

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

@@ -1,2 +1,2 @@
 data:
-  ore_tasks_dependency: ~> 0.1.0
+  ore_tasks_dependency: ~> 0.2.0

data/gemspec.yml

@@ -1,5 +1,5 @@
 name: ore
-version: 0.2.3
+version: 0.3.0
 summary: Mine raw RubyGems from YAML
 description:
   Ore is a simple RubyGem building solution. Ore handles the
@@ -14,8 +14,10 @@ homepage: http://github.com/ruby-ore/ore
 has_yard: true
 
 dependencies:
+  ore-core: ~> 0.1.0
   thor: ~> 0.14.3
 
 development_dependencies:
-  yard: ~> 0.6.1
+  ore-tasks: ~> 0.2.0
   rspec: ~> 2.0.0
+  yard: ~> 0.6.1

data/lib/ore/generator.rb

@@ -141,7 +141,7 @@ module Ore
       
       @enabled_templates.each do |name|
         unless (template_dir = Generator.templates[name])
-          say "Unknown template #{name.dump}", :red
+          say "Unknown template #{name}", :red
           exit -1
         end
 

data/lib/ore/template/helpers.rb

@@ -97,6 +97,30 @@ module Ore
         enabled?(:bundler)
       end
 
+      #
+      # Determines if the project is using `Jeweler::Tasks`.
+      #
+      # @return [Boolean]
+      #   Specifies whether the project is using `Jeweler::Tasks`.
+      #
+      # @since 0.3.0
+      #
+      def jeweler_tasks?
+        enabled?(:jeweler_tasks)
+      end
+
+      #
+      # Determines if the project is using `Ore::Tasks`.
+      #
+      # @return [Boolean]
+      #   Specifies whether the project is using `Ore::Tasks`.
+      #
+      # @since 0.3.0
+      #
+      def ore_tasks?
+        enabled?(:ore_tasks)
+      end
+
       #
       # Creates an indentation string.
       #

data/ore.gemspec

@@ -1,6 +1,10 @@
-lib_dir = File.expand_path('lib',File.dirname(__FILE__))
-$LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
+# -*- encoding: utf-8 -*-
 
-require 'ore/specification'
-
-Ore::Specification.new
+begin
+  Ore::Specification.new do |gemspec|
+    # custom logic here
+  end
+rescue NameError
+  STDERR.puts "The 'ore.gemspec' file requires Ore."
+  STDERR.puts "Run `gem install ore-ore` to install Ore."
+end

data/spec/generator_spec.rb

@@ -76,7 +76,7 @@ describe Generator do
       end
 
       it "should have 'ore' as a development dependency" do
-        subject['development_dependencies'].should have_key('ore')
+        subject['development_dependencies'].should have_key('ore-core')
       end
     end
 
@@ -264,6 +264,10 @@ describe Generator do
       generate!(name, :ore_tasks => true)
     end
 
+    it "should omit 'ore-core' as a development dependency" do
+      @gemspec['development_dependencies'].should_not have_key('ore-core')
+    end
+
     it "should add 'ore-tasks' as a development dependency" do
       @gemspec['development_dependencies'].should have_key('ore-tasks')
     end
@@ -276,6 +280,10 @@ describe Generator do
       generate!(name, :bundler => true, :ore_tasks => true)
     end
 
+    it "should omit 'ore-core' as a development dependency" do
+      @gemspec['development_dependencies'].should_not have_key('ore-core')
+    end
+
     it "should not add 'ore-tasks' as a development dependency" do
       @gemspec['development_dependencies'].should_not have_key('ore-tasks')
     end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require 'rspec'
+
+gem 'ore-core', '~> 0.1.0'
 require 'ore/config'
 
 include Ore

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Postmodern
@@ -14,13 +14,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 -07:00
+date: 2010-11-07 00:00:00 -07:00
 default_executable: ore
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: ore-core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 0
+        version: 0.1.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: thor
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,26 +46,26 @@ dependencies:
         - 3
         version: 0.14.3
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: ore-tasks
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 6
-        - 1
-        version: 0.6.1
+        - 2
+        - 0
+        version: 0.2.0
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,7 +76,22 @@ dependencies:
         - 0
         version: 2.0.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 1
+        version: 0.6.1
+  type: :development
+  version_requirements: *id005
 description: Ore is a simple RubyGem building solution. Ore handles the creation of Gem::Specification objects as well as building '.gem' files. Ore allows the developer to keep all of the project information in a single YAML file.
 email: postmodern.mod3@gmail.com
 executables: 
@@ -72,14 +102,12 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 - ChangeLog.md
-- GemspecYML.md
 - LICENSE.txt
 files: 
 - .document
 - .rspec
 - .yardopts
 - ChangeLog.md
-- GemspecYML.md
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -129,74 +157,19 @@ files:
 - data/ore/templates/yard/_tasks.erb
 - data/ore/templates/yard/template.yml
 - gemspec.yml
-- lib/ore.rb
-- lib/ore/checks.rb
 - lib/ore/cli.rb
 - lib/ore/config.rb
-- lib/ore/defaults.rb
-- lib/ore/dependency.rb
-- lib/ore/document_file.rb
-- lib/ore/exceptions.rb
-- lib/ore/exceptions/exception.rb
-- lib/ore/exceptions/invalid_metadata.rb
-- lib/ore/exceptions/project_not_found.rb
 - lib/ore/generator.rb
-- lib/ore/naming.rb
-- lib/ore/paths.rb
-- lib/ore/project.rb
-- lib/ore/settings.rb
-- lib/ore/specification.rb
 - lib/ore/template.rb
 - lib/ore/template/directory.rb
 - lib/ore/template/exceptions.rb
 - lib/ore/template/exceptions/invalid_template.rb
 - lib/ore/template/helpers.rb
 - lib/ore/template/interpolations.rb
-- lib/ore/versions.rb
-- lib/ore/versions/exceptions.rb
-- lib/ore/versions/exceptions/invalid_version.rb
-- lib/ore/versions/version.rb
-- lib/ore/versions/version_constant.rb
-- lib/ore/versions/version_file.rb
-- lib/rubygems_plugin.rb
 - ore.gemspec
-- spec/dependency_spec.rb
-- spec/document_file_spec.rb
 - spec/generator_spec.rb
-- spec/helpers/files.rb
-- spec/helpers/files/.document
-- spec/helpers/files/VERSION
-- spec/helpers/files/VERSION.yml
 - spec/helpers/generator.rb
-- spec/helpers/projects.rb
-- spec/helpers/projects/dm-is-plugin/Gemfile
-- spec/helpers/projects/dm-is-plugin/VERSION
-- spec/helpers/projects/dm-is-plugin/dm-is-plugin.gemspec
-- spec/helpers/projects/dm-is-plugin/gemspec.yml
-- spec/helpers/projects/dm-is-plugin/lib/dm-is-plugin.rb
-- spec/helpers/projects/dm-is-plugin/lib/dm-is-plugin/is/plugin.rb
-- spec/helpers/projects/explicit/gemspec.yml
-- spec/helpers/projects/explicit/lib/explicit/version.rb
-- spec/helpers/projects/ffi-binding/gemspec.yml
-- spec/helpers/projects/ffi-binding/lib/ffi/binding/version.rb
-- spec/helpers/projects/jewelery/VERSION
-- spec/helpers/projects/jewelery/bin/jewelery
-- spec/helpers/projects/jewelery/gemspec.yml
-- spec/helpers/projects/jewelery/jewelery.gemspec
-- spec/helpers/projects/jewelery/lib/jewelery.rb
-- spec/helpers/projects/jewelery/lib/jewelery/rubies.rb
-- spec/helpers/projects/minimal/gemspec.yml
-- spec/helpers/projects/minimal/lib/minimal.rb
-- spec/naming_spec.rb
-- spec/projects/dm_plugin_project_spec.rb
-- spec/projects/explicit_project_spec.rb
-- spec/projects/ffi_binding_project_spec.rb
-- spec/projects/jeweler_project_spec.rb
-- spec/projects/minimal_project_spec.rb
-- spec/projects/project_examples.rb
 - spec/spec_helper.rb
-- spec/versions/version_file_spec.rb
-- spec/versions/version_spec.rb
 has_rdoc: yard
 homepage: http://github.com/ruby-ore/ore
 licenses: 
@@ -230,14 +203,4 @@ signing_key:
 specification_version: 3
 summary: Mine raw RubyGems from YAML
 test_files: 
-- spec/dependency_spec.rb
-- spec/naming_spec.rb
-- spec/document_file_spec.rb
 - spec/generator_spec.rb
-- spec/versions/version_spec.rb
-- spec/versions/version_file_spec.rb
-- spec/projects/jeweler_project_spec.rb
-- spec/projects/minimal_project_spec.rb
-- spec/projects/explicit_project_spec.rb
-- spec/projects/dm_plugin_project_spec.rb
-- spec/projects/ffi_binding_project_spec.rb