jeweler 2.1.1 → 2.1.2

data/lib/jeweler/generator.rb

@@ -23,12 +23,12 @@ class Jeweler
   class NoGitHubUser < StandardError
   end
   class GitInitFailed < StandardError
-  end    
+  end
   class GitRepoCreationFailed < StandardError
   end
 
   # Generator for creating a jeweler-enabled project
-  class Generator    
+  class Generator
     require 'jeweler/generator/options'
     require 'jeweler/generator/application'
 
@@ -49,7 +49,7 @@ class Jeweler
 
     attr_accessor :target_dir, :user_name, :user_email, :summary, :homepage,
                   :description, :project_name, :github_username,
-                  :repo, :should_create_remote_repo, 
+                  :repo, :should_create_remote_repo,
                   :testing_framework, :documentation_framework,
                   :should_use_cucumber, :should_use_bundler,
                   :should_setup_rubyforge, :should_use_reek, :should_use_roodi,
@@ -62,10 +62,10 @@ class Jeweler
       extracted_directory = nil
 
       self.project_name   = options[:project_name]
-      if self.project_name.nil? || self.project_name.squeeze.strip == ""
+      if project_name.nil? || project_name.squeeze.strip == ''
         raise NoGitHubRepoNameGiven
       else
-        path = File.split(self.project_name)
+        path = File.split(project_name)
 
         if path.size > 1
           extracted_directory = File.join(path[0..-1])
@@ -74,10 +74,10 @@ class Jeweler
       end
 
       self.development_dependencies = []
-      self.testing_framework  = options[:testing_framework]
+      self.testing_framework = options[:testing_framework]
       self.documentation_framework = options[:documentation_framework]
       begin
-        generator_mixin_name = "#{self.testing_framework.to_s.capitalize}Mixin"
+        generator_mixin_name = "#{testing_framework.to_s.capitalize}Mixin"
         generator_mixin = self.class.const_get(generator_mixin_name)
         extend generator_mixin
       rescue NameError => e
@@ -85,14 +85,14 @@ class Jeweler
       end
 
       begin
-        generator_mixin_name = "#{self.documentation_framework.to_s.capitalize}Mixin"
+        generator_mixin_name = "#{documentation_framework.to_s.capitalize}Mixin"
         generator_mixin = self.class.const_get(generator_mixin_name)
         extend generator_mixin
       rescue NameError => e
         raise ArgumentError, "Unsupported documentation framework (#{documentation_framework})"
       end
 
-      self.target_dir             = options[:directory] || extracted_directory || self.project_name
+      self.target_dir             = options[:directory] || extracted_directory || project_name
 
       self.summary                = options[:summary] || 'TODO: one-line summary of your gem'
       self.description            = options[:description] || 'TODO: longer description of your gem'
@@ -102,24 +102,24 @@ class Jeweler
       self.should_setup_rubyforge = options[:rubyforge]
       self.should_use_bundler     = options[:use_bundler]
 
-      development_dependencies << ["cucumber", ">= 0"] if should_use_cucumber
+      development_dependencies << ['cucumber', '>= 0'] if should_use_cucumber
 
-      # TODO make bundler optional?
-      development_dependencies << ["bundler", "~> 1.0"]
-      development_dependencies << ["jeweler", "~> #{Jeweler::Version::STRING}"]
-      development_dependencies << ["simplecov", ">= 0"]
+      # TODO: make bundler optional?
+      development_dependencies << ['bundler', '~> 1.0']
+      development_dependencies << ['jeweler', "~> #{Jeweler::Version::STRING}"]
+      development_dependencies << ['simplecov', '>= 0']
 
-      development_dependencies << ["reek", "~> 1.2.8"] if should_use_reek
-      development_dependencies << ["roodi", "~> 2.1.0"] if should_use_roodi
+      development_dependencies << ['reek', '~> 1.2.8'] if should_use_reek
+      development_dependencies << ['roodi', '~> 2.1.0'] if should_use_roodi
 
       self.user_name       = options[:user_name]
       self.user_email      = options[:user_email]
       self.homepage        = options[:homepage]
-      
+
       self.git_remote      = options[:git_remote]
 
-      raise NoGitUserName unless self.user_name
-      raise NoGitUserEmail unless self.user_email
+      raise NoGitUserName unless user_name
+      raise NoGitUserEmail unless user_email
 
       extend GithubMixin
     end
@@ -135,7 +135,7 @@ class Jeweler
     end
 
     def constant_name
-      self.project_name.split(/[-_]/).collect{|each| each.capitalize }.join
+      project_name.split(/[-_]/).collect(&:capitalize).join
     end
 
     def lib_filename
@@ -143,11 +143,11 @@ class Jeweler
     end
 
     def require_name
-      self.project_name
+      project_name
     end
 
     def file_name_prefix
-      self.project_name.gsub('-', '_')
+      project_name.tr('-', '_')
     end
 
     def lib_dir
@@ -174,16 +174,15 @@ class Jeweler
       File.join(features_dir, 'step_definitions')
     end
 
-  private
+    private
 
     def create_files
-      unless File.exists?(target_dir) || File.directory?(target_dir)
-        FileUtils.mkdir target_dir
-      else
+      if File.exist?(target_dir) || File.directory?(target_dir)
         raise FileInTheWay, "The directory #{target_dir} already exists, aborting. Maybe move it out of the way before continuing?"
+      else
+        FileUtils.mkdir target_dir
       end
 
-
       output_template_in_target '.gitignore'
       output_template_in_target 'Rakefile'
       output_template_in_target 'Gemfile' if should_use_bundler
@@ -200,7 +199,6 @@ class Jeweler
       output_template_in_target File.join(testing_framework.to_s, 'flunking.rb'),
                                 File.join(test_dir, test_filename)
 
-
       if testing_framework == :rspec
         output_template_in_target File.join(testing_framework.to_s, '.rspec'),
                                   '.rspec'
@@ -231,7 +229,7 @@ class Jeweler
       final_destination = File.join(target_dir, destination)
       template_result   = render_template(source)
 
-      File.open(final_destination, 'w') {|file| file.write(template_result)}
+      File.open(final_destination, 'w') { |file| file.write(template_result) }
 
       $stdout.puts "\tcreate\t#{destination}"
     end
@@ -250,22 +248,22 @@ class Jeweler
 
     def touch_in_target(destination)
       final_destination = File.join(target_dir, destination)
-      FileUtils.touch  final_destination
+      FileUtils.touch final_destination
       $stdout.puts "\tcreate\t#{destination}"
     end
 
     def create_version_control
       Dir.chdir(target_dir) do
         begin
-          @repo = Git.init()
+          @repo = Git.init
         rescue Git::GitExecuteError => e
-          raise GitInitFailed, "Encountered an error during gitification. Maybe the repo already exists, or has already been pushed to?"
+          raise GitInitFailed, 'Encountered an error during gitification. Maybe the repo already exists, or has already been pushed to?'
         end
 
         begin
           @repo.add('.')
         rescue Git::GitExecuteError => e
-          #raise GitAddFailed, "There was some problem adding this directory to the git changeset"
+          # raise GitAddFailed, "There was some problem adding this directory to the git changeset"
           raise
         end
 
@@ -278,26 +276,26 @@ class Jeweler
         begin
           @repo.add_remote('origin', git_remote)
         rescue Git::GitExecuteError => e
-          puts "Encountered an error while adding origin remote. Maybe you have some weird settings in ~/.gitconfig?"
+          puts 'Encountered an error while adding origin remote. Maybe you have some weird settings in ~/.gitconfig?'
           raise
         end
       end
     end
-    
+
     def create_and_push_repo
-      puts "Please provide your Github password to create the Github repository"
+      puts 'Please provide your Github password to create the Github repository'
       begin
         login = github_username
-        password = ask("Password: ") { |q| q.echo = false }
-        github = Github.new(:login => login.strip, :password => password.strip)
-        github.repos.create(:name => project_name, :description => summary)
+        password = ask('Password: ') { |q| q.echo = false }
+        github = Github.new(login: login.strip, password: password.strip)
+        github.repos.create(name: project_name, description: summary)
       rescue Github::Error::Unauthorized
-        puts "Wrong login/password! Please try again"
+        puts 'Wrong login/password! Please try again'
         retry
       rescue Github::Error::UnprocessableEntity
         raise GitRepoCreationFailed, "Can't create that repo. Does it already exist?"
       end
-      # TODO do a HEAD request to see when it's ready?
+      # TODO: do a HEAD request to see when it's ready?
       @repo.push('origin')
     end
   end

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,13 +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{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}
+            $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?"
@@ -49,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

@@ -5,9 +5,7 @@ class Jeweler
         generator.github_username           = generator.options[:github_username]
         generator.should_create_remote_repo = generator.options[:create_repo]
 
-        unless generator.github_username
-          raise NoGitHubUser
-        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

@@ -17,14 +17,14 @@ class Jeweler
 
         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 directory 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
@@ -62,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
@@ -72,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
@@ -82,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
@@ -92,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
@@ -102,9 +102,9 @@ 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
 
@@ -112,7 +112,7 @@ class Jeweler
             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
 
@@ -120,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
@@ -152,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