jeweler 2.1.1 → 2.1.2

data/lib/jeweler/generator/riot_mixin.rb

@@ -2,7 +2,7 @@ class Jeweler
   class Generator
     module RiotMixin
       def self.extended(generator)
-        generator.development_dependencies << ["riot", ">= 0"]
+        generator.development_dependencies << ['riot', '>= 0']
       end
 
       def default_task
@@ -34,9 +34,8 @@ class Jeweler
       end
 
       def test_helper_filename
-        "teststrap.rb"
+        'teststrap.rb'
       end
-
     end
   end
 end

data/lib/jeweler/generator/rspec_mixin.rb

@@ -2,7 +2,7 @@ class Jeweler
   class Generator
     module RspecMixin
       def self.extended(generator)
-        generator.development_dependencies << ["rspec", "~> 2.8.0"]
+        generator.development_dependencies << ['rspec', '~> 2.8.0']
       end
 
       def default_task
@@ -34,9 +34,8 @@ class Jeweler
       end
 
       def test_helper_filename
-        "spec_helper.rb"
+        'spec_helper.rb'
       end
-
     end
   end
 end

data/lib/jeweler/generator/shindo_mixin.rb

@@ -2,7 +2,7 @@ class Jeweler
   class Generator
     module ShindoMixin
       def self.extended(generator)
-        generator.development_dependencies << ["shindo", ">= 0"]
+        generator.development_dependencies << ['shindo', '>= 0']
       end
 
       def default_task
@@ -36,9 +36,8 @@ class Jeweler
       end
 
       def test_helper_filename
-        "tests_helper.rb"
+        'tests_helper.rb'
       end
-
     end
   end
 end

data/lib/jeweler/generator/shoulda_mixin.rb

@@ -2,7 +2,7 @@ class Jeweler
   class Generator
     module ShouldaMixin
       def self.extended(generator)
-        generator.development_dependencies << ["shoulda", ">= 0"]
+        generator.development_dependencies << ['shoulda', '>= 0']
       end
 
       def default_task
@@ -34,9 +34,8 @@ class Jeweler
       end
 
       def test_helper_filename
-        "helper.rb"
+        'helper.rb'
       end
-
     end
   end
 end

data/lib/jeweler/generator/testspec_mixin.rb

@@ -2,7 +2,7 @@ class Jeweler
   class Generator
     module TestspecMixin
       def self.extended(generator)
-        generator.development_dependencies << ["test-spec", ">= 0"]
+        generator.development_dependencies << ['test-spec', '>= 0']
       end
 
       def default_task
@@ -34,9 +34,8 @@ class Jeweler
       end
 
       def test_helper_filename
-        "test_helper.rb"
+        'test_helper.rb'
       end
-
     end
   end
 end

data/lib/jeweler/generator/testunit_mixin.rb

@@ -1,7 +1,6 @@
 class Jeweler
   class Generator
     module TestunitMixin
-
       def default_task
         'test'
       end
@@ -31,9 +30,8 @@ class Jeweler
       end
 
       def test_helper_filename
-        "helper.rb"
+        'helper.rb'
       end
-
     end
   end
 end

data/lib/jeweler/generator/yard_mixin.rb

@@ -2,14 +2,13 @@ class Jeweler
   class Generator
     module YardMixin
       def self.extended(generator)
-        generator.development_dependencies << ["yard", "~> 0.7"]
-        generator.development_dependencies << ["rdoc", "~> 3.12"]
+        generator.development_dependencies << ['yard', '~> 0.7']
+        generator.development_dependencies << ['rdoc', '~> 3.12']
       end
-      
+
       def doc_task
         'yardoc'
       end
     end
   end
 end
-

data/lib/jeweler/rubyforge_tasks.rb

@@ -11,7 +11,7 @@ class Jeweler
   #     Jeweler::RubyforgeTasks.new
   #
   # Easy enough, right?
-  # 
+  #
   # There are a few options you can tweak:
   #
   #  * project: the rubyforge project to operate on. This defaults to whatever you specified in your gemspec. Defaults to your gem name.
@@ -31,7 +31,7 @@ class Jeweler
     def initialize
       yield self if block_given?
 
-      $stderr.puts "Releasing gems to Rubyforge is deprecated. See details at http://wiki.github.com/technicalpickles/jeweler/migrating-from-releasing-gems-to-rubyforge"
+      $stderr.puts 'Releasing gems to Rubyforge is deprecated. See details at http://wiki.github.com/technicalpickles/jeweler/migrating-from-releasing-gems-to-rubyforge'
 
       define
     end
@@ -51,14 +51,14 @@ class Jeweler
     def define
       namespace :rubyforge do
         namespace :release do
-          desc "Release the current gem version to RubyForge."
+          desc 'Release the current gem version to RubyForge.'
           task :gem do
-            $stderr.puts "DEPRECATION: Releasing gems to RubyForge is deprecated. You should see about releasing to Gemcutter instead: http://wiki.github.com/technicalpickles/jeweler/gemcutter"
+            $stderr.puts 'DEPRECATION: Releasing gems to RubyForge is deprecated. You should see about releasing to Gemcutter instead: http://wiki.github.com/technicalpickles/jeweler/gemcutter'
           end
 
           if publish_documentation?
-            desc "Publish docs to RubyForge."
-            task :docs => doc_task do
+            desc 'Publish docs to RubyForge.'
+            task docs: doc_task do
               config = YAML.load(
                 File.read(File.expand_path('~/.rubyforge/user-config.yml'))
               )
@@ -66,26 +66,26 @@ class Jeweler
               host = "#{config['username']}@rubyforge.org"
               remote_dir = "/var/www/gforge-projects/#{project}/#{remote_doc_path}"
 
-              local_dir = case self.doc_task.to_sym
+              local_dir = case doc_task.to_sym
                           when :rdoc then 'rdoc'
                           when :yardoc then 'doc'
-                          when 'doc:app'.to_sym then 'doc/app' 
+                          when 'doc:app'.to_sym then 'doc/app'
                           else
-                            raise "Unsure what to run to generate documentation. Please set doc_task and re-run."
+                            raise 'Unsure what to run to generate documentation. Please set doc_task and re-run.'
                           end
 
-              sh %{rsync --archive --verbose --delete #{local_dir}/ #{host}:#{remote_dir}}
+              sh %(rsync --archive --verbose --delete #{local_dir}/ #{host}:#{remote_dir})
             end
           end
         end
 
         if publish_documentation?
-          desc "Release RDoc documentation to RubyForge"
-          task :release => "rubyforge:release:docs"
+          desc 'Release RDoc documentation to RubyForge'
+          task release: 'rubyforge:release:docs'
         end
       end
 
-      task :release => 'rubyforge:release'
+      task release: 'rubyforge:release'
     end
 
     def publish_documentation?

data/lib/jeweler/rubygems_dot_org_tasks.rb

@@ -26,13 +26,13 @@ class Jeweler
 
     def define
       namespace :gemcutter do
-        desc "Release gem to Gemcutter"
-        task :release => [:gemspec, :build] do
+        desc 'Release gem to Gemcutter'
+        task release: [:gemspec, :build] do
           jeweler.release_gem_to_rubygems
         end
       end
 
-      task :release => 'gemcutter:release'
+      task release: 'gemcutter:release'
     end
   end
 end

data/lib/jeweler/rubygems_tasks.rb

@@ -26,13 +26,13 @@ class Jeweler
 
     def define
       namespace :rubygems do
-        desc "Release gem to Gemcutter"
-        task :release => [:gemspec, :build] do
+        desc 'Release gem to Gemcutter'
+        task release: [:gemspec, :build] do
           jeweler.release_gem_to_rubygems
         end
       end
 
-      task :release => 'rubygems:release'
+      task release: 'rubygems:release'
     end
   end
 end

data/lib/jeweler/specification.rb

@@ -45,11 +45,11 @@ class Jeweler
                end
 
         if blank?(files) && repo
-          base_dir_with_trailing_separator = File.join(base_dir, "")
+          base_dir_with_trailing_separator = File.join(base_dir, '')
 
-          ignored_files = repo.lib.ignored_files + [".gitignore"]
+          ignored_files = repo.lib.ignored_files + ['.gitignore']
           self.files = (repo.ls_files(base_dir).keys - ignored_files).compact.map do |file|
-            File.expand_path(file).sub(base_dir_with_trailing_separator, "")
+            File.expand_path(file).sub(base_dir_with_trailing_separator, '')
           end
         end
 
@@ -69,15 +69,14 @@ class Jeweler
 
         if File.exist?('Gemfile')
           require 'bundler'
-          bundler = Bundler.load
-          bundler.dependencies_for(:default, :runtime).each do |dependency|
-            self.add_dependency dependency.name, *dependency.requirement.as_list
+          bundler_runtime = Bundler.load
+          bundler_dependencies_for(bundler_runtime, :default, :runtime).each do |dependency|
+            add_dependency dependency.name, *dependency.requirement.as_list
           end
-          bundler.dependencies_for(:development).each do |dependency|
-            self.add_development_dependency dependency.name, *dependency.requirement.as_list
+          bundler_dependencies_for(bundler_runtime, :development).each do |dependency|
+            add_development_dependency dependency.name, *dependency.requirement.as_list
           end
         end
-        
       end
     end
 
@@ -89,7 +88,19 @@ class Jeweler
       end
     end
 
-  private
+    private
+
+    # Backported (or rather forward-ported) from Bunder::Runtime#dependencies_for.
+    # This method was available until Bundler 1.13, and then removed. We need it
+    # to be able to tell which gems are listed in the Gemfile without loading
+    # those gems first.
+    def bundler_dependencies_for(bundler_runtime, *groups)
+      if groups.empty?
+        bundler_runtime.dependencies
+      else
+        bundler_runtime.dependencies.select {|d| (groups & d.groups).any? }
+      end
+    end
 
     def blank?(value)
       value.nil? || value.empty?
@@ -97,10 +108,10 @@ class Jeweler
   end
 end
 
-
 # Workaround for cloning/duping a Gem::Specification
 # documented in http://github.com/technicalpickles/jeweler/issues#issue/73
 Gem::Specification.class_eval do
+  # TODO: fix 'warning: method redefined; discarding old initialize_copy'
   def initialize_copy(original)
     super
 

data/lib/jeweler/tasks.rb

@@ -37,7 +37,8 @@ class Jeweler
   #
   # In addition, it provides reasonable defaults for several values. See Jeweler::Specification for more details.
   class Tasks < ::Rake::TaskLib
-    attr_accessor :gemspec, :jeweler, :gemspec_building_block
+    attr_accessor :gemspec, :gemspec_building_block
+    attr_writer :jeweler
 
     def initialize(gemspec = nil, &gemspec_building_block)
       @gemspec = gemspec || Gem::Specification.new
@@ -48,14 +49,16 @@ class Jeweler
     end
 
     def jeweler
-      if @jeweler.nil?
-        @jeweler = Jeweler.new(gemspec)
-        gemspec_building_block.call gemspec if gemspec_building_block
-      end
-      @jeweler
+      @jeweler ||= jeweler!
     end
 
-  private
+    private
+
+    def jeweler!
+      j = Jeweler.new(gemspec)
+      gemspec_building_block.call gemspec if gemspec_building_block
+      j
+    end
 
     def yield_gemspec_set_version?
       yielded_gemspec = @gemspec.dup
@@ -65,7 +68,7 @@ class Jeweler
 
       gemspec_building_block.call(yielded_gemspec) if gemspec_building_block
 
-      ! yielded_gemspec.version.nil?
+      !yielded_gemspec.version.nil?
     end
 
     def release_args
@@ -74,61 +77,58 @@ class Jeweler
       args[:branch] = ENV['BRANCH']
       args[:local_branch] = ENV['LOCAL_BRANCH']
       args[:remote_branch] = ENV['REMOTE_BRANCH']
-      return args
+      args
     end
 
     def define
       task :version_required do
-        if jeweler.expects_version_file? && !jeweler.version_file_exists?
+        if jeweler.expects_version_file? && !jeweler.version_file_exist?
           abort "Expected VERSION or VERSION.yml to exist. Use 'rake version:write' to create an initial one."
         end
       end
 
       task :gemspec_required do
-        if ! File.exist?(jeweler.gemspec_helper.path)
+        unless File.exist?(jeweler.gemspec_helper.path)
           abort "Expected #{jeweler.gemspec_helper.path} to exist. See 'rake gemspec:write' to create it"
         end
       end
 
-
-      desc "Build gem into pkg/"
+      desc 'Build gem into pkg/'
       task :build do
         jeweler.build_gem
       end
 
-
-
-      desc "Build and install gem using `gem install`"
-      task :install => [:build] do
+      desc 'Build and install gem using `gem install`'
+      task install: [:build] do
         jeweler.install_gem
       end
 
-      desc "Displays the current version"
-      task :version => :version_required do
+      desc 'Displays the current version'
+      task version: :version_required do
         $stdout.puts "Current version: #{jeweler.version}"
       end
 
-      desc "Release gem"
-      task :release => :clean do
+      desc 'Release gem'
+      task release: :clean do
       end
 
-      desc "Generate and validate gemspec"
-      task :gemspec => ['gemspec:generate', 'gemspec:validate']
+      desc 'Generate and validate gemspec'
+      task gemspec: ['gemspec:generate', 'gemspec:validate']
 
       namespace :gemspec do
-        desc "Validates the gemspec on the filesystem"
-        task :validate => :gemspec_required do
+        desc 'Validates the gemspec on the filesystem'
+        task validate: :gemspec_required do
           jeweler.validate_gemspec
         end
 
-        desc "Regenerate the gemspec on the filesystem"
-        task :generate => :version_required do
+        desc 'Regenerate the gemspec on the filesystem'
+        task generate: :version_required do
           jeweler.write_gemspec
         end
 
-        desc "Display the gemspec for debugging purposes, as jeweler knows it (not from the filesystem)"
+        desc 'Display the gemspec for debugging purposes, as jeweler knows it (not from the filesystem)'
         task :debug do
-          # TODO move to a command
+          # TODO: move to a command
           jeweler.gemspec_helper.spec.version ||= begin
                                                     jeweler.version_helper.refresh
                                                     jeweler.version_helper.to_s
@@ -137,39 +137,41 @@ class Jeweler
           puts jeweler.gemspec_helper.to_ruby
         end
 
-        desc "Regenerate and validate gemspec, and then commits and pushes to git"
+        desc 'Regenerate and validate gemspec, and then commits and pushes to git'
         task :release do
           jeweler.release_gemspec(release_args)
         end
       end
 
-      task :release => 'gemspec:release'
-
+      task release: 'gemspec:release'
 
       unless yield_gemspec_set_version?
         namespace :version do
-          desc "Writes out an explicit version. Respects the following environment variables, or defaults to 0: MAJOR, MINOR, PATCH. Also recognizes BUILD, which defaults to nil"
+          desc 'Writes out an explicit version. Respects the following environment variables, or defaults to 0: MAJOR, MINOR, PATCH. Also recognizes BUILD, which defaults to nil'
           task :write do
-            major, minor, patch, build = ENV['MAJOR'].to_i, ENV['MINOR'].to_i, ENV['PATCH'].to_i, (ENV['BUILD'] || nil )
-            jeweler.write_version(major, minor, patch, build, :announce => false, :commit => false)
+            major = ENV['MAJOR'].to_i
+            minor = ENV['MINOR'].to_i
+            patch = ENV['PATCH'].to_i
+            build = (ENV['BUILD'] || nil)
+            jeweler.write_version(major, minor, patch, build, announce: false, commit: false)
             $stdout.puts "Updated version: #{jeweler.version}"
           end
 
           namespace :bump do
-            desc "Bump the major version by 1"
-            task :major => [:version_required, :version] do
+            desc 'Bump the major version by 1'
+            task major: [:version_required, :version] do
               jeweler.bump_major_version
               $stdout.puts "Updated version: #{jeweler.version}"
             end
 
-            desc "Bump the a minor version by 1"
-            task :minor => [:version_required, :version] do
+            desc 'Bump the a minor version by 1'
+            task minor: [:version_required, :version] do
               jeweler.bump_minor_version
               $stdout.puts "Updated version: #{jeweler.version}"
             end
 
-            desc "Bump the patch version by 1"
-            task :patch => [:version_required, :version] do
+            desc 'Bump the patch version by 1'
+            task patch: [:version_required, :version] do
               jeweler.bump_patch_version
               $stdout.puts "Updated version: #{jeweler.version}"
             end
@@ -177,45 +179,44 @@ class Jeweler
         end
       end
 
-
       namespace :git do
-        desc "Tag and push release to git. (happens by default with `rake release`)"
+        desc 'Tag and push release to git. (happens by default with `rake release`)'
         task :release do
           jeweler.release_to_git(release_args)
         end
       end
 
-      task :release => 'git:release'
+      task release: 'git:release'
 
       unless File.exist?('Gemfile')
-        desc "Check that runtime and development dependencies are installed"
+        desc 'Check that runtime and development dependencies are installed'
         task :check_dependencies do
           jeweler.check_dependencies
         end
 
         namespace :check_dependencies do
-          desc "Check that runtime dependencies are installed"
-          task :runtime  do
+          desc 'Check that runtime dependencies are installed'
+          task :runtime do
             jeweler.check_dependencies(:runtime)
           end
 
-          desc"Check that development dependencies are installed"
+          desc'Check that development dependencies are installed'
           task :development do
             jeweler.check_dependencies(:development)
           end
         end
       end
 
-      desc "Start IRB with all runtime dependencies loaded"
-      task :console, [:script] do |t,args|
-        # TODO move to a command
-        dirs = ['ext', 'lib'].select { |dir| File.directory?(dir) }
+      desc 'Start IRB with all runtime dependencies loaded'
+      task :console, [:script] do |_t, args|
+        # TODO: move to a command
+        dirs = %w(ext lib).select { |dir| File.directory?(dir) }
 
         original_load_path = $LOAD_PATH
 
-        cmd = if File.exist?('Gemfile')
-                require 'bundler'
-                Bundler.setup(:default)
+        _cmd = if File.exist?('Gemfile')
+                 require 'bundler'
+                 Bundler.setup(:default)
               end
 
         # add the project code directories
@@ -231,9 +232,8 @@ class Jeweler
         IRB.start
 
         # return the $LOAD_PATH to it's original state
-        $LOAD_PATH.reject! { |path| !(original_load_path.include?(path)) }
+        $LOAD_PATH.reject! { |path| !original_load_path.include?(path) }
       end
-
     end
   end
 end