jeweler 1.8.2 → 2.3.7

data/lib/jeweler/tasks.rb

@@ -33,11 +33,12 @@ class Jeweler
   # The block variable gem is actually a Gem::Specification, so you can
   # do anything you would normally do with a Gem::Specification.
   # For more details, see the official gemspec reference:
-  # http://docs.rubygems.org/read/chapter/20
+  # http://guides.rubygems.org/specification-reference
   #
   # 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,61 +68,67 @@ class Jeweler
 
       gemspec_building_block.call(yielded_gemspec) if gemspec_building_block
 
-      ! yielded_gemspec.version.nil?
+      !yielded_gemspec.version.nil?
+    end
+
+    def release_args
+      args = {}
+      args[:remote] = ENV['REMOTE']
+      args[:branch] = ENV['BRANCH']
+      args[:local_branch] = ENV['LOCAL_BRANCH']
+      args[:remote_branch] = ENV['REMOTE_BRANCH']
+      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
@@ -128,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
+          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
@@ -168,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
+          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
@@ -222,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

data/lib/jeweler/templates/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"

data/lib/jeweler/templates/bacon/flunking.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe "<%= constant_name %>" do
-  it "fails" do
-    should.flunk "hey buddy, you should probably rename this file and start specing for real"
+describe '<%= constant_name %>' do
+  it 'fails' do
+    should.flunk 'hey buddy, you should probably rename this file and start specing for real'
   end
 end

data/lib/jeweler/templates/bacon/helper.rb

@@ -1,3 +1,4 @@
+<%= render_template 'simplecov.erb' %>
 require 'rubygems'
 <%= render_template 'bundler_setup.erb' %>
 require 'bacon'

data/lib/jeweler/templates/features/support/env.rb

@@ -1,3 +1,4 @@
+<%= render_template 'simplecov.erb' %>
 <%= render_template 'bundler_setup.erb' %>
 
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')

data/lib/jeweler/templates/jeweler_tasks.erb

@@ -1,6 +1,6 @@
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
   gem.name = "<%= project_name %>"
   gem.homepage = "<%= homepage %>"
   gem.license = "MIT"

data/lib/jeweler/templates/micronaut/flunking.rb

@@ -1,7 +1,7 @@
 require 'example_helper'
 
-describe "<%= constant_name %>" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+describe '<%= constant_name %>' do
+  it 'fails' do
+    fail 'hey buddy, you should probably rename this file and start specing for real'
   end
 end

data/lib/jeweler/templates/micronaut/helper.rb

@@ -1,3 +1,4 @@
+<%= render_template 'simplecov.erb' %>
 require 'rubygems'
 <%= render_template 'bundler_setup.erb' %>
 require 'micronaut'

data/lib/jeweler/templates/minitest/flunking.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Test<%= constant_name %> < MiniTest::Unit::TestCase
+class Test<%= constant_name %> < MiniTest::Test
   def test_something_for_real
     flunk "hey buddy, you should probably rename this file and start testing for real"
   end

data/lib/jeweler/templates/minitest/helper.rb

@@ -1,12 +1,13 @@
+<%= render_template 'simplecov.erb' %>
 require 'rubygems'
 <%= render_template 'bundler_setup.erb' %>
-require 'minitest/unit'
+require 'minitest/test'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require '<%= require_name %>'
 
-class MiniTest::Unit::TestCase
+class MiniTest::Test
 end
 
-MiniTest::Unit.autorun
+require 'minitest/autorun'

data/lib/jeweler/templates/other_tasks.erb

@@ -23,27 +23,11 @@ Rake::TestTask.new(:<%= test_task %>) do |<%= test_task %>|
 end
 <% end %>
 
-<% case testing_framework %>
-<% when :rspec %>
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = '<%= test_pattern %>'
-  spec.rcov = true
+desc "Code coverage detail"
+task :simplecov do
+  ENV['COVERAGE'] = "true"
+  Rake::Task['<%= test_task %>'].execute
 end
-<% when :micronaut %>
-Micronaut::RakeTask.new(:rcov) do |examples|
-  examples.pattern = '<%= test_pattern %>'
-  examples.rcov_opts = '-Ilib -I<%= test_dir %>'
-  examples.rcov = true
-end
-<% else %>
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |<%= test_task %>|
-  <%= test_task %>.libs << '<%= test_dir %>'
-  <%= test_task %>.pattern = '<%= test_pattern %>'
-  <%= test_task %>.verbose = true
-  <%= test_task %>.rcov_opts << '--exclude "gems/*"'
-end
-<% end %>
 
 <% if should_use_cucumber %>
 require 'cucumber/rake/task'

data/lib/jeweler/templates/riot/flunking.rb

@@ -1,6 +1,6 @@
 require 'teststrap'
 
-context "<%= require_name %>" do
+context '<%= require_name %>' do
   setup do
     false
   end

data/lib/jeweler/templates/riot/helper.rb

@@ -1,3 +1,4 @@
+<%= render_template 'simplecov.erb' %>
 require 'rubygems'
 <%= render_template 'bundler_setup.erb' %>
 require 'riot'

data/lib/jeweler/templates/rspec/flunking.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "<%= constant_name %>" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+describe '<%= constant_name %>' do
+  it 'fails' do
+    fail 'hey buddy, you should probably rename this file and start specing for real'
   end
 end

data/lib/jeweler/templates/rspec/helper.rb

@@ -1,5 +1,7 @@
+<%= render_template 'simplecov.erb' %>
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+
 require 'rspec'
 require '<%= require_name %>'
 
@@ -8,5 +10,5 @@ require '<%= require_name %>'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+
 end

data/lib/jeweler/templates/shindo/flunking.rb

@@ -1,8 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/tests_helper')
 
-Shindo.tests("<%= constant_name %>") do
-  test("fails") do
-    "hey buddy, you should probably rename this file and start specing for real"
+Shindo.tests('<%= constant_name %>') do
+  test('fails') do
+    'hey buddy, you should probably rename this file and start specing for real'
     false
   end
 end

data/lib/jeweler/templates/shindo/helper.rb

@@ -1,3 +1,4 @@
+<%= render_template 'simplecov.erb' %>
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require '<%= require_name %>'

data/lib/jeweler/templates/shoulda/helper.rb

@@ -1,3 +1,4 @@
+<%= render_template 'simplecov.erb' %>
 require 'rubygems'
 <%= render_template 'bundler_setup.erb' %>
 require 'test/unit'

data/lib/jeweler/templates/simplecov.erb

@@ -0,0 +1,16 @@
+require 'simplecov'
+
+module SimpleCov::Configuration
+  def clean_filters
+    @filters = []
+  end
+end
+
+SimpleCov.configure do
+  clean_filters
+  load_adapter 'test_frameworks'
+end
+
+ENV["COVERAGE"] && SimpleCov.start do
+  add_filter "/.rvm/"
+end

data/lib/jeweler/templates/testspec/flunking.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
-describe "<%= constant_name %>" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+describe '<%= constant_name %>' do
+  it 'fails' do
+    fail 'hey buddy, you should probably rename this file and start specing for real'
   end
 end

data/lib/jeweler/templates/testspec/helper.rb

@@ -1,4 +1,4 @@
-
+<%= render_template 'simplecov.erb' %>
 require 'rubygems'
 require 'test/spec'
 

data/lib/jeweler/templates/testunit/helper.rb

@@ -1,3 +1,4 @@
+<%= render_template 'simplecov.erb' %>
 require 'rubygems'
 <%= render_template 'bundler_setup.erb' %>
 require 'test/unit'

data/lib/jeweler/version.rb

@@ -1,8 +1,8 @@
 class Jeweler
   module Version
-    MAJOR = 1
-    MINOR = 8
-    PATCH = 2
+    MAJOR = 2
+    MINOR = 0
+    PATCH = 1
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/lib/jeweler/version_helper.rb

@@ -13,16 +13,16 @@ class Jeweler
     module YamlExtension
       def write
         File.open(yaml_path, 'w+') do |f|
-          YAML.dump(self.to_hash, f)
+          YAML.dump(to_hash, f)
         end
       end
 
       def to_hash
         {
-          :major => major,
-          :minor => minor,
-          :patch => patch,
-          :build => build
+          major: major,
+          minor: minor,
+          patch: patch,
+          build: build
         }
       end
 
@@ -39,7 +39,7 @@ class Jeweler
       end
 
       def read_yaml
-        if File.exists?(yaml_path)
+        if File.exist?(yaml_path)
           YAML.load_file(yaml_path)
         else
           raise VersionYmlError, "#{yaml_path} does not exist!"
@@ -86,14 +86,12 @@ class Jeweler
     def initialize(base_dir)
       self.base_dir = base_dir
 
-      if File.exists?(yaml_path)
+      if File.exist?(yaml_path)
         extend YamlExtension
         parse_yaml
       else
         extend PlaintextExtension
-        if File.exists?(plaintext_path)
-          parse_plaintext
-        end
+        parse_plaintext if File.exist?(plaintext_path)
       end
     end
 
@@ -115,7 +113,7 @@ class Jeweler
       @build = nil
     end
 
-    def update_to(major, minor, patch, build=nil)
+    def update_to(major, minor, patch, build = nil)
       @major = major
       @minor = minor
       @patch = patch
@@ -127,15 +125,20 @@ class Jeweler
     end
 
     def yaml_path
-      denormalized_path = File.join(@base_dir, 'VERSION.yml')
-      absolute_path = File.expand_path(denormalized_path)
-      absolute_path.gsub(Dir.getwd + File::SEPARATOR, '')
+      path_to_version_file('VERSION.yml')
     end
 
     def plaintext_path
-      denormalized_path = File.join(@base_dir, 'VERSION')
+      path_to_version_file('VERSION')
+    end
+
+  private
+
+    def path_to_version_file(filename)
+      denormalized_path = File.join(@base_dir, filename)
       absolute_path = File.expand_path(denormalized_path)
       absolute_path.gsub(Dir.getwd + File::SEPARATOR, '')
     end
+
   end
 end