tumbler 0.0.11 → 0.0.12

data/test/gemspec_test.rb

@@ -0,0 +1,23 @@
+require File.join(File.dirname(__FILE__),'teststrap')
+
+context "GemspecHelper" do
+  setup { @dir, @app = create_bare_app('test') }
+  setup { @helper = Tumbler::GemspecHelper.new(@app) }
+  teardown { FileUtils.rm_rf(@dir) }
+
+  asserts(:name).equals 'test'
+  asserts(:version).equals '0.0.0'
+  asserts(:files).equivalent_to ["CHANGELOG", "Gemfile", "Rakefile", "Tumbler", "lib/test.rb", "lib/test/version.rb", "test.gemspec"]
+  asserts(:date).equals Time.new.strftime("%Y-%m-%d")
+  
+  context "inject_dependencies" do
+    setup do
+      spec = Gem::Specification.new
+      File.open("#{@app.base}/Gemfile", 'a') {|f| f.puts "gem 'test', '>= 0.0.5'"}
+      @app.reload
+      @helper.inject_dependencies(spec) ; spec
+    end
+    asserts(:runtime_dependencies).equals [Gem::Dependency.new('test', '>= 0.0.5')]
+    asserts(:development_dependencies).equals [Gem::Dependency.new('tumbler', '>= 0', :development)]
+  end
+end

data/test/generate_test.rb

@@ -0,0 +1,81 @@
+require File.join(File.dirname(__FILE__),'teststrap')
+
+context "Generate" do
+  setup { @test_dir = temp_dir('test') }
+  teardown { $".delete "tumbler/gemspec.rb" } # we need to delete this so each gemspec can be generated fresh
+  teardown{ FileUtils.rm_rf(@test_dir) }
+
+  context "suppress changelog creation if disabled" do
+    setup { Tumbler::Generate.app(@test_dir, 'mygem', :changelog => nil).write }
+    asserts("has changelog") { File.exist? File.join(@test_dir, "CHANGELOG") }.not!
+  end
+
+  context "generate mygem directory" do
+    setup { Tumbler::Generate.app(@test_dir, 'mygem').write }
+    asserts("dir exists") { File.exist? File.join(@test_dir, "lib", "mygem") }
+  end
+
+  context "generate the mygem.rb file" do
+    setup do
+      Tumbler::Generate.app(@test_dir, 'my_gem').write
+      File.join(@test_dir, "lib", 'my_gem.rb')
+    end
+    asserts("it exists") { File.exist? topic }
+    asserts("has module") { File.read(topic) }.matches %r{module MyGem #:nodoc}
+    asserts("has require") { File.read(topic) }.matches %r{require 'my_gem/version'\n}
+  end
+
+  context "generate the mygem.rb file without the version require if no version is being used" do
+    setup do
+      Tumbler::Generate.app(@test_dir, 'my_gem', :version => nil).write
+      File.join(@test_dir, "lib", 'my_gem.rb')
+    end
+    asserts("exists") { File.exists? topic }
+    asserts("module") { File.read topic }.matches %r{module MyGem #:nodoc}
+    asserts("require") { File.read(topic) =~ %r{require 'my_gem/version'\n} }
+  end
+
+  context "generate the gem constant correctly with -" do
+    setup { Tumbler::Generate.app(@test_dir, 'my-gem').write }
+    asserts("My::Gem") { File.read File.join(@test_dir, 'lib','my-gem','version.rb') }.matches %r{My::Gem}
+  end
+
+  context "generate the gem constant correctly with _" do
+    setup { Tumbler::Generate.app(@test_dir, 'my_gem').write }
+    asserts("MyGem") { File.read File.join(@test_dir, 'lib','my_gem','version.rb') }.matches %r{MyGem}
+  end
+
+  context "generate a gemspec" do
+    setup do
+      Tumbler::Generate.app(@test_dir, 'mygem').write
+      Gem::Specification.load("#{@test_dir}/mygem.gemspec")
+    end
+    asserts(:dependencies).equals [Gem::Dependency.new('tumbler', '>=0', :development)]
+  end
+
+  context "generate a Rakefile" do
+    setup { Tumbler::Generate.app(@test_dir, 'mygem').write }
+    asserts("Rakefile") { File.exist?("#{@test_dir}/Rakefile") }
+  end
+
+  context "accepts an extra dependency" do
+    setup do
+      Tumbler::Generate.app(@test_dir, 'mygem', :dependencies => 'eventmachine').write
+      Gem::Specification.load("#{@test_dir}/mygem.gemspec")
+    end
+    asserts(:dependencies).includes Gem::Dependency.new('tumbler', '>=0', :development)
+    asserts(:dependencies).includes Gem::Dependency.new('eventmachine', '>=0', :runtime)
+    asserts(:dependencies).size 2
+  end
+
+  context "accepts an extra dependency with a version" do
+    setup do
+      Tumbler::Generate.app(@test_dir, 'mygem', :dependencies => [['eventmachine', '>=1.0.0']]).write
+      Gem::Specification.load("#{@test_dir}/mygem.gemspec")
+    end
+    asserts(:dependencies).includes Gem::Dependency.new('tumbler', '>=0', :development)
+    asserts(:dependencies).includes Gem::Dependency.new('eventmachine', '>=1.0.0', :runtime)
+    asserts(:dependencies).size 2
+  end
+
+end

data/test/tasks_test.rb

@@ -0,0 +1,76 @@
+require File.join(File.dirname(__FILE__),'teststrap')
+
+context "Tasks" do
+  setup { ENV['RUBYLIB'] = File.expand_path(File.join(__DIR__, '..', 'lib')) }
+
+  context "should gem.build" do
+    setup { @tumbler, @dir, @remote_dir = create_app }
+    teardown { FileUtils.rm_rf @dir ; FileUtils.rm_rf @remote_dir }
+    setup { @tumbler.gem.build }
+    asserts("gem exists") { File.exist?("#{@tumbler.base}/pkg/test-0.0.0.gem") }
+  end
+
+  context "version bumping" do
+
+    context "shouldn't write a new tag" do
+      setup { @tumbler, @dir, @remote_dir = create_app }
+      teardown { FileUtils.rm_rf @dir ; FileUtils.rm_rf @remote_dir }
+      setup { @tumbler.bump_and_commit(:minor) }
+      asserts("has tag") { @tumbler.tags }.equals ['0.0.0']
+    end
+
+    context "should increment the locally stored version" do
+      setup { @tumbler, @dir, @remote_dir = create_app }
+      teardown { FileUtils.rm_rf @dir ; FileUtils.rm_rf @remote_dir }
+      setup { @tumbler.bump_and_commit(:minor) ; @tumbler.reload }
+      asserts("has right version") { @tumbler.version.to_s }.equals '0.1.0'
+    end
+
+    context "should successfully push after a bump" do
+      setup { @tumbler, @dir, @remote_dir = create_app }
+      teardown { FileUtils.rm_rf @dir ; FileUtils.rm_rf @remote_dir }
+      setup do
+        Tumbler::Gem.any_instance.stubs(:push).once.returns(true)
+        @tumbler.bump_and_commit(:minor)
+        @tumbler.tag_and_push
+        @tumbler.reload
+      end
+      asserts("has right version") { @tumbler.version.to_s }.equals '0.1.0'
+      asserts("has right tags") { @tumbler.tags }.equals %w(0.0.0 0.1.0)
+    end
+
+    context "shouldn't commit the changed changelog on a simple bump" do
+      setup { @tumbler, @dir, @remote_dir = create_app }
+      teardown { FileUtils.rm_rf @dir ; FileUtils.rm_rf @remote_dir }
+      setup { @tumbler.bump_and_commit(:minor) }
+      asserts("git status") { @tumbler.sh('git status') }.matches %r{modified:\s+CHANGELOG}
+    end
+
+  end
+
+  context "version bumping & pushing" do
+    context "should create a nice changelog" do
+      setup { @tumbler, @dir, @remote_dir = create_app }
+      teardown { FileUtils.rm_rf @dir ; FileUtils.rm_rf @remote_dir }
+      setup do
+        Tumbler::Gem.any_instance.stubs(:push).times(4).returns(true)
+        @tumbler.sh 'touch test1; git add test1; git commit test1 -m"Added test1"'
+        @tumbler.bump_and_push(:minor)
+        @tumbler.sh 'touch test2; git add test2; git commit test2 -m"Added test2"'
+        @tumbler.sh 'touch test2-1; git add test2-1; git commit test2-1 -m"Added test2-1"'
+        @tumbler.bump_and_push(:minor)
+        @tumbler.sh 'touch test3; git add test3; git commit test3 -m"Added test3"'
+        @tumbler.bump_and_push(:minor)
+        @tumbler.sh 'touch test4; git add test4; git commit test4 -m"Added test4"'
+        @tumbler.bump_and_push(:minor)
+        @tumbler.reload
+        File.read(@tumbler.changelog.file)
+      end
+      asserts_topic.matches %r{== 0\.4\.0\s+\* Added test4 \(.*?\)\n\n==}
+      asserts_topic.matches %r{== 0\.3\.0\s+\* Added test3 \(.*?\)\n\n==}
+      asserts_topic.matches %r{== 0\.2\.0\s+\* Added test2-1 \(.*?\)\n\* Added test2 \(.*?\)\n\n==}
+      asserts_topic.matches %r{== 0\.1\.0\s+\* Added test1 \(.*?\)\n\n$}
+    end
+  end
+
+end

data/test/teststrap.rb

@@ -0,0 +1,72 @@
+require 'rubygems'
+require 'tempfile'
+require 'fileutils'
+require 'riot'
+require 'mocha'
+
+$LOAD_PATH << File.basename(__FILE__)
+$LOAD_PATH << File.join(File.basename(__FILE__), '..', 'lib')
+require 'tumbler'
+
+Tumbler::Gem.any_instance.stubs(:install).raises
+Tumbler::Gem.any_instance.stubs(:push).raises
+
+
+Riot.reporter = Riot::DotMatrixReporter
+class Riot::Situation
+
+  def create_app(name='test', opts={})
+    @dir = temp_dir(name)
+    @remote_dir = temp_dir("remote-#{name}.git")
+    Tumbler::Generate.app(@dir, name, opts).write
+    Dir.chdir(@remote_dir) { `git --bare init` }
+    remote = opts[:remote] || "file://#{@remote_dir}"
+    Dir.chdir(@dir) {
+      `git remote add origin #{remote}`
+      `git push origin master`
+    }
+    [Tumbler::Manager.new(@dir), @dir, @remote_dir]
+  end
+
+  def create_bare_app(name, opts = {})
+    dir = temp_dir(name)
+    Tumbler::Generate.app(dir, name, opts).write
+    tumbler = Tumbler::Manager.new(dir)
+    [dir, tumbler]
+  end
+
+  def temp_dir(name)
+    dir = File.join(Dir.tmpdir, rand(10000).to_s, "#{Process.pid}-#{name}")
+    FileUtils.rm_rf(dir)
+    FileUtils.mkdir_p(dir)
+    if block_given?
+      begin
+        yield dir
+      ensure
+        FileUtils.rm_rf(dir)
+      end
+    else
+      dir
+    end
+  end
+
+end
+
+class Riot::Context
+
+end
+
+class Object
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+    result
+  end
+
+end

data/test/updater_test.rb

@@ -0,0 +1,80 @@
+require File.join(File.dirname(__FILE__),'teststrap')
+require 'fakeweb'
+FakeWeb.allow_net_connect = false
+
+
+context "Updater" do
+  setup do
+    @bin = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'tumbler'))
+    @target = '/tmp/test'
+    FileUtils.mkdir_p(@target)
+    capture(:stdout) { Tumbler::Cli.start(['rails',"-r=#{@target}"]) }
+  end
+  teardown do
+    FileUtils.rm_rf @target
+    $".delete "tumbler/gemspec.rb" # we need to delete this so each gemspec can be generated fresh
+  end
+
+  context "fetches the version number" do
+    setup do
+      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/lib/rails/version.rb")
+      Tumbler::Updater.new("#{@target}/rails", :name => 'rails').update
+      File.read("#{@target}/rails/lib/rails/version.rb")
+    end
+    asserts_topic.matches %r{2\.3\.5}
+  end
+
+  context "generates a CHANGELOG" do
+    setup do
+      File.unlink("#{@target}/rails/CHANGELOG")
+      Tumbler::Updater.new("#{@target}/rails", :name => 'rails').update
+    end
+    asserts("file exists") { File.exist?("#{@target}/rails/CHANGELOG") }
+  end
+
+  context "does not append anything to the Rakefile as it already has the tumbler tasks in it" do
+    setup do
+      @rakefile = File.read("#{@target}/rails/Rakefile")
+      Tumbler::Updater.new("#{@target}/rails", :name => 'rails').update
+    end
+    asserts("same rakefile") { @rakefile == File.read("/tmp/test/rails/Rakefile") }
+  end
+
+  context "append the Tumbler tasks if they don't already exist" do
+    setup do
+      File.open("#{@target}/rails/Rakefile", 'w') {|f| f.puts '# Some other rake file'}
+      Tumbler::Updater.new("#{@target}/rails", :name => 'rails').update
+    end
+    asserts("finds use_rake_tasks once") do
+      File.read("#{@target}/rails/Rakefile").scan(/require 'tumbler'\nTumbler\.use_rake_tasks/)
+    end.size 1
+  end
+
+  context "does not append anything to the gemspec if it already is using tumbler" do
+    setup do
+      @gemspec = File.read("#{@target}/rails/rails.gemspec")
+      Tumbler::Updater.new("#{@target}/rails", :name => 'rails').update
+    end
+    asserts("doesn't change") { File.read("#{@target}/rails/rails.gemspec") == @gemspec }
+  end
+
+  context "append inject_dependencies if its doesn't exist" do
+    setup do
+      File.open("#{@target}/rails/Rakefile", 'w') {|f| f.puts '# Some other gemspec file'}
+      Tumbler::Updater.new("#{@target}/rails", :name => 'rails').update
+    end
+    asserts("finds inject_dependencies once") do
+      File.read("#{@target}/rails/rails.gemspec").scan(/Tumbler::Gemspec.inject_dependencies/)
+    end.size 1
+  end
+
+  context "add a Tumbler config file if it doesn't exist" do
+    setup do
+      File.unlink("#{@target}/rails/Tumbler")
+      Tumbler::Updater.new("#{@target}/rails", :name => 'rails').update
+    end
+    asserts("adds Tumbler file") { File.exist?("#{@target}/rails/Tumbler") }
+  end
+
+end

data/test/version_test.rb

@@ -0,0 +1,31 @@
+require File.join(File.dirname(__FILE__),'teststrap')
+
+context 'Version' do
+  setup { @tumbler, @dir, @remote_dir = create_app('test', :version => '0.1.2') }
+  setup { Tumbler::Gem.any_instance.stubs(:push).once.returns(true) }
+  teardown { FileUtils.rm_rf @dir ; FileUtils.rm_rf @remote_dir }
+  asserts("right version") { @tumbler.version.to_s }.equals '0.1.2'
+
+  context "should bump the current version by minor" do
+    setup { @tumbler.bump_and_push(:minor) }
+    asserts("right version") { @tumbler.version.to_s }.equals '0.2.0'
+    asserts("has tags") { @tumbler.tags }.includes '0.2.0'
+  end
+
+  context "should bump the current version by tiny" do
+    setup { @tumbler.bump_and_push(:tiny) }
+    asserts("right version") { @tumbler.version.to_s }.equals '0.1.3'
+  end
+
+  context "should bump the current version by major" do
+    setup { @tumbler.bump_and_push(:major) }
+    asserts("right version") { @tumbler.version.to_s }.equals '1.0.0'
+  end
+
+  context "should not let you tag the same version twice" do
+    setup { @tumbler.bump_and_push(:major) }
+    asserts("right version") { @tumbler.version.to_s }.equals '1.0.0'
+    asserts("should fail") { @tumbler.tag_and_push(:major) }.raises ArgumentError
+  end
+
+end

data/tumbler.gemspec

@@ -10,7 +10,8 @@ Gem::Specification.new do |s|
   s.rubyforge_project = Tumbler::Gemspec.name
   s.authors = ["Joshua Hull"]
   s.date = Tumbler::Gemspec.date
-  s.description = %q{Description}
+  s.description = "Let's make gem development fun and remove all the repetition! Tumbler provides support for common gem management tasks which helps you spend less time dealing with gem releases and more time focusing on your gem functionality!"
+  s.summary = "Common gem generation and management tasks"
   s.email = %q{joshbuddy@gmail.com}
   s.extra_rdoc_files = Tumbler::Gemspec.files('README.rdoc')
   s.files = Tumbler::Gemspec.files
@@ -18,20 +19,9 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{This is awesome.}
   s.test_files = Tumbler::Gemspec.files(/^spec/)
   s.executables = Tumbler::Gemspec.bin_files
 
   # dependencies
   Tumbler::Gemspec.inject_dependencies(s)
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tumbler
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 -04:00
+date: 2010-06-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,8 +86,8 @@ dependencies:
         - 0
         version: "0"
   requirement: *id005
-  type: :development
-  name: rake
+  type: :runtime
+  name: thor
 - !ruby/object:Gem::Dependency 
   prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
@@ -101,7 +101,7 @@ dependencies:
         version: "0"
   requirement: *id006
   type: :development
-  name: rspec
+  name: rake
 - !ruby/object:Gem::Dependency 
   prerelease: false
   version_requirements: &id007 !ruby/object:Gem::Requirement 
@@ -115,7 +115,7 @@ dependencies:
         version: "0"
   requirement: *id007
   type: :development
-  name: fakeweb
+  name: riot
 - !ruby/object:Gem::Dependency 
   prerelease: false
   version_requirements: &id008 !ruby/object:Gem::Requirement 
@@ -129,8 +129,36 @@ dependencies:
         version: "0"
   requirement: *id008
   type: :development
+  name: fakeweb
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id009
+  type: :development
   name: mocha
-description: Description
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id010
+  type: :development
+  name: blockenspiel
+description: Let's make gem development fun and remove all the repetition! Tumbler provides support for common gem management tasks which helps you spend less time dealing with gem releases and more time focusing on your gem functionality!
 email: joshbuddy@gmail.com
 executables: 
 - tumbler
@@ -142,7 +170,6 @@ files:
 - .gitignore
 - CHANGELOG
 - Gemfile
-- Gemfile.lock
 - README.rdoc
 - Rakefile
 - Tumbler
@@ -151,6 +178,7 @@ files:
 - lib/template/Rakefile
 - lib/template/Tumbler.erb
 - lib/template/generic.gemspec.erb
+- lib/template/generic.rb.erb
 - lib/template/version.rb.erb
 - lib/tumbler.rb
 - lib/tumbler/cli.rb
@@ -165,15 +193,14 @@ files:
 - lib/tumbler/runner.rb
 - lib/tumbler/updater.rb
 - lib/tumbler/version.rb
-- spec/bin_tumbler_spec.rb
-- spec/changelog_spec.rb
-- spec/gemspec_spec.rb
-- spec/generate_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/tasks_spec.rb
-- spec/updater_spec.rb
-- spec/version_spec.rb
+- test/changelog_test.rb
+- test/cli_test.rb
+- test/gemspec_test.rb
+- test/generate_test.rb
+- test/tasks_test.rb
+- test/teststrap.rb
+- test/updater_test.rb
+- test/version_test.rb
 - tumbler.gemspec
 has_rdoc: true
 homepage: http://github.com/joshbuddy/tumbler
@@ -208,14 +235,6 @@ rubyforge_project: tumbler
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: This is awesome.
-test_files: 
-- spec/bin_tumbler_spec.rb
-- spec/changelog_spec.rb
-- spec/gemspec_spec.rb
-- spec/generate_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/tasks_spec.rb
-- spec/updater_spec.rb
-- spec/version_spec.rb
+summary: Common gem generation and management tasks
+test_files: []
+