technicalpickles-jeweler 0.0.4 → 0.0.5

data/Rakefile

@@ -16,4 +16,13 @@ begin
   end
 rescue LoadError
   puts "Jeweler not available. Try installing technicalpickles-jeweler."
-end
+end
+
+Rake::TestTask.new do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+ 
+desc "Run the test suite"
+task :default => :test

data/lib/jeweler/tasks.rb

@@ -19,30 +19,20 @@ namespace :version do
       jeweler.bump_version(major, 0, 0)
       jeweler.write_gemspec
       
-      puts "Version bumped to #{Jeweler.version}"
+      puts "Version bumped to #{jeweler.version}"
     end
     
     desc "Bump the gemspec a minor version."
     task :minor do
       jeweler = Jeweler.instance
-      
-      minor = jeweler.minor_version + 1
-      
-      jeweler.bump_version(jeweler.major_version, minor, 0)
-      jeweler.write_gemspec
-      
+      jeweler.bump_minor_version
       puts "Version bumped to #{jeweler.version}"
     end
     
     desc "Bump the gemspec a patch version."
     task :patch do
       jeweler = Jeweler.instance
-      
-      patch = jeweler.patch_version + 1
-      
-      jeweler.bump_version(jeweler.major_version, jeweler.minor_version, patch)
-      jeweler.write_gemspec
-      
+      jeweler.bump_patch_version
       puts "Version bumped to #{jeweler.version}"
     end
   end

data/lib/jeweler/version.rb

@@ -2,6 +2,6 @@ class Jeweler
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 4
+    PATCH = 5
   end
 end

data/lib/jeweler.rb

@@ -1,17 +1,22 @@
 require 'date'
 
+require 'jeweler/bumping'
+require 'jeweler/versioning'
+require 'jeweler/singleton'
+require 'jeweler/gemspec'
+
 class Jeweler
-  def self.gemspec=(gemspec)
-    @@instance = new(gemspec)
-  end
-  
-  def self.instance
-    @@instance
-  end
+  include Jeweler::Singleton
+  include Jeweler::Bumping
+  include Jeweler::Versioning
+  include Jeweler::Gemspec
   
   attr_reader :gemspec
-  def initialize(gemspec)
+  attr_accessor :base_dir
+  
+  def initialize(gemspec, base_dir = '.')
     @gemspec = gemspec
+    @base_dir = base_dir
     
     load_version()
     
@@ -19,96 +24,10 @@ class Jeweler
     @gemspec.files ||= FileList["[A-Z]*", "{generators,lib,test,spec}/**/*"]
   end
   
-  def major_version
-    version_module.const_get(:MAJOR)
-  end
-  
-  def minor_version
-    version_module.const_get(:MINOR)
-  end
-  
-  def patch_version
-    version_module.const_get(:PATCH)
-  end
-  
-  def version
-    "#{major_version}.#{minor_version}.#{patch_version}"
-  end
-  
-  def date
-    date = DateTime.now
-    "#{date.year}-#{date.month}-#{date.day}"
-  end
-    
-  def bump_version(major, minor, patch)
-    main_module_or_class = constantize(main_module_name)
-    keyword = top_level_keyword
-    
-    File.open(version_module_path, 'w') do |file|
-      file.write <<-END
-#{keyword} #{main_module_name}
-  module Version
-    MAJOR = #{major}
-    MINOR = #{minor}
-    PATCH = #{patch}
-  end
-end
-      END
-    end
-    @gemspec.version = "#{major}.#{minor}.#{patch}"
-    refresh_version
-  end
-  
-  def write_gemspec
-    @gemspec.date = self.date
-    File.open(gemspec_path, 'w') do |f|
-      f.write @gemspec.to_ruby
-    end
-  end
-  
-  private
-  
-  def top_level_keyword
-    main_module_or_class = constantize(main_module_name)
-    case main_module_or_class
-    when Class
-      'class'
-    when Module
-      'module'
-    else
-      raise "Uh, main_module_name should be a class or module, but was a #{main_module_or_class.class}"
-    end
-  end
-  
-  def gemspec_path
-    "#{@gemspec.name}.gemspec"
-  end
-  
-  def version_module_path
-    "lib/#{@gemspec.name}/version.rb"
-  end
-  
-  def version_module
-    constantize("#{main_module_name}::Version")
-  end
-  
+private  
   def main_module_name
     camelize(@gemspec.name)
   end
-  
-  def refresh_version
-    # Remove the constants, so we can reload the version_module
-    version_module.module_eval do
-      remove_const(:MAJOR) if const_defined?(:MAJOR)
-      remove_const(:MINOR) if const_defined?(:MINOR)
-      remove_const(:PATCH) if const_defined?(:PATCH)
-    end
-    load_version
-  end
-  
-  def load_version
-    load version_module_path
-  end
 end
 
 require 'jeweler/active_support' # Adds the stolen camelize and constantize

data/test/jeweler_test.rb

@@ -0,0 +1,174 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class JewelerTest < Test::Unit::TestCase
+  
+  def write_version_file(name, keyword, const_name, major, minor, patch)
+    dir = "#{File.dirname(__FILE__)}/lib/#{name}"
+    FileUtils.mkdir_p(dir)
+    File.open("#{dir}/version.rb", 'w+') do |file|
+      file.write <<-END
+#{keyword} #{const_name}
+  module Version
+    MAJOR = #{major}
+    MINOR = #{minor}
+    PATCH = #{patch}
+  end
+end
+      END
+    end
+  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")
+  end
+  
+  class << self
+    def should_have_major_version(version)
+      should "have major version of #{version}" do 
+        assert_equal version, @jeweler.major_version
+      end
+    end
+    
+    def should_have_minor_version(version)
+      should "have minor version of #{version}" do
+        assert_equal version, @jeweler.minor_version
+      end
+    end
+    
+    def should_have_patch_version(version)
+      should "have patch version of #{version}" do
+        assert_equal version, @jeweler.patch_version
+      end
+    end
+    
+    def should_be_version(version)
+      should "be version #{version}" do
+        assert_equal version, @jeweler.version
+      end
+    end
+    
+    def should_have_toplevel_keyword(keyword)
+      should "have '#{keyword}' top level keyword" do
+        assert_equal keyword, @jeweler.send(:top_level_keyword)
+      end
+    end
+  end
+  
+  context 'A gem, with top level module,' do
+    setup do
+      write_version_file('foo', 'module', 'Foo', 0, 1, 0)
+      @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__))
+    end
+    
+    teardown do
+      @jeweler.send(:undefine_versions) if @jeweler
+    end
+    
+    should_have_major_version 0
+    should_have_minor_version 1
+    should_have_patch_version 0
+    should_be_version '0.1.0'
+    
+    should_have_toplevel_keyword 'module'
+    
+    context "bumping the patch version" do
+      setup do
+        @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
+    end
+    
+    context "bumping the minor version" do
+      setup do
+        @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
+    end
+    
+    context "bumping the major version" do
+      setup do
+        @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 gem, with top level class," do
+    setup do
+      write_version_file('bar', 'class', 'Bar', 1, 5, 2)
+      
+      @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
+      @jeweler = Jeweler.new(@spec, File.dirname(__FILE__))
+    end
+    
+    teardown do
+      @jeweler.send(:undefine_versions) if @jeweler
+    end
+    
+    should_have_major_version 1
+    should_have_minor_version 5
+    should_have_patch_version 2
+    should_be_version '1.5.2'
+    should_have_toplevel_keyword 'class'
+    
+    context "bumping the patch version" do
+      setup do
+        @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_eventually "still have class Bar" do
+        # do some regexp of version.rb
+      end
+    end
+  end
+  
+end

data/test/test_helper.rb

@@ -0,0 +1,17 @@
+require 'test/unit'
+
+require 'rubygems'
+gem 'thoughtbot-shoulda'
+require 'shoulda'
+gem 'ruby-debug'
+require 'ruby-debug'
+
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'jeweler'
+
+# Fake out FileList from Rake
+class FileList
+  def self.[](*args)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: technicalpickles-jeweler
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Josh Nichols
@@ -31,6 +31,8 @@ files:
 - lib/jeweler/tasks.rb
 - lib/jeweler/version.rb
 - lib/jeweler.rb
+- test/jeweler_test.rb
+- test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/technicalpickles/jeweler
 post_install_message: