jeweler 2.1.1 → 2.1.2

data/lib/jeweler.rb

@@ -16,12 +16,12 @@ class Jeweler
   autoload :Generator,      'jeweler/generator'
 
   autoload :Commands,       'jeweler/commands'
-  
+
   autoload :VersionHelper,  'jeweler/version_helper'
   autoload :GemSpecHelper,  'jeweler/gemspec_helper'
 
   autoload :Tasks,          'jeweler/tasks'
-  autoload :RubygemsDotOrgTasks,  'jeweler/rubygems_dot_org_tasks'
+  autoload :RubygemsDotOrgTasks, 'jeweler/rubygems_dot_org_tasks'
   autoload :GemcutterTasks, 'jeweler/gemcutter_tasks'
   autoload :RubyforgeTasks, 'jeweler/rubyforge_tasks'
   autoload :Specification,  'jeweler/specification'
@@ -72,7 +72,7 @@ class Jeweler
     Jeweler::Commands::WriteGemspec.build_for(self).run
   end
 
-  # Validates the project's gemspec from disk in an environment similar to how 
+  # Validates the project's gemspec from disk in an environment similar to how
   # GitHub would build from it. See http://gist.github.com/16215
   def validate_gemspec
     Jeweler::Commands::ValidateGemspec.build_for(self).run
@@ -96,26 +96,26 @@ class Jeweler
   # Bumps the patch version.
   #
   # 1.5.1 -> 1.5.2
-  def bump_patch_version()
+  def bump_patch_version
     Jeweler::Commands::Version::BumpPatch.build_for(self).run
   end
 
   # Bumps the minor version.
   #
   # 1.5.1 -> 1.6.0
-  def bump_minor_version()
+  def bump_minor_version
     Jeweler::Commands::Version::BumpMinor.build_for(self).run
   end
 
   # Bumps the major version.
   #
   # 1.5.1 -> 2.0.0
-  def bump_major_version()
+  def bump_major_version
     Jeweler::Commands::Version::BumpMajor.build_for(self).run
   end
 
   # Bumps the version, to the specific major/minor/patch version, writing out the appropriate version.rb, and then reloads it.
-  def write_version(major, minor, patch, build, options = {})
+  def write_version(major, minor, patch, build, _options = {})
     command = Jeweler::Commands::Version::Write.build_for(self)
     command.major = major
     command.minor = minor
@@ -153,26 +153,25 @@ class Jeweler
   end
 
   def git_base_dir(base_dir = nil)
-    if base_dir
-      base_dir = File.dirname(base_dir)
-    else
-      base_dir = File.expand_path(self.base_dir || ".")
-    end
-    return nil if base_dir==File.dirname("/")
-    return base_dir if File.exists?(File.join(base_dir, '.git'))
-    return git_base_dir(base_dir)
-  end    
+    base_dir = if base_dir
+                 File.dirname(base_dir)
+               else
+                 File.expand_path(self.base_dir || '.')
+               end
+    return nil if base_dir == File.dirname('/')
+    return base_dir if File.exist?(File.join(base_dir, '.git'))
+    git_base_dir(base_dir)
+  end
 
   def in_git_repo?
     git_base_dir
   end
 
-  def version_file_exists?
-    File.exists?(@version_helper.plaintext_path) || File.exists?(@version_helper.yaml_path)
+  def version_file_exist?
+    File.exist?(@version_helper.plaintext_path) || File.exist?(@version_helper.yaml_path)
   end
 
   def expects_version_file?
     gemspec.version.nil?
   end
-
 end

data/lib/jeweler/commands/build_gem.rb

@@ -12,10 +12,10 @@ class Jeweler
 
         gemspec = gemspec_helper.parse
 
-        if Gem::Version.new(`gem -v`) >= Gem::Version.new("2.0.0.a")
+        if Gem::Version.new(`gem -v`) >= Gem::Version.new('2.0.0.a')
           gem_file_name = Gem::Package.build(gemspec)
         else
-          require "rubygems/builder"
+          require 'rubygems/builder'
           gem_file_name = Gem::Builder.new(gemspec).build
         end
 

data/lib/jeweler/commands/check_dependencies.rb

@@ -13,12 +13,12 @@ class Jeweler
         if missing_dependencies.empty?
           puts "#{type || 'All'} dependencies seem to be installed."
         else
-          puts "Missing some dependencies. Install them with the following commands:"
+          puts 'Missing some dependencies. Install them with the following commands:'
           missing_dependencies.each do |dependency|
-            puts %Q{\tgem install #{dependency.name} --version "#{dependency.requirement.to_s}"}
+            puts %(\tgem install #{dependency.name} --version "#{dependency.requirement}")
           end
 
-          abort "Run the specified gem commands before trying to run this again: #{$0} #{ARGV.join(' ')}"
+          abort "Run the specified gem commands before trying to run this again: {$PROGRAM_NAME} #{ARGV.join(' ')}"
         end
       end
 

data/lib/jeweler/commands/install_gem.rb

@@ -13,7 +13,7 @@ class Jeweler
         command = "#{gem_command} install #{gemspec_helper.gem_path}"
         output.puts "Executing #{command.inspect}:"
 
-        sh command # TODO where does sh actually come from!? - rake, apparently
+        sh command # TODO: where does sh actually come from!? - rake, apparently
       end
 
       def gem_command

data/lib/jeweler/commands/release_gemspec.rb

@@ -3,7 +3,8 @@ require 'pathname'
 class Jeweler
   module Commands
     class ReleaseGemspec
-      attr_accessor :gemspec, :version, :repo, :output, :gemspec_helper, :base_dir
+      attr_accessor :gemspec, :version, :repo, :output, :base_dir
+      attr_writer :gemspec_helper
 
       def initialize(attributes = {})
         self.output = $stdout
@@ -20,8 +21,8 @@ class Jeweler
         remote_branch = args[:remote_branch] || branch
 
         unless clean_staging_area?
-          system "git status"
-          raise "Unclean staging area! Be sure to commit or .gitignore everything first. See `git status` above."
+          system 'git status'
+          raise 'Unclean staging area! Be sure to commit or .gitignore everything first. See `git status` above.'
         end
 
         repo.checkout(local_branch)
@@ -35,7 +36,7 @@ class Jeweler
 
       def clean_staging_area?
         # surprisingly simpler than ruby-git
-        `git ls-files --deleted --modified --others --exclude-standard` == ""
+        `git ls-files --deleted --modified --others --exclude-standard` == ''
       end
 
       def commit_gemspec!
@@ -56,14 +57,11 @@ class Jeweler
       end
 
       def gemspec_helper
-        @gemspec_helper ||= Jeweler::GemSpecHelper.new(self.gemspec, self.base_dir)
+        @gemspec_helper ||= Jeweler::GemSpecHelper.new(gemspec, base_dir)
       end
 
       def working_subdir
-        return @working_subdir if @working_subdir
-        cwd = base_dir_path
-        @working_subdir = cwd.relative_path_from(Pathname.new(repo.dir.path))
-        @working_subdir
+        @working_subdir ||= base_dir_path.relative_path_from(Pathname.new(repo.dir.path))
       end
 
       def base_dir_path
@@ -71,7 +69,7 @@ class Jeweler
       end
 
       def self.build_for(jeweler)
-        command = self.new
+        command = new
 
         command.base_dir = jeweler.base_dir
         command.gemspec = jeweler.gemspec

data/lib/jeweler/commands/release_to_git.rb

@@ -18,8 +18,8 @@ class Jeweler
         remote_branch = args[:remote_branch] || branch
 
         unless clean_staging_area?
-          system "git status"
-          raise "Unclean staging area! Be sure to commit or .gitignore everything first. See `git status` above."
+          system 'git status'
+          raise 'Unclean staging area! Be sure to commit or .gitignore everything first. See `git status` above.'
         end
 
         repo.checkout(local_branch)
@@ -35,7 +35,7 @@ class Jeweler
       end
 
       def clean_staging_area?
-        `git ls-files --deleted --modified --others --exclude-standard` == ""
+        `git ls-files --deleted --modified --others --exclude-standard` == ''
       end
 
       def release_tag
@@ -43,12 +43,16 @@ class Jeweler
       end
 
       def release_not_tagged?
-        tag = repo.tag(release_tag) rescue nil
+        tag = begin
+                repo.tag(release_tag)
+              rescue
+                nil
+              end
         tag.nil?
       end
 
       def self.build_for(jeweler)
-        command = self.new
+        command = new
 
         command.base_dir = jeweler.base_dir
         command.gemspec = jeweler.gemspec

data/lib/jeweler/commands/validate_gemspec.rb

@@ -8,13 +8,11 @@ class Jeweler
       end
 
       def run
-        begin
-          gemspec_helper.parse
-          output.puts "#{gemspec_helper.path} is valid."
-        rescue Exception => e
-          output.puts "#{gemspec_helper.path} is invalid. See the backtrace for more details."
-          raise
-        end
+        gemspec_helper.parse
+        output.puts "#{gemspec_helper.path} is valid."
+      rescue Exception => _e
+        output.puts "#{gemspec_helper.path} is invalid. See the backtrace for more details."
+        raise
       end
 
       def self.build_for(jeweler)

data/lib/jeweler/commands/version/base.rb

@@ -4,41 +4,36 @@ class Jeweler
   module Commands
     module Version
       class Base
-
         attr_accessor :repo, :version_helper, :gemspec, :commit, :base_dir
 
         def run
           update_version
 
-          self.version_helper.write
-          self.gemspec.version = self.version_helper.to_s
+          version_helper.write
+          gemspec.version = version_helper.to_s
 
-          commit_version if self.repo && self.commit
+          commit_version if repo && commit
         end
 
         def update_version
-          raise "Subclasses should implement this"
+          raise 'Subclasses should implement this'
         end
 
         def commit_version
-          if self.repo
-            self.repo.add(working_subdir.join(version_helper.path).to_s)
-            self.repo.commit("Version bump to #{self.version_helper.to_s}")
+          if repo
+            repo.add(working_subdir.join(version_helper.path).to_s)
+            repo.commit("Version bump to #{version_helper}")
           end
         end
 
         def working_subdir
-          return @working_subdir if @working_subdir
-          cwd = base_dir_path
-          @working_subdir = cwd.relative_path_from(Pathname.new(repo.dir.path))
-          @working_subdir
+          @working_subdir ||= base_dir_path.relative_path_from(Pathname.new(repo.dir.path))
         end
 
         def base_dir_path
           Pathname.new(base_dir).realpath
         end
 
-
         def self.build_for(jeweler)
           command = new
           command.repo = jeweler.repo

data/lib/jeweler/commands/version/bump_major.rb

@@ -2,11 +2,9 @@ class Jeweler
   module Commands
     module Version
       class BumpMajor < Base
-
         def update_version
-          self.version_helper.bump_major
+          version_helper.bump_major
         end
-
       end
     end
   end

data/lib/jeweler/commands/version/bump_minor.rb

@@ -2,9 +2,8 @@ class Jeweler
   module Commands
     module Version
       class BumpMinor < Base
-        
         def update_version
-          self.version_helper.bump_minor
+          version_helper.bump_minor
         end
       end
     end

data/lib/jeweler/commands/version/bump_patch.rb

@@ -2,13 +2,10 @@ class Jeweler
   module Commands
     module Version
       class BumpPatch < Base
-
         def update_version
-          self.version_helper.bump_patch
+          version_helper.bump_patch
         end
-
       end
     end
   end
 end
-

data/lib/jeweler/commands/write_gemspec.rb

@@ -1,7 +1,8 @@
 class Jeweler
   module Commands
     class WriteGemspec
-      attr_accessor :base_dir, :gemspec, :version, :output, :gemspec_helper, :version_helper
+      attr_accessor :base_dir, :gemspec, :version, :output, :version_helper
+      attr_writer :gemspec_helper
 
       def initialize
         self.output = $stdout
@@ -15,11 +16,11 @@ class Jeweler
 
         gemspec_helper.write
 
-        output.puts "Generated: #{gemspec_helper.path}"  
+        output.puts "Generated: #{gemspec_helper.path}"
       end
 
       def gemspec_helper
-        @gemspec_helper ||= GemSpecHelper.new(self.gemspec, self.base_dir)
+        @gemspec_helper ||= GemSpecHelper.new(gemspec, base_dir)
       end
 
       def self.build_for(jeweler)

data/lib/jeweler/gemspec_helper.rb

@@ -10,18 +10,16 @@ class Jeweler
     end
 
     def valid?
-      begin
-        parse
-        true
-      rescue
-        false
-      end
+      parse
+      true
+    rescue
+      false
     end
 
     def write
       File.open(path, 'w') do |f|
-        f.write self.to_ruby
-      end 
+        f.write to_ruby
+      end
     end
 
     def to_ruby
@@ -42,13 +40,15 @@ class Jeweler
     def path
       denormalized_path = File.join(@base_dir, "#{@spec.name}.gemspec")
       absolute_path = File.expand_path(denormalized_path)
-      absolute_path.gsub(Dir.getwd + File::SEPARATOR, '') 
+      absolute_path.gsub(Dir.getwd + File::SEPARATOR, '')
     end
 
+    PARSE_SAFE = (RUBY_VERSION >= '2.3') ? 1 : 3
+
     def parse
-      data = self.to_ruby
+      data = to_ruby
       parsed_gemspec = nil
-      Thread.new { parsed_gemspec = eval("$SAFE = 1\n#{data}", binding, path) }.join
+      Thread.new { parsed_gemspec = eval("$SAFE = #{PARSE_SAFE}\n#{data}", binding, path) }.join
       parsed_gemspec
     end
 
@@ -65,9 +65,9 @@ class Jeweler
     # Adds extra space when outputting an array. This helps create better version control diffs, because otherwise it is all on the same line.
     def prettyify_array(gemspec_ruby, array_name)
       gemspec_ruby.gsub(/s\.#{array_name.to_s} = \[.+?\]/) do |match|
-        leadin, files = match[0..-2].split("[")
-        
-        leadin + "[\n    #{files.gsub(%|", "|, %|",\n    "|)}\n  ]"
+        leadin, files = match[0..-2].split('[')
+
+        leadin + "[\n    #{files.gsub(%(", "), %(",\n    "))}\n  ]"
       end
     end
 
@@ -78,7 +78,7 @@ class Jeweler
     def update_version(version)
       @spec.version = version.to_s
     end
-    
+
     # Checks whether it uses the version helper or the users defined version.
     def has_version?
       !@spec.version.nil?

data/lib/jeweler/gemspec_helper.rb.orig

@@ -0,0 +1,91 @@
+class Jeweler
+  class GemSpecHelper
+    attr_accessor :spec, :base_dir
+
+    def initialize(spec, base_dir = nil)
+      self.spec = spec
+      self.base_dir = base_dir || ''
+
+      yield spec if block_given?
+    end
+
+    def valid?
+      parse
+      true
+    rescue
+      false
+    end
+
+    def write
+      File.open(path, 'w') do |f|
+        f.write to_ruby
+      end
+    end
+
+    def to_ruby
+      normalize_files(:files)
+      normalize_files(:extra_rdoc_files)
+
+      gemspec_ruby = @spec.to_ruby
+      gemspec_ruby = prettyify_array(gemspec_ruby, :files)
+      gemspec_ruby = prettyify_array(gemspec_ruby, :extra_rdoc_files)
+      gemspec_ruby = <<-END
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in #{Rake.application.rakefile}, and run 'rake gemspec'
+#{gemspec_ruby}
+        END
+    end
+
+    def path
+      denormalized_path = File.join(@base_dir, "#{@spec.name}.gemspec")
+      absolute_path = File.expand_path(denormalized_path)
+      absolute_path.gsub(Dir.getwd + File::SEPARATOR, '')
+    end
+
+    PARSE_SAFE = (RUBY_VERSION >= '2.3') ? 1 : 3
+
+    def parse
+      data = to_ruby
+      parsed_gemspec = nil
+<<<<<<< HEAD
+      Thread.new { parsed_gemspec = eval("$SAFE = 1\n#{data}", binding, path) }.join
+=======
+      Thread.new { parsed_gemspec = eval("$SAFE = #{PARSE_SAFE}\n#{data}", binding, path) }.join
+>>>>>>> 1d6f8d13d012c584ad37b496c999edfb0127aadc
+      parsed_gemspec
+    end
+
+    def normalize_files(array_attribute)
+      array = @spec.send(array_attribute)
+      # only keep files, no directories, and sort
+      array = array.select do |path|
+        File.file? File.join(@base_dir, path)
+      end.sort
+
+      @spec.send("#{array_attribute}=", array)
+    end
+
+    # Adds extra space when outputting an array. This helps create better version control diffs, because otherwise it is all on the same line.
+    def prettyify_array(gemspec_ruby, array_name)
+      gemspec_ruby.gsub(/s\.#{array_name.to_s} = \[.+?\]/) do |match|
+        leadin, files = match[0..-2].split('[')
+
+        leadin + "[\n    #{files.gsub(%(", "), %(",\n    "))}\n  ]"
+      end
+    end
+
+    def gem_path
+      File.join(@base_dir, 'pkg', parse.file_name)
+    end
+
+    def update_version(version)
+      @spec.version = version.to_s
+    end
+
+    # Checks whether it uses the version helper or the users defined version.
+    def has_version?
+      !@spec.version.nil?
+    end
+  end
+end