jewel 0.0.3 → 0.0.4

data/lib/jewel/gem.rb

@@ -42,13 +42,13 @@ class << Jewel::Gem
   # @return [String] the gem root as an absolute path
   # @since 0.0.2
   def root(relative_to = nil)
-    # caller returns an array of strings that are like “file:line” or “file:line: in `method’”
-    file = caller.first.split(/:/).first
     arguments = []
     unless relative_to.nil?
       relative_to = relative_to.to_s
-      file = File.dirname file
-      arguments << File.expand_path(relative_to, file)
+      # caller returns an array of strings that are like “file:line” or “file:line: in `method’”
+      file = caller.first.split(/:/).first
+      directory = File.dirname file
+      arguments << File.expand_path(relative_to, directory)
     end
     metadata.send :root, *arguments
   end
@@ -59,7 +59,7 @@ class << Jewel::Gem
   # added instead.
   #
   # @param [String, Symbol, #to_s] gem the name of the gem
-  # @param [String, Symbol, #to_s] version the version of the gem
+  # @param [Array<String>] requirements the version requirements
   # @see development
   # @example
   #   depend_on :jewel    # runtime dependency
@@ -67,10 +67,9 @@ class << Jewel::Gem
   #   development do
   #     depend_on :rspec  # development dependency
   #   end
-  def depend_on(gem, version = nil)
-    metadata.send(if development?
-      :development_dependencies
-    else :dependencies end).merge! gem => version
+  def depend_on(gem, *requirements)
+    method = development? ? :add_development_dependency : :add_dependency
+    specification.send method, gem.to_s, *requirements
   end
 
   # Makes sure the correct versions of this gem's dependencies are loaded at
@@ -80,8 +79,8 @@ class << Jewel::Gem
   #   dependencies should be activated
   # @since 0.0.2
   def activate_dependencies!(options = {})
-    metadata.each_dependency options do |name, version|
-      gem name, version unless version.nil?
+    metadata.each_dependency options do |name, *requirements|
+      gem name, *requirements unless requirements.empty?
     end
   end
 
@@ -101,16 +100,18 @@ class << Jewel::Gem
     @development = false
   end
 
-  # Returns this gem's specification.
+  # Returns this gem's specification. If passed an existing instance, it will be
+  # stored as this gem's specification.
   #
+  # @param [::Gem::Specification] existing_specification the existing instance
   # @return [::Gem::Specification] the gem specification
-  # @see Jewel::Gem::Metadata#to_spec
-  def spec
-    metadata.to_spec
+  # @see Jewel::Gem::Metadata#gem_specification
+  def specification(existing_specification = nil)
+    metadata.gem_specification existing_specification
   end
 
-  alias gemspec spec
-  alias to_spec spec
+  alias spec    specification
+  alias to_spec specification
 
   private
 
@@ -128,7 +129,7 @@ class Jewel::Gem
 
   name! :jewel
   summary 'Easy access to gem metadata'
-  version '0.0.3'
+  version '0.0.4'
   homepage 'https://github.com/matheusmoreira/jewel'
   license 'Mozilla Public License, version 2.0'
 
@@ -142,6 +143,7 @@ class Jewel::Gem
     depend_on :bundler
     depend_on :redcarpet  # yard uses it for markdown formatting
     depend_on :rookie
+    depend_on :rspec
     depend_on :yard
   end
 

data/lib/jewel/gem/metadata.rb

@@ -17,33 +17,52 @@ module Jewel
         instance_eval &block unless block.nil?
       end
 
-      # Associates the name of the missing method with the given arguments.
+      # Assigns or returns attributes from the associated
+      # {#gem_specification gem specification}. If it doesn't respond to it, the
+      # attribute will be stored in this object.
       def method_missing(method_name, *arguments, &block)
         method = method_name.to_s.gsub(/[=?!\z]/ix, '').strip.intern
         count = arguments.count
-        return stored_attributes[method] if count.zero?
-        value = count == 1 ? arguments.first : arguments
-        stored_attributes[method] = value
+        if count.zero?
+          if spec.respond_to? method
+            spec.send method
+          else
+            stored_attributes[method]
+          end
+        else
+          writer_method = '='.prepend(method.to_s).intern
+          if spec.respond_to? writer_method
+            spec.send writer_method, *arguments
+          else
+            value = count == 1 ? arguments.first : arguments
+            stored_attributes[method] = value
+          end
+        end
       end
 
       # This gem's runtime dependencies.
       #
-      # @return [Hash] name => version pairs
+      # @return [Hash<String, Array<String>>] names of gems associated with
+      #                                       their requirements
       def dependencies
-        @dependencies ||= {}
+        convert_to_hash specification.runtime_dependencies
       end
 
+      alias runtime_dependencies dependencies
+
       # This gem's development dependencies.
       #
-      # @return [Hash] name => version pairs
+      # @return [Hash<String, Array<String>>] names of gems associated with
+      #                                       their requirements
       def development_dependencies
-        @development_dependencies ||= {}
+        convert_to_hash specification.development_dependencies
       end
 
-      # Runtime and development dependencies. The former takes precedence,
-      # should version requirements conflict.
+      # Runtime and development dependencies. The former takes precedence in
+      # case of conflict.
       #
-      # @return [Hash] name => version pairs
+      # @return [Hash<String, Array<String>>] names of gems associated with
+      #                                       their requirements
       # @since 0.0.2
       def all_dependencies
         development_dependencies.merge dependencies
@@ -53,47 +72,39 @@ module Jewel
       #
       # @option options [true, false, :only] :development (false) whether
       #   runtime and development dependencies should be included
+      # @yield [gem_name, *requirements]
       # @yieldparam [String] gem_name the name of the gem
-      # @yieldparam [String, nil] version the required version
+      # @yieldparam [Array<String>] requirements the version requirements
       # @since 0.0.2
-      def each_dependency(options = {})
+      def each_dependency(options = {}, &block)
         return enum_for :each_dependency, options unless block_given?
         development = options.fetch :development, false
         case development
           when :only then development_dependencies
           when  true then all_dependencies
           else dependencies
-        end.each do |gem_name, version|
-          yield gem_name.to_s, version
-        end
+        end.each &block
       end
 
-      # Uses the stored information to generate a ::Gem::Specification.
+      # The Gem::Specification. If passed an existing instance, it will be
+      # used instead.
       #
+      # @param [::Gem::Specification] existing_specification the existing
+      #                                                      instance
       # @return [::Gem::Specification] the specification
-      def to_spec
-        ::Gem::Specification.new do |gem_specification|
-
-          # Set all attributes
-          stored_attributes.keys.each do |key|
-            writer_method = '='.prepend(key.to_s).intern
-            if gem_specification.respond_to? writer_method
-              gem_specification.send writer_method, stored_attributes[key]
-            end
-          end
-
-          # Add the dependencies
-          {
-            :add_runtime_dependency => false,
-            :add_development_dependency => :only
-          }.each do |method, option|
-            each_dependency development: option do |*arguments|
-              gem_specification.send method, *arguments.compact
-            end
-          end
+      # @since 0.0.4
+      def gem_specification(existing_specification = nil)
+        unless existing_specification.nil?
+          @gem_specification = existing_specification
         end
+        @gem_specification ||= ::Gem::Specification.new
       end
 
+      alias spec          gem_specification
+      alias gemspec       gem_specification
+      alias to_spec       gem_specification
+      alias specification gem_specification
+
       private
 
       # The stored gem attributes.
@@ -103,6 +114,22 @@ module Jewel
         @stored_attributes ||= {}
       end
 
+      # Converts an array of Gem::Dependency objects into an array of hashes in
+      # the following form:
+      #
+      #   { 'gem_name' => ['= 0.0.0'], ... }
+      #
+      # @return [Hash<String, Array<String>>] names of gems associated with
+      #                                       their requirements
+      # @since 0.0.4
+      def convert_to_hash(dependencies)
+        Hash.new.tap do |hash|
+          dependencies.each do |dependency|
+            hash[dependency.name] = dependency.requirements_list
+          end
+        end
+      end
+
     end
 
   end

data/spec/jewel/gem_spec.rb

@@ -0,0 +1,65 @@
+require 'jewel'
+
+describe Jewel::Gem do
+
+  let(:example_name) { :example }
+  let(:example_summary) { 'Example description' }
+  let(:example_version) { '1.2.3' }
+  let(:example_homepage) { 'https://github.com/example/example' }
+  let(:example_license) { 'Mozilla Public License, version 2.0' }
+
+  let(:example_author) { 'Person' }
+  let(:example_email) { 'person@example.com' }
+
+  let(:example_files) { [] }
+
+  let(:example_runtime_dependency) { 'jewel' }
+  let(:example_development_dependency) { 'rookie' }
+
+  let :gem do
+    Class.new(Jewel::Gem).tap do |gem_class|
+      gem_class.name! example_name
+      gem_class.summary example_summary
+      gem_class.version example_version
+      gem_class.homepage example_homepage
+      gem_class.license example_license
+
+      gem_class.author example_author
+      gem_class.email example_email
+
+      gem_class.files example_files
+
+      gem_class.depend_on example_runtime_dependency
+
+      gem_class.development do
+        gem_class.depend_on example_development_dependency
+      end
+    end
+  end
+
+  subject { gem }
+
+  let :hand_written_gem_specification do
+    ::Gem::Specification.new 'jewel' do |gem|
+      gem.name = example_name.to_s
+      gem.summary = example_summary
+      gem.version = example_version
+      gem.homepage = example_homepage
+      gem.license = example_license
+
+      gem.author = example_author
+      gem.email = example_email
+
+      gem.files = example_files
+
+      gem.add_runtime_dependency example_runtime_dependency
+
+      gem.add_development_dependency example_development_dependency
+    end
+  end
+
+  it "'s gem specification should be equivalent to the hand-written one" do
+    subject.specification.should == hand_written_gem_specification
+  end
+
+end

metadata

@@ -1,15 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: jewel
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
+  segments:
+  - 0
+  - 0
+  - 4
   prerelease: 
+  hash: -3852523161477996427
 platform: ruby
 authors:
 - Matheus Afonso Martins Moreira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -19,6 +24,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        segments:
+        - 0
+        hash: -4447801726355984837
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,6 +35,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        segments:
+        - 0
+        hash: -4447801726355984837
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -35,6 +46,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        segments:
+        - 0
+        hash: -4447801726355984837
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,6 +57,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        segments:
+        - 0
+        hash: -4447801726355984837
 - !ruby/object:Gem::Dependency
   name: rookie
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +68,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        segments:
+        - 0
+        hash: -4447801726355984837
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,6 +79,31 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        segments:
+        - 0
+        hash: -4447801726355984837
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+        segments:
+        - 0
+        hash: -4447801726355984837
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+        segments:
+        - 0
+        hash: -4447801726355984837
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +112,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        segments:
+        - 0
+        hash: -4447801726355984837
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,6 +123,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        segments:
+        - 0
+        hash: -4447801726355984837
 description: 
 email: matheus.a.m.moreira@gmail.com
 executables: []
@@ -91,6 +142,7 @@ files:
 - lib/jewel.rb
 - lib/jewel/gem.rb
 - lib/jewel/gem/metadata.rb
+- spec/jewel/gem_spec.rb
 homepage: https://github.com/matheusmoreira/jewel
 licenses:
 - Mozilla Public License, version 2.0
@@ -106,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4515205193521416105
+      hash: -4447801726355984837
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4515205193521416105
+      hash: -4447801726355984837
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24