hu 1.2.5 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1babad82eca64c75989202f3d24ba9291a617611
-  data.tar.gz: 86dcd8c998bafccd484d0a7094fb8cdf0149e915
+  metadata.gz: b674ec9985e3ac991e88bcf451a44b13d1cd21b6
+  data.tar.gz: 3d0651f52053bf56a2806efc553d42d131ca158c
 SHA512:
-  metadata.gz: d2e304f88f06b4f19b3eb800937338e0490d5af366321dea7344533ada433d7fd5ded7e023c593312f07df961ceb841995c8b1fe70b937f5a8976feba263c5df
-  data.tar.gz: 93be94284c132a473739474fa7e6ad7da82f5fc4d1cc310541a8b8bdc7fe63ffa48fb5bb187024f262cd52d6e3858b1c3b9aead69a313a22ee66748fe3aaf739
+  metadata.gz: 3cadd159b4da1444da1ce4fa4e96cc8805dd840efd11b79fd27ce5fe310e63e58355bf4ed7b6d41bcf1b5e780c9fe288bba1d98980dbba8e48c1b56323b7596e
+  data.tar.gz: 95801c40cb64d7428168098b123c0e0309701d2e1d956ff3b6f6ba30b5a6629814fe96dae61f6981ed53a62cf26efe2d9b3835aa40475e081c0611136f15446e

data/hu.gemspec

@@ -37,4 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "netrc"
   spec.add_dependency "chronic_duration"
   spec.add_dependency "thread_safe"
+  spec.add_dependency "rugged"
 end

data/lib/hu/deploy.rb

@@ -12,6 +12,7 @@ require 'chronic_duration'
 require 'tempfile'
 require 'thread_safe'
 require 'io/console'
+require 'rugged'
 
 module Hu
   class Cli < Optix::Cli
@@ -35,23 +36,57 @@ module Hu
       def deploy(cmd, opts, argv)
         trap('INT') { shutdown; safe_abort; exit 1 }
         at_exit {
-          if 130 == $!.status
+          if $!.class == SystemExit && 130 == $!.status
             shutdown
             puts
             safe_abort
-            exit $!.status
           end
         }
 
-        unless File.exists? '.git'
+        begin
+          @git = Rugged::Repository.discover('.')
+        rescue Rugged::RepositoryError => e
           puts
-          puts "You need to be inside the working directory of the app that you wish to deploy.".color(:red)
+          puts "Git error: #{e}".color(:red)
+          puts "You need to be inside the working copy of the app that you wish to deploy.".color(:red)
           puts
           safe_abort
           print TTY::Cursor.prev_line
           exit 1
         end
 
+        Dir.chdir(@git.workdir)
+
+        if @git.config['branch.master.remote'] != 'origin'
+          puts
+          puts "ERROR: Remote of branch 'master' does not point to 'origin'.".color(:red)
+          puts
+          puts "       Sorry, we need an origin here. We really do."
+          puts
+          exit 1
+        end
+
+        if @git.config['gitflow.branch.master'].nil?
+          puts
+          puts "ERROR: This repository doesn't seem to be git-flow enabled.".color(:red)
+          puts
+          puts "       Please run 'git flow init'."
+          puts
+          exit 1
+        end
+
+        unless @git.config['gitflow.prefix.versiontag'].nil? ||
+               @git.config['gitflow.prefix.versiontag'].empty?
+          puts
+          puts "ERROR: git-flow version prefix configured.".color(:red)
+          puts
+          puts "       Please use this command to remove the prefix:"
+          puts
+          puts "       git config --add gitflow.prefix.versiontag ''".bright
+          puts
+          exit 1
+        end
+
         push_url = get_heroku_git_remote
 
         wc_update = Thread.new { update_working_copy }
@@ -60,7 +95,7 @@ module Hu
 
         if app.nil?
           puts
-          puts "FATAL: Found no heroku app for git remote #{push_url}".color(:red)
+          puts "ERROR: Found no heroku app for git remote #{push_url}".color(:red)
           puts "       Are you logged into the right heroku account?".color(:red)
           puts
           puts "       Please run 'git remote rm heroku'. Then run 'hu deploy' again to select a new remote."
@@ -72,7 +107,7 @@ module Hu
 
         if app['id'] != stag_app_id
           puts
-          puts "FATAL: The git remote 'heroku' points to app '#{app['name']}'".color(:red)
+          puts "ERROR: The git remote 'heroku' points to app '#{app['name']}'".color(:red)
           puts "       which is not in stage 'staging'".color(:red)+
                " of pipeline '#{pipeline_name}'.".color(:red)
           puts
@@ -94,9 +129,34 @@ module Hu
         unbusy
 
         highest_version = find_highest_version_tag
-        tiny_bump = Versionomy.parse(highest_version).bump(:tiny).to_s
-        minor_bump = Versionomy.parse(highest_version).bump(:minor).to_s
-        major_bump = Versionomy.parse(highest_version).bump(:major).to_s
+        begin
+          highest_versionomy = Versionomy.parse(highest_version)
+        rescue
+          highest_versionomy = Versionomy.parse('v0.0.0')
+        end
+
+        all_tags = Set.new(@git.references.to_a("refs/tags/*").collect{|e| e.target.name})
+
+        tiny_bump  = highest_versionomy.dup
+        minor_bump = highest_versionomy.dup
+        major_bump = highest_versionomy.dup
+
+        loop do
+          tiny_bump  = tiny_bump.bump(:tiny)
+          break unless all_tags.include? tiny_bump.to_s
+        end
+        loop do
+          minor_bump = minor_bump.bump(:minor)
+          break unless all_tags.include? minor_bump.to_s
+        end
+        loop do
+          major_bump = major_bump.bump(:major)
+          break unless all_tags.include? tiny_bump.to_s
+        end
+        tiny_bump  = tiny_bump.to_s
+        minor_bump = minor_bump.to_s
+        major_bump = major_bump.to_s
+
         likely_next_version = tiny_bump
 
         release_tag, branch_already_exists = prompt_for_release_tag(likely_next_version, likely_next_version, true)
@@ -114,7 +174,11 @@ module Hu
           if release_branch_exists
             puts "\nThis release will be "+release_tag.color(:red).bright
             unless highest_version == 'v0.0.0'
-              changelog=`git log --pretty=format:" - %s" #{highest_version}..HEAD 2>/dev/null` unless highest_version == 'v0.0.0'
+              env = {
+                'PREVIOUS_TAG' => highest_version,
+                'RELEASE_TAG'  => release_tag
+              }
+              changelog=create_changelog(env) unless highest_version == 'v0.0.0'
               unless changelog.empty?
                 puts "\nChanges since "+highest_version.bright+":"
                 puts changelog
@@ -166,7 +230,11 @@ module Hu
               tf.write "#{release_tag}\n#{changelog}"
               tf.close
               ENV['EDITOR'] = "cp #{tf.path}"
-              unless 0 == finish_release(release_tag)
+              env = {
+                'PREVIOUS_TAG' => highest_version,
+                'RELEASE_TAG'  => release_tag
+              }
+              unless 0 == finish_release(release_tag, env)
                 abort_merge
                 puts "*** ERROR!  Push did not complete. *** ".color(:red)
               end
@@ -175,7 +243,6 @@ module Hu
             when :push_to_staging
               push_command = "git push #{push_url} release/#{release_tag}:master -f"
               `#{push_command}`
-              puts
               anykey
             when :abort_ask
               puts if delete_branch("release/#{release_tag}")
@@ -537,7 +604,15 @@ module Hu
         EOS
       end
 
-      def finish_release(release_tag)
+      def finish_release(release_tag, env)
+        env.each { |k,v| ENV[k] = v }
+        if File.executable? '.hu/hooks/pre_release'
+          run_each <<-EOS.strip_heredoc
+          # Run pre-release hook
+          .hu/hooks/pre_release
+          EOS
+        end
+
         run_each <<-EOS.strip_heredoc
         :return
         # Finish release
@@ -563,6 +638,15 @@ module Hu
         EOS
       end
 
+      def create_changelog(env)
+        if File.executable? '.hu/hooks/changelog'
+          env.each { |k,v| ENV[k] = v }
+          `.hu/hooks/changelog`
+        else
+          `git log --pretty=format:" - %s" #{env['PREVIOUS_TAG']}..HEAD 2>/dev/null`
+        end
+      end
+
       def shutdown
         @@shutting_down = true
         unbusy
@@ -577,7 +661,7 @@ module Hu
       end
 
       def unbusy
-        @@spinner.stop
+        @@spinner&.stop
         printf "\e[?25h"
       end
 
@@ -589,7 +673,7 @@ module Hu
 
       def anykey
         puts TTY::Cursor.hide
-        print "--- Press any key to continue ---".color(:cyan).inverse
+        print "--- Press any key ---".color(:cyan)
         STDIN.getch
         print TTY::Cursor.clear_line + TTY::Cursor.show
       end

data/lib/hu/version.rb

@@ -1,3 +1,3 @@
 module Hu
-  VERSION = "1.2.5"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hu
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.3.0
 platform: ruby
 authors:
 - moe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -248,6 +248,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rugged
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Heroku Utility.
 email:
 - moe@busyloop.net