rubygems-tasks 0.2.4 → 0.2.5

data/lib/rubygems/tasks/project.rb

@@ -9,9 +9,9 @@ module Gem
 
       # Supported SCMs and their control directories.
       SCM_DIRS = {
-        :git => '.git',
-        :hg  => '.hg',
-        :svn => '.svn'
+        git: '.git',
+        hg:  '.hg',
+        svn: '.svn'
       }
 
       # The `pkg/` directory.

data/lib/rubygems/tasks/push.rb

@@ -7,7 +7,7 @@ module Gem
     #
     class Push < Task
 
-      # The Gemcutter host to push gems to.
+      # The rubygems host to push gems to.
       attr_accessor :host
 
       #
@@ -17,7 +17,7 @@ module Gem
       #   Additional options.
       #
       # @option options [String] :host
-      #   The Gemcutter host to push gems to.
+      #   The rubygems host to push gems to.
       #
       def initialize(options={})
         super()

data/lib/rubygems/tasks/sign/checksum.rb

@@ -84,8 +84,9 @@ module Gem
         # Defines the `sign:checksum` tasks.
         #
         def define
-          sign_task :checksum
-          task      :checksum => 'sign:checksum'
+          super(:checksum)
+
+          task :checksum => 'sign:checksum'
         end
 
         #

data/lib/rubygems/tasks/sign/pgp.rb

@@ -25,7 +25,7 @@ module Gem
         # Defines the `sign:pgp` task.
         #
         def define
-          sign_task :pgp
+          super(:pgp)
 
           task :pgp => 'sign:pgp'
         end

data/lib/rubygems/tasks/sign/task.rb

@@ -7,28 +7,13 @@ module Gem
     module Sign
       class Task < Tasks::Task
 
-        #
-        # Signs a package.
-        #
-        # @param [String] path
-        #   The path to the package.
-        #
-        # @abstract
-        #
-        def sign(path)
-        end
-
-        protected
-
         #
         # Defines signing tasks for the various packages.
         #
         # @param [Symbol] name
         #   The name for the `sign:` task.
         #
-        # @api semipublic
-        #
-        def sign_task(name)
+        def define(name)
           @project.builds.each do |build,packages|
             packages.each do |format,path|
               namespace :sign do
@@ -42,7 +27,7 @@ module Gem
               end
             end
 
-            multi_task "sign:#{name}:#{build}", packages.keys
+            namespaced_tasks "sign:#{name}:#{build}", packages.keys
 
             task "sign:#{name}"  => "sign:#{name}:#{build}"
             task "sign:#{build}" => "sign:#{name}:#{build}"
@@ -52,6 +37,17 @@ module Gem
           end
         end
 
+        #
+        # Signs a package.
+        #
+        # @param [String] path
+        #   The path to the package.
+        #
+        # @abstract
+        #
+        def sign(path)
+        end
+
       end
     end
   end

data/lib/rubygems/tasks/task.rb

@@ -124,28 +124,28 @@ module Gem
       # @param [String] prefix
       #   The namespace of the sub-tasks to call.
       #
-      # @param [Array<Symbol>] names
+      # @param [Array<Symbol>] subtasks
       #   The names of the sub-tasks.
       #
       # @example
-      #   gemspec_tasks 'pkg:tar'
+      #   namespaced_tasks 'pkg:tar', @project.gemspecs.keys
       #
       # @api semipublic
       #
-      def multi_task(prefix,names)
-        task prefix => names.map { |name| "#{prefix}:#{name}" }
+      def namespaced_tasks(prefix,subtasks)
+        task prefix => subtasks.map { |subtask| "#{prefix}:#{subtask}" }
       end
 
       #
       # Defines a task that will execute tasks for each gemspec.
       #
-      # @param [Symbol, String] name
+      # @param [Symbol, String] prefix
       #   The name for the task.
       #
       # @api semipublic
       #
-      def gemspec_tasks(name)
-        multi_task name, @project.gemspecs.keys
+      def gemspec_tasks(prefix)
+        namespaced_tasks prefix, @project.gemspecs.keys
       end
 
     end

data/rubygems-tasks.gemspec

@@ -2,108 +2,59 @@
 
 require 'yaml'
 
-Gem::Specification.new do |gemspec|
-  files = if File.directory?('.git')
-            `git ls-files`.split($/)
-          elsif File.directory?('.hg')
-            `hg manifest`.split($/)
-          elsif File.directory?('.svn')
-            `svn ls -R`.split($/).select { |path| File.file?(path) }
-          else
-            Dir['{**/}{.*,*}'].select { |path| File.file?(path) }
-          end
+Gem::Specification.new do |gem|
+  gemspec = YAML.load_file('gemspec.yml')
 
-  filter_files = lambda { |paths|
-    case paths
-    when Array
-      (files & paths)
-    when String
-      (files & Dir[paths])
-    end
-  }
-
-  version = {
-    :file     => 'lib/rubygems/tasks/version.rb',
-    :constant => 'Gem::Tasks::VERSION'
-  }
-
-  defaults = {
-    'name'            => File.basename(File.dirname(__FILE__)),
-    'files'           => files,
-    'require_paths'   => ['ext', 'lib'].select { |dir| File.directory?(dir) },
-    'executables'     => filter_files['bin/*'].map { |path| File.basename(path) },
-    'test_files'      => filter_files['{test/{**/}*_test.rb,spec/{**/}*_spec.rb}'],
-    'extra_doc_files' => filter_files['*.{txt,rdoc,md,markdown,tt,textile}']
-  }
-
-  metadata = defaults.merge(YAML.load_file('gemspec.yml'))
+  gem.name    = gemspec.fetch('name')
+  gem.version = gemspec.fetch('version') do
+                  lib_dir = File.join(File.dirname(__FILE__),'lib')
+                  $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
 
-  gemspec.name    = metadata['name']
-  gemspec.version = if metadata['version']
-                      metadata['version']
-                    else
-                      $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
+                  require 'rubygems/tasks/version'
+                  Gem::Tasks::VERSION
+                end
 
-                      require version[:file]
-                      eval(version[:constant])
-                    end
+  gem.summary     = gemspec['summary']
+  gem.description = gemspec['description']
+  gem.licenses    = Array(gemspec['license'])
+  gem.authors     = Array(gemspec['authors'])
+  gem.email       = gemspec['email']
+  gem.homepage    = gemspec['homepage']
 
-  gemspec.summary     = metadata.fetch('summary',metadata['description'])
-  gemspec.description = metadata.fetch('description',metadata['summary'])
+  glob = lambda { |patterns| gem.files & Dir[*patterns] }
 
-  gemspec.licenses = Array(metadata['license'])
-  gemspec.authors  = Array(metadata['authors'])
+  gem.files = `git ls-files`.split($/)
+  gem.files = glob[gemspec['files']] if gemspec['files']
 
-  gemspec.email    = metadata['email']
-  gemspec.homepage = metadata['homepage']
-
-  gemspec.require_paths = Array(metadata['require_paths'])
-  gemspec.files         = filter_files[metadata['files']]
-  gemspec.executables   = metadata['executables']
-  gemspec.extensions    = metadata['extensions']
-
-  if Gem::VERSION < '1.7.'
-    gemspec.default_executable = gemspec.executables.first
+  gem.executables = gemspec.fetch('executables') do
+    glob['bin/*'].map { |path| File.basename(path) }
   end
+  gem.default_executable = gem.executables.first if Gem::VERSION < '1.7.'
 
-  gemspec.test_files       = filter_files[metadata['test_files']]
-  gemspec.extra_rdoc_files = Array(metadata['extra_doc_files'])
+  gem.extensions       = glob[gemspec['extensions'] || 'ext/**/extconf.rb']
+  gem.test_files       = glob[gemspec['test_files'] || '{test/{**/}*_test.rb']
+  gem.extra_rdoc_files = glob[gemspec['extra_doc_files'] || '*.{txt,md}']
 
-  gemspec.post_install_message = metadata['post_install_message']
-  gemspec.requirements         = metadata['requirements']
+  gem.require_paths = Array(gemspec.fetch('require_paths') {
+    %w[ext lib].select { |dir| File.directory?(dir) }
+  })
 
-  if gemspec.respond_to?(:required_ruby_version=)
-    gemspec.required_ruby_version = metadata['required_ruby_version']
-  end
+  gem.requirements              = gemspec['requirements']
+  gem.required_ruby_version     = gemspec['required_ruby_version']
+  gem.required_rubygems_version = gemspec['required_rubygems_version']
+  gem.post_install_message      = gemspec['post_install_message']
 
-  if gemspec.respond_to?(:required_rubygems_version=)
-    gemspec.required_rubygems_version = metadata['required_ruby_version']
-  end
-
-  parse_versions = lambda { |versions|
-    case versions
-    when Array
-      versions.map { |v| v.to_s }
-    when String
-      versions.split(/,\s*/)
-    end
-  }
-
-  if metadata['dependencies']
-    metadata['dependencies'].each do |name,versions|
-      gemspec.add_dependency(name,parse_versions[versions])  
-    end
-  end
+  split = lambda { |string| string.split(/,\s*/) }
 
-  if metadata['runtime_dependencies']
-    metadata['runtime_dependencies'].each do |name,versions|
-      gemspec.add_runtime_dependency(name,parse_versions[versions])  
+  if gemspec['dependencies']
+    gemspec['dependencies'].each do |name,versions|
+      gem.add_dependency(name,split[versions])
     end
   end
 
-  if metadata['development_dependencies']
-    metadata['development_dependencies'].each do |name,versions|
-      gemspec.add_development_dependency(name,parse_versions[versions])  
+  if gemspec['development_dependencies']
+    gemspec['development_dependencies'].each do |name,versions|
+      gem.add_development_dependency(name,split[versions])
     end
   end
 end

data/spec/console_spec.rb

@@ -7,26 +7,22 @@ describe Gem::Tasks::Console do
   describe "#console" do
     include_context "rake"
 
-    if RUBY_VERSION < '1.9'
-      let(:default_options) { %w[-Ilib -rrubygems -rrubygems/tasks] }
-    else
-      let(:default_options) { %w[-Ilib -rrubygems/tasks]            }
-    end
+    let(:default_options) { %w[-Ilib -rrubygems/tasks] }
 
     let(:custom_command)  { 'ripl'             }
     let(:custom_options)  { %w[-Ivendor -rfoo] }
 
     context "defaults" do
       it "should run `irb`" do
-        subject.should_receive(:run).with('irb',*default_options)
+        expect(subject).to receive(:run).with('irb',*default_options)
 
         subject.console
       end
 
       context "when project.bundler? == true" do
         it "should use `bundle exec`" do
-          subject.project.stub!(:bundler?).and_return(true)
-          subject.should_receive(:run).with(
+          allow(subject.project).to receive(:bundler?).and_return(true)
+          expect(subject).to receive(:run).with(
             'bundle', 'exec', 'irb', *default_options
           )
 
@@ -39,15 +35,15 @@ describe Gem::Tasks::Console do
       subject { described_class.new(:command => custom_command) }
 
       it "should run the custom console" do
-        subject.should_receive(:run).with(custom_command,*default_options)
+        expect(subject).to receive(:run).with(custom_command,*default_options)
 
         subject.console
       end
 
       context "when project.bundler? == true" do
         it "should use `bundle exec`" do
-          subject.project.stub!(:bundler?).and_return(true)
-          subject.should_receive(:run).with(
+          allow(subject.project).to receive(:bundler?).and_return(true)
+          expect(subject).to receive(:run).with(
             'bundle', 'exec', custom_command, *default_options
           )
 
@@ -60,15 +56,15 @@ describe Gem::Tasks::Console do
       subject { described_class.new(:options => custom_options) }
 
       it "should pass custom options to `irb`" do
-        subject.should_receive(:run).with('irb', *(default_options + custom_options))
+        expect(subject).to receive(:run).with('irb', *(default_options + custom_options))
 
         subject.console
       end
 
       context "when project.bundler? == true" do
         it "should use `bundle exec ...`" do
-          subject.project.stub!(:bundler?).and_return(true)
-          subject.should_receive(:run).with('bundle', 'exec', 'irb', *(default_options + custom_options))
+          allow(subject.project).to receive(:bundler?).and_return(true)
+          expect(subject).to receive(:run).with('bundle', 'exec', 'irb', *(default_options + custom_options))
 
           subject.console
         end

data/spec/install_spec.rb

@@ -8,7 +8,7 @@ describe Gem::Tasks::Install do
     let(:path) { 'pkg/foo-1.2.3.gem' }
 
     it "should use `gem install -q`" do
-      subject.should_receive(:run).with('gem', 'install', '-q', path)
+      expect(subject).to receive(:run).with('gem', 'install', '-q', path)
 
       subject.install(path)
     end

data/spec/project_spec.rb

@@ -2,24 +2,27 @@ require 'spec_helper'
 require 'rubygems/tasks/project'
 
 describe Gem::Tasks::Project do
-  let(:rubygems_project) do
-    described_class.new(PROJECT_DIRS['rubygems-project'])
+  let(:rubygems_project_dir) { File.join(PROJECTS_DIR,'rubygems-project') }
+  let(:rubygems_project)     { described_class.new(rubygems_project_dir)   }
+
+  let(:rubygems_multi_project_dir) do
+    File.join(PROJECTS_DIR,'rubygems-multi-project')
   end
 
   let(:rubygems_multi_project) do
-    described_class.new(PROJECT_DIRS['rubygems-multi-project'])
+    described_class.new(rubygems_multi_project_dir)
   end
 
-  let(:bundler_project) do
-    described_class.new(PROJECT_DIRS['bundler-project'])
-  end
+  let(:bundler_project_dir) { File.join(PROJECTS_DIR,'bundler-project') }
+  let(:bundler_project)     { described_class.new(bundler_project_dir)   }
 
   describe "directories" do
+    let(:directory) { rubygems_project_dir }
+
     it "should map paths to #{described_class} instances" do
-      directory = PROJECT_DIRS['rubygems-project']
-      project   = described_class.directories[directory]
+      project = described_class.directories[directory]
 
-      project.root.should == directory
+      expect(project.root).to eq(directory)
     end
   end
 
@@ -27,7 +30,7 @@ describe Gem::Tasks::Project do
     subject { rubygems_project }
 
     it "should use the name of the directory" do
-      subject.name.should == 'rubygems-project'
+      expect(subject.name).to eq('rubygems-project')
     end
   end
 
@@ -35,7 +38,7 @@ describe Gem::Tasks::Project do
     subject { bundler_project }
 
     it "should detect the SCM used" do
-      subject.scm.should == :git
+      expect(subject.scm).to eq(:git)
     end
   end
 
@@ -44,7 +47,7 @@ describe Gem::Tasks::Project do
       subject { rubygems_project }
 
       it "should load the single-gemspec" do
-        subject.gemspecs.values.map(&:name).should == %w[rubygems-project]
+        expect(subject.gemspecs.values.map(&:name)).to eq(%w[rubygems-project])
       end
     end
 
@@ -52,10 +55,10 @@ describe Gem::Tasks::Project do
       subject { rubygems_multi_project }
 
       it "should load all gemspecs" do
-        subject.gemspecs.values.map(&:name).should =~ %w[
+        expect(subject.gemspecs.values.map(&:name)).to match_array(%w[
           rubygems-project
           rubygems-project-lite
-        ]
+        ])
       end
     end
   end
@@ -65,7 +68,7 @@ describe Gem::Tasks::Project do
       subject { rubygems_project }
 
       it "should match the directory name to the gemspec" do
-        subject.primary_gemspec.should == subject.name
+        expect(subject.primary_gemspec).to eq(subject.name)
       end
     end
 
@@ -73,7 +76,7 @@ describe Gem::Tasks::Project do
       subject { rubygems_multi_project }
 
       it "should pick the first gemspec" do
-        subject.primary_gemspec.should == 'rubygems-project'
+        expect(subject.primary_gemspec).to eq('rubygems-project')
       end
     end
   end
@@ -83,11 +86,11 @@ describe Gem::Tasks::Project do
       subject { rubygems_project }
 
       it "should default the directory name to the gemspec" do
-        subject.gemspec.name.should == subject.name
+        expect(subject.gemspec.name).to eq(subject.name)
       end
 
       it "should raise an ArgumentError for unknown gemspec names" do
-        lambda { subject.gemspec('foo') }.should raise_error(ArgumentError)
+        expect { subject.gemspec('foo') }.to raise_error(ArgumentError)
       end
     end
 
@@ -95,13 +98,13 @@ describe Gem::Tasks::Project do
       subject { rubygems_multi_project }
 
       it "should default the first gemspec" do
-        subject.gemspec.name.should == 'rubygems-project'
+        expect(subject.gemspec.name).to eq('rubygems-project')
       end
 
       it "should allow accessing alternate gemspecs" do
         alternate = 'rubygems-project-lite'
 
-        subject.gemspec(alternate).name.should == alternate
+        expect(subject.gemspec(alternate).name).to eq(alternate)
       end
     end
   end
@@ -110,20 +113,20 @@ describe Gem::Tasks::Project do
     subject { rubygems_multi_project }
 
     it "should group builds by gemspec name" do
-      subject.builds.keys.should =~ subject.gemspecs.keys
+      expect(subject.builds.keys).to be == subject.gemspecs.keys
     end
 
     it "should map a package format to a pkg/ path" do
       packages = subject.builds['rubygems-project']
 
-      packages['tar.gz'].should == 'pkg/rubygems-project-1.2.3.tar.gz'
+      expect(packages['tar.gz']).to eq('pkg/rubygems-project-1.2.3.tar.gz')
     end
 
     context "with single-gemspec project" do
       subject { rubygems_project }
 
       it "should only have a key for the single-gemspec" do
-        subject.builds.keys.should == %w[rubygems-project]
+        expect(subject.builds.keys).to eq(%w[rubygems-project])
       end
     end
 
@@ -131,10 +134,10 @@ describe Gem::Tasks::Project do
       subject { rubygems_multi_project }
 
       it "should have keys for each gemspec" do
-        subject.builds.keys.should =~ %w[
+        expect(subject.builds.keys).to match_array(%w[
           rubygems-project
           rubygems-project-lite
-        ]
+        ])
       end
     end
   end
@@ -144,7 +147,7 @@ describe Gem::Tasks::Project do
       subject { bundler_project }
 
       it "should detect the 'Gemfile' file" do
-        subject.bundler?.should be_true
+        expect(subject.bundler?).to be_truthy
       end
     end
 
@@ -152,7 +155,7 @@ describe Gem::Tasks::Project do
       subject { rubygems_project }
 
       it "should be false" do
-        subject.bundler?.should be_false
+        expect(subject.bundler?).to be_falsey
       end
     end
   end