tumbler 0.0.13 → 0.0.14

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.0.14
+
+* Remove sudo on gem install. You have to sudo it yourself if you want that behaviour. (Joshua Hull, 1a244cc)
+* More informative output (Joshua Hull, cb09263)
+
 == 0.0.13
 
 * Tidier pathing and building. (Joshua Hull, 21a9017)

data/lib/tumbler.rb

@@ -6,6 +6,7 @@ Callsite.activate_kernel_dir_methods
 
 $LOAD_PATH << __DIR__
 
+require 'tumbler/informer'
 require 'tumbler/runner'
 require 'tumbler/updater'
 require 'tumbler/rake_tasks'

data/lib/tumbler/gem.rb

@@ -1,7 +1,8 @@
 module Tumbler
   class Gem
     include Runner
-
+    include Informer
+    
     def initialize(manager)
       @manager = manager
     end
@@ -20,12 +21,16 @@ module Tumbler
 
     def push
       build
-      sh("gem push #{built_gem_path}")
+      inform "Pushing #{built_gem_path}" do
+        sh("gem push #{built_gem_path}")
+      end
     end
 
     def install
       build
-      exec("sudo gem install #{built_gem_path}")
+      inform "Installing #{built_gem_path}" do
+        exec("gem install #{built_gem_path}")
+      end
     end
 
     def spec_path
@@ -33,11 +38,13 @@ module Tumbler
     end
 
     def build
-      sh("bundle exec gem build #{spec_path}")
-      Dir.chdir(base) { 
-        FileUtils.mkdir_p('pkg')
-        FileUtils.mv(built_gem_base, 'pkg')
-      }
+      inform "Building #{built_gem_path}" do
+        sh("bundle exec gem build #{spec_path}")
+        Dir.chdir(base) { 
+          FileUtils.mkdir_p('pkg')
+          FileUtils.mv(built_gem_base, 'pkg')
+        }
+      end
     end
   end
 end

data/lib/tumbler/informer.rb

@@ -0,0 +1,18 @@
+$informer_indent = 0
+
+module Tumbler
+  module Informer
+    def inform(msg, &block)
+      $stderr.puts (' ' * $informer_indent << msg)
+      $informer_indent += 1
+      begin
+        block.call if block
+      rescue Exception
+        $stderr.puts " #{msg} failed!"
+        raise
+      ensure
+        $informer_indent -= 1
+      end
+    end
+  end
+end

data/lib/tumbler/manager.rb

@@ -4,6 +4,7 @@ require 'tumbler/manager/version'
 module Tumbler
   class Manager
     include Runner
+    include Informer
 
     Change = Struct.new(:hash, :author, :summary)
 
@@ -68,25 +69,31 @@ module Tumbler
 
     def bump_and_commit(field)
       guard_clean
-      @changelog.update if @changelog
-      bump(field)
-      @changelog.write_version_header if @changelog
+      inform "Bumping & committing" do
+        @changelog.update if @changelog
+        bump(field)
+        @changelog.write_version_header if @changelog
+      end
     end
 
     def tag_and_push
-      @changelog.commit if @changelog && !clean?
-      guard_clean
-      guard_already_tagged
-      tag
-      push
-      @gem.push
+      inform "Tagging & pushing" do
+        @changelog.commit if @changelog && !clean?
+        guard_clean
+        guard_already_tagged
+        tag
+        push
+        @gem.push
+      end
     end
 
     def bump_and_push(field)
-      revert_on_error {
-        bump_and_commit(field)
-        tag_and_push
-      }
+      inform "Bumping & pushing" do
+        revert_on_error do
+          bump_and_commit(field)
+          tag_and_push
+        end
+      end
     end
 
     def current_revision
@@ -98,6 +105,7 @@ module Tumbler
       begin
         yield
       rescue
+        inform "Undoing commit"
         sh "git reset --hard #{current_ref}"
         raise
       end
@@ -113,8 +121,10 @@ module Tumbler
 
     def bump(level)
       from = @version.to_s
-      @version.bump(level)
-      @version.commit(from)
+      inform "Bumping from #{from} by #{level}" do
+        @version.bump(level)
+        @version.commit(from)
+      end
     end
 
     def clean?
@@ -122,16 +132,16 @@ module Tumbler
     end
 
     def push
-      sh "git push --all"
-      sh "git push --tags"
+      inform "Pushing commit & tags" do
+        sh "git push --all"
+        sh "git push --tags"
+      end
     end
 
     def tag
-      sh "git tag #{@version.to_s}"
-    end
-
-    def commit(msg)
-      sh "git commit #{@version.basefile} -m'#{msg}'"
+      inform "Tagging version #{@version.to_s}" do
+        sh "git tag #{@version.to_s}"
+      end
     end
 
     def tags

data/lib/tumbler/manager/changelog.rb

@@ -5,6 +5,7 @@ module Tumbler
   class Manager
     class Changelog
       include Runner
+      include Informer
 
       DEFAULT_FILE = 'CHANGELOG'
 
@@ -21,12 +22,14 @@ module Tumbler
       end
 
       def write_version_header
-        prepend "== #{@manager.version}\n\n"
+        inform "Writing version header to `#{@basefile}'" do
+          prepend "== #{@manager.version}\n\n"
+        end
       end
 
       def prepend(data)
         if @manager.noop
-          @manager.dry "Prepending #{data} to #{@basefile}"
+          @manager.dry "Prepending #{data} to `#{@basefile}'"
         else
           Tempfile.open('changelog') do |tmp|
             tmp.puts data
@@ -44,8 +47,10 @@ module Tumbler
 
       def update
         ensure_existence
-        prepend("\n")
-        prepend(@manager.latest_changes.inject('') { |changes, change| changes << "* #{change.summary} (#{change.author}, #{change.hash})\n" })
+        inform "Updating `#{@basefile}' with latest changes" do
+          prepend("\n")
+          prepend(@manager.latest_changes.inject('') { |changes, change| changes << "* #{change.summary} (#{change.author}, #{change.hash})\n" })
+        end
       end
 
       def ensure_existence

data/lib/tumbler/manager/version.rb

@@ -2,6 +2,7 @@ module Tumbler
   class Manager
     class Version
       include Runner
+      include Informer
 
       attr_reader :file, :basefile, :field_names
 
@@ -45,17 +46,21 @@ module Tumbler
       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
+        inform "Bumping version to #{@version.bump(level).to_s}" do
+          if @manager.noop
+            @manager.dry "Bumping version to #{@version.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
       end
 
       def commit(from)
-        sh "git commit #{@basefile} -m'Bumped version from #{from} to #{to_s}'"
+        inform "Committing version `#{@basefile}'" do
+          sh "git commit #{@basefile} -m'Bumped version from #{from} to #{to_s}'"
+        end
       end
 
       def base

data/lib/tumbler/version.rb

@@ -1,3 +1,3 @@
 module Tumbler
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tumbler
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Joshua Hull
@@ -186,6 +186,7 @@ files:
 - lib/tumbler/gemspec.rb
 - lib/tumbler/gemspec_helper.rb
 - lib/tumbler/generate.rb
+- lib/tumbler/informer.rb
 - lib/tumbler/manager.rb
 - lib/tumbler/manager/changelog.rb
 - lib/tumbler/manager/version.rb