jeweler 2.1.1 → 2.1.2

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/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/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,13 +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/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/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/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/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/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

data/test/fixtures/bar/lib/foo_the_ultimate_lib.rb

@@ -1 +1 @@
-# Uhuh
+# Uhuh

data/test/fixtures/existing-project-with-version-constant/Rakefile

@@ -4,16 +4,16 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.version = "1.0.0"
-    gem.name = "existing-project-with-version"
-    gem.summary = %Q{Summarize your gem}
-    gem.email = "josh@technicalpickles.com"
-    gem.homepage = "http://github.com/technicalpickles/existing-project-with-version"
-    gem.authors = ["Josh Nichols"]
+    gem.version = '1.0.0'
+    gem.name = 'existing-project-with-version'
+    gem.summary = %(Summarize your gem)
+    gem.email = 'josh@technicalpickles.com'
+    gem.homepage = 'http://github.com/technicalpickles/existing-project-with-version'
+    gem.authors = ['Josh Nichols']
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts 'Jeweler not available. Install it with: gem install technicalpickles-jeweler -s http://gems.github.com'
 end
 
 require 'rake/testtask'
@@ -32,12 +32,11 @@ begin
   end
 rescue LoadError
   task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: gem install spicycode-rcov"
+    abort 'RCov is not available. In order to run rcov, you must: gem install spicycode-rcov'
   end
 end
 
-
-task :default => :test
+task default: :test
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
@@ -46,7 +45,7 @@ Rake::RDocTask.new do |rdoc|
     config = YAML.load(File.read('VERSION.yml'))
     version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
   else
-    version = ""
+    version = ''
   end
 
   rdoc.rdoc_dir = 'rdoc'
@@ -60,20 +59,19 @@ end
 begin
   require 'rake/contrib/sshpublisher'
   namespace :rubyforge do
-    
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-    
+    desc 'Release gem and RDoc documentation to RubyForge'
+    task release: ['rubyforge:release:gem', 'rubyforge:release:docs']
+
     namespace :release do
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
+      desc 'Publish RDoc to RubyForge.'
+      task docs: [:rdoc] do
         require 'yaml'
         config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+          File.read(File.expand_path('~/.rubyforge/user-config.yml'))
         )
 
         host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/existing-project-with-version/"
+        remote_dir = '/var/www/gforge-projects/existing-project-with-version/'
         local_dir = 'rdoc'
 
         Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
@@ -81,5 +79,5 @@ begin
     end
   end
 rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+  puts 'Rake SshDirPublisher is unavailable or your rubyforge environment is not configured.'
 end

data/test/fixtures/existing-project-with-version-constant/existing-project-with-version.gemspec

@@ -1,29 +1,27 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{existing-project-with-version}
-  s.version = "1.5.3"
+  s.name = 'existing-project-with-version'
+  s.version = '1.5.3'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Josh Nichols"]
-  s.date = %q{2009-03-13}
-  s.email = %q{josh@technicalpickles.com}
-  s.extra_rdoc_files = ["README.rdoc", "LICENSE"]
-  s.files = ["README.rdoc", "VERSION.yml", "lib/existing_project_with_version.rb", "test/existing_project_with_version_test.rb", "test/test_helper.rb", "LICENSE"]
+  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
+  s.authors = ['Josh Nichols']
+  s.date = '2009-03-13'
+  s.email = 'josh@technicalpickles.com'
+  s.extra_rdoc_files = ['README.rdoc', 'LICENSE']
+  s.files = ['README.rdoc', 'VERSION.yml', 'lib/existing_project_with_version.rb', 'test/existing_project_with_version_test.rb', 'test/test_helper.rb', 'LICENSE']
   s.has_rdoc = true
-  s.homepage = %q{http://github.com/technicalpickles/existing-project-with-version}
-  s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Summarize your gem}
+  s.homepage = 'http://github.com/technicalpickles/existing-project-with-version'
+  s.rdoc_options = ['--inline-source', '--charset=UTF-8']
+  s.require_paths = ['lib']
+  s.rubygems_version = '1.3.1'
+  s.summary = 'Summarize your gem'
 
-  if s.respond_to? :specification_version then
+  if s.respond_to? :specification_version
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0')
     end
-  else
   end
 end

data/test/fixtures/existing-project-with-version-constant/test/existing_project_with_version_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class ExistingProjectWithVersionTest < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+  should 'probably rename this file and start testing for real' do
+    flunk 'hey buddy, you should probably rename this file and start testing for real'
   end
 end

data/test/fixtures/existing-project-with-version-plaintext/Rakefile

@@ -4,15 +4,15 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "existing-project-with-version"
-    gem.summary = %Q{Summarize your gem}
-    gem.email = "josh@technicalpickles.com"
-    gem.homepage = "http://github.com/technicalpickles/existing-project-with-version"
-    gem.authors = ["Josh Nichols"]
+    gem.name = 'existing-project-with-version'
+    gem.summary = %(Summarize your gem)
+    gem.email = 'josh@technicalpickles.com'
+    gem.homepage = 'http://github.com/technicalpickles/existing-project-with-version'
+    gem.authors = ['Josh Nichols']
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts 'Jeweler not available. Install it with: gem install technicalpickles-jeweler -s http://gems.github.com'
 end
 
 require 'rake/testtask'
@@ -31,12 +31,11 @@ begin
   end
 rescue LoadError
   task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: gem install spicycode-rcov"
+    abort 'RCov is not available. In order to run rcov, you must: gem install spicycode-rcov'
   end
 end
 
-
-task :default => :test
+task default: :test
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
@@ -45,7 +44,7 @@ Rake::RDocTask.new do |rdoc|
     config = YAML.load(File.read('VERSION.yml'))
     version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
   else
-    version = ""
+    version = ''
   end
 
   rdoc.rdoc_dir = 'rdoc'
@@ -59,20 +58,19 @@ end
 begin
   require 'rake/contrib/sshpublisher'
   namespace :rubyforge do
-    
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-    
+    desc 'Release gem and RDoc documentation to RubyForge'
+    task release: ['rubyforge:release:gem', 'rubyforge:release:docs']
+
     namespace :release do
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
+      desc 'Publish RDoc to RubyForge.'
+      task docs: [:rdoc] do
         require 'yaml'
         config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+          File.read(File.expand_path('~/.rubyforge/user-config.yml'))
         )
 
         host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/existing-project-with-version/"
+        remote_dir = '/var/www/gforge-projects/existing-project-with-version/'
         local_dir = 'rdoc'
 
         Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
@@ -80,5 +78,5 @@ begin
     end
   end
 rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+  puts 'Rake SshDirPublisher is unavailable or your rubyforge environment is not configured.'
 end

data/test/fixtures/existing-project-with-version-plaintext/existing-project-with-version.gemspec

@@ -1,29 +1,27 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{existing-project-with-version}
-  s.version = "1.5.3"
+  s.name = 'existing-project-with-version'
+  s.version = '1.5.3'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Josh Nichols"]
-  s.date = %q{2009-03-13}
-  s.email = %q{josh@technicalpickles.com}
-  s.extra_rdoc_files = ["README.rdoc", "LICENSE"]
-  s.files = ["README.rdoc", "VERSION.yml", "lib/existing_project_with_version.rb", "test/existing_project_with_version_test.rb", "test/test_helper.rb", "LICENSE"]
+  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
+  s.authors = ['Josh Nichols']
+  s.date = '2009-03-13'
+  s.email = 'josh@technicalpickles.com'
+  s.extra_rdoc_files = ['README.rdoc', 'LICENSE']
+  s.files = ['README.rdoc', 'VERSION.yml', 'lib/existing_project_with_version.rb', 'test/existing_project_with_version_test.rb', 'test/test_helper.rb', 'LICENSE']
   s.has_rdoc = true
-  s.homepage = %q{http://github.com/technicalpickles/existing-project-with-version}
-  s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Summarize your gem}
+  s.homepage = 'http://github.com/technicalpickles/existing-project-with-version'
+  s.rdoc_options = ['--inline-source', '--charset=UTF-8']
+  s.require_paths = ['lib']
+  s.rubygems_version = '1.3.1'
+  s.summary = 'Summarize your gem'
 
-  if s.respond_to? :specification_version then
+  if s.respond_to? :specification_version
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0')
     end
-  else
   end
 end

data/test/fixtures/existing-project-with-version-plaintext/test/existing_project_with_version_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class ExistingProjectWithVersionTest < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+  should 'probably rename this file and start testing for real' do
+    flunk 'hey buddy, you should probably rename this file and start testing for real'
   end
 end