tumbler 0.0.4 → 0.0.6

data/CHANGELOG

@@ -1,3 +1,14 @@
+== 0.0.6
+
+* corrected docs. correct version (Joshua Hull, a3ee9bc)
+* new version scheme (Joshua Hull, 631c067)
+* restructure (Joshua Hull, 641ea47)
+* create Tumbler config on update (Joshua Hull, e26b306)
+
+== 0.0.5
+
+* remove push task (Joshua Hull, b85b730)
+
 == 0.0.4
 
 

data/README.rdoc

@@ -19,14 +19,10 @@ For existing projects, you need to configure it to tell Tumbler to do its work.
   gem_name 'my_awesome_gem'
   
   # Use this file to track the version
-  use_version do
-    filename 'VERSION'
-  end
+  version_file 'lib/my_awesome_gem/version.rb'
 
   # Use this file to hang onto your changelog
-  use_changelog do
-    filename 'CHANGELOG'
-  end
+  changelog_file 'CHANGELOG'
 
 Your version number has to only be something parsable by Versionomy. The changelog will automatically be updated when you do releases.
 

data/Tumbler

@@ -1,9 +1,4 @@
 gem_name 'tumbler'
 
-use_version do
-  filename 'VERSION'
-end
-
-use_changelog do
-  filename 'CHANGELOG'
-end
+version_file 'lib/tumbler/version.rb'
+changelog_file 'CHANGELOG'

data/lib/template/Gemfile.erb

@@ -0,0 +1,17 @@
+source :rubygems
+
+# your dependencies go here
+# gem 'nokogiri'
+<% @dependencies.each do |dep|%>
+gem <%=dep.name.inspect%>, <%=dep.requirement.to_s.inspect%>
+<% end %>
+
+group :development do
+  # your development dependencies go here
+  # gem 'rake'
+  # gem 'rspect'
+<% development_dependencies.each do |dep| %>
+  gem <%=dep.name.inspect%>, <%=dep.requirement.to_s.inspect%>
+<% end %>
+end
+

data/lib/template/Tumbler.erb

@@ -0,0 +1,9 @@
+gem_name <%=@name.inspect%>
+
+<% if @version %>
+version_file 'lib/<%=@name%>/version.rb'
+<% end %>
+
+<% if @changelog %>
+changelog_file <%=@changelog.inspect%>
+<% end %>

data/lib/template/version.rb.erb

@@ -0,0 +1,4 @@
+# encoding: utf-8
+module <%=constant_name%> #:nodoc
+  VERSION = '<%=version%>'
+end

data/lib/tumbler.rb

@@ -11,169 +11,19 @@ require 'tumbler/updater'
 require 'tumbler/rake_tasks'
 require 'tumbler/version'
 require 'tumbler/gemspec_helper'
-require 'tumbler/changelog'
 require 'tumbler/generate'
 require 'tumbler/gem'
 require 'tumbler/cli'
+require 'tumbler/manager'
 
-class Tumbler
-  def self.load_version(filename = Version::DEFAULT_FILE)
-    File.read(File.join(__DIR__, '..', filename))
-  end
-
-  VERSION = Tumbler.load_version
-
-  include Runner
-  
-  Change = Struct.new(:hash, :author, :summary)
-  
-  attr_reader :base, :version, :changelog, :gem, :name
-  attr_accessor :noop
-
+module Tumbler
   def self.use_rake_tasks(name = nil)
     root = File.dirname(Callsite.parse(caller).find{|c| c.filename =~ /Rakefile/}.filename)
     Tumbler::RakeTasks.register(File.expand_path(root), name)
   end
 
   def self.load(base)
-    File.exist?(File.join(base, 'Tumbler')) ? new(base) : nil
-  end
-
-  def set_version(version)
-    @version = Version.new
-  end
-
-  def gem_name(name)
-    @name = name
-  end
-
-  def bundler
-    @definition ||= Bundler::Dsl.evaluate(gemfile_path)
-  end
-
-  def config_path
-    File.join(@base, 'Tumbler')
-  end
-
-  def gemfile_path
-    File.join(@base, 'Gemfile')
-  end
-
-  def gemspec_path
-    File.join(@base, "#{@name}.gemspec")
-  end
-
-  def lockfile_path
-    File.join(@base, 'Gemfile.lock')
-  end
-
-  def use_version(&block)
-    @version = Version.new(self, &block)
-  end
-
-  def use_gem(&block)
-    @gem.instance_eval(block)
-  end
-
-  def use_changelog(&block)
-    @changelog = Changelog.new(self, &block)
-  end
-
-  def reset
-    @version = nil
-    @changelog = nil
-  end
-
-  def bump_and_commit(field)
-    guard_clean
-    @changelog.update if @changelog
-    bump(field)
-    if @changelog
-      @changelog.write_version_header
-      @changelog.commit
-    end
-  end
-
-  def tag_and_push
-    guard_clean
-    guard_already_tagged
-    tag
-    push
-  end
-
-  def bump_and_push(field)
-    revert_on_error {
-      bump_and_commit(field)
-      tag_and_push
-    }
-  end
-
-  def current_revision
-    sh('git show --pretty=format:%H').split(/\n/)[0].strip
-  end
-
-  def revert_on_error
-    current_ref = current_revision
-    begin
-      yield
-    rescue
-      sh "git reset --hard #{current_ref}"
-      raise
-    end
-  end
-
-  def guard_clean
-    clean? or raise("There are files that need to be committed first.")
-  end
-
-  def guard_already_tagged
-    sh('git tag').split(/\n/).include?(@version.to_s) and raise("This tag has already been committed to the repo.")
-  end
-
-  def bump(level)
-    from = @version.to_s
-    @version.bump(level)
-    @version.commit(from)
-  end
-
-  def clean?
-    sh("git ls-files -dm").split("\n").size.zero?
-  end
-
-  def push
-    sh "git push --all"
-    sh "git push --tags"
-  end
-
-  def tag
-    sh "git tag #{@version.to_s}"
-  end
-
-  def commit(msg)
-    sh "git commit #{@version.basefile} -m'#{msg}'"
-  end
-
-  def tags
-    sh('git tag').split(/\n/)
-  end
-
-  def reload
-    reset
-    @gem = Gem.new(self)
-    instance_eval(File.read(config_path), config_path, 1)
-  end
-
-  def latest_changes
-    changes = sh("git log --pretty=format:'%h (%aN) %s' --no-color #{@version}..HEAD").
-      scan(/([a-f0-9]{7}) \((.*?)\) (.*)$/).
-      map{|line| Change.new(line[0], line[1], line[2])}
-  end
-
-  private
-  def initialize(base)
-    @base = base
-    reload
-    @noop = true if ENV['DRY'] == '1'
+    File.exist?(File.join(base, 'Tumbler')) ? Manager.new(base) : nil
   end
 
 end

data/lib/tumbler/cli.rb

@@ -1,6 +1,6 @@
 require 'optparse'
 
-class Tumbler
+module Tumbler
   class CLI
     def self.run(args)
       CLI.new(args).run
@@ -8,8 +8,7 @@ class Tumbler
 
     def initialize(args)
       @options = {
-        :changelog => Changelog::DEFAULT_FILE,
-        :version => Version::INITIAL_VERSION
+        :changelog => Manager::Changelog::DEFAULT_FILE,
       }
       parser.parse!(args)
     end
@@ -37,7 +36,7 @@ class Tumbler
           @options[:version] = v
         end
 
-        opts.on("-nv", "--no-value", "Disable version") do |v|
+        opts.on("-nv", "--no-version", "Disable version") do |v|
           @options[:version] = nil
         end
 

data/lib/tumbler/gem.rb

@@ -1,4 +1,4 @@
-class Tumbler
+module Tumbler
   class Gem
     include Runner
 

data/lib/tumbler/gemspec.rb

@@ -1,4 +1,4 @@
 require File.join(File.dirname(__FILE__), '..', 'tumbler') unless Kernel.const_defined?(:Tumbler)
 root = File.expand_path(File.dirname(Callsite.parse(caller).find{|c| c.filename =~ /\.gemspec$/}.filename))
 Tumbler.send(:remove_const, :Gemspec) if (Tumbler.const_defined?(:Gemspec))
-Tumbler::Gemspec = Tumbler::GemspecHelper.new(Tumbler.new(root))
+Tumbler::Gemspec = Tumbler::GemspecHelper.new(Tumbler.load(root))

data/lib/tumbler/gemspec_helper.rb

@@ -1,4 +1,4 @@
-class Tumbler
+module Tumbler
   class GemspecHelper
     def initialize(manager)
       @manager = manager

data/lib/tumbler/generate.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'erb'
 
-class Tumbler
+module Tumbler
   class Generate
     
     include Runner
@@ -32,14 +32,18 @@ class Tumbler
       @name = name
       @dependencies = []
       @development_dependencies = []
-      @version = Version::INITIAL_VERSION
-      @changelog = Changelog::DEFAULT_FILE
+      @version = Manager::Version::INITIAL_VERSION
+      @changelog = Manager::Changelog::DEFAULT_FILE
+    end
+
+    def constant_name
+      @name.split('_').map{|p| p.capitalize}.join
     end
 
     def write
       write_gemspec
       write_gemfile
-      write_version
+      write_version(@version)
       write_changelog
       write_rakefile
       write_tumbler_config
@@ -62,18 +66,13 @@ class Tumbler
       File.join(@base, 'Tumbler')
     end
 
-    def init_version
-      return unless @version
-      File.open(@version.file, "w") {|f| f.puts @version.value.to_s} unless File.exist?(@version.file)
+    def write_version(version)
+      FileUtils.mkdir_p(File.dirname(version_path))
+      File.open(version_path, 'w') {|f| f << generate_version(version) }
     end
-
-    def init_changelog
-      return unless @changelog
-      File.open(@changelog.file, "w") {|f| f << ''} unless File.exist?(@changelog.file)
-    end
-
-    def write_version
-      File.open(File.join(@base, Version::DEFAULT_FILE), 'w') {|f| f << @version }
+    
+    def version_path
+      File.join(@base, 'lib', @name, 'version.rb')
     end
     
     def write_gemfile
@@ -109,23 +108,21 @@ class Tumbler
     end
 
     def template_path(path)
-      File.join(File.dirname(__FILE__), '..', '..', 'template', path)
+      File.join(File.dirname(__FILE__), '..', 'template', path)
     end
 
     def generate_tumbler_conf
-      template = ERB.new(File.read(template_path('generic.Tumbler.erb')))
+      template = ERB.new(File.read(template_path('Tumbler.erb')))
       template.result(binding)
     end
 
     def generate_gemfile
-      template = ERB.new <<-EOF
-source :rubygems
-
-<% @dependencies.each do |dep|%>gem <%=dep.name.inspect%>, <%=dep.requirement.to_s.inspect%><%="\n"%><% end %>
-group(:development) do
-<% development_dependencies.each do |dep|%>  gem <%=dep.name.inspect%>, <%=dep.requirement.to_s.inspect%><%="\n"%><% end %>
-end
-      EOF
+      template = ERB.new(File.read(template_path('Gemfile.erb')))
+      template.result(binding)
+    end
+
+    def generate_version(version)
+      template = ERB.new(File.read(template_path('version.rb.erb')))
       template.result(binding)
     end
 

data/lib/tumbler/manager.rb

@@ -0,0 +1,161 @@
+require 'tumbler/manager/changelog'
+require 'tumbler/manager/version'
+
+module Tumbler
+  class Manager
+    include Runner
+
+    Change = Struct.new(:hash, :author, :summary)
+
+    attr_reader :base, :version, :changelog, :gem, :name
+    attr_accessor :noop
+
+    def default_version_file
+      File.join('lib', name, 'version.rb')
+    end
+
+    def default_changelog_file
+      Changelog::DEFAULT_FILE
+    end
+
+    def gem_name(name)
+      @name = name
+    end
+
+    def bundler
+      @definition ||= Bundler::Dsl.evaluate(gemfile_path)
+    end
+
+    def config_path
+      File.join(@base, 'Tumbler')
+    end
+
+    def gemfile_path
+      File.join(@base, 'Gemfile')
+    end
+
+    def gemspec_path
+      File.join(@base, "#{@name}.gemspec")
+    end
+
+    def lockfile_path
+      File.join(@base, 'Gemfile.lock')
+    end
+
+    def version_file(file = default_version_file, &block)
+      @version = Manager::Version.new(self)
+      @version.filename(file)
+      @version.instance_eval(&block) if block
+      @version.reload
+      @version
+    end
+
+    def use_gem(&block)
+      @gem.instance_eval(block)
+    end
+
+    def changelog_file(file = default_changelog_file, &block)
+      @changelog = Changelog.new(self)
+      @changelog.filename(file)
+      @changelog.instance_eval(&block) if block
+      @changelog
+    end
+
+    def reset
+      @version = nil
+      @changelog = nil
+    end
+
+    def bump_and_commit(field)
+      guard_clean
+      @changelog.update if @changelog
+      bump(field)
+      if @changelog
+        @changelog.write_version_header
+        @changelog.commit
+      end
+    end
+
+    def tag_and_push
+      guard_clean
+      guard_already_tagged
+      tag
+      push
+    end
+
+    def bump_and_push(field)
+      revert_on_error {
+        bump_and_commit(field)
+        tag_and_push
+      }
+    end
+
+    def current_revision
+      sh('git show --pretty=format:%H').split(/\n/)[0].strip
+    end
+
+    def revert_on_error
+      current_ref = current_revision
+      begin
+        yield
+      rescue
+        sh "git reset --hard #{current_ref}"
+        raise
+      end
+    end
+
+    def guard_clean
+      clean? or raise("There are files that need to be committed first.")
+    end
+
+    def guard_already_tagged
+      sh('git tag').split(/\n/).include?(@version.to_s) and raise("This tag has already been committed to the repo.")
+    end
+
+    def bump(level)
+      from = @version.to_s
+      @version.bump(level)
+      @version.commit(from)
+    end
+
+    def clean?
+      sh("git ls-files -dm").split("\n").size.zero?
+    end
+
+    def push
+      sh "git push --all"
+      sh "git push --tags"
+    end
+
+    def tag
+      sh "git tag #{@version.to_s}"
+    end
+
+    def commit(msg)
+      sh "git commit #{@version.basefile} -m'#{msg}'"
+    end
+
+    def tags
+      sh('git tag').split(/\n/)
+    end
+
+    def reload
+      reset
+      @gem = Gem.new(self)
+      instance_eval(File.read(config_path), config_path, 1)
+    end
+
+    def latest_changes
+      changes = sh("git log --pretty=format:'%h (%aN) %s' --no-color #{@version}..HEAD").
+        scan(/([a-f0-9]{7}) \((.*?)\) (.*)$/).
+        map{|line| Change.new(line[0], line[1], line[2])}
+    end
+
+    private
+    def initialize(base)
+      @base = base
+      reload
+      @noop = true if ENV['DRY'] == '1'
+    end
+  end
+end

data/lib/tumbler/manager/changelog.rb

@@ -0,0 +1,64 @@
+require 'tempfile'
+require 'fileutils'
+
+module Tumbler
+  class Manager
+    class Changelog
+      include Runner
+
+      DEFAULT_FILE = 'CHANGELOG'
+
+      attr_reader :file
+
+      def initialize(manager, &block)
+        @manager = manager
+        instance_eval(&block) if block
+      end
+
+      def filename(file)
+        @basefile = file
+        @file = File.join(@manager.base, file)
+      end
+
+      def write_version_header
+        prepend "== #{@manager.version}\n\n"
+      end
+
+      def prepend(data)
+        if @manager.noop
+          @manager.dry "Prepending #{data} to #{@basefile}"
+        else
+          Tempfile.open('changelog') do |tmp|
+            tmp.puts data
+            File.open(@file) do |f|
+              f.each do |line|
+                tmp << line
+              end
+            end
+            tmp.close
+            FileUtils.copy(tmp.path, @file)
+            File.unlink(tmp.path)
+          end
+        end
+      end
+
+      def update
+        ensure_existence
+        prepend("\n")
+        prepend(@manager.latest_changes.inject('') { |changes, change| changes << "* #{change.summary} (#{change.author}, #{change.hash})\n" })
+      end
+
+      def ensure_existence
+        File.open(@file, 'w') {|f| f << ''} unless File.exist?(@file)
+      end
+
+      def commit
+        sh "git commit #{@basefile} -m'Updated changelog'"
+      end
+
+      def base
+        @manager.base
+      end
+    end
+  end
+end

data/lib/tumbler/manager/version.rb

@@ -0,0 +1,66 @@
+module Tumbler
+  class Manager
+    class Version
+      include Runner
+
+      attr_reader :file, :basefile, :field_names
+
+      DEFAULT_FIELD = [:major, :minor, :tiny]
+      INITIAL_VERSION = '0.0.0'
+
+      def initialize(manager, &block)
+        @manager = manager
+        filename(manager.default_version_file)
+        fields(DEFAULT_FIELD)
+        instance_eval(&block) if block
+      end
+
+      def fields(f)
+        @field_names = (f == :all ? @version.field_names : f)
+      end
+
+      def reload
+        @version = Versionomy.parse(File.exist?(file) ? extract : '0.0.0')
+      end  
+
+      def extract
+        File.read(@file)[/Version\s*=\s*['"](.*?)['"]/i, 1]
+      end
+
+      def generate_with_new(version)
+        File.read(@file).gsub(/(Version\s*=\s*['"])(.*?)(['"])/i, "\\1#{version.to_s}\\3")
+      end
+
+      def filename(file)
+        @basefile = file
+        @file = File.join(@manager.base, file)
+      end
+
+      def value
+        @version
+      end
+
+      def to_s
+        value.to_s
+      end
+
+      def bump(level)
+        if @manager.noop
+          @manager.dry "Bumping version to #{bump(level).to_s}"
+        else
+          new_file = generate_with_new(@version.bump(level).to_s)
+          File.open(file, 'w') {|f| f << new_file }
+          reload
+        end
+      end
+    
+      def commit(from)
+        sh "git commit #{@basefile} -m'Bumped version from #{from} to #{to_s}'"
+      end
+    
+      def base
+        @manager.base
+      end
+    end
+  end
+end

data/lib/tumbler/rake_tasks.rb

@@ -1,4 +1,4 @@
-class Tumbler
+module Tumbler
   class RakeTasks
 
     def self.register(base, name)
@@ -59,12 +59,6 @@ class Tumbler
               task :release do
                 @manager.bump_and_push(field)
               end
-
-              desc "Bump version from #{@manager.version.to_s} ->  #{@manager.version.value.bump(field).to_s} and push"
-              task :release do
-                @manager.bump_and_push(field)
-                @manager.gem.push
-              end
             end
           end
         end

data/lib/tumbler/runner.rb

@@ -1,4 +1,4 @@
-class Tumbler
+module Tumbler
   module Runner
 
     attr_accessor :noop

data/lib/tumbler/updater.rb

@@ -2,9 +2,8 @@ require 'net/http'
 require 'uri'
 require 'json'
 
-class Tumbler
+module Tumbler
   class Updater
-
     def initialize(dir, opts = nil)
       @dir = dir
       @name = opts && opts[:name] || File.basename(File.expand_path(dir))
@@ -16,6 +15,13 @@ class Tumbler
       upgrade_version
       upgrade_changelog
       upgrade_rakefile
+      upgrade_tumbler_config
+    end
+
+    def upgrade_tumbler_config
+      unless File.exist?(tumbler_config_path)
+        Tumbler::Generate.app(@dir, @name).write_tumbler_config
+      end
     end
 
     def upgrade_deps
@@ -40,13 +46,13 @@ raise # (see below)
         # go to rubygems and get it
         gem_data = JSON.parse(Net::HTTP.get(URI.parse("http://rubygems.org/api/v1/gems/#{URI.escape(@name)}.json")))
         version = gem_data['version']
-        File.open(version_path, 'w') {|f| f << version}
+        Tumbler::Generate.app(@dir, @name).write_version(version)
       end
     end
 
     def upgrade_changelog
       unless File.exists?(changelog_path)
-        File.open(changelog_path, 'w'){ |f| f << '' }
+        Tumbler::Generate.app(@dir, @name).write_changelog
       end
     end
 
@@ -62,6 +68,10 @@ raise # (see below)
       File.join(@dir, 'Rakefile')
     end
 
+    def tumbler_config_path
+      File.join(@dir, 'Tumbler')
+    end
+
     def create_rakefile
       File.open(rakefile_path, 'w') { |f|
         f.puts "require 'tumbler'\nnTumbler.use_rake_tasks"
@@ -69,11 +79,11 @@ raise # (see below)
     end
 
     def version_path
-      File.join(@dir, Version::DEFAULT_FILE)
+      File.join(@dir, 'lib', @name, 'version.rb')
     end
 
     def changelog_path
-      File.join(@dir, Changelog::DEFAULT_FILE)
+      File.join(@dir, Manager::Changelog::DEFAULT_FILE)
     end
 
     def gemspec_path

data/lib/tumbler/version.rb

@@ -1,57 +1,3 @@
-class Tumbler
-  class Version
-    include Runner
-
-    attr_reader :file, :basefile, :field_names
-
-    DEFAULT_FILE = 'VERSION'
-    DEFAULT_FIELD = [:major, :minor, :tiny]
-    INITIAL_VERSION = '0.0.0'
-
-    def initialize(manager, &block)
-      @manager = manager
-      filename(DEFAULT_FILE)
-      fields(DEFAULT_FIELD)
-      instance_eval(&block) if block
-      reload
-    end
-
-    def fields(f)
-      @field_names = (f == :all ? @version.field_names : f)
-    end
-
-    def reload
-      @version = Versionomy.parse(File.exist?(file) ? File.read(file).strip : '0.0.0')
-    end  
-
-    def filename(file)
-      @basefile = file
-      @file = File.join(@manager.base, file)
-    end
-
-    def value
-      @version
-    end
-
-    def to_s
-      value.to_s
-    end
-
-    def bump(level)
-      if @manager.noop
-        @manager.dry "Bumping version to #{bump(level).to_s}"
-      else
-        File.open(file, 'w') {|f| f << @version.bump(level).to_s}
-        reload
-      end
-    end
-    
-    def commit(from)
-      sh "git commit #{@basefile} -m'Bumped version from #{from} to #{to_s}'"
-    end
-    
-    def base
-      @manager.base
-    end
-  end
+module Tumbler
+  VERSION = '0.0.6'
 end

data/spec/{bin_bijou_spec.rb → bin_tumbler_spec.rb}

@@ -15,7 +15,7 @@ describe 'bin/tumbler' do
     it "should generate an app" do
       Dir.chdir(@target) {`bundle exec ruby #{@bin} test_gem`}
       $?.should == 0
-      tumbler = Tumbler.new(File.join(@target, 'test_gem'))
+      tumbler = Tumbler.load(File.join(@target, 'test_gem'))
       tumbler.version.to_s.should == '0.0.0'
       tumbler.bundler.dependencies.first.name.should == 'tumbler'
       tumbler.bundler.dependencies.first.requirements_list.should == ['>= 0']
@@ -29,7 +29,7 @@ describe 'bin/tumbler' do
     end
     
     it "should do nothing on a normal existing tumbler app" do
-      tumbler = Tumbler.new(File.join(@target, 'rails'))
+      tumbler = Tumbler.load(File.join(@target, 'rails'))
       version_file = File.read(tumbler.version.file)
       changelog_file = File.read(tumbler.changelog.file)
       gemfile_file = File.read(tumbler.gemfile_path)
@@ -43,7 +43,7 @@ describe 'bin/tumbler' do
     end
 
     it "should work from inside the directory" do
-      tumbler = Tumbler.new(File.join(@target, 'rails'))
+      tumbler = Tumbler.load(File.join(@target, 'rails'))
       version_file = File.read(tumbler.version.file)
       changelog_file = File.read(tumbler.changelog.file)
       gemfile_file = File.read(tumbler.gemfile_path)
@@ -57,7 +57,7 @@ describe 'bin/tumbler' do
     end
 
     it "should not work if the directory and gemspec mismatch and you don't supply a name" do
-      tumbler = Tumbler.new(File.join(@target, 'rails'))
+      tumbler = Tumbler.load(File.join(@target, 'rails'))
       FileUtils.mv("#{@target}/rails/rails.gemspec", "#{@target}/rails/notrails.gemspec")
       Dir.chdir(@target) {`bundle exec ruby #{@bin} rails -u`}
       $?.exitstatus.should == 1

data/spec/changelog_spec.rb

@@ -1,6 +1,6 @@
 require 'spec/spec_helper'
 
-describe Tumbler::Changelog do
+describe Tumbler::Manager::Changelog do
 
   after(:each) do
     $".delete "tumbler/gemspec.rb" # we need to delete this so each gemspec can be generated fresh

data/spec/gemspec_spec.rb

@@ -19,7 +19,7 @@ describe Tumbler::GemspecHelper do
   end
 
   it "should have files" do
-    @helper.files.should == ["CHANGELOG", "Gemfile", "Rakefile", "Tumbler", "VERSION", "test.gemspec"]
+    @helper.files.should == ["CHANGELOG", "Gemfile", "Rakefile", "Tumbler", "lib/test/version.rb", "test.gemspec"]
   end
 
   it "should have a date" do

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ def create_app(name = 'test', opts = {})
   temp_dir(name) do |dir|
     temp_dir("remote-#{name}.git") do |remote_dir|
       Tumbler::Generate.app(dir, name, opts).write
-      tumbler = Tumbler.new(dir)
+      tumbler = Tumbler::Manager.new(dir)
 
       Dir.chdir(remote_dir) { `git --bare init` }
 
@@ -29,7 +29,7 @@ end
 def create_bare_app(name, opts = {})
   dir = temp_dir(name)
   Tumbler::Generate.app(dir, name, opts).write
-  tumbler = Tumbler.new(dir)
+  tumbler = Tumbler::Manager.new(dir)
   [dir, tumbler]
 end
 

data/spec/updater_spec.rb

@@ -16,9 +16,9 @@ describe Tumbler::Updater do
   it "should fetch the version number" do
     FakeWeb.allow_net_connect = false
     FakeWeb.register_uri(:get, "http://rubygems.org/api/v1/gems/rails.json", :body => '{ "name": "rails", "info": "Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates.", "version": "2.3.5", "version_downloads": 2451, "authors": "David Heinemeier Hansson", "downloads": 134451, "project_uri": "http://rubygems.org/gems/rails", "gem_uri": "http://rubygems.org/gems/rails-2.3.5.gem", "dependencies": { "runtime": [ { "name": "activesupport", "requirements": ">= 2.3.5" } ], "development": [ ] }}')
-    File.unlink("#{@target}/rails/VERSION")
+    File.unlink("#{@target}/rails/lib/rails/version.rb")
     Tumbler::Updater.new("#{@target}/rails", :name => 'rails').update
-    File.read("#{@target}/rails/VERSION").should == '2.3.5'
+    File.read("#{@target}/rails/lib/rails/version.rb").should match(/2\.3\.5/)
   end
 
   it "should generate a CHANGELOG" do
@@ -51,4 +51,10 @@ describe Tumbler::Updater do
     File.read("#{@target}/rails/rails.gemspec").scan(/Tumbler::Gemspec.inject_dependencies/).size.should == 1
   end
   
+  it "should add a Tumbler config file if its not already there" do
+    File.unlink("#{@target}/rails/Tumbler")
+    Tumbler::Updater.new("#{@target}/rails", :name => 'rails').update
+    File.exist?("#{@target}/rails/Tumbler").should be_true
+  end
+  
 end

data/spec/version_spec.rb

@@ -9,6 +9,7 @@ describe 'Tumbler#version' do
 
   it "should bump the current version by minor" do
     create_app('test', :version => '0.1.2') { |tumbler|
+      puts "File.read(tumbler.version.file) #{File.read(tumbler.version.file)}"
       tumbler.bump_and_push(:minor)
       tumbler.version.to_s.should == '0.2.0'
       tumbler.tags.should include('0.2.0')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tumbler
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-16 00:00:00 -04:00
+date: 2010-06-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -132,20 +132,26 @@ files:
 - README.rdoc
 - Rakefile
 - Tumbler
-- VERSION
 - bin/tumbler
+- lib/template/Gemfile.erb
+- lib/template/Rakefile
+- lib/template/Tumbler.erb
+- lib/template/generic.gemspec.erb
+- lib/template/version.rb.erb
 - lib/tumbler.rb
-- lib/tumbler/changelog.rb
 - lib/tumbler/cli.rb
 - lib/tumbler/gem.rb
 - lib/tumbler/gemspec.rb
 - lib/tumbler/gemspec_helper.rb
 - lib/tumbler/generate.rb
+- lib/tumbler/manager.rb
+- lib/tumbler/manager/changelog.rb
+- lib/tumbler/manager/version.rb
 - lib/tumbler/rake_tasks.rb
 - lib/tumbler/runner.rb
 - lib/tumbler/updater.rb
 - lib/tumbler/version.rb
-- spec/bin_bijou_spec.rb
+- spec/bin_tumbler_spec.rb
 - spec/changelog_spec.rb
 - spec/gemspec_spec.rb
 - spec/generate_spec.rb
@@ -154,14 +160,9 @@ files:
 - spec/tasks_spec.rb
 - spec/updater_spec.rb
 - spec/version_spec.rb
-- template/Gemfile
-- template/Rakefile
-- template/generic.Tumbler.erb
-- template/generic.gemspec.erb
 - test1
 - thinking.txt
 - thinking2.txt
-- tumbler-0.0.1.gem
 - tumbler.gemspec
 has_rdoc: true
 homepage: http://github.com/joshbuddy/tumbler
@@ -198,7 +199,7 @@ signing_key:
 specification_version: 3
 summary: This is awesome.
 test_files: 
-- spec/bin_bijou_spec.rb
+- spec/bin_tumbler_spec.rb
 - spec/changelog_spec.rb
 - spec/gemspec_spec.rb
 - spec/generate_spec.rb

data/VERSION

@@ -1 +0,0 @@
-0.0.4

data/lib/tumbler/changelog.rb

@@ -1,62 +0,0 @@
-require 'tempfile'
-require 'fileutils'
-
-class Tumbler
-  class Changelog
-    include Runner
-
-    DEFAULT_FILE = 'CHANGELOG'
-
-    attr_reader :file
-
-    def initialize(manager, &block)
-      @manager = manager
-      instance_eval(&block) if block
-    end
-
-    def filename(file)
-      @basefile = file
-      @file = File.join(@manager.base, file)
-    end
-
-    def write_version_header
-      prepend "== #{@manager.version}\n\n"
-    end
-
-    def prepend(data)
-      if @manager.noop
-        @manager.dry "Prepending #{data} to #{@basefile}"
-      else
-        Tempfile.open('changelog') do |tmp|
-          tmp.puts data
-          File.open(@file) do |f|
-            f.each do |line|
-              tmp << line
-            end
-          end
-          tmp.close
-          FileUtils.copy(tmp.path, @file)
-          File.unlink(tmp.path)
-        end
-      end
-    end
-
-    def update
-      ensure_existence
-      prepend("\n")
-      prepend(@manager.latest_changes.inject('') { |changes, change| changes << "* #{change.summary} (#{change.author}, #{change.hash})\n" })
-    end
-
-    def ensure_existence
-      File.open(@file, 'w') {|f| f << ''} unless File.exist?(@file)
-    end
-
-    def commit
-      sh "git commit #{@basefile} -m'Updated changelog'"
-    end
-
-    def base
-      @manager.base
-    end
-  end
-end

data/template/Gemfile

@@ -1,10 +0,0 @@
-source :rubygems
-
-# your dependencies go here
-# gem 'nokogiri'
-
-group :development do
-  # your development dependencies go here
-  # gem 'rake'
-  # gem 'rspect'
-end

data/template/generic.Tumbler.erb

@@ -1,14 +0,0 @@
-gem_name <%=@name.inspect%>
-
-<% if @version %>
-use_version do
-  filename 'VERSION'
-  format 'standard'
-end
-<% end %>
-
-<% if @changelog %>
-use_changelog do
-  filename <%=@changelog.inspect%>
-end
-<% end %>