jeweler 0.11.1 → 1.0.0

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

@@ -0,0 +1,82 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "existing-project-with-version"
+    gem.summary = %Q{TODO}
+    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: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = false
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/*_test.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION.yml')
+    config = YAML.load(File.read('VERSION.yml'))
+    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "existing-project-with-version #{version}"
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+# Rubyforge documentation task
+begin
+  require 'rake/contrib/sshpublisher'
+  namespace :rubyforge do
+    
+    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
+        config = YAML.load(
+            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+        )
+
+        host = "#{config['username']}@rubyforge.org"
+        remote_dir = "/var/www/gforge-projects/existing-project-with-version/"
+        local_dir = 'rdoc'
+
+        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
+      end
+    end
+  end
+rescue LoadError
+  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+end

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

@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{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.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{TODO}
+
+  if s.respond_to? :specification_version then
+    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
+    end
+  else
+  end
+end

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

@@ -0,0 +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"
+  end
+end

data/test/fixtures/existing-project-with-version-yaml/test/test_helper.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+require 'test/unit'
+require 'shoulda'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'existing_project_with_version'
+
+class Test::Unit::TestCase
+end

data/test/jeweler/commands/test_release.rb

@@ -4,15 +4,10 @@ class Jeweler
   module Commands
     class TestRelease < Test::Unit::TestCase
 
-      context "with added files" do
+      context "with pending changes" do
         setup do
           @repo = Object.new
           stub(@repo).checkout(anything)
-
-          status = Object.new
-          stub(status).added { ['README'] }
-          stub(status).deleted { [] }
-          stub(status).changed { [] }
           stub(@repo).status { status }
 
           @command                = Jeweler::Commands::Release.new
@@ -20,6 +15,8 @@ class Jeweler
           @command.repo           = @repo
           @command.gemspec_helper = @gemspec_helper
           @command.version        = '1.2.3'
+
+          stub(@command).any_pending_changes? { true }
         end
 
         should 'raise error' do
@@ -29,85 +26,86 @@ class Jeweler
         end
       end
 
-      context "with deleted files" do
+      context "run without pending changes, and gemspec changed, and tagged not created already" do
         setup do
           @repo = Object.new
-          stub(@repo).checkout(anything)
+          stub(@repo) do
+            checkout(anything)
+            add(anything)
+            commit(anything)
+            push
+          end
 
-          status = Object.new
-          stub(status).added { [] }
-          stub(status).deleted { ['README'] }
-          stub(status).changed { [] }
-          stub(@repo).status { status }
+          @gemspec_helper = Object.new
+          stub(@gemspec_helper) do
+            write
+            path {'zomg.gemspec'}
+            update_version('1.2.3')
+          end
 
-          @command                = Jeweler::Commands::Release.new
-          @command.output         = @output
-          @command.repo           = @repo
-          @command.gemspec_helper = @gemspec_helper
-          @command.version        = '1.2.3'
-          @command.base_dir       = '.'
-        end
+          @output = StringIO.new
 
-        should 'raise error' do
-          assert_raises RuntimeError, /try commiting/i do
-            @command.run
-          end
+          @command                = Jeweler::Commands::Release.new :output => @output,
+                                                                   :repo => @repo,
+                                                                   :gemspec_helper => @gemspec_helper,
+                                                                   :version => '1.2.3'
+
+          stub(@command).tag_release!
+          stub(@command).gemspec_changed? { true }
+          stub(@command).any_pending_changes? { false }
+          stub(@command).regenerate_gemspec!
+          stub(@command).commit_gemspec!
+          stub(@command).release_tagged? { false }
+
+          @command.run
         end
-      end
 
-      context "with changed files" do
-        setup do
-          @repo = Object.new
-          stub(@repo).checkout(anything)
+        should "checkout master" do
+          assert_received(@repo) {|repo| repo.checkout('master') }
+        end
 
-          status = Object.new
-          stub(status).added { [] }
-          stub(status).deleted { [] }
-          stub(status).changed { ['README'] }
-          stub(@repo).status { status }
+        should "regenerate gemspec" do
+          assert_received(@command) {|command| command.regenerate_gemspec! }
+        end
 
-          @command                = Jeweler::Commands::Release.new
-          @command.output         = @output
-          @command.repo           = @repo
-          @command.gemspec_helper = @gemspec_helper
-          @command.version        = '1.2.3'
+        should "commit gemspec" do
+          assert_received(@command) {|command| command.commit_gemspec! }
         end
 
-        should 'raise error' do
-          assert_raises RuntimeError, /try commiting/i do
-            @command.run
-          end
+        should "tag release" do
+          assert_received(@command) {|command| command.tag_release! }
         end
       end
 
-      context "after running without pending changes" do
+      context "run without pending changes, and gemspec didn't change, and tagged not created already" do
         setup do
           @repo = Object.new
-          stub(@repo).checkout(anything)
-          stub(@repo).add(anything)
-          stub(@repo).commit(anything)
-          stub(@repo).push
-          stub(@repo).push(anything)
-          stub(@repo).add_tag(anything)
+          stub(@repo) do
+            checkout(anything)
+            add(anything)
+            commit(anything)
+            push
+          end
 
           @gemspec_helper = Object.new
-          stub(@gemspec_helper).write
-          stub(@gemspec_helper).path {'zomg.gemspec'}
-          stub(@gemspec_helper).update_version('1.2.3')
-
-          status = Object.new
-          stub(status).added { [] }
-          stub(status).deleted { [] }
-          stub(status).changed { [] }
-          stub(@repo).status { status }
+          stub(@gemspec_helper) do
+            write
+            path {'zomg.gemspec'}
+            update_version('1.2.3')
+          end
 
           @output = StringIO.new
 
-          @command                = Jeweler::Commands::Release.new
-          @command.output         = @output
-          @command.repo           = @repo
-          @command.gemspec_helper = @gemspec_helper
-          @command.version        = '1.2.3'
+          @command                = Jeweler::Commands::Release.new :output => @output,
+                                                                   :repo => @repo,
+                                                                   :gemspec_helper => @gemspec_helper,
+                                                                   :version => '1.2.3'
+
+          stub(@command).tag_release!
+          stub(@command).any_pending_changes? { false }
+          stub(@command).gemspec_changed? { false } 
+          stub(@command).regenerate_gemspec!
+          stub(@command).release_tagged? { false }
 
           @command.run
         end
@@ -116,33 +114,62 @@ class Jeweler
           assert_received(@repo) {|repo| repo.checkout('master') }
         end
 
-        should "refresh gemspec version" do
-          assert_received(@gemspec_helper) {|gemspec_helper| gemspec_helper.update_version('1.2.3') }
+        should "regenerate gemspec" do
+          assert_received(@command) {|command| command.regenerate_gemspec! }
         end
 
-        should "write gemspec" do
-          assert_received(@gemspec_helper) {|gemspec_helper| gemspec_helper.write }
-
+        should_eventually "not commit gemspec" do
+          # need a way to assert it wasn't received short of not stubbing it
+          #assert_received(@command) {|command| command.commit_gemspec! }
         end
 
-        should "add gemspec to repository" do
-          assert_received(@repo) {|repo| repo.add('zomg.gemspec') }
+        should "tag release" do
+          assert_received(@command) {|command| command.tag_release! }
         end
+      end
 
-        should "commit with commit message including version" do
-          assert_received(@repo) {|repo| repo.commit("Regenerated gemspec for version 1.2.3") }
+      context "run without pending changes and tagged already" do
+        setup do
+          @repo = Object.new
+          stub(@repo) do
+            checkout(anything)
+            add(anything)
+            commit(anything)
+            push
+          end
+
+          @gemspec_helper = Object.new
+          stub(@gemspec_helper) do
+            write
+            path {'zomg.gemspec'}
+            update_version('1.2.3')
+          end
+
+          @output = StringIO.new
+
+          @command                = Jeweler::Commands::Release.new :output => @output,
+                                                                   :repo => @repo,
+                                                                   :gemspec_helper => @gemspec_helper,
+                                                                   :version => '1.2.3'
+
+          #stub(@command).tag_release!
+          stub(@command).any_pending_changes? { false }
+          stub(@command).regenerate_gemspec!
+          stub(@command).release_tagged? { true }
+
+          @command.run
         end
 
-        should "push repository" do
-          assert_received(@repo) {|repo| repo.push }
+        should "checkout master" do
+          assert_received(@repo) {|repo| repo.checkout('master') }
         end
 
-        should "tag release" do
-          assert_received(@repo) {|repo| repo.add_tag("v1.2.3")}
+        should "regenerate gemspec" do
+          assert_received(@command) {|command| command.regenerate_gemspec! }
         end
 
-        should "push tag to repository" do
-          assert_received(@repo) {|repo| repo.push('origin', 'v1.2.3')}
+        should_eventually "not tag release" do
+          # need to have a way to verify tag_release! not being called, short of not stubbing it
         end
       end
 
@@ -175,6 +202,204 @@ class Jeweler
           assert_same @base_dir, @command.base_dir
         end
       end
+
+      context "any_pending_changes?" do
+
+        should "be true if there added files" do
+          repo = build_repo :added => %w(README)
+
+          command = Jeweler::Commands::Release.new :repo => repo
+
+          assert command.any_pending_changes?
+        end
+
+        should "be true if there are changed files" do
+          repo = build_repo :changed => %w(README)
+
+          command = Jeweler::Commands::Release.new
+          command.repo = repo
+
+          assert command.any_pending_changes?
+        end
+
+        should "be true if there are deleted files" do
+          repo = build_repo :deleted => %w(README)
+
+          command = Jeweler::Commands::Release.new
+          command.repo = repo
+
+          assert command.any_pending_changes?
+        end
+
+        should "be false if nothing added, changed, or deleted" do
+          repo = build_repo
+
+          command = Jeweler::Commands::Release.new
+          command.repo = repo
+
+          assert ! command.any_pending_changes?
+        end
+      end
+
+      context "tag_release!" do
+        setup do
+          @repo = Object.new
+          stub(@repo) do
+            add_tag(anything)
+            push(anything, anything)
+          end
+
+          @output = StringIO.new
+
+          @command                = Jeweler::Commands::Release.new
+          @command.output         = @output
+          @command.repo           = @repo
+          @command.gemspec_helper = @gemspec_helper
+          @command.version        = '1.2.3'
+
+          @command.tag_release!
+        end
+
+        should "tag release" do
+          assert_received(@repo) {|repo| repo.add_tag("v1.2.3")}
+        end
+
+        should "push tag to repository" do
+          assert_received(@repo) {|repo| repo.push('origin', 'v1.2.3')}
+        end
+      end
+
+      context "regenerate_gemspec!" do
+        setup do
+          @repo = Object.new
+          stub(@repo) do
+            add(anything)
+            commit(anything)
+          end
+
+          @gemspec_helper = Object.new
+          stub(@gemspec_helper) do
+            write
+            path {'zomg.gemspec'}
+            update_version('1.2.3')
+          end
+
+          @output = StringIO.new
+
+          @command                = Jeweler::Commands::Release.new :output => @output,
+                                                                   :repo => @repo,
+                                                                   :gemspec_helper => @gemspec_helper,
+                                                                   :version => '1.2.3'
+
+          @command.regenerate_gemspec!
+        end
+
+        should "refresh gemspec version" do
+          assert_received(@gemspec_helper) {|gemspec_helper| gemspec_helper.update_version('1.2.3') }
+        end
+
+        should "write gemspec" do
+          assert_received(@gemspec_helper) {|gemspec_helper| gemspec_helper.write }
+        end
+      end
+
+      context "commit_gemspec!" do
+        setup do
+          @repo = Object.new
+          stub(@repo) do
+            add(anything)
+            commit(anything)
+          end
+
+          @gemspec_helper = Object.new
+          stub(@gemspec_helper) do
+            path {'zomg.gemspec'}
+            update_version('1.2.3')
+          end
+
+          @output = StringIO.new
+
+          @command                = Jeweler::Commands::Release.new :output => @output,
+                                                                   :repo => @repo,
+                                                                   :gemspec_helper => @gemspec_helper,
+                                                                   :version => '1.2.3'
+
+          @command.commit_gemspec!
+        end
+
+        should "add gemspec to repository" do
+          assert_received(@repo) {|repo| repo.add('zomg.gemspec') }
+        end
+
+        should "commit with commit message including version" do
+          assert_received(@repo) {|repo| repo.commit("Regenerated gemspec for version 1.2.3") }
+        end
+
+      end
+
+      context "release_tagged? when no tag exists" do
+        setup do
+          @repo = Object.new
+          stub(@repo).tag('v1.2.3') {raise Git::GitTagNameDoesNotExist, tag}
+          #stub(@repo) do
+            #tag('v1.2.3') do |tag|
+              #raise Git::GitTagNameDoesNotExist, tag
+            #end
+          #end
+
+          @output = StringIO.new
+
+          @command                = Jeweler::Commands::Release.new
+          @command.output         = @output
+          @command.repo           = @repo
+          @command.version        = '1.2.3'
+        end
+
+        should_eventually "be false" do
+          assert ! @command.release_tagged?
+        end
+
+      end
+
+      context "release_tagged? when tag exists" do
+        setup do
+          @repo = Object.new
+          stub(@repo) do
+            tag('v1.2.3') { Object.new }
+          end
+
+          @output = StringIO.new
+
+          @command                = Jeweler::Commands::Release.new
+          @command.output         = @output
+          @command.repo           = @repo
+          @command.version        = '1.2.3'
+        end
+
+        should_eventually "be true" do
+          assert @command.release_tagged?
+        end
+
+      end
+
+      def build_repo(options = {})
+        status = build_status options
+        repo = Object.new
+        stub(repo).status { status }
+        repo
+      end
+
+      def build_status(options = {})
+        options = {:added => [], :deleted => [], :changed => []}.merge(options)
+
+        status = Object.new
+        stub(status) do
+          added { options[:added] }
+          deleted { options[:deleted] }
+          changed { options[:changed] }
+        end
+        
+      end
     end
   end
 end

data/test/test_generator.rb

@@ -67,7 +67,11 @@ class TestGenerator < Test::Unit::TestCase
   end
 
   should "have the correct require name" do
-    assert_equal "the_perfect_gem", build_generator.require_name
+    assert_equal "the-perfect-gem", build_generator.require_name
+  end
+
+  should "have the correct lib file name" do
+    assert_equal "the-perfect-gem.rb", build_generator.lib_filename
   end
 
   def self.should_have_generator_attribute(attribute, value)
@@ -84,7 +88,7 @@ class TestGenerator < Test::Unit::TestCase
     should_have_generator_attribute :feature_support_require, 'test/unit/assertions'
     should_have_generator_attribute :feature_support_extend, 'Test::Unit::Assertions'
     should_have_generator_attribute :test_pattern, 'test/**/*_test.rb'
-    should_have_generator_attribute :test_filename, 'the_perfect_gem_test.rb'
+    should_have_generator_attribute :test_filename, 'the-perfect-gem_test.rb'
     should_have_generator_attribute :test_helper_filename, 'test_helper.rb'
   end
 
@@ -96,7 +100,7 @@ class TestGenerator < Test::Unit::TestCase
     should_have_generator_attribute :feature_support_require, 'test/unit/assertions'
     should_have_generator_attribute :feature_support_extend, 'Test::Unit::Assertions'
     should_have_generator_attribute :test_pattern, 'test/**/*_test.rb'
-    should_have_generator_attribute :test_filename, 'the_perfect_gem_test.rb'
+    should_have_generator_attribute :test_filename, 'the-perfect-gem_test.rb'
     should_have_generator_attribute :test_helper_filename, 'test_helper.rb'
   end
 
@@ -108,7 +112,7 @@ class TestGenerator < Test::Unit::TestCase
     should_have_generator_attribute :feature_support_require, 'mini/test'
     should_have_generator_attribute :feature_support_extend, 'Mini::Test::Assertions'
     should_have_generator_attribute :test_pattern, 'test/**/*_test.rb'
-    should_have_generator_attribute :test_filename, 'the_perfect_gem_test.rb'
+    should_have_generator_attribute :test_filename, 'the-perfect-gem_test.rb'
     should_have_generator_attribute :test_helper_filename, 'test_helper.rb'
   end
 
@@ -120,7 +124,7 @@ class TestGenerator < Test::Unit::TestCase
     should_have_generator_attribute :feature_support_require, 'test/unit/assertions'
     should_have_generator_attribute :feature_support_extend, 'Test::Unit::Assertions'
     should_have_generator_attribute :test_pattern, 'spec/**/*_spec.rb'
-    should_have_generator_attribute :test_filename, 'the_perfect_gem_spec.rb'
+    should_have_generator_attribute :test_filename, 'the-perfect-gem_spec.rb'
     should_have_generator_attribute :test_helper_filename, 'spec_helper.rb'
   end
 
@@ -132,7 +136,7 @@ class TestGenerator < Test::Unit::TestCase
     should_have_generator_attribute :feature_support_require, 'spec/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'
+    should_have_generator_attribute :test_filename, 'the-perfect-gem_spec.rb'
     should_have_generator_attribute :test_helper_filename, 'spec_helper.rb'
   end
 
@@ -144,7 +148,7 @@ class TestGenerator < Test::Unit::TestCase
     should_have_generator_attribute :feature_support_require, 'micronaut/expectations'
     should_have_generator_attribute :feature_support_extend, 'Micronaut::Matchers'
     should_have_generator_attribute :test_pattern, 'examples/**/*_example.rb'
-    should_have_generator_attribute :test_filename, 'the_perfect_gem_example.rb'
+    should_have_generator_attribute :test_filename, 'the-perfect-gem_example.rb'
     should_have_generator_attribute :test_helper_filename, 'example_helper.rb'
   end
 end

data/test/test_generator_initialization.rb

@@ -68,9 +68,9 @@ class TestGeneratorInitialization < Test::Unit::TestCase
       stub_git_config 'user.name' => @git_name, 'user.email' => @git_email, 'github.user' => @github_user
     end
 
-    should 'raise NoGitHubToken' do
+    should 'raise NoGitHubToken if creating repo' do
       assert_raise Jeweler::NoGitHubToken do
-        Jeweler::Generator.new(@project_name)
+        Jeweler::Generator.new(@project_name, :create_repo => true)
       end
     end
   end

data/test/test_helper.rb

@@ -13,7 +13,9 @@ begin
   require 'ruby-debug'
 rescue LoadError
 end
+
 require 'rr'
+require 'redgreen'
 require 'time'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')