jeweler 1.8.2 → 2.3.7

data/lib/jeweler/commands/release_to_git.rb

@@ -11,26 +11,31 @@ class Jeweler
         end
       end
 
-      def run
+      def run(args = {})
+        remote = args[:remote] || 'origin'
+        branch = args[:branch] || 'master'
+        local_branch = args[:local_branch] || branch
+        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('master')
-        repo.push
-        
+        repo.checkout(local_branch)
+        repo.push(remote, "#{local_branch}:#{remote_branch}")
+
         if release_not_tagged?
           output.puts "Tagging #{release_tag}"
           repo.add_tag(release_tag)
 
-          output.puts "Pushing #{release_tag} to origin"
-          repo.push('origin', release_tag)
+          output.puts "Pushing #{release_tag} to #{remote}"
+          repo.push(remote, release_tag)
         end
       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
@@ -38,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))
-            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/commands.rb

@@ -1,13 +1,13 @@
 class Jeweler
   module Commands
-    autoload :BuildGem, 'jeweler/commands/build_gem'
-    autoload :InstallGem, 'jeweler/commands/install_gem'
+    autoload :BuildGem,          'jeweler/commands/build_gem'
+    autoload :InstallGem,        'jeweler/commands/install_gem'
     autoload :CheckDependencies, 'jeweler/commands/check_dependencies'
-    autoload :ReleaseToGit, 'jeweler/commands/release_to_git'
-    autoload :ReleaseGemspec, 'jeweler/commands/release_gemspec'
+    autoload :ReleaseToGit,      'jeweler/commands/release_to_git'
+    autoload :ReleaseGemspec,    'jeweler/commands/release_gemspec'
     autoload :ReleaseToRubygems, 'jeweler/commands/release_to_rubygems'
-    autoload :ValidateGemspec, 'jeweler/commands/validate_gemspec'
-    autoload :WriteGemspec, 'jeweler/commands/write_gemspec'
+    autoload :ValidateGemspec,   'jeweler/commands/validate_gemspec'
+    autoload :WriteGemspec,      'jeweler/commands/write_gemspec'
 
     module Version
       autoload :Base,      'jeweler/commands/version/base'

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 = 3\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/generator/application.rb

@@ -24,7 +24,7 @@ class Jeweler
             return 1
           end
 
-          if options[:project_name].nil? || options[:project_name].squeeze.strip == ""
+          if options[:project_name].nil? || options[:project_name].squeeze.strip == ''
             $stderr.puts options.opts
             return 1
           end
@@ -34,16 +34,13 @@ class Jeweler
             generator.run
             return 0
           rescue Jeweler::NoGitUserName
-            $stderr.puts %Q{No user.name found in ~/.gitconfig. Please tell git about yourself (see http://help.github.com/git-email-settings/ for details). For example: git config --global user.name "mad voo"}
+            $stderr.puts %{No user.name found in ~/.gitconfig. Please tell git about yourself (see http://help.github.com/git-email-settings/ for details). For example: git config --global user.name "mad voo"}
             return 1
           rescue Jeweler::NoGitUserEmail
-            $stderr.puts %Q{No user.email found in ~/.gitconfig. Please tell git about yourself (see http://help.github.com/git-email-settings/ for details). For example: git config --global user.email mad.vooo@gmail.com}
+            $stderr.puts %{No user.email found in ~/.gitconfig. Please tell git about yourself (see http://help.github.com/git-email-settings/ for details). For example: git config --global user.email mad.vooo@gmail.com}
             return 1
           rescue Jeweler::NoGitHubUser
-            $stderr.puts %Q{No github.user found in ~/.gitconfig. Please tell git about your GitHub account (see http://github.com/blog/180-local-github-config for details). For example: git config --global github.user defunkt}
-            return 1
-          rescue Jeweler::NoGitHubToken
-            $stderr.puts %Q{No github.token found in ~/.gitconfig. Please tell git about your GitHub account (see http://github.com/blog/180-local-github-config for details). For example: git config --global github.token 6ef8395fecf207165f1a82178ae1b984}
+            $stderr.puts %{Please specify --github-username or set github.user in ~/.gitconfig (see http://github.com/blog/180-local-github-config for details). For example: git config --global github.user defunkt}
             return 1
           rescue Jeweler::FileInTheWay
             $stderr.puts "The directory #{options[:project_name]} already exists. Maybe move it out of the way before continuing?"
@@ -52,15 +49,13 @@ class Jeweler
         end
 
         def build_options(arguments)
-          env_opts_string = ENV['JEWELER_OPTS'] || ""
+          env_opts_string = ENV['JEWELER_OPTS'] || ''
           env_opts        = Jeweler::Generator::Options.new(shellwords(env_opts_string))
           argument_opts   = Jeweler::Generator::Options.new(arguments)
 
           env_opts.merge(argument_opts)
         end
-
       end
-
     end
   end
 end

data/lib/jeweler/generator/bacon_mixin.rb

@@ -1,9 +1,8 @@
 class Jeweler
   class Generator
     module BaconMixin
-
       def self.extended(generator)
-        generator.development_dependencies << ["bacon", ">= 0"]
+        generator.development_dependencies << ['bacon', '>= 0']
       end
 
       def default_task
@@ -35,9 +34,8 @@ class Jeweler
       end
 
       def test_helper_filename
-        "spec_helper.rb"
+        'spec_helper.rb'
       end
-
     end
   end
 end

data/lib/jeweler/generator/github_mixin.rb

@@ -3,18 +3,9 @@ class Jeweler
     module GithubMixin
       def self.extended(generator)
         generator.github_username           = generator.options[:github_username]
-        generator.github_token              = generator.options[:github_token]
         generator.should_create_remote_repo = generator.options[:create_repo]
 
-        unless generator.github_username
-          raise NoGitHubUser
-        end
-        
-        if generator.should_create_remote_repo
-          unless generator.github_token
-            raise NoGitHubToken
-          end
-        end
+        raise NoGitHubUser unless generator.github_username
       end
 
       def git_remote

data/lib/jeweler/generator/micronaut_mixin.rb

@@ -2,9 +2,9 @@ class Jeweler
   class Generator
     module MicronautMixin
       def self.extended(generator)
-        generator.development_dependencies << ["spicycode-micronaut", ">= 0"]
+        generator.development_dependencies << ['spicycode-micronaut', '>= 0']
       end
-      
+
       def default_task
         'examples'
       end
@@ -34,7 +34,7 @@ class Jeweler
       end
 
       def test_helper_filename
-        "example_helper.rb"
+        'example_helper.rb'
       end
     end
   end

data/lib/jeweler/generator/minitest_mixin.rb

@@ -2,7 +2,7 @@ class Jeweler
   class Generator
     module MinitestMixin
       def self.extended(generator)
-        generator.development_dependencies << ["minitest", ">= 0"]
+        generator.development_dependencies << ['minitest', '>= 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/options.rb

@@ -14,18 +14,17 @@ class Jeweler
         self[:user_name]       = ENV['GIT_AUTHOR_NAME']  || ENV['GIT_COMMITTER_NAME']  || git_config['user.name']
         self[:user_email]      = ENV['GIT_AUTHOR_EMAIL'] || ENV['GIT_COMMITTER_EMAIL'] || git_config['user.email']
         self[:github_username] = git_config['github.user']
-        self[:github_token]    = git_config['github.token']
 
         require 'optparse'
         @opts = OptionParser.new do |o|
-          o.banner = "Usage: #{File.basename($0)} [options] reponame\ne.g. #{File.basename($0)} the-perfect-gem"
+          o.banner = "Usage: #{File.basename($PROGRAM_NAME)} [options] reponame\ne.g. #{File.basename($PROGRAM_NAME)} the-perfect-gem"
 
           o.on('--directory [DIRECTORY]', 'specify the directory to generate into (deprecated)') do |directory|
-            warn "--directory is deprecated and will be removed in 2.0.0. Please specify an absolute path to a directoy as the last argument instead" # DEPRECATE
+            warn '--directory is deprecated and will be removed in 2.0.0. Please specify an absolute path to a directory as the last argument instead' # DEPRECATE
             self[:directory] = directory
           end
 
-          o.separator ""
+          o.separator ''
 
           o.on('--rspec', 'generate rspec code examples') do
             self[:testing_framework] = :rspec
@@ -63,7 +62,7 @@ class Jeweler
             self[:testing_framework] = :shindo
           end
 
-          o.separator ""
+          o.separator ''
 
           o.on('--[no-]bundler', 'use bundler for managing dependencies') do |v|
             self[:use_bundler] = v
@@ -73,7 +72,7 @@ class Jeweler
             self[:use_cucumber] = true
           end
 
-          o.separator ""
+          o.separator ''
 
           o.on('--reek', 'generate rake task for reek') do
             self[:use_reek] = true
@@ -83,7 +82,7 @@ class Jeweler
             self[:use_roodi] = true
           end
 
-          o.separator ""
+          o.separator ''
 
           o.on('--summary [SUMMARY]', 'specify the summary of the project') do |summary|
             self[:summary] = summary
@@ -93,7 +92,7 @@ class Jeweler
             self[:description] = description
           end
 
-          o.separator ""
+          o.separator ''
 
           o.on('--user-name [USER_NAME]', "the user's name, ie that is credited in the LICENSE") do |user_name|
             self[:user_name] = user_name
@@ -103,21 +102,17 @@ class Jeweler
             self[:user_email] = user_email
           end
 
-          o.separator ""
+          o.separator ''
 
-          o.on('--github-username [GITHUB_USERNAME]', "name of the user on GitHub to set the project up under") do |github_username|
+          o.on('--github-username [GITHUB_USERNAME]', 'name of the user on GitHub to set the project up under') do |github_username|
             self[:github_username] = github_username
           end
 
-          o.on('--github-token [GITHUB_TOKEN]', "GitHub token to use for interacting with the GitHub API") do |github_token|
-            self[:github_token] = github_token
-          end
-
           o.on('--git-remote [GIT_REMOTE]', 'URI to set the git origin remote to') do |git_remote|
             self[:git_remote] = git_remote
           end
 
-          o.on('--homepage [HOMEPAGE]', "the homepage for your project (defaults to the GitHub repo)") do |homepage|
+          o.on('--homepage [HOMEPAGE]', 'the homepage for your project (defaults to the GitHub repo)') do |homepage|
             self[:homepage] = homepage
           end
 
@@ -125,8 +120,7 @@ class Jeweler
             self[:create_repo] = true
           end
 
-
-          o.separator ""
+          o.separator ''
 
           o.on('--yard', 'use yard for documentation') do
             self[:documentation_framework] = :yard
@@ -135,7 +129,7 @@ class Jeweler
           o.on('--rdoc', 'use rdoc for documentation') do
             self[:documentation_framework] = :rdoc
           end
-          
+
           o.on('-v', '--version', 'show version') do
             self[:show_version] = true
           end
@@ -157,21 +151,18 @@ class Jeweler
         self.class.new(@orig_args + other.orig_args)
       end
 
-
       # Expose git config here, so we can stub it out for test environments
       def self.git_config
-        @git_config  ||=  if Pathname.new("~/.gitconfig").expand_path.exist?
-                           Git.global_config
-                         else
-                           {}
+        @git_config ||= if Pathname.new('~/.gitconfig').expand_path.exist?
+                          Git.global_config
+                        else
+                          {}
                          end
-
       end
 
       def git_config
         self.class.git_config
       end
-
     end
   end
 end

data/lib/jeweler/generator/rdoc_mixin.rb

@@ -2,7 +2,7 @@ class Jeweler
   class Generator
     module RdocMixin
       def self.extended(generator)
-        generator.development_dependencies << ["rdoc", "~> 3.12"]
+        generator.development_dependencies << ['rdoc', '~> 3.12']
       end
 
       def doc_task

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', '~> 3.5.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