tumbler 0.0.11 → 0.0.12

data/.gitignore

@@ -1,2 +1,3 @@
 .bundle
-pkg/*
+pkg/*
+Gemfile.lock

data/CHANGELOG

@@ -1,3 +1,31 @@
+== 0.0.12
+
+* Having a default require for the version file is probably a reasonable default. (Joshua Hull, 6afc0be)
+* Remove spec completely and update rakefile (Arthur Chiu, a99fbb4)
+* Converted version_test (Arthur Chiu, 2b6c300)
+* Convert task_test (Arthur Chiu, 73ccc19)
+* Updated teststrap and converted changelog_test (Arthur Chiu, a05e105)
+* Merged in bin_tumbler tests into cli_test (Arthur Chiu, 016ee16)
+* Generate test conversion (Arthur Chiu, 622a9cf)
+* Converted updater_test (Arthur Chiu, 0548e72)
+* Change to DotMatrix, addd gemspec test (Arthur Chiu, c50705c)
+* Initial changes to riot (Arthur Chiu, 321683b)
+* What did dev say to the cli options parser? you're such a thor. (Arthur Chiu, 0a428eb)
+* Remove gemfile.lock (Arthur Chiu, 9c94f67)
+* Added a section to readme to explain differences from Jeweler (I will flesh it out soon) (Nathan Esquenazi, 0bba249)
+* Fixes summary and description to be different to prevent warning (Nathan Esquenazi, 9ea80a0)
+* remove specification_version (set automatically when the gemspec is 'packaged') (Nathan Esquenazi, ad69939)
+* Cleanup and refactor into a copy_template method (Nathan Esquenazi, e8e9033)
+* Remove generate_xxx methods and render directly in write methods (Nathan Esquenazi, 759d0fe)
+* Cleaned up spec. (Joshua Hull, 4231be6)
+* Require version file by default (Joshua Hull, 6c599a9)
+* Removed require in gem lib file (Arthur Chiu, d26adee)
+* Added gem lib file (Arthur Chiu, a953012)
+* Add test to check mygem directory and mygem.rb (Arthur Chiu, f4ee058)
+* Use /test for spec files. (Joshua Hull, ef67ebd)
+* Don't commit CHANGELOG after first part of two part deploy. (Joshua Hull, a0e96aa)
+* Add correct summary/description to gem (Joshua Hull, 573ecf2)
+
 == 0.0.11
 
 * Use custom matcher for searching in file. (Joshua Hull, 8d16801)

data/Gemfile

@@ -4,10 +4,12 @@ gem 'callsite'
 gem 'versionomy'
 gem 'bundler'
 gem 'json'
+gem 'thor', :require => 'thor/group'
 
 group :development do
   gem 'rake'
-  gem 'rspec'
+  gem 'riot'
   gem 'fakeweb'
   gem 'mocha'
+  gem 'blockenspiel'
 end

data/README.rdoc

@@ -116,4 +116,8 @@ and that does it! Your gem is now released onto the world.
 
 == What's next?
 
-I'm sure there are bugs and other common workflows that I will add and/or document, but basically, I just wanna type a lot less when I bump a gem, and get more things done.
+I'm sure there are bugs and other common workflows that I will add and/or document, but basically, I just wanna type a lot less when I bump a gem, and get more things done.
+
+== How is this different from Jeweler?
+
+Clearly worth explaining briefly how this gem differs from Jeweler to help people to understand why they might want to use this instead. Will flesh this section out very soon. Dynamic gemspec, better version practice, closer integration to git, et. al

data/Rakefile

@@ -2,14 +2,13 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
 require 'tumbler'
 Tumbler.use_rake_tasks
 
-task 'tumbler:preflight' do
-  Rake::Task["spec"].invoke
-end
+# task 'tumbler:preflight' do
+#   Rake::Task["spec"].invoke
+# end
 
-require 'spec'
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts ||= []
-  t.spec_opts << "--options" << "spec/spec.opts"
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
+end

data/Tumbler

@@ -1,4 +1,3 @@
 gem_name 'tumbler'
-
 version_file 'lib/tumbler/version.rb'
 changelog_file 'CHANGELOG'

data/bin/tumbler

@@ -1,8 +1,7 @@
-#!/usr/env ruby
+#!/usr/bin/env ruby
 
 require 'fileutils'
-
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'tumbler'
 
-Tumbler::CLI.run(ARGV)
+Tumbler::Cli.start(ARGV)

data/lib/template/generic.gemspec.erb

@@ -18,13 +18,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{This is awesome.}
-  s.test_files = `git ls-files spec`.split("\n")
+  s.test_files = Tumbler::Gemspec.files(/^test/)
 
   # dependencies
   Tumbler::Gemspec.inject_dependencies(s)
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-  end
 end

data/lib/template/generic.rb.erb

@@ -0,0 +1,4 @@
+require '<%= name %>/version'
+
+module <%=constant_name %> #:nodoc
+end

data/lib/tumbler/cli.rb

@@ -1,69 +1,27 @@
-require 'optparse'
+require 'thor/group'
 
 module Tumbler
-  class CLI
-    def self.run(args)
-      CLI.new(args).run
-    end
-
-    def initialize(args)
-      @options = {
-        :changelog => Manager::Changelog::DEFAULT_FILE,
-      }
-      parser.parse!(args)
-    end
-
-    def parser
-      OptionParser.new do |opts|
-        opts.banner = "Usage: tumbler name [options]"
-
-        opts.separator ""
-        opts.separator "Options:"
-
-        opts.on("-cVALUE", "--changelog=VALUE", "Set changelog file") do |v|
-          @options[:changelog] = v
-        end
-
-        opts.on("-u", "--update", "Update existing application") do |v|
-          @options[:update] = nil
-        end
+  class Cli < Thor::Group
+    include Thor::Actions
 
-        opts.on("-nc", "--no-changelog", "Disable changelog") do |v|
-          @options[:changelog] = nil
-        end
+    def self.banner; "tumbler name [options]"; end
 
-        opts.on("-vVALUE", "--version=VALUE", "Set version file") do |v|
-          @options[:version] = v
-        end
+    desc "Generates a new gem project"
 
-        opts.on("-nv", "--no-version", "Disable version") do |v|
-          @options[:version] = nil
-        end
+    argument :name, :desc => "name of your awesome gem"
 
-        opts.on("-vNAME", "--name=NAME", "Set gem name") do |v|
-          @options[:name] = v
-        end
-
-        opts.on_tail("-h", "--help", "Show this help message.") { puts opts; exit }
+    class_option :changelog, :desc => 'Set the CHANGELOG file',       :aliases => '-c', :default => nil,   :type => :string
+    class_option :update,    :desc => 'Update existing application',  :aliases => '-u', :default => false, :type => :boolean
+    class_option :version,   :desc => 'Set the version number',       :aliases => '-v', :default => nil,   :type => :string
+    class_option :root,      :desc => 'set root path',                :aliases => '-r', :default => '.',   :type => :string
+    def setup_gem
+      path = File.join options[:root], name
+      case
+      when options[:update] then Tumbler::Updater.new(path, options).update
+      when File.exist?(path) then raise("Directory path #{path} already exists!")
+      else FileUtils.mkdir_p(path) ; Tumbler::Generate.app(path, name, options).write
       end
+      say "Gem #{name} successfully generated!", :green
     end
-
-    def run
-      app_name = ARGV.first
-
-      if app_name.nil?
-        raise 'You must supply an application name.'
-      elsif @options.key?(:update)
-        Tumbler::Updater.new(app_name, @options).update
-      elsif File.exist?(app_name)
-        raise "There is already a directory named #{app_name}"
-      else
-        FileUtils.mkdir_p(app_name)
-        Tumbler::Generate.app(app_name, app_name, @options).write
-      end
-
-      puts "Gem '#{app_name}' generated successfully!"
-    end
-
   end
-end
+end

data/lib/tumbler/generate.rb

@@ -24,7 +24,7 @@ module Tumbler
       generator
     end
 
-    attr_reader :development_dependencies, :dependencies, :base
+    attr_reader :development_dependencies, :dependencies, :base, :name
     attr_accessor :version, :changelog
 
     def initialize(dir, name)
@@ -46,6 +46,7 @@ module Tumbler
       write_gemspec
       write_gemfile
       write_version(@version)
+      write_file
       write_changelog
       write_rakefile
       write_tumbler_config
@@ -63,38 +64,49 @@ module Tumbler
     def gemfile_file
       File.join(@base, 'Gemfile')
     end
+    
+    def gemspec_file
+      File.join(@base, "#{@name}.gemspec")
+    end
 
     def config_file
       File.join(@base, 'Tumbler')
     end
 
-    def write_version(version)
-      FileUtils.mkdir_p(File.dirname(version_path))
-      File.open(version_path, 'w') {|f| f << generate_version(version) }
-    end
-
     def version_path
       File.join(@base, 'lib', @name, 'version.rb')
     end
 
-    def write_gemfile
-      File.open(gemfile_file, 'w') {|f| f << generate_gemfile }
+    def rb_path
+      File.join(@base, 'lib', "#{@name}.rb")
     end
-
+    
+    def write_changelog
+      File.open(File.join(@base, @changelog), 'w') {|f| f << '' } if @changelog
+    end
+    
     def write_rakefile
       FileUtils.cp(template_path('Rakefile'), @base)
     end
 
-    def write_gemspec
-      File.open(File.join(@base, "#{@name}.gemspec"), 'w') {|f| f << generate_gemspec }
+    def write_file
+      copy_template('generic.rb.erb', :to => rb_path)
+    end
+    
+    def write_version(version)
+      copy_template('version.rb.erb', :to => version_path, :binding => binding)
     end
 
-    def write_changelog
-      File.open(File.join(@base, @changelog), 'w') {|f| f << '' } if @changelog
+    def write_gemfile
+      copy_template('Gemfile.erb', :to => gemfile_file)
+    end
+
+    def write_gemspec
+      copy_template('generic.gemspec.erb', :to => gemspec_file)
     end
 
     def write_tumbler_config
-      File.open(config_file, 'w') {|f| f << generate_tumbler_conf}
+      copy_template('Tumbler.erb', :to => config_file)
     end
 
     def git_email
@@ -113,25 +125,12 @@ module Tumbler
       File.join(File.dirname(__FILE__), '..', 'template', path)
     end
 
-    def generate_tumbler_conf
-      render_erb('Tumbler.erb')
-    end
-
-    def generate_gemfile
-      render_erb('Gemfile.erb')
-    end
-
-    def generate_version(version)
-      render_erb('version.rb.erb', binding)
-    end
-
-    def generate_gemspec
-      render_erb('generic.gemspec.erb')
-    end
-    
-    def render_erb(file, local_binding=binding)
-      template = ERB.new(File.read(template_path(file)), 0, '<>')
-      template.result(local_binding)
+    # copy_template('generic.rb.erb', :to => '/path/to/file')
+    def copy_template(template_file, options={})
+      FileUtils.mkdir_p(File.dirname(options[:to]))
+      template = ERB.new(File.read(template_path(template_file)), 0, '<>')
+      contents = template.result(options[:binding] || binding)
+      File.open(options[:to], 'w') {|f| f << contents }
     end
   end
 end

data/lib/tumbler/manager.rb

@@ -70,13 +70,11 @@ module Tumbler
       guard_clean
       @changelog.update if @changelog
       bump(field)
-      if @changelog
-        @changelog.write_version_header
-        @changelog.commit
-      end
+      @changelog.write_version_header if @changelog
     end
 
     def tag_and_push
+      @changelog.commit if @changelog && !clean?
       guard_clean
       guard_already_tagged
       tag

data/lib/tumbler/version.rb

@@ -1,3 +1,3 @@
 module Tumbler
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/test/changelog_test.rb

@@ -0,0 +1,59 @@
+require File.join(File.dirname(__FILE__),'teststrap')
+
+context "Manager::Changelog" do
+  setup { $".delete "tumbler/gemspec.rb" }
+  teardown { $".delete "tumbler/gemspec.rb" } # we need to delete this so each gemspec can be generated fresh
+
+  context "generates changelog" do
+    setup { @tumbler, @dir, @test_dir = create_app('test') }
+    teardown { FileUtils.rm_rf @dir ; FileUtils.rm_rf @test_dir }
+    setup do
+      @tumbler.sh 'touch file1'
+      @tumbler.sh 'git add file1'
+      @tumbler.sh 'git commit file1 -m"added file1"'
+      @tumbler.sh 'touch file2'
+      @tumbler.sh 'git add file2'
+      @tumbler.sh 'git commit file2 -m"added file2"'
+      Tumbler::Gem.any_instance.stubs(:push).once.returns(true)
+      @tumbler.bump_and_push(:tiny)
+      @tumbler
+    end
+    asserts("correct version") { topic.version.to_s }.equals '0.0.1'
+    asserts("adds to changelog file") { File.read(topic.changelog.file) }.matches %r{== 0\.0\.1\s+\* added file2 \(.*?, [a-f0-9]{7}\)\s+\* added file1 \(.*?, [a-f0-9]{7}\)}
+  end
+
+  context "should not perform any changelog activity when the option isn't specified" do
+    setup { @tumbler, @dir, @test_dir = create_app('test', :changelog => nil) }
+    teardown { FileUtils.rm_rf @dir ; FileUtils.rm_rf @test_dir }
+    setup do
+      @tumbler.sh 'touch file1'
+      @tumbler.sh 'git add file1'
+      @tumbler.sh 'git commit file1 -m"added file1"'
+      @tumbler.sh 'touch file2'
+      @tumbler.sh 'git add file2'
+      @tumbler.sh 'git commit file2 -m"added file2"'
+      Tumbler::Gem.any_instance.stubs(:push).once.returns(true)
+      @tumbler.bump_and_push(:tiny)
+      @tumbler
+    end
+    asserts("correct version") { topic.version.to_s }.equals '0.0.1'
+    asserts("CHANGELOG exist") { File.exist?(File.join(topic.base, 'CHANGELOG')) }.not!
+  end
+
+  context "should rollback the entire set of commits when the remote is unreachable" do
+    setup { @tumbler, @dir, @test_dir = create_app('test', :changelog => nil,:remote => 'ssh://ijustmadethisupisadomain.com/what_you_say.git') }
+    teardown { FileUtils.rm_rf @dir ; FileUtils.rm_rf @test_dir }
+    setup do
+      @tumbler.sh 'touch file1'
+      @tumbler.sh 'git add file1'
+      @tumbler.sh 'git commit file1 -m"added file1"'
+      @tumbler.sh 'touch file2'
+      @tumbler.sh 'git add file2'
+      @tumbler.sh 'git commit file2 -m"added file2"'
+      @current_rev = @tumbler.current_revision
+      @tumbler
+    end
+    asserts("raises error") { topic.bump_and_push(:tiny) }.raises RuntimeError
+    asserts("commit revision") { @tumbler.sh('git log').split(/\n/)[0] == "commit #{@current_rev}" }
+  end
+end

data/test/cli_test.rb

@@ -0,0 +1,68 @@
+require File.join(File.dirname(__FILE__),'teststrap')
+
+context "Cli" do
+  setup { @test_dir = temp_dir('test') }
+  setup { FileUtils.rm_rf @test_dir }
+  teardown { FileUtils.rm_rf @test_dir }
+
+  context "shows the help" do
+    setup { capture(:stdout) { Tumbler::Cli.start(['-h']) } }
+    asserts_topic.matches  %r{tumbler name \[options\]}
+    asserts_topic.matches  %r{Update existing application}
+    asserts_topic.matches  %r{Set the version number}
+    asserts_topic.matches  %r{Set the CHANGELOG file}
+    asserts_topic.matches  %r{set root path}
+  end
+
+  context "generates" do
+    context "the app" do
+      setup do
+        capture(:stdout) { Tumbler::Cli.start(['test_gem',"-r=#{@test_dir}"]) }
+        Tumbler.load(File.join(@test_dir, 'test_gem'))
+      end
+      asserts("$?") { $? }.equals 0
+      asserts("version") { topic.version.to_s }.equals '0.0.0'
+      asserts("tumbler") { topic.bundler.dependencies.first.name }.equals 'tumbler'
+      asserts(">=0") { topic.bundler.dependencies.first.requirements_list }.equals ['>= 0']
+      asserts("development") { topic.bundler.dependencies.first.groups }.equals [:development]
+    end
+
+    context "at designated root" do
+      setup { capture(:stdout) { Tumbler::Cli.start(['agem', "-r=#{@test_dir}"]) } }
+      asserts_topic.matches %r{agem successfully generated!}
+      asserts("in the right path") { File.exists? File.join(@test_dir,'agem') }
+    end
+
+  end
+
+  context "upgrades" do
+    setup { capture(:stdout) { Tumbler::Cli.start(['rails', "-r=#{@test_dir}"]) } }
+
+    context "does nothing on a normal existing tumbler app" do
+      setup do
+        @tumbler = Tumbler.load(File.join(@test_dir, 'rails'))
+        @version = File.read @tumbler.version.file
+        @changelog = File.read @tumbler.changelog.file
+        @gemfile = File.read @tumbler.gemfile_path
+        @gemspec = File.read @tumbler.gemspec_path
+      end
+      setup { capture(:stdout) { Tumbler::Cli.start(['rails', '-u', "-r=#{@test_dir}"]) } }
+      asserts("$?") { $? }.equals 0
+      asserts("version") { File.read(@tumbler.version.file) == @version }
+      asserts("changelog") { File.read(@tumbler.changelog.file) == @changelog }
+      asserts("gemfile") { File.read(@tumbler.gemfile_path) == @gemfile }
+      asserts("gemspec") { File.read(@tumbler.gemspec_path) == @gemspec }
+    end
+
+    context "should not work if the directory and gemspec mismatch and you don't supply a name" do
+      setup do
+        FileUtils.mv("#{@test_dir}/rails/rails.gemspec", "#{@test_dir}/rails/notrails.gemspec")
+      end
+      asserts "exit status" do 
+        capture(:stdout) { Tumbler::Cli.start(['rails', '-u',"-r=#{@test_dir}"]) }
+      end.raises RuntimeError
+    end
+  end
+
+
+end