ore-core 0.1.4 → 0.1.5

data/ChangeLog.md

@@ -1,8 +1,15 @@
+### 0.1.5 / 2011-04-08
+
+* Added {Ore::RubyGems}.
+* Do not set `default_executable` in {Ore::RubyGems#to_gemspec} on RubyGems
+  >= 1.7.0.
+* Specs now pass on JRuby 1.6.0 under 1.9 mode.
+
 ### 0.1.4 / 2011-02-25
 
 * Added `core` to the list of namespaces to ignore.
 * Bypass the filtering of `Gem::Specification#has_rdoc=` added by RubyGems
-  1.5.x in {Ore::Project#to_gemspec}.
+  1.5.x in `Ore::Project#to_gemspec`.
 
 ### 0.1.3 / 2011-02-12
 
@@ -64,5 +71,5 @@
     * Added {Ore::Settings}.
   * Added {Ore::Specification}.
 * Added {Ore::Project#post_install_message}.
-* Added {Ore::Settings#set_post_install_message!}.
+* Added `Ore::Settings#set_post_install_message!`.
 

data/README.md

@@ -2,8 +2,8 @@
 
 * [Source](http://github.com/ruby-ore/ore-core)
 * [Issues](http://github.com/ruby-ore/ore-core/issues)
-* [Documentation](http://rubydoc.info/gems/ore-core/file/README.md)
-* [Email](postmodern.mod3 at gmail.com)
+* [Documentation](http://rubydoc.info/gems/ore-core/frames)
+* [Email](mailto:postmodern.mod3 at gmail.com)
 * IRC: irc.freenode.net #ruby-ore
 
 ## Description
@@ -50,7 +50,7 @@ project information in a single YAML file.
 The `gemspec.yml` file used to build Ore:
 
     name: ore-core
-    version: 0.1.2
+    version: 0.1.5
     summary: Mine raw RubyGems from YAML.
     description:
       Ore is a simple RubyGem building solution. Ore handles the
@@ -65,8 +65,8 @@ The `gemspec.yml` file used to build Ore:
     has_yard: true
     
     development_dependencies:
-      yard: ~> 0.6.1
-      rspec: ~> 2.4.0
+      yard: ~> 0.6
+      rspec: ~> 2.4
 
 For a complete refrence to the `gemspec.yml` file, please see
 [GemspecYML Reference](http://rubydoc.info/gems/ore-core/file/GemspecYML.html).

data/gemspec.yml

@@ -1,5 +1,5 @@
 name: ore-core
-version: 0.1.4
+version: 0.1.5
 summary: Mine raw RubyGems from YAML
 description:
   Ore is a simple RubyGem building solution. Ore handles the

data/lib/ore/dependency.rb

@@ -1,4 +1,4 @@
-require 'rubygems/dependency'
+require 'rubygems'
 
 module Ore
   #

data/lib/ore/project.rb

@@ -5,14 +5,13 @@ require 'ore/paths'
 require 'ore/checks'
 require 'ore/inferences'
 require 'ore/settings'
+require 'ore/rubygems'
 require 'ore/document_file'
 
 require 'pathname'
 require 'yaml'
 require 'find'
 require 'fileutils'
-require 'rubygems/specification'
-require 'rubygems/builder'
 
 module Ore
   #
@@ -26,6 +25,7 @@ module Ore
     include Checks
     include Inferences
     include Settings
+    include RubyGems
 
     # The project metadata file
     @@metadata_file = 'gemspec.yml'
@@ -412,118 +412,24 @@ module Ore
 
     alias has_yard? has_yard
 
-    #
-    # Populates a Gem Specification using the metadata of the project.
-    #
-    # @yield [gemspec]
-    #   The given block will be passed the populated Gem Specification
-    #   object.
-    #
-    # @yieldparam [Gem::Specification] gemspec
-    #   The newly created Gem Specification.
-    #
-    # @return [Gem::Specification]
-    #   The Gem Specification.
-    #
-    # @see http://rubygems.rubyforge.org/rdoc/Gem/Specification.html
-    #
-    def to_gemspec
-      Gem::Specification.new do |gemspec|
-        gemspec.name = @name.to_s
-        gemspec.version = @version.to_s
-        gemspec.summary = @summary.to_s
-        gemspec.description = @description.to_s
-        gemspec.licenses = @licenses
-        gemspec.authors = @authors
-        gemspec.homepage = @homepage
-        gemspec.email = @emails
-        gemspec.date = @date
-
-        @require_paths.each do |path|
-          unless gemspec.require_paths.include?(path)
-            gemspec.require_paths << path
-          end
-        end
-
-        gemspec.executables = @executables
-        gemspec.default_executable = @default_executable
-
-        # forcibly set the @has_rdoc ivar, as RubyGems 1.5.x disables the
-        # #has_rdoc= writer method.
-        if gemspec.instance_variable_defined?('@has_rdoc')
-          case @documentation
-          when :yard
-            gemspec.instance_variable_set('@has_rdoc','yard')
-          when :rdoc
-            gemspec.instance_variable_set('@has_rdoc',true)
-          when nil
-            gemspec.instance_variable_set('@has_rdoc',false)
-          end
-        end
-
-        gemspec.extra_rdoc_files = @extra_doc_files
-        gemspec.files = @files
-        gemspec.test_files = @test_files
-        gemspec.post_install_message = @post_install_message
-
-        gemspec.requirements = @requirements
-
-        if gemspec.respond_to?(:required_ruby_version=)
-          gemspec.required_ruby_version = @required_ruby_version
-        end
-
-        if gemspec.respond_to?(:required_rubygems_version=)
-          gemspec.required_rubygems_version = @required_rubygems_version
-        end
-
-        @dependencies.each do |dep|
-          gemspec.add_dependency(dep.name,*dep.versions)
-        end
-
-        if gemspec.respond_to?(:add_runtime_dependency)
-          @runtime_dependencies.each do |dep|
-            gemspec.add_runtime_dependency(dep.name,*dep.versions)
-          end
-        else
-          @runtime_dependencies.each do |dep|
-            gemspec.add_dependency(dep.name,*dep.versions)
-          end
-        end
-
-        if gemspec.respond_to?(:add_development_dependency)
-          @development_dependencies.each do |dep|
-            gemspec.add_development_dependency(dep.name,*dep.versions)
-          end
-        else
-          @development_dependencies.each do |dep|
-            gemspec.add_dependency(dep.name,*dep.versions)
-          end
-        end
-
-        # legacy information
-        if gemspec.respond_to?(:rubyforge_project=)
-          gemspec.rubyforge_project = gemspec.name
-        end
-
-        yield gemspec if block_given?
-      end
-    end
-
     #
     # Builds a gem for the project.
     #
+    # @param [Symbol] package
+    #   The type of package to build.
+    #
     # @return [Pathname]
     #   The path to the built gem file within the `pkg/` directory.
     #
-    def build!
-      pkg_dir = @root.join(@@pkg_dir)
-      FileUtils.mkdir_p(pkg_dir)
-
-      gem_file = Gem::Builder.new(self.to_gemspec).build
-      pkg_path = @root.join(pkg_file)
-
-      FileUtils.mv(gem_file,pkg_path)
-      return pkg_path
+    # @raise [ArgumentError]
+    #   The given package type is not supported.
+    #
+    def build!(package=:gem)
+      if package == :gem
+        to_gem
+      else
+        raise(ArgumentError,"unsupported package type #{package}")
+      end
     end
 
     protected

data/lib/ore/rubygems.rb

@@ -0,0 +1,132 @@
+require 'ore/paths'
+
+require 'rubygems'
+
+module Ore
+  module RubyGems
+    include Paths
+
+    #
+    # Populates a Gem Specification using the metadata of the project.
+    #
+    # @yield [gemspec]
+    #   The given block will be passed the populated Gem Specification
+    #   object.
+    #
+    # @yieldparam [Gem::Specification] gemspec
+    #   The newly created Gem Specification.
+    #
+    # @return [Gem::Specification]
+    #   The Gem Specification.
+    #
+    # @see http://rubygems.rubyforge.org/rdoc/Gem/Specification.html
+    #
+    # @since 0.1.5
+    #
+    def to_gemspec
+      Gem::Specification.new do |gemspec|
+        gemspec.name = @name.to_s
+        gemspec.version = @version.to_s
+        gemspec.summary = @summary.to_s
+        gemspec.description = @description.to_s
+        gemspec.licenses = @licenses
+        gemspec.authors = @authors
+        gemspec.homepage = @homepage
+        gemspec.email = @emails
+        gemspec.date = @date
+
+        @require_paths.each do |path|
+          unless gemspec.require_paths.include?(path)
+            gemspec.require_paths << path
+          end
+        end
+
+        gemspec.executables = @executables
+
+        # default_executable is deprecated in RubyGems 1.7.0 and will be
+        # removed after 2011-10-01.
+        if Gem::VERSION < '1.7.'
+          gemspec.default_executable = @default_executable
+        end
+
+        # forcibly set the @has_rdoc ivar, as RubyGems 1.5.x disables the
+        # #has_rdoc= writer method.
+        if gemspec.instance_variable_defined?('@has_rdoc')
+          case @documentation
+          when :yard
+            gemspec.instance_variable_set('@has_rdoc','yard')
+          when :rdoc
+            gemspec.instance_variable_set('@has_rdoc',true)
+          when nil
+            gemspec.instance_variable_set('@has_rdoc',false)
+          end
+        end
+
+        gemspec.extra_rdoc_files = @extra_doc_files
+        gemspec.files = @files
+        gemspec.test_files = @test_files
+        gemspec.post_install_message = @post_install_message
+
+        gemspec.requirements = @requirements
+
+        if gemspec.respond_to?(:required_ruby_version=)
+          gemspec.required_ruby_version = @required_ruby_version
+        end
+
+        if gemspec.respond_to?(:required_rubygems_version=)
+          gemspec.required_rubygems_version = @required_rubygems_version
+        end
+
+        @dependencies.each do |dep|
+          gemspec.add_dependency(dep.name,*dep.versions)
+        end
+
+        if gemspec.respond_to?(:add_runtime_dependency)
+          @runtime_dependencies.each do |dep|
+            gemspec.add_runtime_dependency(dep.name,*dep.versions)
+          end
+        else
+          @runtime_dependencies.each do |dep|
+            gemspec.add_dependency(dep.name,*dep.versions)
+          end
+        end
+
+        if gemspec.respond_to?(:add_development_dependency)
+          @development_dependencies.each do |dep|
+            gemspec.add_development_dependency(dep.name,*dep.versions)
+          end
+        else
+          @development_dependencies.each do |dep|
+            gemspec.add_dependency(dep.name,*dep.versions)
+          end
+        end
+
+        # legacy information
+        if gemspec.respond_to?(:rubyforge_project=)
+          gemspec.rubyforge_project = gemspec.name
+        end
+
+        yield gemspec if block_given?
+      end
+    end
+
+    #
+    # Builds a gem for the project.
+    #
+    # @return [Pathname]
+    #   The path to the built gem file within the `pkg/` directory.
+    #
+    # @since 0.1.5
+    #
+    def to_gem
+      pkg_dir = @root.join(@@pkg_dir)
+      FileUtils.mkdir_p(pkg_dir)
+
+      gem_file = Gem::Builder.new(self.to_gemspec).build
+      pkg_path = @root.join(pkg_file)
+
+      FileUtils.mv(gem_file,pkg_path)
+      return pkg_path
+    end
+  end
+end

data/lib/ore/versions/version.rb

@@ -1,6 +1,6 @@
 require 'ore/versions/exceptions/invalid_version'
 
-require 'rubygems/version'
+require 'rubygems'
 
 module Ore
   module Versions

data/spec/dependency_spec.rb

@@ -30,13 +30,13 @@ describe Dependency do
     it "should parse multiple versions" do
       dep = subject.parse_versions('foo', '~> 1.2.3, >= 1.4.0')
 
-      dep.versions.should == ['~> 1.2.3', '>= 1.4.0']
+      dep.versions.should =~ ['~> 1.2.3', '>= 1.4.0']
     end
 
     it "should parse an Array of versions" do
       dep = subject.parse_versions('foo', ['~> 1.2.3', '>= 1.4.0'])
 
-      dep.versions.should == ['~> 1.2.3', '>= 1.4.0']
+      dep.versions.should =~ ['~> 1.2.3', '>= 1.4.0']
     end
   end
 end

data/spec/helpers/projects/explicit/gemspec.yml

@@ -15,5 +15,5 @@ post_install_message: |
 
   $ explicit
 
-required_ruby_version: >= 1.8.7
-required_rubygems_version: >= 1.3.7
+required_ruby_version: ">= 1.8.7"
+required_rubygems_version: ">= 1.3.7"

data/spec/projects/project_examples.rb

@@ -32,9 +32,17 @@ shared_examples_for 'an Ore Project' do
     @project.authors.should_not be_empty
   end
 
-  it "should be able to create a Gem::Specification" do
-    Dir.chdir(@project.root) do
-      @project.to_gemspec.validate.should == true
+  describe "RubyGems" do
+    it "should be able to create a Gem::Specification" do
+      Dir.chdir(@project.root) do
+        @project.to_gemspec.validate.should == true
+      end
+    end
+
+    it "should be able to build a .gem package" do
+      Dir.chdir(@project.root) do
+        @project.to_gem.should be_file
+      end
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: ore-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Postmodern
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 -08:00
-default_executable: 
+date: 2011-04-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -70,6 +69,7 @@ files:
 - lib/ore/naming.rb
 - lib/ore/paths.rb
 - lib/ore/project.rb
+- lib/ore/rubygems.rb
 - lib/ore/settings.rb
 - lib/ore/specification.rb
 - lib/ore/versions.rb
@@ -114,7 +114,6 @@ files:
 - 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-core
 licenses: 
 - MIT
@@ -138,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ore-core
-rubygems_version: 1.5.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Mine raw RubyGems from YAML
@@ -153,3 +152,4 @@ test_files:
 - spec/projects/explicit_project_spec.rb
 - spec/projects/dm_plugin_project_spec.rb
 - spec/projects/ffi_binding_project_spec.rb
+has_rdoc: yard