geordi 3.0.0 → 3.0.1

data/lib/geordi/remote.rb

@@ -6,7 +6,6 @@ require 'pathname'
 
 module Geordi
   class Remote
-    include Geordi::Interaction
 
     REMOTE_DUMP_PATH = '~/dumps/dump_for_download.dump'.freeze
 
@@ -43,11 +42,11 @@ module Geordi
       destination_path = File.join(destination_directory, "#{@stage}.dump")
       relative_destination = Pathname.new(destination_path).relative_path_from Pathname.new(@config.root)
 
-      note "Downloading remote dump to #{relative_destination} ..."
+      Interaction.note "Downloading remote dump to #{relative_destination} ..."
       server = @config.primary_server
       Util.system! "scp -C #{@config.user(server)}@#{server}:#{REMOTE_DUMP_PATH} #{destination_path}"
 
-      success "Dumped the #{@stage} database to #{relative_destination}."
+      Interaction.success "Dumped the #{@stage} database to #{relative_destination}."
 
       destination_path
     end
@@ -62,7 +61,7 @@ module Geordi
       remote_command = "cd #{@config.remote_root} && #{@config.shell}"
       remote_command << " -c '#{options[:remote_command]}'" if options[:remote_command]
 
-      note 'Connecting to ' + server.to_s
+      Interaction.note 'Connecting to ' + server.to_s
       Util.system! 'ssh', "#{@config.user(server)}@#{server}", '-t', remote_command
     end
 

data/lib/geordi/util.rb

@@ -4,7 +4,6 @@ require 'socket'
 module Geordi
   class Util
     class << self
-      include Geordi::Interaction
 
       # Geordi commands sometimes require external gems. However, we don't want
       # all employed gems as runtime dependencies because that would
@@ -20,13 +19,13 @@ module Geordi
         install_command = 'gem install ' + gem_name
 
         # install missing gem
-        warn 'Probably missing gem: ' + gem_name
-        prompt('Install it now?', 'y', /y|yes/) || raise('Missing Gems.')
+        Interaction.warn 'Probably missing gem: ' + gem_name
+        Interaction.prompt('Install it now?', 'y', /y|yes/) || Interaction.fail('Missing Gems.')
         system! install_command, show_cmd: true
 
         # retry
         Gem.clear_paths
-        note 'Retrying ...'
+        Interaction.note 'Retrying ...'
         require gem_name
         retry
       end
@@ -39,10 +38,10 @@ module Geordi
       # @option fail_message: The text to print on command failure
       def system!(*commands)
         options = commands.last.is_a?(Hash) ? commands.pop : {}
-        note_cmd commands.join(' ') if options[:show_cmd]
+        Interaction.note_cmd commands.join(' ') if options[:show_cmd]
 
         if options[:confirm]
-          prompt('Run this now?', 'n', /y|yes/) || raise('Cancelled.')
+          Interaction.prompt('Run this now?', 'n', /y|yes/) or Interaction.fail('Cancelled.')
         end
 
         if testing?
@@ -59,7 +58,7 @@ module Geordi
             Bundler.clean_system(*commands)
           end
 
-          success || raise(options[:fail_message] || 'Something went wrong.')
+          success || Interaction.fail(options[:fail_message] || 'Something went wrong.')
         end
       end
 
@@ -118,7 +117,7 @@ module Geordi
       # check if given cmd is executable. Absolute path or command in $PATH allowed.
       def cmd_exists?(cmd)
         system("which #{cmd} > /dev/null")
-        $CHILD_STATUS.exitstatus.zero?
+        $?.exitstatus.zero?
       end
 
       def is_port_open?(port)
@@ -167,6 +166,12 @@ module Geordi
         !!ENV['GEORDI_TESTING']
       end
 
+      def strip_heredoc(string)
+        leading_whitespace = (string.match(/\A( +)[^ ]+/) || [])[1]
+        string.gsub! /^#{leading_whitespace}/, '' if leading_whitespace
+        string
+      end
+
       private
 
       def bundle_list

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-04 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails