technicalpickles-jeweler 0.6.2 → 0.6.3

data/Rakefile

@@ -1,6 +1,11 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+begin
+  require 'hanna/rdoctask'
+rescue LoadError
+  require 'rake/rdoctask'
+end
+
 require 'rcov/rcovtask'
 
 $:.unshift('lib')

data/VERSION.yml

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

data/lib/jeweler.rb

@@ -1,20 +1,15 @@
 require 'date'
+require 'rubygems/builder'
 
-require 'jeweler/bumping'
-require 'jeweler/versioning'
+require 'jeweler/version'
 require 'jeweler/gemspec'
 require 'jeweler/errors'
 require 'jeweler/generator'
-require 'jeweler/release'
 
 require 'jeweler/tasks'
 
 # A Jeweler helps you craft the perfect Rubygem. Give him a gemspec, and he takes care of the rest.
 class Jeweler
-  include Jeweler::Bumping
-  include Jeweler::Versioning
-  include Jeweler::Gemspec
-  include Jeweler::Release
 
   attr_reader :gemspec
   attr_accessor :base_dir
@@ -23,12 +18,210 @@ class Jeweler
     raise(GemspecError, "Can't create a Jeweler with a nil gemspec") if gemspec.nil?
     @gemspec = gemspec
     @base_dir = base_dir
-
-    @gemspec.files ||= FileList["[A-Z]*.*", "{bin,generators,lib,test,spec}/**/*"]
+    
+    if @gemspec.files.nil? || @gemspec.files.empty?
+      @gemspec.files = FileList["[A-Z]*.*", "{bin,generators,lib,test,spec}/**/*"]
+    end
 
     if File.exists?(File.join(base_dir, '.git'))
       @repo = Git.open(base_dir)
     end
+
+    @version = Jeweler::Version.new(@base_dir)
+  end
+
+  # Major version, as defined by the gemspec's Version module.
+  # For 1.5.3, this would return 1.
+  def major_version
+    @version.major
+  end
+
+  # Minor version, as defined by the gemspec's Version module.
+  # For 1.5.3, this would return 5.
+  def minor_version
+    @version.minor
+  end
+
+  # Patch version, as defined by the gemspec's Version module.
+  # For 1.5.3, this would return 5.
+  def patch_version
+    @version.patch
+  end
+
+  # Human readable version, which is used in the gemspec.
+  def version
+    @version.to_s
+  end
+
+  # Writes out the gemspec
+  def write_gemspec
+    self.refresh_version
+
+    helper = gemspec_helper do |s|
+      s.version = self.version
+      s.date = Time.now
+    end
+
+    helper.write
+
+    puts "Generated: #{helper.path}"
+  end
+
+  # Validates the project's gemspec from disk in an environment similar to how 
+  # GitHub would build from it. See http://gist.github.com/16215
+  def validate_gemspec
+    begin
+      gemspec_helper.parse
+      puts "#{gemspec_path} is valid."
+    rescue Exception => e
+      puts "#{gemspec_path} is invalid. See the backtrace for more details."
+      raise
+    end
+  end
+
+
+  # is the project's gemspec from disk valid?
+  def valid_gemspec?
+    gemspec_helper.valid?
+  end
+
+  # parses the project's gemspec from disk without extra sanity checks
+  def unsafe_parse_gemspec(data = nil)
+    data ||= File.read(gemspec_path)
+    eval(data, binding, gemspec_path)
+  end
+
+  def build_gem
+    parsed_gemspec = unsafe_parse_gemspec()
+    Gem::Builder.new(parsed_gemspec).build
+
+    pkg_dir = File.join(@base_dir, 'pkg')
+    FileUtils.mkdir_p pkg_dir
+
+    gem_filename = File.join(@base_dir, parsed_gemspec.file_name)
+    FileUtils.mv gem_filename, pkg_dir
+  end
+
+  def install_gem
+    command = "sudo gem install #{gem_path}"
+    $stdout.puts "Executing #{command.inspect}:"
+    sh command
+  end
+
+  # Bumps the patch version.
+  #
+  # 1.5.1 -> 1.5.2
+  def bump_patch_version(options = {})
+    options = version_writing_options(options)
+
+    @version.bump_patch
+    @version.write
+
+    commit_version if options[:commit]
+  end
+
+  # Bumps the minor version.
+  #
+  # 1.5.1 -> 1.6.0
+  def bump_minor_version(options = {})
+    options = version_writing_options(options)
+
+    @version.bump_minor
+    @version.write
+
+    commit_version if options[:commit]
+  end
+
+  # Bumps the major version.
+  #
+  # 1.5.1 -> 2.0.0
+  def bump_major_version(options = {})
+    options = version_writing_options(options)
+
+    @version.bump_major
+    @version.write
+
+    commit_version if options[:commit]
+  end
+
+  # Bumps the version, to the specific major/minor/patch version, writing out the appropriate version.rb, and then reloads it.
+  def write_version(major, minor, patch, options = {})
+    options = version_writing_options(options)
+
+    @version.update_to major, minor, patch
+    @version.write
+
+    @gemspec.version = @version.to_s
+
+    commit_version if options[:commit]
+  end
+
+
+  def release
+    @repo.checkout('master')
+
+    raise "Hey buddy, try committing them files first" if any_pending_changes?
+
+    write_gemspec()
+
+    @repo.add(gemspec_path)
+    $stdout.puts "Committing #{gemspec_path}"
+    @repo.commit("Regenerated gemspec for version #{version}")
+
+    $stdout.puts "Pushing master to origin"
+    @repo.push
+
+    $stdout.puts "Tagging #{release_tag}"
+    @repo.add_tag(release_tag)
+
+    $stdout.puts "Pushing #{release_tag} to origin"
+    @repo.push('origin', release_tag)
+  end
+
+  def release_tag
+    @release_tag ||= "v#{version}"
+  end
+
+  protected
+
+  def version_writing_options(options)
+    {:commit => true}.merge(options)
+  end
+
+  def commit_version
+    if @repo
+      @repo.add('VERSION.yml')
+      @repo.commit("Version bump to #{version}", 'VERSION.yml')
+    end
+  end
+
+  def refresh_version
+    @version.refresh
+  end
+
+  def gemspec_helper(&block)
+    GemSpecHelper.new(@gemspec, @base_dir, &block)
   end
+
+  def gemspec_path
+    gemspec_helper.path
+  end
+
+  def gem_path
+    parsed_gemspec = unsafe_parse_gemspec()
+    File.join(@base_dir, 'pkg', parsed_gemspec.file_name)
+  end
+
+  def any_pending_changes?
+    unless ENV['JEWELER_DEBUG'].nil? || ENV['JEWELER_DEBUG'].squeeze == ''
+      require 'ruby-debug'; breakpoint
+    end
+    !(@repo.status.added.empty? && @repo.status.deleted.empty? && @repo.status.changed.empty?)
+  end
+
+  protected
+    def any_pending_changes?
+      !(@repo.status.added.empty? && @repo.status.deleted.empty? && @repo.status.changed.empty?)
+    end
 end
 

data/lib/jeweler/gemspec.rb

@@ -1,53 +1,41 @@
 class Jeweler
-  module Gemspec
-    # Writes out the gemspec
-    def write_gemspec
-      self.refresh_version
-      @gemspec.version = self.version
-      @gemspec.date = Time.now
-      File.open(gemspec_path, 'w') do |f|
-        f.write @gemspec.to_ruby
-      end
-      puts "Generated: #{gemspec_path}"
-    end
 
-    # Validates the gemspec in an environment similar to how GitHub would build
-    # it. See http://gist.github.com/16215
-    def validate_gemspec
-      begin
-        parse_gemspec
-        puts "#{gemspec_path} is valid."
-      rescue Exception => e
-        puts "#{gemspec_path} is invalid. See the backtrace for more details."
-        raise
-      end
-    end
+  class GemSpecHelper
+
+    attr_accessor :spec, :base_dir
 
+    def initialize(spec, base_dir = nil)
+      self.spec = spec
+      self.base_dir = base_dir || ''
 
-    def valid_gemspec?
+      yield spec if block_given?
+    end
+
+    def valid?
       begin
-        parse_gemspec
+        parse
         true
-      rescue Exception => e
+      rescue
         false
       end
     end
-
-    def parse_gemspec(data = nil)
-      data ||= File.read(gemspec_path)
-      Thread.new { eval("$SAFE = 3\n#{data}", binding, gemspec_path) }.join
+    
+    def write
+      File.open(path, 'w') do |f|
+        f.write @spec.to_ruby
+      end 
     end
 
-    def unsafe_parse_gemspec(data = nil)
-      data ||= File.read(gemspec_path)
-      eval(data, binding, gemspec_path)
+    def path
+      denormalized_path = File.join(@base_dir, "#{@spec.name}.gemspec")
+      absolute_path = File.expand_path(denormalized_path)
+      absolute_path.gsub(Dir.getwd + File::SEPARATOR, '') 
     end
 
-  protected
-    def gemspec_path
-      denormalized_path = File.join(@base_dir, "#{@gemspec.name}.gemspec")
-      absolute_path = File.expand_path(denormalized_path)
-      absolute_path.gsub(Dir.getwd + File::SEPARATOR, '')
+    def parse
+      data = File.read(path)
+      Thread.new { eval("$SAFE = 3\n#{data}", binding, path) }.join 
     end
+
   end
 end

data/lib/jeweler/tasks.rb

@@ -1,6 +1,5 @@
 require 'rake'
 require 'rake/tasklib'
-require 'rubygems/builder'
 
 class Jeweler
   class Tasks < ::Rake::TaskLib
@@ -16,18 +15,27 @@ class Jeweler
     end
 
   private
-    def ensure_version_yml(&block)
-      unless File.exists? 'VERSION.yml'
-        @jeweler.write_version(ENV['MAJOR'], ENV['MINOR'], ENV['PATCH'])
+    def define
+      desc "Setup initial version of 0.0.0"
+      file "VERSION.yml" do
+        @jeweler.write_version 0, 0, 0, :commit => false
+        $stdout.puts "Created VERSION.yml: 0.0.0"
       end
-      block.call if block
-    end
 
-    def define
-      desc "Generate a gem"
-      task :gem => :'gemspec:validate' do
-        gemspec = @jeweler.unsafe_parse_gemspec
-        Gem::Builder.new(gemspec).build
+
+      desc "Build gem"
+      task :gem => :'gem:build'
+
+      namespace :gem do
+        desc "Install gem using sudo"
+        task :install => :build do
+          @jeweler.install_gem
+        end
+
+        desc "Build gem"
+        task :build => :'gemspec:validate' do
+          @jeweler.build_gem
+        end
       end
 
       desc "Generate and validates gemspec"
@@ -35,15 +43,13 @@ class Jeweler
 
       namespace :gemspec do
         desc "Validates the gemspec"
-        task :validate do
+        task :validate => 'VERSION.yml' do
           @jeweler.validate_gemspec
         end
 
-        desc "Generates the gemspec"
-        task :generate do
-          ensure_version_yml do
-            @jeweler.write_gemspec
-          end
+        desc "Generates the gemspec, using version from VERSION.yml"
+        task :generate => 'VERSION.yml' do
+          @jeweler.write_gemspec
         end
       end
 
@@ -51,38 +57,38 @@ class Jeweler
       task :version => 'version:display'
 
       namespace :version do
-        desc "Creates an initial version file. Respects the following environment variables, or defaults to 0: MAJOR, MINOR, PATCH"
+        desc "Setup initial version of 0.0.0"
+        task :setup => "VERSION.yml"
+
+        desc "Writes out an explicit version. Respects the following environment variables, or defaults to 0: MAJOR, MINOR, PATCH"
         task :write do
-          @jeweler.write_version(ENV['MAJOR'], ENV['MINOR'], ENV['PATCH'])
+          major, minor, patch = ENV['MAJOR'].to_i, ENV['MINOR'].to_i, ENV['PATCH'].to_i
+          @jeweler.write_version(major, minor, patch, :announce => false, :commit => false)
+          $stdout.puts "Updated version: #{@jeweler.version}"
         end
 
         desc "Displays the current version"
-        task :display do
-          ensure_version_yml do
-            puts "Current version: #{@jeweler.version}"
-          end
+        task :display => :setup do
+          $stdout.puts "Current version: #{@jeweler.version}"
         end
 
         namespace :bump do
           desc "Bump the gemspec by a major version."
-          task :major => 'version:display' do
-            ensure_version_yml do
-              @jeweler.bump_major_version
-            end
+          task :major => ['VERSION.yml', :display] do
+            @jeweler.bump_major_version
+            $stdout.puts "Updated version: #{@jeweler.version}"
           end
 
           desc "Bump the gemspec by a minor version."
-          task :minor => 'version:display' do
-            ensure_version_yml do
-              @jeweler.bump_minor_version
-            end
+          task :minor => ['VERSION.yml', 'version:display'] do
+            @jeweler.bump_minor_version
+            $stdout.puts "Updated version: #{@jeweler.version}"
           end
 
           desc "Bump the gemspec by a patch version."
-          task :patch => 'version:display' do
-            ensure_version_yml do
-              @jeweler.bump_patch_version
-            end
+          task :patch => ['VERSION.yml', 'version:display'] do
+            @jeweler.bump_patch_version
+            $stdout.puts "Updated version: #{@jeweler.version}"
           end
         end
       end

data/lib/jeweler/version.rb

@@ -0,0 +1,81 @@
+class Jeweler
+  class Version
+    attr_accessor :base_dir
+    attr_reader :major, :minor, :patch
+
+    def initialize(base_dir)
+      self.base_dir = base_dir
+
+      if File.exists?(yaml_path)
+        parse_yaml
+      end
+    end
+
+    def bump_major
+      @major += 1
+      @minor = 0
+      @patch = 0
+    end
+
+    def bump_minor
+      @minor += 1
+      @patch = 0
+    end
+
+    def bump_patch
+      @patch += 1
+    end
+
+    def update_to(major, minor, patch)
+      @major = major
+      @minor = minor
+      @patch = patch
+    end
+
+    def write
+      File.open(yaml_path, 'w+') do |f|
+        YAML.dump(self.to_hash, f)
+      end
+    end
+
+    def to_s
+      "#{major}.#{minor}.#{patch}"
+    end
+
+    def to_hash
+      {
+        :major => major,
+        :minor => minor,
+        :patch => patch
+      }
+    end
+
+    def refresh
+      parse_yaml
+    end
+
+    def yaml_path
+      denormalized_path = File.join(@base_dir, 'VERSION.yml')
+      absolute_path = File.expand_path(denormalized_path)
+      absolute_path.gsub(Dir.getwd + File::SEPARATOR, '')
+    end
+
+    protected
+
+    def parse_yaml
+      yaml = read_yaml
+      @major = (yaml['major'] || yaml[:major]).to_i
+      @minor = (yaml['minor'] || yaml[:minor]).to_i
+      @patch = (yaml['patch'] || yaml[:patch]).to_i
+    end
+
+    def read_yaml
+      if File.exists?(yaml_path)
+        YAML.load_file(yaml_path)
+      else
+        raise VersionYmlError, "#{yaml_path} does not exist!"
+      end
+    end
+
+  end
+end

data/test/gemspec_test.rb

@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class GemspecTest < Test::Unit::TestCase
+  context "A Jeweler::GemSpec, given a gemspec" do
+    setup do
+      @spec = build_spec
+      @helper = Jeweler::GemSpecHelper.new(@spec, File.dirname(__FILE__))
+    end
+
+    should 'have sane gemspec path' do
+      assert_equal "test/#{@spec.name}.gemspec", @helper.path
+    end
+  end
+
+  context "Jeweler::GemSpec#write" do
+    setup do
+      @spec = build_spec
+      @helper = Jeweler::GemSpecHelper.new(@spec)
+      FileUtils.rm_f(@helper.path)
+
+      @helper.write
+    end
+
+    should "create gemspec file" do
+      assert File.exists?(@helper.path)
+    end
+
+    should "make valid spec" do
+      assert @helper.valid?
+    end
+  end
+end

data/test/generators/initialization_test.rb

@@ -68,7 +68,7 @@ class JewelerGeneratorInitializerTest < Test::Unit::TestCase
     end
   end
   
-  context "without github username set" do
+  context "without github token set" do
     setup do
       Jeweler::Generator.any_instance.stubs(:read_git_config).
         returns({'user.email' => 'bar@example.com', 'user.name' => 'foo', 'github.user' => 'technicalpickles'})
@@ -143,4 +143,4 @@ class JewelerGeneratorInitializerTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/jeweler_test.rb

@@ -12,18 +12,6 @@ class JewelerTest < Test::Unit::TestCase
     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
-
   context "A jeweler without a VERSION.yml" do
     setup do
       FileUtils.mkdir_p(tmp_dir)
@@ -31,7 +19,7 @@ class JewelerTest < Test::Unit::TestCase
     end
 
     should "not have VERSION.yml" do
-      assert ! File.exists?(File.join(tmp_dir, 'bar.gemspec'))
+      assert ! File.exists?(File.join(tmp_dir, 'VERSION.yml'))
     end
   end
 
@@ -39,7 +27,7 @@ class JewelerTest < Test::Unit::TestCase
   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
 
@@ -71,6 +59,21 @@ class JewelerTest < Test::Unit::TestCase
       should_bump_version 2, 0, 0
     end
 
+    should "should find files" do
+      assert ! @jeweler.gemspec.files.empty?
+    end
+
+    context "with standard 'files' specified" do
+      setup do
+        @alt_jeweler = Jeweler.new(build_spec("[A-Z]*.*", "{bin,generators,lib,test,spec}/**/*"), tmp_dir)
+      end
+      
+      should "have the same files as when no 'files' are specified" do
+        assert_equal @jeweler.gemspec.files, @alt_jeweler.gemspec.files
+      end
+    end
+
+
     context "writing the gemspec" do
       setup do
         @output = catch_out { @jeweler.write_gemspec }

data/test/shoulda_macros/jeweler_macros.rb

@@ -30,9 +30,6 @@ class Test::Unit::TestCase
       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
 end

data/test/test_helper.rb

@@ -27,6 +27,7 @@ require 'jeweler'
 # Fake out FileList from Rake
 class FileList
   def self.[](*args)
+    TMP_DIR.entries - ['.','..','.DS_STORE']
   end
 end
 
@@ -47,4 +48,16 @@ class Test::Unit::TestCase
   def tmp_dir
     File.join(File.dirname(__FILE__), 'tmp')
   end
+
+  def build_spec(*files)
+    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[*files] unless files.empty?
+    end
+  end
 end

data/test/version_test.rb

@@ -0,0 +1,116 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class VersionTest < Test::Unit::TestCase
+
+  VERSION_TMP_DIR = File.dirname(__FILE__) + '/version_tmp'
+
+
+  def self.should_have_version(major, minor, patch)
+    should "have major version #{major}" do
+      assert_equal major, @version.major
+    end
+
+    should "have minor version #{minor}" do
+      assert_equal minor, @version.minor
+    end
+
+    should "have patch version #{patch}" do
+      assert_equal patch, @version.patch
+    end
+
+    version_s = "#{major}.#{minor}.#{patch}"
+    should "render string as #{version_s.inspect}" do
+      assert_equal version_s, @version.to_s
+    end
+
+    version_hash = {:major => major, :minor => minor, :patch => patch}
+    should "render hash as #{version_hash.inspect}" do
+      assert_equal version_hash, @version.to_hash
+    end
+    
+  end
+
+  context "VERSION.yml with 3.5.4" do
+    setup do
+      FileUtils.rm_rf VERSION_TMP_DIR
+      FileUtils.mkdir_p VERSION_TMP_DIR
+
+      build_version_yml VERSION_TMP_DIR, 3, 5, 4
+
+      @version = Jeweler::Version.new VERSION_TMP_DIR
+    end
+
+    should_have_version 3, 5, 4
+
+    context "bumping major version" do
+      setup { @version.bump_major }
+      should_have_version 4, 0, 0
+    end
+
+    context "bumping the minor version" do
+      setup { @version.bump_minor }
+      should_have_version 3, 6, 0
+    end
+
+    context "bumping the patch version" do
+      setup { @version.bump_patch }
+      should_have_version 3, 5, 5
+    end
+  end
+
+  context "Non-existant VERSION.yml" do
+    setup do
+      FileUtils.rm_rf VERSION_TMP_DIR
+      FileUtils.mkdir_p VERSION_TMP_DIR
+    end
+
+    should "not raise error if the VERSION.yml doesn't exist" do
+      assert_nothing_raised Jeweler::VersionYmlError do
+        Jeweler::Version.new(VERSION_TMP_DIR)
+      end
+    end
+
+    context "setting an initial version" do
+      setup do
+        @version = Jeweler::Version.new(VERSION_TMP_DIR)
+        @version.update_to 0, 0, 1
+      end
+
+      should_have_version 0, 0, 1
+      should "not create VERSION.yml" do
+        assert ! File.exists?(File.join(VERSION_TMP_DIR, 'VERSION.yml'))
+      end
+
+      context "outputting" do
+        setup do
+          @version.write
+        end
+
+        should "create VERSION.yml" do
+          assert File.exists?(File.join(VERSION_TMP_DIR, 'VERSION.yml'))
+        end
+
+        context "re-reading VERSION.yml" do
+          setup do
+            @version = Jeweler::Version.new(VERSION_TMP_DIR)
+          end
+
+          should_have_version 0, 0, 1
+        end
+      end
+    end
+  end
+
+  def build_version_yml(base_dir, major, minor, patch)
+    version_yaml_path = File.join(base_dir, 'VERSION.yml')
+
+    File.open(version_yaml_path, 'w+') do |f|
+      version_hash = {
+        'major' => major.to_i,
+        'minor' => minor.to_i,
+        'patch' => patch.to_i
+      }
+      YAML.dump(version_hash, f)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: technicalpickles-jeweler
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Josh Nichols
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-16 00:00:00 -08:00
+date: 2008-12-27 00:00:00 -08:00
 default_executable: jeweler
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,11 +36,9 @@ files:
 - VERSION.yml
 - bin/jeweler
 - lib/jeweler
-- lib/jeweler/bumping.rb
 - lib/jeweler/errors.rb
 - lib/jeweler/gemspec.rb
 - lib/jeweler/generator.rb
-- lib/jeweler/release.rb
 - lib/jeweler/tasks.rb
 - lib/jeweler/templates
 - lib/jeweler/templates/bacon
@@ -52,11 +50,12 @@ files:
 - lib/jeweler/templates/shoulda
 - lib/jeweler/templates/shoulda/flunking_test.rb
 - lib/jeweler/templates/shoulda/test_helper.rb
-- lib/jeweler/versioning.rb
+- lib/jeweler/version.rb
 - lib/jeweler.rb
 - test/fixtures
 - test/fixtures/bar
 - test/fixtures/bar/VERSION.yml
+- test/gemspec_test.rb
 - test/generators
 - test/generators/initialization_test.rb
 - test/jeweler_generator_test.rb
@@ -65,6 +64,9 @@ files:
 - test/shoulda_macros/jeweler_macros.rb
 - test/tasks_test.rb
 - test/test_helper.rb
+- test/version_test.rb
+- test/version_tmp
+- test/version_tmp/VERSION.yml
 - lib/jeweler/templates/.gitignore
 has_rdoc: false
 homepage: http://github.com/technicalpickles/jeweler

data/lib/jeweler/bumping.rb

@@ -1,61 +0,0 @@
-class Jeweler
-  module Bumping
-    # Bumps the patch version.
-    #
-    # 1.5.1 -> 1.5.2
-    def bump_patch_version()
-      patch = self.patch_version.to_i + 1
-
-      write_version(major_version, minor_version, patch)
-    end
-
-    # Bumps the minor version.
-    #
-    # 1.5.1 -> 1.6.0
-    def bump_minor_version()
-      minor = minor_version.to_i + 1
-
-      write_version(major_version, minor)
-    end
-
-    # Bumps the major version.
-    #
-    # 1.5.1 -> 2.0.0
-    def bump_major_version()
-      major = major_version.to_i + 1
-
-      write_version(major)
-    end
-
-    # Bumps the version, to the specific major/minor/patch version, writing out the appropriate version.rb, and then reloads it.
-    def write_version(major = 0, minor = 0, patch = 0)
-      major ||= 0
-      minor ||= 0
-      patch ||= 0
-
-      File.open(version_yaml_path, 'w+') do |f|
-        version_hash = {
-          'major' => major.to_i,
-          'minor' => minor.to_i,
-          'patch' => patch.to_i
-        }
-        YAML.dump(version_hash, f)
-      end
-
-      refresh_version
-
-      @gemspec.version = version
-
-      puts "Wrote to #{version_yaml_path}: #{version}"
-
-      commit_version
-    end
-
-    def commit_version
-      if @repo
-        @repo.add('VERSION.yml')
-        @repo.commit("Version bump to #{version}", 'VERSION.yml')
-      end
-    end
-  end
-end

data/lib/jeweler/release.rb

@@ -1,31 +0,0 @@
-class Jeweler
-  module Release
-
-    def release
-      @repo.checkout('master')
-
-      raise "Hey buddy, try committing them files first" if any_pending_changes?
-
-      write_gemspec()
-
-      @repo.add(gemspec_path)
-      @repo.commit("Regenerated gemspec for version #{version}")
-      @repo.push
-
-      @repo.add_tag(release_tag)
-      @repo.push('origin', release_tag)
-    end
-
-    def release_tag
-      @release_tag ||= "v#{version}"
-    end
-
-  protected
-    def any_pending_changes?
-      unless ENV['JEWELER_DEBUG'].nil? || ENV['JEWELER_DEBUG'].squeeze == ''
-        require 'ruby-debug'; breakpoint
-      end
-      !(@repo.status.added.empty? && @repo.status.deleted.empty? && @repo.status.changed.empty?)
-    end
-  end
-end

data/lib/jeweler/versioning.rb

@@ -1,50 +0,0 @@
-require 'yaml'
-class Jeweler
-  module Versioning
-    # Major version, as defined by the gemspec's Version module.
-    # For 1.5.3, this would return 1.
-    def major_version
-      version_yaml['major']
-    end
-
-    # Minor version, as defined by the gemspec's Version module.
-    # For 1.5.3, this would return 5.
-    def minor_version
-      version_yaml['minor']
-    end
-
-    # Patch version, as defined by the gemspec's Version module.
-    # For 1.5.3, this would return 5.
-    def patch_version
-      version_yaml['patch']
-    end
-
-    # Human readable version, which is used in the gemspec.
-    def version
-      "#{major_version}.#{minor_version}.#{patch_version}"
-    end
-
-  protected
-    def version_yaml_path
-      denormalized_path = File.join(@base_dir, 'VERSION.yml')
-      absolute_path = File.expand_path(denormalized_path)
-      absolute_path.gsub(Dir.getwd + File::SEPARATOR, '')
-    end
-
-    def version_yaml
-      @version_yaml ||= read_version_yaml
-    end
-
-    def read_version_yaml
-      if File.exists?(version_yaml_path)
-        YAML.load_file(version_yaml_path)
-      else
-        raise VersionYmlError, "#{version_yaml_path} does not exist!"
-      end
-    end
-
-    def refresh_version
-      @version_yaml = read_version_yaml
-    end
-  end
-end