jeweler 1.5.0.pre4 → 1.5.0.pre5

data/.document

@@ -1,14 +1,8 @@
-# .document is used by rdoc and yard to know how to generate documentation 
-# for example, it can be used to control how rdoc gets built when you do `gem install foo`
-
 lib/jeweler.rb
 lib/jeweler/*.rb
 lib/jeweler/commands/*.rb
 lib/jeweler/generator/*.rb
 bin/*
-
-# Files below the line with - are treated as 'extra files', and aren't parsed for ruby code
 -
-README.markdown
 features/**/*.feature
-LICENSE
+LICENSE.txt

data/Gemfile.lock

@@ -35,7 +35,7 @@ GEM
     test-construct (1.2.0)
     timecop (0.3.5)
     trollop (1.16.2)
-    yard (0.6.0)
+    yard (0.6.1)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -1,5 +1,6 @@
-require 'rake'
+require 'rubygems'
 require 'bundler'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -10,7 +11,9 @@ end
 
 $LOAD_PATH.unshift('lib')
 
+require 'rake'
 require 'jeweler'
+
 Jeweler::Tasks.new do |gem|
   gem.name = "jeweler"
   gem.version = Jeweler::Version::STRING

data/features/generator/cucumber.feature

@@ -90,7 +90,7 @@ Feature: generating cucumber stories
     When I generate a rspec project named 'the-perfect-gem' that is 'zomg, so good'
 
     Then 'features/support/env.rb' requires 'the-perfect-gem'
-    And 'features/support/env.rb' requires 'spec/expectations'
+    And 'features/support/env.rb' requires 'rspec/expectations'
 
   Scenario: cucumber setup for mirconaut
     Given a working directory

data/features/generator/git.feature

@@ -26,7 +26,7 @@ Feature: git support
     Then a commit with the message 'Initial commit to the-perfect-gem.' is made
     And 'README.rdoc' was checked in
     And 'Rakefile' was checked in
-    And 'LICENSE' was checked in
+    And 'LICENSE.txt' was checked in
     And 'lib/the-perfect-gem.rb' was checked in
     And '.gitignore' was checked in
 
@@ -99,4 +99,4 @@ Feature: git support
     When I generate a shindo project named 'the-perfect-gem' that is 'zomg, so good'
 
     Then 'tests/tests_helper.rb' was checked in
-    And 'tests/the-perfect-gem_tests.rb' was checked in
+    And 'tests/the-perfect-gem_tests.rb' was checked in

data/features/generator/license.feature

@@ -10,11 +10,11 @@ Feature: generated license
     Given I have configured git sanely
     When I generate a project named 'the-perfect-gem' that is 'zomg, so good'
 
-    Then LICENSE credits 'foo'
+    Then LICENSE.txt credits 'foo'
 
   Scenario: copyright in the current year
     Given it is the year 2005
     And I have configured git sanely
     When I generate a project named 'the-perfect-gem' that is 'zomg, so good'
 
-    Then LICENSE has a copyright in the year 2005
+    Then LICENSE.txt has a copyright in the year 2005

data/features/generator/test_helper.feature

@@ -45,10 +45,7 @@ Feature: generated test or spec
     And I have configured git sanely
     And I want bundler
     When I generate a rspec project named 'the-perfect-gem' that is 'zomg, so good'
-    Then 'spec/spec_helper.rb' requires 'bundler'
-    And 'spec/spec_helper.rb' sets up bundler using the default and development groups
-    And 'spec/spec_helper.rb' requires 'rspec'
-    And 'spec/spec_helper.rb' requires 'rspec/autorun'
+    Then 'spec/spec_helper.rb' requires 'rspec'
     And 'spec/spec_helper.rb' requires 'the-perfect-gem'
 
   Scenario: rspec w/o bundler

data/features/step_definitions/generator_steps.rb

@@ -185,9 +185,9 @@ Then /^'(.*)' mentions copyright belonging to me in the current year$/ do |file|
 end
 
 
-Then /^LICENSE credits '(.*)'$/ do |copyright_holder|
-  Then "a file named 'the-perfect-gem/LICENSE' is created"
-  @license_content ||= File.read(File.join(@working_dir, @name, 'LICENSE'))
+Then /^LICENSE\.txt credits '(.*)'$/ do |copyright_holder|
+  Then "a file named 'the-perfect-gem/LICENSE.txt' is created"
+  @license_content ||= File.read(File.join(@working_dir, @name, 'LICENSE.txt'))
   assert_match copyright_holder, @license_content
 end
 
@@ -197,9 +197,9 @@ Given /^it is the year (\d+)$/ do |year|
 end
 
 
-Then /^LICENSE has a copyright in the year (\d+)$/ do |year|
-  Then "a file named 'the-perfect-gem/LICENSE' is created"
-  @license_content ||= File.read(File.join(@working_dir, @name, 'LICENSE'))
+Then /^LICENSE\.txt has a copyright in the year (\d+)$/ do |year|
+  Then "a file named 'the-perfect-gem/LICENSE.txt' is created"
+  @license_content ||= File.read(File.join(@working_dir, @name, 'LICENSE.txt'))
   assert_match year, @license_content
 end
 

data/jeweler.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jeweler}
-  s.version = "1.5.0.pre4"
+  s.version = "1.5.0.pre5"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Nichols"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.executables = ["jeweler"]
   s.extra_rdoc_files = [
     "ChangeLog.markdown",
-    "LICENSE",
+    "LICENSE.txt",
     "README.markdown"
   ]
   s.files = [
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
     "ChangeLog.markdown",
     "Gemfile",
     "Gemfile.lock",
-    "LICENSE",
+    "LICENSE.txt",
     "README.markdown",
     "Rakefile",
     "bin/jeweler",
@@ -90,7 +90,7 @@ Gem::Specification.new do |s|
     "lib/jeweler/templates/.document",
     "lib/jeweler/templates/.gitignore",
     "lib/jeweler/templates/Gemfile",
-    "lib/jeweler/templates/LICENSE",
+    "lib/jeweler/templates/LICENSE.txt",
     "lib/jeweler/templates/README.rdoc",
     "lib/jeweler/templates/Rakefile",
     "lib/jeweler/templates/bacon/flunking.rb",
@@ -125,7 +125,7 @@ Gem::Specification.new do |s|
     "test/fixtures/bar/lib/foo_the_ultimate_lib.rb",
     "test/fixtures/existing-project-with-version-constant/.document",
     "test/fixtures/existing-project-with-version-constant/.gitignore",
-    "test/fixtures/existing-project-with-version-constant/LICENSE",
+    "test/fixtures/existing-project-with-version-constant/LICENSE.txt",
     "test/fixtures/existing-project-with-version-constant/README.rdoc",
     "test/fixtures/existing-project-with-version-constant/Rakefile",
     "test/fixtures/existing-project-with-version-constant/existing-project-with-version.gemspec",
@@ -134,7 +134,7 @@ Gem::Specification.new do |s|
     "test/fixtures/existing-project-with-version-constant/test/test_helper.rb",
     "test/fixtures/existing-project-with-version-plaintext/.document",
     "test/fixtures/existing-project-with-version-plaintext/.gitignore",
-    "test/fixtures/existing-project-with-version-plaintext/LICENSE",
+    "test/fixtures/existing-project-with-version-plaintext/LICENSE.txt",
     "test/fixtures/existing-project-with-version-plaintext/README.rdoc",
     "test/fixtures/existing-project-with-version-plaintext/Rakefile",
     "test/fixtures/existing-project-with-version-plaintext/VERSION",
@@ -144,7 +144,7 @@ Gem::Specification.new do |s|
     "test/fixtures/existing-project-with-version-plaintext/test/test_helper.rb",
     "test/fixtures/existing-project-with-version-yaml/.document",
     "test/fixtures/existing-project-with-version-yaml/.gitignore",
-    "test/fixtures/existing-project-with-version-yaml/LICENSE",
+    "test/fixtures/existing-project-with-version-yaml/LICENSE.txt",
     "test/fixtures/existing-project-with-version-yaml/README.rdoc",
     "test/fixtures/existing-project-with-version-yaml/Rakefile",
     "test/fixtures/existing-project-with-version-yaml/VERSION.yml",
@@ -181,7 +181,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/technicalpickles/jeweler}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Opinionated tool for creating and managing RubyGem projects}
   s.test_files = [
     "test/fixtures/bar/lib/foo_the_ultimate_lib.rb",
@@ -224,7 +224,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rake>, [">= 0"])
       s.add_runtime_dependency(%q<git>, [">= 1.2.5"])
       s.add_runtime_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/jeweler/commands/check_dependencies.rb

@@ -10,7 +10,7 @@ class Jeweler
       def run
         missing_dependencies = dependencies.select do |dependency|
           begin
-            Gem.activate dependency.name, dependency.requirements.to_s
+            Gem.activate dependency.name, *dependency.requirement.as_list
             false
           rescue LoadError => e
             true
@@ -22,7 +22,7 @@ class Jeweler
         else
           puts "Missing some dependencies. Install them with the following commands:"
           missing_dependencies.each do |dependency|
-            puts %Q{\tgem install #{dependency.name} --version "#{dependency.requirements.to_s}"}
+            puts %Q{\tgem install #{dependency.name} --version "#{dependency.requirement.to_s}"}
           end
 
           abort "Run the specified gem commands before trying to run this again: #{$0} #{ARGV.join(' ')}"

data/lib/jeweler/commands/release_gemspec.rb

@@ -37,7 +37,7 @@ class Jeweler
         gemspec_gitpath = working_subdir.join(gemspec_helper.path)
         repo.add(gemspec_gitpath.to_s)
         output.puts "Committing #{gemspec_gitpath}"
-        repo.commit "Regenerated gemspec for version #{version}"
+        repo.commit "Regenerate gemspec for version #{version}"
       end
 
       def regenerate_gemspec!

data/lib/jeweler/generator.rb

@@ -177,7 +177,7 @@ class Jeweler
       output_template_in_target '.gitignore'
       output_template_in_target 'Rakefile'
       output_template_in_target 'Gemfile' if should_use_bundler
-      output_template_in_target 'LICENSE'
+      output_template_in_target 'LICENSE.txt'
       output_template_in_target 'README.rdoc'
       output_template_in_target '.document'
 
@@ -193,7 +193,7 @@ class Jeweler
 
       if testing_framework == :rspec
         output_template_in_target File.join(testing_framework.to_s, '.rspec'),
-                                  File.join(test_dir, '.rspec')
+                                  '.rspec'
 
       end
 

data/lib/jeweler/generator/rspec_mixin.rb

@@ -10,7 +10,7 @@ class Jeweler
       end
 
       def feature_support_require
-        'spec/expectations'
+        'rspec/expectations'
       end
 
       def feature_support_extend

data/lib/jeweler/templates/.document

@@ -1,11 +1,5 @@
-# .document is used by rdoc and yard to know how to generate documentation 
-# for example, it can be used to control how rdoc gets built when you do `gem install foo`
-
-README.rdoc
 lib/**/*.rb
 bin/*
-
-# Files below this - are treated as 'extra files', and aren't parsed for ruby code
 - 
 features/**/*.feature
-LICENSE
+LICENSE.txt

data/lib/jeweler/templates/README.rdoc

@@ -14,4 +14,6 @@ Description goes here.
 
 == Copyright
 
-Copyright (c) <%= Time.now.year %> <%= user_name %>. See LICENSE for details.
+Copyright (c) <%= Time.now.year %> <%= user_name %>. See LICENSE.txt for
+further details.
+

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

@@ -1,8 +1,5 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require '<%= require_name %>'
 require 'rspec'
-require 'rspec/autorun'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

data/lib/jeweler/version.rb

@@ -3,7 +3,7 @@ class Jeweler
     MAJOR = 1
     MINOR = 5
     PATCH = 0
-    BUILD = 'pre4'
+    BUILD = 'pre5'
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

data/test/jeweler/commands/test_release_to_github.rb

@@ -264,7 +264,7 @@ class Jeweler
         end
 
         should "commit with commit message including version" do
-          assert_received(@repo) {|repo| repo.commit("Regenerated gemspec for version 1.2.3") }
+          assert_received(@repo) {|repo| repo.commit("Regenerate gemspec for version 1.2.3") }
         end
 
       end

data/test/jeweler/test_generator.rb

@@ -93,7 +93,7 @@ class TestGenerator < Test::Unit::TestCase
     should_have_generator_attribute :test_task, 'spec'
     should_have_generator_attribute :test_dir, 'spec'
     should_have_generator_attribute :default_task, 'spec'
-    should_have_generator_attribute :feature_support_require, 'spec/expectations'
+    should_have_generator_attribute :feature_support_require, 'rspec/expectations'
     should_have_generator_attribute :feature_support_extend, nil
     should_have_generator_attribute :test_pattern, 'spec/**/*_spec.rb'
     should_have_generator_attribute :test_filename, 'the-perfect-gem_spec.rb'

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: jeweler
 version: !ruby/object:Gem::Version 
+  hash: -1876988220
   prerelease: true
   segments: 
   - 1
   - 5
   - 0
-  - pre4
-  version: 1.5.0.pre4
+  - pre5
+  version: 1.5.0.pre5
 platform: ruby
 authors: 
 - Josh Nichols
@@ -20,22 +21,27 @@ default_executable: jeweler
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   name: rake
   requirement: *id001
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 2
@@ -43,13 +49,15 @@ dependencies:
         version: 1.2.5
   name: git
   requirement: *id002
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -57,85 +65,99 @@ dependencies:
         version: 1.0.0
   name: bundler
   requirement: *id003
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   name: shoulda
   requirement: *id004
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   name: mhennemeyer-output_catcher
   requirement: *id005
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   name: rr
   requirement: *id006
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   name: mocha
   requirement: *id007
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   name: redgreen
   requirement: *id008
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   name: test-construct
   requirement: *id009
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 6
@@ -143,61 +165,71 @@ dependencies:
         version: 0.6.0
   name: yard
   requirement: *id010
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   name: bluecloth
   requirement: *id011
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   name: cucumber
   requirement: *id012
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   name: rcov
   requirement: *id013
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id014 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   name: timecop
   requirement: *id014
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id015 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 3
@@ -205,19 +237,20 @@ dependencies:
         version: 2.3.5
   name: activesupport
   requirement: *id015
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
   version_requirements: &id016 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   name: ruby-debug
   requirement: *id016
-  prerelease: false
 description: Simple and opinionated helper for creating Rubygem projects on GitHub
 email: josh@technicalpickles.com
 executables: 
@@ -226,14 +259,14 @@ extensions: []
 
 extra_rdoc_files: 
 - ChangeLog.markdown
-- LICENSE
+- LICENSE.txt
 - README.markdown
 files: 
 - .document
 - ChangeLog.markdown
 - Gemfile
 - Gemfile.lock
-- LICENSE
+- LICENSE.txt
 - README.markdown
 - Rakefile
 - bin/jeweler
@@ -299,7 +332,7 @@ files:
 - lib/jeweler/templates/.document
 - lib/jeweler/templates/.gitignore
 - lib/jeweler/templates/Gemfile
-- lib/jeweler/templates/LICENSE
+- lib/jeweler/templates/LICENSE.txt
 - lib/jeweler/templates/README.rdoc
 - lib/jeweler/templates/Rakefile
 - lib/jeweler/templates/bacon/flunking.rb
@@ -334,7 +367,7 @@ files:
 - test/fixtures/bar/lib/foo_the_ultimate_lib.rb
 - test/fixtures/existing-project-with-version-constant/.document
 - test/fixtures/existing-project-with-version-constant/.gitignore
-- test/fixtures/existing-project-with-version-constant/LICENSE
+- test/fixtures/existing-project-with-version-constant/LICENSE.txt
 - test/fixtures/existing-project-with-version-constant/README.rdoc
 - test/fixtures/existing-project-with-version-constant/Rakefile
 - test/fixtures/existing-project-with-version-constant/existing-project-with-version.gemspec
@@ -343,7 +376,7 @@ files:
 - test/fixtures/existing-project-with-version-constant/test/test_helper.rb
 - test/fixtures/existing-project-with-version-plaintext/.document
 - test/fixtures/existing-project-with-version-plaintext/.gitignore
-- test/fixtures/existing-project-with-version-plaintext/LICENSE
+- test/fixtures/existing-project-with-version-plaintext/LICENSE.txt
 - test/fixtures/existing-project-with-version-plaintext/README.rdoc
 - test/fixtures/existing-project-with-version-plaintext/Rakefile
 - test/fixtures/existing-project-with-version-plaintext/VERSION
@@ -353,7 +386,7 @@ files:
 - test/fixtures/existing-project-with-version-plaintext/test/test_helper.rb
 - test/fixtures/existing-project-with-version-yaml/.document
 - test/fixtures/existing-project-with-version-yaml/.gitignore
-- test/fixtures/existing-project-with-version-yaml/LICENSE
+- test/fixtures/existing-project-with-version-yaml/LICENSE.txt
 - test/fixtures/existing-project-with-version-yaml/README.rdoc
 - test/fixtures/existing-project-with-version-yaml/Rakefile
 - test/fixtures/existing-project-with-version-yaml/VERSION.yml
@@ -397,16 +430,20 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -415,7 +452,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Opinionated tool for creating and managing RubyGem projects