inventory 1.0.0 → 1.1.0

data/Rakefile

@@ -10,8 +10,5 @@ Inventory::Rake::Tasks.define Inventory::Version, :gem => proc{ |_, s|
   s.author = 'Nikolai Weibull'
   s.email = 'now@bitwi.se'
   s.homepage = 'https://github.com/now/inventory'
-
-  s.add_development_dependency 'lookout', '~> 3.0'
-  s.add_development_dependency 'yard', '~> 0.7.0'
 }
 Lookout::Rake::Tasks::Test.new

data/lib/inventory-1.0.rb

@@ -12,7 +12,7 @@ class Inventory
     raise ArgumentError,
       'path is not of the form PATH/lib/PACKAGE/version.rb: %s' % path if
         @srcdir.empty?
-    instance_exec(&block) if block
+    instance_exec(&Proc.new) if block_given?
   end
 
   def package
@@ -31,12 +31,19 @@ class Inventory
     requires.each do |requirement|
       require requirement
     end
+    dependencies.require
     loads.each do |load|
       Kernel.load File.expand_path('lib/%s' % load, srcdir)
     end
     self
   end
 
+  def dependencies
+    Dependencies.new{
+      development 'inventory', Version.major, Version.minor, Version.patch
+    }
+  end
+
   def requires
     []
   end
@@ -106,6 +113,15 @@ class Inventory
 
   attr_reader :major, :minor, :patch, :path, :srcdir, :package_path, :package_require
 
+#  %w'
+#    inventory/dependencies.rb
+#    inventory/dependency.rb
+#  '.each do |load|
+##    Kernel.load File.expand_path('../%s' % load, __FILE__)
+#  end
   load File.expand_path('../inventory/version.rb', __FILE__)
+  Version.loads.each do |load|
+    Kernel.load File.expand_path('../%s' % load, __FILE__)
+  end
 end
 

data/lib/inventory/dependencies.rb

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+
+class Inventory::Dependencies
+  include Enumerable
+
+  def initialize(*dependencies)
+    @dependencies = dependencies
+    instance_exec(&Proc.new) if block_given?
+  end
+
+  def +(other)
+    self.class.new(*(dependencies + other.dependencies))
+  end
+
+  def each
+    return enum_for(__method__) unless block_given?
+    dependencies.each do |dependency|
+      yield dependency
+    end
+    self
+  end
+
+  def require
+    map{ |dependency| dependency.require }
+  end
+
+  def add_to_gem_specification(specification)
+    each do |dependency|
+      dependency.add_to_gem_specification specification
+    end
+    self
+  end
+
+  protected
+
+  attr_reader :dependencies
+
+  private
+
+  def development(name, major, minor, patch)
+    dependencies << Development.new(name, major, minor, patch)
+    self
+  end
+
+  def runtime(name, major, minor, patch)
+    dependencies << Runtime.new(name, major, minor, patch)
+    self
+  end
+
+  def optional(name, major, minor, patch)
+    dependencies << Optional.new(name, major, minor, patch)
+    self
+  end
+end

data/lib/inventory/dependencies/development.rb

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+
+class Inventory::Dependencies::Development
+  include Inventory::Dependency
+
+  def add_to_gem_specification(specification)
+    specification.add_development_dependency name, gem_requirement
+    self
+  end
+end

data/lib/inventory/dependencies/optional.rb

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+class Inventory::Dependencies::Optional
+  include Inventory::Dependency
+end

data/lib/inventory/dependencies/runtime.rb

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+class Inventory::Dependencies::Runtime
+  include Inventory::Dependency
+
+  def require
+    require '%s-%d.0' % [name, major]
+  end
+end

data/lib/inventory/dependency.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+module Inventory::Dependency
+  def initialize(name, major, minor, patch, options = {})
+    @name, @major, @minor, @patch = name, major, minor, patch
+    instance_exec(&Proc.new) if block_given?
+  end
+
+  def to_s
+    '%d.%d.%d' % [major, minor, patch]
+  end
+
+  def feature
+    '%s-%d.0' % [name, major]
+  end
+
+  def require
+    nil
+  end
+
+  def add_to_gem_specification(specification)
+    specification.add_runtime_dependency name, gem_requirement
+    self
+  end
+
+  attr_reader :name, :major, :minor, :patch
+
+  private
+
+  def gem_requirement
+    '~> %s' % (major > 0 ? '%d.%d' % [major, minor] : to_s)
+  end
+end

data/lib/inventory/rake/tasks/gem.rb

@@ -18,6 +18,8 @@ class Inventory::Rake::Tasks::Gem
                                          s.files = @inventory.files # TODO: We can skip #files and rely on #to_a
 
                                          s.require_paths = @inventory.lib_directories
+
+                                         @inventory.dependencies.add_to_gem_specification s
                                        })
     yield self, @specification if block_given?
     define
@@ -36,7 +38,7 @@ class Inventory::Rake::Tasks::Gem
     file gemspec => %w'Rakefile README' + [@inventory.path] do |t|
       tmp = '%s.tmp' % t.name
       rm([t.name, tmp], :force => true)
-      puts 'gem specification --ruby %s > %s' %
+      rake_output_message 'gem specification --ruby %s > %s' %
         [@specification.name, tmp] if verbose
       File.open(tmp, 'wb') do |f|
         f.write @specification.to_ruby
@@ -52,7 +54,7 @@ class Inventory::Rake::Tasks::Gem
     task :'gem:dist' => [:'inventory:check', @specification.file_name]
     file @specification.file_name => @specification.files do
       require 'rubygems' unless defined? Gem
-      puts 'gem build %s' % gemspec if verbose
+      rake_output_message 'gem build %s' % gemspec if verbose
       Gem::Builder.new(@specification).build
     end
 
@@ -65,7 +67,7 @@ class Inventory::Rake::Tasks::Gem
       require 'rubygems' unless defined? Gem
       require 'rubygems/installer' unless defined? Gem::Installer
       checkdir = @specification.full_name
-      puts 'gem unpack %s --target %s' %
+      rake_output_message 'gem unpack %s --target %s' %
         [@specification.file_name, checkdir] if verbose
       Gem::Installer.new(@specification.file_name, :unpack => true).
         unpack File.expand_path(checkdir)
@@ -76,32 +78,67 @@ class Inventory::Rake::Tasks::Gem
       rm_r checkdir
     end
 
+    desc 'Install dependencies on the local system' unless
+      Rake::Task.task_defined? :'deps:install'
+    task :'deps:install' => :':gem:deps:install'
+
+    desc 'Install dependencies in ruby gem directory'
+    task :'gem:deps:install' do
+      require 'rubygems' unless defined? Gem
+      require 'rubygems/dependency_installer' unless defined? Gem::DependencyInstaller
+      @specification.dependencies.each do |dependency|
+        rake_output_message "gem install %s -v '%s'" % [dependency.name, dependency.requirement] if verbose
+        Gem::DependencyInstaller.new.install dependency.name, dependency.requirement
+      end
+    end
+
+    desc 'Install dependencies for the current user' unless
+      Rake::Task.task_defined? :'deps:install:user'
+    task :'deps:install:user' => :':gem:deps:install:user'
+
+    desc 'Install dependencies for the current user'
+    task :'gem:deps:install:user' do
+      require 'rubygems' unless defined? Gem
+      require 'rubygems/dependency_installer' unless defined? Gem::DependencyInstaller
+      @specification.dependencies.each do |dependency|
+        rake_output_message "gem install --user-install --bindir %s %s -v '%s'" %
+          [Gem.bindir(Gem.user_dir), dependency.name, dependency.requirement] if verbose
+        Gem::DependencyInstaller.
+          new(:user_install => true,
+              :bindir => Gem.bindir(Gem.user_dir)).
+          install dependency.name, dependency.requirement
+      end
+    end
+
     desc 'Install distribution files on the local system' unless
       Rake::Task.task_defined? :install
     task :install => :'gem:install'
 
-    desc 'Install %s and its dependencies in ruby gem directory' %
+    desc 'Install %s in ruby gem directory' %
       @specification.file_name
     task :'gem:install' => :'gem:dist' do |t|
       require 'rubygems' unless defined? Gem
       require 'rubygems/dependency_installer' unless defined? Gem::DependencyInstaller
-      puts 'gem install %s' % @specification.file_name if verbose
-      Gem::DependencyInstaller.new.install @specification.file_name
+      rake_output_message 'gem install %s' % @specification.file_name if verbose
+      Gem::DependencyInstaller.
+        new(:ignore_dependencies => true).
+        install @specification.file_name
     end
 
     desc 'Install distribution files for the current user' unless
       Rake::Task.task_defined? :'install:user'
     task :'install:user' => :'gem:install:user'
 
-    desc 'Install %s and its dependencies in user gem directory' %
+    desc 'Install %s in user gem directory' %
       @specification.file_name
     task :'gem:install:user' => :'gem:dist' do
       require 'rubygems' unless defined? Gem
       require 'rubygems/dependency_installer' unless defined? Gem::DependencyInstaller
-      puts 'gem install --user-install --bindir %s %s' %
+      rake_output_message 'gem install --user-install --bindir %s %s' %
         [Gem.bindir(Gem.user_dir), @specification.file_name] if verbose
       Gem::DependencyInstaller.
-        new(:user_install => true,
+        new(:ignore_dependencies => true,
+            :user_install => true,
             :bindir => Gem.bindir(Gem.user_dir)).
         install @specification.file_name
     end
@@ -116,7 +153,7 @@ class Inventory::Rake::Tasks::Gem
       # TODO: I have absolutely no idea why this is needed, but it is.
       require 'rubygems/user_interaction' unless defined? Gem::UserInteraction
       require 'rubygems/uninstaller' unless defined? Gem::Uninstaller
-      puts 'gem uninstall --executables %s' % @specification.name if verbose
+      rake_output_message 'gem uninstall --executables %s' % @specification.name if verbose
       Gem::Uninstaller.new(@specification.name,
                            :executables => true,
                            :version => @specification.version).uninstall
@@ -132,7 +169,7 @@ class Inventory::Rake::Tasks::Gem
       # TODO: I have absolutely no idea why this is needed, but it is.
       require 'rubygems/user_interaction' unless defined? Gem::UserInteraction
       require 'rubygems/uninstaller' unless defined? Gem::Uninstaller
-      puts 'gem uninstall --executables --install-dir %s %s' %
+      rake_output_message 'gem uninstall --executables --install-dir %s %s' %
         [Gem.user_dir, @specification.name] if verbose
       Gem::Uninstaller.new(@specification.name,
                            :executables => true,

data/lib/inventory/version.rb

@@ -1,7 +1,24 @@
 # -*- coding: utf-8 -*-
 
 class Inventory
-  Version = Inventory.new(1, 0, 0){
+  Version = Inventory.new(1, 1, 0){
+    def dependencies
+      Dependencies.new{
+        development 'lookout', 3, 0, 0
+        development 'yard', 0, 7, 0
+      }
+    end
+
+    def libs
+      %w'
+        inventory/dependency.rb
+        inventory/dependencies.rb
+        inventory/dependencies/development.rb
+        inventory/dependencies/optional.rb
+        inventory/dependencies/runtime.rb
+      '
+    end
+
     def additional_libs
       super + %w'
         inventory/rake/tasks-1.0.rb

data/test/unit/inventory/dependencies.rb

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+Expectations do
+  expect %w'test' do
+    Inventory::Dependencies.new{
+      development 'test', 1, 0, 0
+    }.map(&:name)
+  end
+end

data/test/unit/inventory/dependencies/development.rb

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+Expectations do
+end

data/test/unit/inventory/dependencies/optional.rb

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+Expectations do
+end

data/test/unit/inventory/dependencies/runtime.rb

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+Expectations do
+end

data/test/unit/inventory/dependency.rb

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+Expectations do
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inventory
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lookout
-  requirement: &15885192 !ruby/object:Gem::Requirement
+  requirement: &3940080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *15885192
+  version_requirements: *3940080
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &15886860 !ruby/object:Gem::Requirement
+  requirement: &3938508 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *15886860
+  version_requirements: *3938508
 description: ! "                                   Inventory\n\n  Inventory allows
   you to create inventories of your Ruby projects.  These\n  inventories can then
   be used to load the project, create gem specifications\n  and gems, run unit tests,
@@ -42,6 +42,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/inventory/dependency.rb
+- lib/inventory/dependencies.rb
+- lib/inventory/dependencies/development.rb
+- lib/inventory/dependencies/optional.rb
+- lib/inventory/dependencies/runtime.rb
 - lib/inventory-1.0.rb
 - lib/inventory/version.rb
 - lib/inventory/rake/tasks-1.0.rb
@@ -49,6 +54,11 @@ files:
 - lib/inventory/rake/tasks/clean.rb
 - lib/inventory/rake/tasks/gem.rb
 - lib/inventory/rake/tasks/inventory.rb
+- test/unit/inventory/dependency.rb
+- test/unit/inventory/dependencies.rb
+- test/unit/inventory/dependencies/development.rb
+- test/unit/inventory/dependencies/optional.rb
+- test/unit/inventory/dependencies/runtime.rb
 - test/unit/inventory-1.0.rb
 - test/unit/inventory/version.rb
 - test/unit/inventory/rake/tasks-1.0.rb