jeweler 1.7.0 → 1.8.0

data/.yardopts

@@ -0,0 +1,2 @@
+--exclude /templates/
+lib/**/*.rb

data/ChangeLog.markdown

@@ -1,3 +1,10 @@
+# jeweler 1.8.0, 2012-01-23
+
+ * Generator now has a --version flag #217
+ * Generated Gemfile now includes rdoc gem when using rdoc
+ * Fixed jeweler's yardoc task #216
+ * Updated version of yard used for new projects, and include rdoc compatability
+
 # jeweler 1.7.0, 2012-01-23
 
  * Better grammars in README!

data/Gemfile

@@ -13,7 +13,8 @@ group :development do
   gem "mocha"
   gem "redgreen"
   gem "test-construct"
-  gem "yard", "~> 0.6.0"
+  gem "yard", "~> 0.6"
+  gem "rdoc"
   gem "bluecloth"
   gem "cucumber", "~> 1.1.4"
   gem "rcov"

data/Gemfile.lock

@@ -36,7 +36,7 @@ GEM
     term-ansicolor (1.0.7)
     test-construct (1.2.0)
     timecop (0.3.5)
-    yard (0.6.1)
+    yard (0.7.4)
 
 PLATFORMS
   ruby
@@ -58,4 +58,4 @@ DEPENDENCIES
   shoulda
   test-construct
   timecop
-  yard (~> 0.6.0)
+  yard (~> 0.6)

data/features/generator/gemfile.feature

@@ -24,6 +24,8 @@ Feature: generated Gemfiel
     And 'Gemfile' has a development dependency on 'bundler'
     And 'Gemfile' has a development dependency on the current version of jeweler
     And 'Gemfile' has a development dependency on 'rcov'
+    And 'Gemfile' has a development dependency on 'rdoc'
+    And 'Gemfile' does not have a development dependency on 'yard'
 
   Scenario: bacon
     When I generate a bacon project named 'the-perfect-gem' that is 'zomg, so good'
@@ -61,10 +63,17 @@ Feature: generated Gemfiel
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
     Then 'Gemfile' has a development dependency on 'roodi'
 
+  Scenario: rdoc
+    Given I want to use rdoc instead of yard
+    When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
+    Then 'Gemfile' has a development dependency on 'rdoc'
+    And 'Gemfile' does not have a development dependency on 'yard'
+
   Scenario: yard
     Given I want to use yard instead of rdoc
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
     Then 'Gemfile' has a development dependency on 'yard'
+    Then 'Gemfile' has a development dependency on 'rdoc'
 
   Scenario: shindo
     When I generate a shindo project named 'the-perfect-gem' that is 'zomg, so good'

data/features/step_definitions/generator_steps.rb

@@ -347,6 +347,14 @@ Then /^'Gemfile' has a (\w+) dependency on '(.*)'$/ do |group, name|
   assert_match name, group_block
 end
 
+Then /^'Gemfile' does not have a (\w+) dependency on '(.*)'$/ do |group, name|
+  @gemfile_content ||= File.read(File.join(@working_dir, @name, 'Gemfile'))
+
+  group_block = yank_group_info(@gemfile_content, group)
+
+  assert_no_match Regexp.new(Regexp.escape(name)), group_block
+end
+
 Then /^'Gemfile' has a development dependency on the current version of jeweler$/ do
   @gemfile_content ||= File.read(File.join(@working_dir, @name, 'Gemfile'))
   group_block = yank_group_info(@gemfile_content, 'development')

data/jeweler.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "jeweler"
-  s.version = "1.7.0"
+  s.version = "1.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Nichols"]
-  s.date = "2012-01-23"
+  s.date = "2012-01-24"
   s.description = "Simple and opinionated helper for creating Rubygem projects on GitHub"
   s.email = "josh@technicalpickles.com"
   s.executables = ["jeweler"]
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".yardopts",
     "ChangeLog.markdown",
     "Gemfile",
     "Gemfile.lock",
@@ -198,7 +199,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<redgreen>, [">= 0"])
       s.add_development_dependency(%q<test-construct>, [">= 0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bluecloth>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, ["~> 1.1.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
@@ -216,7 +218,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<redgreen>, [">= 0"])
       s.add_dependency(%q<test-construct>, [">= 0"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_dependency(%q<yard>, ["~> 0.6"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bluecloth>, [">= 0"])
       s.add_dependency(%q<cucumber>, ["~> 1.1.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
@@ -235,7 +238,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<redgreen>, [">= 0"])
     s.add_dependency(%q<test-construct>, [">= 0"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
+    s.add_dependency(%q<yard>, ["~> 0.6"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bluecloth>, [">= 0"])
     s.add_dependency(%q<cucumber>, ["~> 1.1.4"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/lib/jeweler/generator/application.rb

@@ -14,6 +14,11 @@ class Jeweler
             options[:show_help] = true
           end
 
+          if options[:show_version]
+            $stderr.puts "Version: #{Jeweler::Version::STRING}"
+            return 1
+          end
+
           if options[:show_help]
             $stderr.puts options.opts
             return 1

data/lib/jeweler/generator/options.rb

@@ -140,6 +140,10 @@ class Jeweler
           o.on('--rdoc', 'use rdoc for documentation') do
             self[:documentation_framework] = :rdoc
           end
+          
+          o.on('-v', '--version', 'show version') do
+            self[:show_version] = true
+          end
 
           o.on_tail('-h', '--help', 'display this help and exit') do
             self[:show_help] = true

data/lib/jeweler/generator/rdoc_mixin.rb

@@ -1,6 +1,10 @@
 class Jeweler
   class Generator
     module RdocMixin
+      def self.extended(generator)
+        generator.development_dependencies << ["rdoc", "~> 3.12"]
+      end
+
       def doc_task
         'rdoc'
       end

data/lib/jeweler/generator/yard_mixin.rb

@@ -2,7 +2,8 @@ class Jeweler
   class Generator
     module YardMixin
       def self.extended(generator)
-        generator.development_dependencies << ["yard", "~> 0.6.0"]
+        generator.development_dependencies << ["yard", "~> 0.7"]
+        generator.development_dependencies << ["rdoc", "~> 3.12"]
       end
       
       def doc_task

data/lib/jeweler/version.rb

@@ -1,7 +1,7 @@
 class Jeweler
   module Version
     MAJOR = 1
-    MINOR = 7
+    MINOR = 8
     PATCH = 0
     BUILD = nil
 

data/test/jeweler/generator/test_application.rb

@@ -37,6 +37,28 @@ class TestApplication < Test::Unit::TestCase
     end
   end
 
+
+  context "when options indicate version" do
+    setup do
+      stub(Jeweler::Generator::Application).build_opts do
+        stub_options(:show_version => true)
+      end
+
+      stub(Jeweler::Generator).new { raise "Shouldn't have made this far"}
+
+      assert_nothing_raised do
+        @result = run_application("-v")
+      end
+    end
+    
+    should_exit_with_code 1
+    
+    should 'should puts option version' do
+      assert_match 'Version:', @stderr
+    end
+  end
+  
+
   context "when options indicate help usage" do
     setup do
       stub(Jeweler::Generator::Application).build_opts do

data/test/jeweler/generator/test_options.rb

@@ -141,6 +141,18 @@ class TestOptions < Test::Unit::TestCase
       assert_equal 'foo', @options[:directory]
     end
   end
+  
+  for_options '--version' do
+    should 'show version' do
+      assert @options[:show_version]
+    end
+  end
+  
+  for_options '-v' do
+    should 'show version' do
+      assert @options[:show_version]
+    end
+  end
 
   for_options '--help' do
     should 'show help' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jeweler
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 55
   prerelease: 
   segments: 
   - 1
-  - 7
+  - 8
   - 0
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors: 
 - Josh Nichols
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-23 00:00:00 Z
+date: 2012-01-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -170,8 +170,7 @@ dependencies:
         segments: 
         - 0
         - 6
-        - 0
-        version: 0.6.0
+        version: "0.6"
   requirement: *id011
   prerelease: false
   name: yard
@@ -188,10 +187,24 @@ dependencies:
         version: "0"
   requirement: *id012
   prerelease: false
-  name: bluecloth
+  name: rdoc
   type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id013
+  prerelease: false
+  name: bluecloth
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -202,12 +215,12 @@ dependencies:
         - 1
         - 4
         version: 1.1.4
-  requirement: *id013
+  requirement: *id014
   prerelease: false
   name: cucumber
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -216,12 +229,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id014
+  requirement: *id015
   prerelease: false
   name: rcov
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -230,12 +243,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id015
+  requirement: *id016
   prerelease: false
   name: timecop
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -246,12 +259,12 @@ dependencies:
         - 3
         - 5
         version: 2.3.5
-  requirement: *id016
+  requirement: *id017
   prerelease: false
   name: activesupport
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -260,7 +273,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id017
+  requirement: *id018
   prerelease: false
   name: ruby-debug
   type: :development
@@ -276,6 +289,7 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .document
+- .yardopts
 - ChangeLog.markdown
 - Gemfile
 - Gemfile.lock