inventory 1.1.3 → 1.2.2

data/Rakefile

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
-require 'lookout/rake/tasks-3.0'
-
 $:.unshift File.expand_path('../lib', __FILE__)
-require 'inventory/rake/tasks-1.0'
 require 'inventory-1.0'
 
+require 'inventory/rake-1.0'
+require 'lookout/rake-3.0'
+
 Inventory::Rake::Tasks.define Inventory::Version, :gem => proc{ |_, s|
   s.author = 'Nikolai Weibull'
   s.email = 'now@bitwi.se'

data/lib/inventory-1.0.rb

@@ -8,7 +8,7 @@ class Inventory
     raise ArgumentError, 'default value of path argument could not be calculated' unless path
     @path = path
     @srcdir, _, @package_path = File.dirname(File.expand_path(path)).rpartition('/lib/')
-    @package_require = '%s-%d.0' % [package, major]
+    @package_require = '%s-%d.0' % [package_path, major]
     raise ArgumentError,
       'path is not of the form PATH/lib/PACKAGE/version.rb: %s' % path if
         @srcdir.empty?

data/lib/inventory/version.rb

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 
 class Inventory
-  Version = Inventory.new(1, 1, 3){
+  Version = Inventory.new(1, 2, 2){
     def dependencies
       Dependencies.new{
         development 'lookout', 3, 0, 0
+        development 'lookout-rake', 3, 0, 0
         development 'yard', 0, 7, 0
       }
     end
@@ -18,15 +19,5 @@ class Inventory
         inventory/dependencies/runtime.rb
       '
     end
-
-    def additional_libs
-      super + %w'
-        inventory/rake/tasks-1.0.rb
-        inventory/rake/tasks/check.rb
-        inventory/rake/tasks/clean.rb
-        inventory/rake/tasks/gem.rb
-        inventory/rake/tasks/inventory.rb
-      '
-    end
   }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inventory
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lookout
-  requirement: &12881160 !ruby/object:Gem::Requirement
+  requirement: &15170700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,21 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *12881160
+  version_requirements: *15170700
+- !ruby/object:Gem::Dependency
+  name: lookout-rake
+  requirement: &15169428 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: *15169428
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &12880560 !ruby/object:Gem::Requirement
+  requirement: &15168468 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +43,7 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *12880560
+  version_requirements: *15168468
 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,
@@ -49,11 +60,6 @@ files:
 - lib/inventory/dependencies/runtime.rb
 - lib/inventory-1.0.rb
 - lib/inventory/version.rb
-- lib/inventory/rake/tasks-1.0.rb
-- lib/inventory/rake/tasks/check.rb
-- 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
@@ -61,11 +67,6 @@ files:
 - 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
-- test/unit/inventory/rake/tasks/check.rb
-- test/unit/inventory/rake/tasks/clean.rb
-- test/unit/inventory/rake/tasks/gem.rb
-- test/unit/inventory/rake/tasks/inventory.rb
 - README
 - Rakefile
 homepage: https://github.com/now/inventory

data/lib/inventory/rake/tasks-1.0.rb

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-
-require 'rake'
-
-class Inventory; module Rake end end
-
-module Inventory::Rake::Tasks
-  %w'check clean gem inventory'.each do |file|
-    load File.expand_path('../tasks/%s.rb' % file, __FILE__)
-  end
-
-  @mostlycleanfiles, @cleanfiles, @distcleanfiles = [], [], []
-
-  class << self
-    attr_accessor :inventory
-
-    attr_reader :mostlycleanfiles, :cleanfiles, :distcleanfiles
-
-    def define(inventory, options = {})
-      self.inventory = inventory
-      Clean.define
-      Inventory.new(:inventory => inventory)
-      Gem.new(:inventory => inventory, &(options.fetch(:gem, proc{ })))
-    end
-  end
-end

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

@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-
-desc 'Check that the package meets its expectations'
-task :check

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

@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-
-class Inventory::Rake::Tasks::Clean
-  include Rake::DSL
-
-  class << self
-    include Rake::DSL
-
-    def define
-      desc 'Delete targets built by rake that are often rebuilt'
-      new :mostlyclean, Inventory::Rake::Tasks.mostlycleanfiles
-
-      desc 'Delete targets built by rake'
-      new :clean, Inventory::Rake::Tasks.cleanfiles
-      task :clean => :mostlyclean
-
-      desc 'Delete targets built by extconf.rb'
-      new :distclean, Inventory::Rake::Tasks.distcleanfiles
-      task :distclean => :clean
-    end
-  end
-
-  def initialize(name, files = [])
-    @name, @files = name, files
-    define
-  end
-
-  def define
-    task name do
-      rm files, :force => true
-    end
-  end
-
-  attr_accessor :name, :files
-end

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

@@ -1,191 +0,0 @@
-# -*- coding: utf-8 -*-
-
-class Inventory::Rake::Tasks::Gem
-  include Rake::DSL
-
-  def initialize(options = {})
-    self.inventory = options.fetch(:inventory, Inventory::Rake::Tasks.inventory)
-    self.specification = options.fetch(:specification,
-                                       Gem::Specification.new{ |s|
-                                         next unless @inventory
-
-                                         s.name = @inventory.package
-                                         s.version = @inventory.to_s # TODO: We could probably skip #to_s
-
-                                         s.description = IO.read('README')
-                                         s.summary = s.description[/^.*?\./].lstrip
-
-                                         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
-  end
-
-  def define
-    desc 'Create specifications' unless Rake::Task.task_defined? :spec
-    task :spec => :'gem:spec'
-
-    gemspec = '%s.gemspec' % @specification.name
-    Inventory::Rake::Tasks.cleanfiles << gemspec
-
-    desc 'Create gem specification' unless Rake::Task.task_defined? :'gem:spec'
-    task :'gem:spec' => gemspec
-
-    file gemspec => %w'Rakefile README' + [@inventory.path] do |t|
-      tmp = '%s.tmp' % t.name
-      rm([t.name, tmp], :force => true)
-      rake_output_message 'gem specification --ruby %s > %s' %
-        [@specification.name, tmp] if verbose
-      File.open(tmp, 'wb') do |f|
-        f.write @specification.to_ruby
-      end
-      chmod File.stat(tmp).mode & ~0222, tmp
-      mv tmp, t.name
-     end
-
-    desc 'Create files for distribution' unless Rake::Task.task_defined? :dist
-    task :dist => :'gem:dist'
-
-    desc 'Create %s for distribution' % @specification.file_name
-    task :'gem:dist' => [:'inventory:check', @specification.file_name]
-    file @specification.file_name => @specification.files do
-      require 'rubygems' unless defined? Gem
-      rake_output_message 'gem build %s' % gemspec if verbose
-      Gem::Builder.new(@specification).build
-    end
-
-    desc 'Check files before distribution' unless
-      Rake::Task.task_defined? :'dist:check'
-    task :'dist:check' => [:dist, :'gem:dist:check']
-
-    desc 'Check %s before distribution' % @specification.file_name
-    task :'gem:dist:check' => :'gem:dist' do
-      require 'rubygems' unless defined? Gem
-      require 'rubygems/installer' unless defined? Gem::Installer
-      checkdir = @specification.full_name
-      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)
-      chdir checkdir do
-        sh '%s %sinventory:check check' %
-          [Rake.application.name, Rake.application.options.silent ? '-s ' : '']
-      end
-      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 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
-      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 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
-      rake_output_message 'gem install --user-install --bindir %s %s' %
-        [Gem.bindir(Gem.user_dir), @specification.file_name] if verbose
-      Gem::DependencyInstaller.
-        new(:ignore_dependencies => true,
-            :user_install => true,
-            :bindir => Gem.bindir(Gem.user_dir)).
-        install @specification.file_name
-    end
-
-    desc 'Delete all files installed on the local system' unless
-      Rake::Task.task_defined? :uninstall
-    task :uninstall => :'gem:uninstall'
-
-    desc 'Uninstall %s from ruby gem directory' % @specification.file_name
-    task :'gem:uninstall' do
-      require 'rubygems' unless defined? 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
-      rake_output_message 'gem uninstall --executables %s' % @specification.name if verbose
-      Gem::Uninstaller.new(@specification.name,
-                           :executables => true,
-                           :version => @specification.version).uninstall
-    end
-
-    desc 'Delete all files installed for current user' unless
-      Rake::Task.task_defined? :'uninstall:user'
-    task :'uninstall:user' => :'gem:uninstall:user'
-
-    desc 'Uninstall %s from user gem directory' % @specification.file_name
-    task :'gem:uninstall:user' do
-      require 'rubygems' unless defined? 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
-      rake_output_message 'gem uninstall --executables --install-dir %s %s' %
-        [Gem.user_dir, @specification.name] if verbose
-      Gem::Uninstaller.new(@specification.name,
-                           :executables => true,
-                           :install_dir => Gem.user_dir,
-                           :version => @specification.version).uninstall
-    end
-
-    desc 'Push distribution files to distribution hubs' unless
-      Rake::Task.task_defined? :push
-    task :push => :'gem:push'
-
-    desc 'Push %s to rubygems.org' % @specification.file_name
-    task :'gem:push' => :'gem:dist:check' do
-      sh 'gem push -%s-verbose %s' % [verbose ? '' : '-no', @specification.file_name]
-    end
-  end
-
-  attr_writer :inventory, :specification
-end

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

@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-class Inventory::Rake::Tasks::Inventory
-  include Rake::DSL
-
-  def initialize(options = {})
-    self.inventory = options.fetch(:inventory, Inventory::Rake::Tasks.inventory)
-    yield self if block_given?
-    define
-  end
-
-  def define
-    desc 'Check that the inventory is correct'
-    task :'inventory:check' do
-      # TODO: Use directories from Inventory instead of hard-coding lib and
-      # test/unit.  We want to check ext too?
-      diff = ((Dir['{lib,test/unit}/**/*.rb'] -
-               @inventory.lib_files -
-               @inventory.unit_test_files).map{ |e| 'file not listed in inventory: %s' % e } +
-              @inventory.files.reject{ |e| File.exist? e }.map{ |e| 'file listed in inventory does not exist: %s' % e })
-      fail diff.join("\n") unless diff.empty?
-      # TODO: puts 'inventory checks out' if verbose
-    end
-  end
-
-  attr_writer :inventory
-end

data/test/unit/inventory/rake/tasks-1.0.rb

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

data/test/unit/inventory/rake/tasks/check.rb

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

data/test/unit/inventory/rake/tasks/clean.rb

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

data/test/unit/inventory/rake/tasks/gem.rb

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

data/test/unit/inventory/rake/tasks/inventory.rb

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