hu 1.3.16 → 1.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15212224c4c30a5e43535e72f4ade5aa8feccf8f
-  data.tar.gz: 0a3164a2de293c69ab63e14c130bb57a84636cbd
+  metadata.gz: 940552e283a3cc03909ec0c01427ba5cc69df5ff
+  data.tar.gz: 1d0c4fde9af5ac93aa8dbd2f3e5597a6afa617cc
 SHA512:
-  metadata.gz: 80cb800c1e63a61c3bebb37396b86619c0ab3b98e805e17a1406418e2b6c8b171d688a4b391f67c73e0a08c2d142000ddbb0b74c21f07aad8fd1c2491e39751f
-  data.tar.gz: 25b832cf557c8c7957e1de0c085a5edfac5ddb3ff64fb21c0dc36498bb19240cfd6774ba5f8c6344f5571f7360497b2117b039b2f0c4057d19de1d711e29fa54
+  metadata.gz: 145d01c855f29a2404f2dfa902e05cc7198d054b2592fe21e306c604fc0e86ca9f91f267b48227ca1e44af5a06a19f7344368afbca4a188e5cdfadb6bfc80a9e
+  data.tar.gz: 8ccd30130baf37129041ad3c8d253b42a788519cd431f8c9d3dbac21626322e7ce696e026409c2ca440f66b35ca4a372cb234012a424aaa334d02d5bb6063bfc

data/.rubocop_todo.yml

@@ -1,26 +1,31 @@
-# Offense count: 13
+# Offense count: 1
+Lint/HandleExceptions:
+  Exclude:
+    - 'lib/hu/telemetry.rb'
+
+# Offense count: 14
 Metrics/AbcSize:
-  Max: 276
+  Max: 298
 
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 657
+  Max: 694
 
 # Offense count: 6
 Metrics/CyclomaticComplexity:
   Max: 45
 
-# Offense count: 83
+# Offense count: 86
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 176
 
-# Offense count: 14
+# Offense count: 16
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 232
+  Max: 254
 
 # Offense count: 4
 Metrics/PerceivedComplexity:
@@ -31,7 +36,7 @@ Style/ClassVars:
   Exclude:
     - 'lib/hu/deploy.rb'
 
-# Offense count: 5
+# Offense count: 6
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
@@ -40,6 +45,7 @@ Style/Documentation:
     - 'lib/hu/collab.rb'
     - 'lib/hu/common.rb'
     - 'lib/hu/deploy.rb'
+    - 'lib/hu/telemetry.rb'
 
 # Offense count: 3
 # Configuration parameters: AllowedVariables.

data/hu.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hashdiff', '~> 0.3.0'
   spec.add_dependency 'version_sorter', '~> 2.0.0'
   spec.add_dependency 'versionomy', '~> 0.5.0'
-  spec.add_dependency 'tty-prompt'
+  spec.add_dependency 'tty-prompt', '~> 0.6.0'
   spec.add_dependency 'tty-spinner'
   spec.add_dependency 'tty-table'
   spec.add_dependency 'rainbow'
@@ -41,4 +41,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rugged'
   spec.add_dependency 'paint'
   spec.add_dependency 'lolcat'
+  spec.add_dependency 'analytics-ruby'
+  spec.add_dependency 'config'
 end

data/lib/hu/common.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 require 'blackbox/gem'
+require 'config'
 
 module Hu
   API_TOKEN = ENV['HEROKU_API_KEY'] || ENV['HEROKU_API_TOKEN'] || Netrc.read['api.heroku.com']&.password
+  CONFIG_FILE = File.join(ENV['HOME'], '.hu.yaml')
 end
 
 class String
@@ -12,9 +14,13 @@ class String
   end
 end
 
+Config.load_and_set_settings Hu::CONFIG_FILE
+require 'hu/telemetry'
+
 unless ENV['SKIP_VERSION_CHECK']
   version_info = BB::Gem.version_info(check_interval: 900)
   unless version_info[:installed_is_latest] == true
+    Hu::Tm.t(:gem_outdated, installed_version: version_info[:gem_installed_version], available_version: version_info[:gem_latest_version])
     puts
     puts "\e[33;1mWoops! \e[0mA newer version of #{version_info[:gem_name]} is available."
     puts "       Please type '\e[1mgem install #{version_info[:gem_name]}\e[0m' to upgrade (v#{version_info[:gem_installed_version]} -> v#{version_info[:gem_latest_version]})."
@@ -23,3 +29,5 @@ unless ENV['SKIP_VERSION_CHECK']
     exit 1
   end
 end
+
+Hu::Tm.t(:launch)

data/lib/hu/deploy.rb

@@ -39,10 +39,11 @@ module Hu
       end
 
       def deploy(_cmd, _opts, _argv)
+        Hu::Tm.t(:invoke, cmd: 'deploy')
         trap('INT') { shutdown; safe_abort; exit 1 }
         at_exit do
+          shutdown
           if $ERROR_INFO.class == SystemExit && 130 == $ERROR_INFO.status
-            shutdown
             puts
             safe_abort
           end
@@ -57,6 +58,7 @@ module Hu
           puts
           safe_abort
           print TTY::Cursor.prev_line
+          Hu::Tm.t(:error_not_in_working_copy, cmd: 'deploy')
           exit 1
         end
 
@@ -68,6 +70,7 @@ module Hu
           puts
           puts '       Sorry, we need an origin here. We really do.'
           puts
+          Hu::Tm.t(:error_no_git_origin, cmd: 'deploy')
           exit 1
         end
 
@@ -77,6 +80,7 @@ module Hu
           puts
           puts "       Please run 'git flow init -d'"
           puts
+          Hu::Tm.t(:error_no_git_flow, cmd: 'deploy')
           exit 1
         end
 
@@ -89,6 +93,7 @@ module Hu
           puts
           puts "       git config --add gitflow.prefix.versiontag ''".bright
           puts
+          Hu::Tm.t(:error_git_flow_prefix_enabled, cmd: 'deploy')
           exit 1
         end
 
@@ -105,6 +110,7 @@ module Hu
           puts
           puts "       Please run 'git remote rm heroku'. Then run 'hu deploy' again to select a new remote."
           puts
+          Hu::Tm.t(:error_no_heroku_app_for_remote, cmd: 'deploy')
           exit 1
         end
 
@@ -120,6 +126,7 @@ module Hu
 
           puts "       Please run 'git remote rm heroku'. Then run 'hu deploy' again to select a new remote."
           puts
+          Hu::Tm.t(:error_remote_not_staging, cmd: 'deploy')
           sleep 2
           exit 1
         end
@@ -199,6 +206,7 @@ module Hu
             puts '           Nothing else has happened so far. Push this branch to'
             puts '           ' + stag_app_name.to_s.bright + ' to begin the deploy procedure.'
             puts
+            Hu::Tm.t(:phase1, cmd: 'deploy')
           end
 
           if release_branch_exists && git_revisions[:release] == git_revisions[stag_app_name]
@@ -207,6 +215,7 @@ module Hu
             puts '           If everything looks good, you may proceed and finish the release.'
             puts '           If there are problems: Quit, delete the release branch and start fixing.'
             puts
+            Hu::Tm.t(:phase2, cmd: 'deploy')
           elsif git_revisions[prod_app_name] != git_revisions[stag_app_name] && !release_branch_exists && git_revisions[:release] != git_revisions[stag_app_name]
             puts 'Phase 3/3: HEADS UP. This is the last chance to detect problems.'
             puts '           The final version of ' + "release/#{release_tag}".bright + ' is now staged.'
@@ -217,6 +226,7 @@ module Hu
             puts '           This is the exact version that will be promoted to production.'
             puts "           From here you are on your own. Good luck #{`whoami`.chomp}!"
             puts
+            Hu::Tm.t(:phase3, cmd: 'deploy')
           end
 
           choice = prompt.select('Choose your destiny') do |menu|
@@ -251,9 +261,12 @@ module Hu
 
           case choice
           when :DEPLOY
+            Hu::Tm.t(:promote_begin, cmd: 'deploy')
             promote_to_production
+            Hu::Tm.t(:promote_end, cmd: 'deploy')
             anykey
           when :finish_release
+            Hu::Tm.t(:finish_begin, cmd: 'deploy')
             old_editor = ENV['EDITOR']
             old_git_editor = ENV['GIT_EDITOR']
             tf = Tempfile.new('hu-tag')
@@ -270,36 +283,45 @@ module Hu
               puts '*** ERROR! Could not finish release *** '.color(:red)
               puts
               puts 'This usually means a merge conflict or'
-              puts 'something similarly complicated has occured.'
+              puts 'something equally annoying has occured.'
               puts
               puts 'Please bring the universe into a state'
-              puts 'where the above command succeeds, then try again.'
+              puts 'where the above sequence of commands can'
+              puts 'succeed. Then try again.'
               puts
+              Hu::Tm.t(:finish_fail, cmd: 'deploy')
               exit 1
             end
             ENV['EDITOR'] = old_editor
             ENV['GIT_EDITOR'] = old_git_editor
+            Hu::Tm.t(:finish_end, cmd: 'deploy')
             anykey
           when :push_to_staging
+            Hu::Tm.t(:stage_begin, cmd: 'deploy')
             run_each <<-EOS.strip_heredoc
               :stream
               git push #{push_url} release/#{release_tag}:master -f
               EOS
+            Hu::Tm.t(:stage_end, cmd: 'deploy')
             anykey
           when :abort_ask
+            Hu::Tm.t(:user_quit, cmd: 'deploy')
             puts if delete_branch("release/#{release_tag}")
             exit 0
           when :bump_tiny
             if delete_branch("release/#{release_tag}")
               release_tag, branch_already_exists = prompt_for_release_tag(tiny_bump, tiny_bump)
+              Hu::Tm.t(:switch_release_type, bump: 'patch', cmd: 'deploy')
             end
           when :bump_minor
             if delete_branch("release/#{release_tag}")
               release_tag, branch_already_exists = prompt_for_release_tag(minor_bump, minor_bump)
+              Hu::Tm.t(:switch_release_type, bump: 'minor', cmd: 'deploy')
             end
           when :bump_major
             if delete_branch("release/#{release_tag}")
               release_tag, branch_already_exists = prompt_for_release_tag(major_bump, major_bump)
+              Hu::Tm.t(:switch_release_type, bump: 'major', cmd: 'deploy')
             end
           end
         end
@@ -396,6 +418,7 @@ module Hu
         puts
 
         puts table.render(:unicode, padding: [0, 1, 0, 1], multiline: true)
+        Hu::Tm.t(:status_screen, cmd: 'deploy')
         revs
       end
 
@@ -514,6 +537,8 @@ module Hu
           next unless status.exitstatus != 0
           shutdown if opts[:failfast]
           puts "Error, exit #{status.exitstatus}: #{line} (L#{i})".color(:red).bright
+
+          Hu::Tm.t(:runeach_error, exitstatus: status.exitstatus, cmd: 'deploy')
           exit status.exitstatus if opts[:failfast]
           return status.exitstatus
         end
@@ -527,7 +552,13 @@ module Hu
           exit status.exitstatus
         end
 
-        versions = output.lines.map(&:chomp).reject { |e| Versionomy.parse(e) rescue true; false }
+        versions = output.lines.map(&:chomp).reject do |e|
+          begin
+                                                 Versionomy.parse(e)
+                                               rescue
+                                                 true
+                                               end; false
+        end
         versions = versions.map { |e| e[0].casecmp('v').zero? ? e.downcase : "v#{e.downcase}" }
         versions = VersionSorter.sort(versions)
         latest = versions[-1] || 'v0.0.0'
@@ -549,6 +580,7 @@ module Hu
           git checkout develop
           git branch -D #{branch_name}
         EOS
+        Hu::Tm.t(:delete_release_branch, cmd: 'deploy')
         puts "Branch #{branch_name} deleted.".color(:red)
         true
       end
@@ -566,6 +598,7 @@ module Hu
         # Starting release #{release_tag.color(:green)}
         git flow release start #{release_tag} >/dev/null
         EOS
+        Hu::Tm.t(:start_release, cmd: 'deploy')
       end
 
       def update_working_copy
@@ -576,6 +609,7 @@ module Hu
         git checkout develop && git pull
         git checkout master && git pull --rebase origin master
         EOS
+        Hu::Tm.t(:update_working_copy, cmd: 'deploy')
       end
 
       def heroku_git_remote
@@ -736,6 +770,7 @@ module Hu
         # Abort failed merge
         git merge --abort
         EOS
+        Hu::Tm.t(:abort_merge, cmd: 'deploy')
       end
 
       def create_changelog(env)
@@ -748,6 +783,7 @@ module Hu
       end
 
       def shutdown
+        Hu::Tm.flush!
         @@shutting_down = true
         unbusy
       end

data/lib/hu/telemetry.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+require 'segment'
+require 'tty-prompt'
+require 'securerandom'
+
+module Hu
+  class Tm
+    API_TOKEN = ENV['HEROKU_API_KEY'] || ENV['HEROKU_API_TOKEN'] || Netrc.read['api.heroku.com']&.password
+    @segment = nil
+    @context = {}
+
+    class << self
+      def t(event, props = {})
+        return if @segment.nil?
+        @segment.track(anonymous_id: Settings.userid,
+                       event: event.to_s,
+                       properties: props,
+                       context: @context)
+      end
+
+      def flush!
+        return if @segment.nil?
+        @segment.flush
+      end
+
+      def start!
+        if Settings.send_anonymous_usage_statistics.nil?
+          puts <<-EOF.strip_heredoc
+
+          Hu would like to collect anonymous usage
+          statistics for the purpose of self-improvement.
+
+          No personal data or identifying information
+          about your projects will be collected.
+
+          EOF
+
+          prompt = TTY::Prompt.new
+          choice = prompt.select('Enable anonymous usage statistics?') do |menu|
+            menu.enum '.'
+            menu.choice 'Yes, I will help Hu!', true
+            menu.choice 'Nope', false
+          end
+
+          cfg = {
+            userid: SecureRandom.uuid
+          }
+          begin
+            cfg = YAML.parse(File.read(Hu::CONFIG_FILE))
+          rescue
+          end
+          cfg['send_anonymous_usage_statistics'] = choice
+          File.write(Hu::CONFIG_FILE, YAML.dump(cfg))
+
+          puts "\nThanks!\n"
+          puts "Your decision was saved to #{Hu::CONFIG_FILE}\n"
+          sleep 3
+        end
+
+        if Settings.send_anonymous_usage_statistics == true
+          @segment = Segment::Analytics.new(write_key: 'T32sCm68MMAsyoa9r5uPtHz0YwJ3MjXI')
+          @context = { version: Hu::VERSION }
+          @segment.identify(anonymous_id: Settings.userid || SecureRandom.uuid,
+                            context: @context)
+        end
+      end
+    end
+  end
+end
+
+Hu::Tm.start!

data/lib/hu/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hu
-  VERSION = '1.3.16'
+  VERSION = '1.3.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hu
 version: !ruby/object:Gem::Version
-  version: 1.3.16
+  version: 1.3.17
 platform: ruby
 authors:
 - moe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,16 +154,16 @@ dependencies:
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +290,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: analytics-ruby
+  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'
+- !ruby/object:Gem::Dependency
+  name: config
+  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
@@ -311,6 +339,7 @@ files:
 - lib/hu/collab.rb
 - lib/hu/common.rb
 - lib/hu/deploy.rb
+- lib/hu/telemetry.rb
 - lib/hu/version.rb
 homepage: https://github.com/busyloop/hu
 licenses: