jeweler 1.5.0.pre5 → 1.5.0.pre6

data/Rakefile

@@ -17,11 +17,12 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name = "jeweler"
   gem.version = Jeweler::Version::STRING
-  gem.summary = "Opinionated tool for creating and managing RubyGem projects"
-  gem.email = "josh@technicalpickles.com"
   gem.homepage = "http://github.com/technicalpickles/jeweler"
+  gem.summary = "Opinionated tool for creating and managing RubyGem projects"
   gem.description = "Simple and opinionated helper for creating Rubygem projects on GitHub"
+  gem.license = "MIT"
   gem.authors = ["Josh Nichols"]
+  gem.email = "josh@technicalpickles.com"
   gem.files.include %w(lib/jeweler/templates/.document lib/jeweler/templates/.gitignore)
 
   # dependencies defined in Gemfile

data/features/generator/dotdocument.feature

@@ -7,8 +7,7 @@ Feature: generated .document
     Given a working directory
     And I have configured git sanely
     When I generate a project named 'the-perfect-gem' that is 'zomg, so good'
-    Then '.document' contains 'README.rdoc'
-    And '.document' contains 'lib/**/*.rb'
+    Then '.document' contains 'lib/**/*.rb'
     And '.document' contains 'bin/*'
     And '.document' contains 'features/**/*.feature'
-    And '.document' contains 'LICENSE'
+    And '.document' contains 'LICENSE.txt'

data/features/generator/rakefile.feature

@@ -20,6 +20,7 @@ Feature: generated Rakefile
     And Rakefile has 'zomg, so good' for the Jeweler::Tasks summary
     And Rakefile has 'Descriptive' for the Jeweler::Tasks description
     And Rakefile has 'http://github.com/technicalpickles/the-perfect-gem' for the Jeweler::Tasks homepage
+    And Rakefile has 'MIT' for the Jeweler::Tasks license
     And Rakefile instantiates a Jeweler::RubygemsDotOrgTasks
 
   Scenario: bacon
@@ -145,9 +146,11 @@ Feature: generated Rakefile
     When I generate a project named 'the-perfect-gem' that is 'zomg, so good' and described as 'Descriptive'
     Then 'Rakefile' requires 'bundler'
     And 'Rakefile' sets up bundler using the default and development groups
+    And Rakefile does not add 'jeweler' as a development dependency to Jeweler::Tasks
 
   Scenario: no bundler
     Given I do not want bundler
     When I generate a project named 'the-perfect-gem' that is 'zomg, so good' and described as 'Descriptive'
     Then 'Rakefile' does not require 'bundler'
     And 'Rakefile' does not setup bundler
+    And Rakefile adds 'jeweler' as a development dependency to Jeweler::Tasks

data/features/step_definitions/generator_steps.rb

@@ -161,6 +161,20 @@ Then /^Rakefile has '(.*)' for the (.*) (.*)$/ do |value, task_class, field|
   assert_match /#{block_variable}\.#{field} = (%Q\{|"|')#{Regexp.escape(value)}(\}|"|')/, task_block
 end
 
+Then /^Rakefile adds '(.*)' as a development dependency to Jeweler::Tasks$/ do |dependency|
+  @rakefile_content ||= File.read(File.join(@working_dir, @name, 'Rakefile'))
+  block_variable, task_block = yank_task_info(@rakefile_content, "Jeweler::Tasks")
+
+  assert_match /#{block_variable}\.add_development_dependency "#{dependency}"/, task_block
+end
+
+Then /^Rakefile does not add '(.*)' as a development dependency to Jeweler::Tasks$/ do |dependency|
+  @rakefile_content ||= File.read(File.join(@working_dir, @name, 'Rakefile'))
+  block_variable, task_block = yank_task_info(@rakefile_content, "Jeweler::Tasks")
+
+  assert_no_match /#{block_variable}\.add_development_dependency "#{dependency}"/, task_block
+end
+
 Then /^Rakefile has '(.*)' in the Rcov::RcovTask libs$/ do |libs|
   @rakefile_content ||= File.read(File.join(@working_dir, @name, 'Rakefile'))
   block_variable, task_block = yank_task_info(@rakefile_content, 'Rcov::RcovTask')

data/features/support/env.rb

@@ -22,7 +22,7 @@ require 'construct'
 World(Construct::Helpers)
 
 def yank_task_info(content, task)
-  if content =~ /#{Regexp.escape(task)}.new(\(.*\))? do \|(.*?)\|(.*?)end/m
+  if content =~ /#{Regexp.escape(task)}.new(\(.*\))? do \|(.*?)\|(.*?)^end$/m
     [$2, $3]
   end
 end

data/jeweler.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jeweler}
-  s.version = "1.5.0.pre5"
+  s.version = "1.5.0.pre6"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Nichols"]
-  s.date = %q{2010-10-12}
+  s.date = %q{2010-11-13}
   s.default_executable = %q{jeweler}
   s.description = %q{Simple and opinionated helper for creating Rubygem projects on GitHub}
   s.email = %q{josh@technicalpickles.com}
@@ -180,6 +180,7 @@ Gem::Specification.new do |s|
     "test/test_jeweler.rb"
   ]
   s.homepage = %q{http://github.com/technicalpickles/jeweler}
+  s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Opinionated tool for creating and managing RubyGem projects}

data/lib/jeweler/rubyforge_tasks.rb

@@ -69,6 +69,7 @@ class Jeweler
               local_dir = case self.doc_task.to_sym
                           when :rdoc then 'rdoc'
                           when :yardoc then 'doc'
+                          when 'doc:app'.to_sym then 'doc/app' 
                           else
                             raise "Unsure what to run to generate documentation. Please set doc_task and re-run."
                           end

data/lib/jeweler/specification.rb

@@ -78,11 +78,11 @@ class Jeweler
         if File.exist?('Gemfile')
           require 'bundler'
           bundler = Bundler.load
-          bundler.dependencies_for(:default).each do |dependency|
-            self.add_dependency dependency.name, dependency.requirement.to_s
+          bundler.dependencies_for(:default, :runtime).each do |dependency|
+            self.add_dependency dependency.name, *dependency.requirement.as_list
           end
           bundler.dependencies_for(:development).each do |dependency|
-            self.add_development_dependency dependency.name, dependency.requirement.to_s
+            self.add_development_dependency dependency.name, *dependency.requirement.as_list
           end
         end
         

data/lib/jeweler/templates/jeweler_tasks.erb

@@ -2,21 +2,24 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "<%= project_name %>"
+  gem.homepage = "<%= homepage %>"
+  gem.license = "MIT"
   gem.summary = %Q{<%= summary %>}
   gem.description = %Q{<%= description %>}
   gem.email = "<%= user_email %>"
-  gem.homepage = "<%= homepage %>"
   gem.authors = ["<%= user_name %>"]
 <% if should_setup_rubyforge %>
   gem.rubyforge_project = "<%= project_name %>"
 <% end %>
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  spec.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  spec.add_development_dependency 'rspec', '> 1.2.3'
+  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
+  #  gem.add_development_dependency 'rspec', '> 1.2.3'
+<% if ! should_use_bundler %>
 <% development_dependencies.each do |name, version| %>
   gem.add_development_dependency "<%= name %>", "<%= version %>"
 <% end %>
+<% end %>
 end
 Jeweler::RubygemsDotOrgTasks.new
 <% if should_setup_rubyforge %>

data/lib/jeweler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: jeweler
 version: !ruby/object:Gem::Version 
-  hash: -1876988220
+  hash: -1876988219
   prerelease: true
   segments: 
   - 1
   - 5
   - 0
-  - pre5
-  version: 1.5.0.pre5
+  - pre6
+  version: 1.5.0.pre6
 platform: ruby
 authors: 
 - Josh Nichols
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -04:00
+date: 2010-11-13 00:00:00 -06:00
 default_executable: jeweler
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -422,8 +422,8 @@ files:
 - test/test_jeweler.rb
 has_rdoc: true
 homepage: http://github.com/technicalpickles/jeweler
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []