technicalpickles-jeweler 0.1.1 → 0.2.0

data/TODO

@@ -1,7 +1,5 @@
- * Move away from having a version module to having version.yml in top level directory
  * Generator for making new Jeweler projects
  * Rails generator for making a plugin that's Jeweler enabled
  * Git tagging/branching
  * Make sure everything is pushed/committed before bumping (controlled by a Jeweler.strict perhaps)
- * Have version:bump:xxx do a commit with an appropriate message 
- * Capture stdout during testing
+ * Have version:bump:xxx do a commit with an appropriate message 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-patch: 1
+patch: 0
 major: 0
-minor: 1
+minor: 2

data/lib/jeweler.rb

@@ -24,13 +24,7 @@ class Jeweler
     @gemspec = gemspec
     @base_dir = base_dir
     
-    # @gemspec.version = version
     @gemspec.files ||= FileList["[A-Z]*.*", "{generators,lib,test,spec}/**/*"]
   end
-  
-private  
-  def main_module_name
-    camelize(@gemspec.name)
-  end
 end
 

data/lib/jeweler/gemspec.rb

@@ -14,9 +14,7 @@ class Jeweler
     # it. See http://gist.github.com/16215
     def validate_gemspec
       begin
-        data = File.read(gemspec_path)
-        Thread.new { spec = parse_gemspec(data) }.join
-        
+        parse_gemspec
         puts "#{gemspec_path} is valid."
       rescue Exception => e
         puts "#{gemspec_path} is invalid. See the backtrace for more details."
@@ -26,11 +24,8 @@ class Jeweler
     
     
     def valid_gemspec?
-      # gah, so wet...
       begin
-        data = File.read(gemspec_path)
-      
-        Thread.new { spec = parse_gemspec(data) }.join
+        parse_gemspec
         true
       rescue Exception => e
         false
@@ -39,7 +34,7 @@ class Jeweler
     
     def parse_gemspec(data = nil)
       data ||= File.read(gemspec_path)
-      eval("$SAFE = 3\n#{data}", binding, gemspec_path)
+      Thread.new { eval("$SAFE = 3\n#{data}", binding, gemspec_path) }.join
     end
     
   protected

data/lib/jeweler/tasks.rb

@@ -1,4 +1,3 @@
-require 'ruby-debug'
 desc "Generate and validates gemspec"
 task :gemspec => ['gemspec:generate', 'gemspec:validate']
 

data/test/fixtures/bar/VERSION.yml

@@ -0,0 +1,4 @@
+---
+major: 1
+minor: 5
+patch: 2

data/test/jeweler_test.rb

@@ -2,11 +2,25 @@ require File.dirname(__FILE__) + '/test_helper'
 
 class JewelerTest < Test::Unit::TestCase
   
+  def setup
+    @now = Time.now
+    Time.stubs(:now).returns(@now)
+  end
+  
   def teardown
-    FileUtils.rm_rf("#{File.dirname(__FILE__)}/lib")
-    FileUtils.rm_f("#{File.dirname(__FILE__)}/foo.gemspec")
-    FileUtils.rm_f("#{File.dirname(__FILE__)}/bar.gemspec")
-    FileUtils.rm_f("#{File.dirname(__FILE__)}/VERSION.yml")
+    FileUtils.rm_rf("#{File.dirname(__FILE__)}/tmp")
+  end
+  
+  def build_spec
+    Gem::Specification.new do |s|
+      s.name = "bar"
+      s.summary = "Simple and opinionated helper for creating Rubygem projects on GitHub"
+      s.email = "josh@technicalpickles.com"
+      s.homepage = "http://github.com/technicalpickles/jeweler"
+      s.description = "Simple and opinionated helper for creating Rubygem projects on GitHub"
+      s.authors = ["Josh Nichols", "Dan Croak"]
+      s.files =  FileList["[A-Z]*", "{generators,lib,test}/**/*"]
+    end
   end
   
   class << self
@@ -33,113 +47,64 @@ class JewelerTest < Test::Unit::TestCase
         assert_equal version, @jeweler.version
       end
     end
+    
+    def should_bump_version(major, minor, patch)
+      version = "#{major}.#{minor}.#{patch}"
+      should_have_major_version major
+      should_have_minor_version minor
+      should_have_patch_version patch
+      should_be_version version
+      should "output the new version, #{version}" do
+        assert_match version, @output
+      end
+    end
   end
   
-  context 'A jeweler (with a gemspec with top level module)' do
+  context "A jeweler without a VERSION.yml" do
     setup do
-      spec = Gem::Specification.new do |s|
-        s.name = 'foo'
-        s.summary = "Simple and opinionated helper for creating Rubygem projects on GitHub"
-        s.email = "josh@technicalpickles.com"
-        s.homepage = "http://github.com/technicalpickles/jeweler"
-        s.description = "Simple and opinionated helper for creating Rubygem projects on GitHub"
-        s.authors = ["Josh Nichols", "Dan Croak"]
-        s.files =  FileList["[A-Z]*", "{generators,lib,test}/**/*"]
-      end
-      @jeweler = Jeweler.new(spec, File.dirname(__FILE__))
-      
-      catch_out do
-        @jeweler.write_version(0, 1, 0)
-      end
-      @jeweler = Jeweler.new(spec, File.dirname(__FILE__))
+      FileUtils.mkdir_p(tmp_dir)
+      @jeweler = Jeweler.new(build_spec, tmp_dir)
     end
     
-    should_have_major_version 0
-    should_have_minor_version 1
-    should_have_patch_version 0
-    should_be_version '0.1.0'
+    should "not have VERSION.yml" do
+      assert ! File.exists?(File.join(tmp_dir, 'bar.gemspec'))
+    end
+  end
+  
+  
+  context "A Jeweler with a VERSION.yml" do
+    setup do
+      FileUtils.cp_r(fixture_dir, tmp_dir)
+
+      @jeweler = Jeweler.new(build_spec, tmp_dir)
+    end  
+    
+    should_have_major_version 1
+    should_have_minor_version 5
+    should_have_patch_version 2
+    should_be_version '1.5.2'
     
     context "bumping the patch version" do
       setup do
         @output = catch_out { @jeweler.bump_patch_version }
       end
-      
-      should_have_major_version 0
-      should_have_minor_version 1
-      should_have_patch_version 1
-      should_be_version '0.1.1'
-      
-      should "still have module Foo" do
-        # do some regexp of version.rb
-      end
+      should_bump_version 1, 5, 3
     end
     
     context "bumping the minor version" do
       setup do
         @output = catch_out { @jeweler.bump_minor_version }
       end
-      
-      should_have_major_version 0
-      should_have_minor_version 2
-      should_have_patch_version 0
-      should_be_version '0.2.0'
-      
-      should "still have module Foo" do
-        # do some regexp of version.rb
-      end
+
+      should_bump_version 1, 6, 0
     end
     
     context "bumping the major version" do
       setup do
-        @output = catch_out { @jeweler.bump_major_version }
-      end
-      
-      should_have_major_version 1
-      should_have_minor_version 0
-      should_have_patch_version 0
-      should_be_version '1.0.0'
-      
-      should "still have module Foo" do
-        # do some regexp of version.rb
-      end
-    end
-    
-  end
-  
-  context "A Jeweler (with a gemspec with top level class)" do
-    setup do
-      spec = Gem::Specification.new do |s|
-        s.name = "bar"
-        s.summary = "Simple and opinionated helper for creating Rubygem projects on GitHub"
-        s.email = "josh@technicalpickles.com"
-        s.homepage = "http://github.com/technicalpickles/jeweler"
-        s.description = "Simple and opinionated helper for creating Rubygem projects on GitHub"
-        s.authors = ["Josh Nichols", "Dan Croak"]
-        s.files =  FileList["[A-Z]*", "{generators,lib,test}/**/*"]
+        @output = catch_out { @jeweler.bump_major_version}
       end
-      @jeweler = Jeweler.new(spec, File.dirname(__FILE__))
-
-      @now = Time.now
-      Time.stubs(:now).returns(@now)
 
-      @output = catch_out { @jeweler.write_version(1, 5, 2) }
-      @jeweler = Jeweler.new(spec, File.dirname(__FILE__))
-    end  
-    
-    should_have_major_version 1
-    should_have_minor_version 5
-    should_have_patch_version 2
-    should_be_version '1.5.2'
-    
-    context "bumping the patch version" do
-      setup do
-        @output = catch_out { @jeweler.bump_patch_version }
-      end
-      
-      should_have_major_version 1
-      should_have_minor_version 5
-      should_have_patch_version 3
-      should_be_version '1.5.3'
+      should_bump_version 2, 0, 0
     end
     
     context "writing the gemspec" do
@@ -148,19 +113,24 @@ class JewelerTest < Test::Unit::TestCase
       end
       
       should "create bar.gemspec" do
-        assert File.exists?(File.join(File.dirname(__FILE__), 'bar.gemspec'))
+        assert File.exists?(File.join(tmp_dir, 'bar.gemspec'))
       end
 
       should "have created a valid gemspec" do
         assert @jeweler.valid_gemspec?
       end
+      
+      should "output the name of the gemspec" do
+        assert_match 'bar.gemspec', @output
+      end
     
       
       context "re-reading the gemspec" do
         setup do
-          data = File.read(File.join(File.dirname(__FILE__), 'bar.gemspec'))
+          gemspec_path = File.join(tmp_dir, 'bar.gemspec')
+          data = File.read(gemspec_path)
 
-          @parsed_spec = eval("$SAFE = 3\n#{data}", binding, File.join(File.dirname(__FILE__), 'bar.gemspec'))
+          @parsed_spec = eval("$SAFE = 3\n#{data}", binding, gemspec_path)
         end
 
         should "have version 1.5.2" do
@@ -176,7 +146,7 @@ class JewelerTest < Test::Unit::TestCase
   
   should "raise an exception when created with a nil gemspec" do
     assert_raises Jeweler::GemspecError do
-      @jeweler = Jeweler.new(nil, File.dirname(__FILE__))
+      @jeweler = Jeweler.new(nil, tmp_dir)
     end
   end
   

data/test/test_helper.rb

@@ -8,7 +8,12 @@ require 'ruby-debug'
 gem 'mocha'
 require 'mocha'
 
-gem 'mhennemeyer-output_catcher'
+# Use vendored gem because of limited gem availability on runcoderun
+# This is loosely based on 'vendor everything'.
+Dir[File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', '**')].each do |dir| 
+  lib = "#{dir}/lib"
+  $LOAD_PATH.unshift(lib) if File.directory?(lib)
+end
 require 'output_catcher'
 
 require 'time'
@@ -30,4 +35,12 @@ class Test::Unit::TestCase
        block.call
      end
   end
+  
+  def fixture_dir
+    File.join(File.dirname(__FILE__), 'fixtures', 'bar')
+  end
+  
+  def tmp_dir
+    File.join(File.dirname(__FILE__), 'tmp')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: technicalpickles-jeweler
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Josh Nichols
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-14 00:00:00 -07:00
+date: 2008-10-21 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,9 @@ files:
 - lib/jeweler/tasks.rb
 - lib/jeweler/versioning.rb
 - lib/jeweler.rb
+- test/fixtures
+- test/fixtures/bar
+- test/fixtures/bar/VERSION.yml
 - test/jeweler_test.rb
 - test/test_helper.rb
 has_rdoc: false