geordi 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70f9242df556d6b8259f341827cc8996f6970de1e9d51c5ff13cbc44307a7ee7
-  data.tar.gz: 59e54eca6438f61af0c7640f88771e5f7f67008237445a0d25521b3adea4f0fd
+  metadata.gz: b58c675d81b07400a5d816bc1191ef4ea26a010395379a3e1e103130fa0edd14
+  data.tar.gz: 85a7a4a397ed51b174468b1a9f8005d9dec37a2e35ab2c765b41eb01ddbf6052
 SHA512:
-  metadata.gz: d143f1c68d472cc9918d6de6d2271b6633d0f9f01182d835b9667d872d65c495cc85b6c2752545e670b4bc685367baeb7122a32b7e4d3265ea8cc6412629be5d
-  data.tar.gz: ec93583e23658f4c1c69febc903f8d3d05c98b6e0e7ec7066c4c678277161fcc9d4e8f365e79e38792ee0c7a5b8bb9deec07408983c50c694a3884be254d2124
+  metadata.gz: aebd6912385505c157d89cda5d81f78e2f35fc172e081690832b824d4d162745c4c415b1b28fc100a0aad83623d6c91e5bbcc87f7613e3079d2260d16e0ca591
+  data.tar.gz: 9afd1e6b056e881fc7ad0ee13182d72ee3bb35ca34672935183a225efe850f1a42ac090df9f45722ec062d4d212a926e93cba5964ab704b1903e6c6c743339e5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (1.9.0)
+    geordi (1.9.1)
       thor (>= 0.18.0)
 
 GEM

data/lib/geordi/cli.rb

@@ -14,10 +14,6 @@ module Geordi
 
     private
 
-    def file_containing?(file, regex)
-      File.exists?(file) and File.read(file).scan(regex).any?
-    end
-
     # fix weird implementation of #invoke
     def invoke_cmd(name, *args)
       options = args.last.is_a?(Hash) ? args.pop : {}

data/lib/geordi/commands/create_databases.rb

@@ -7,7 +7,7 @@ def create_databases
 
   if File.exists?('config/database.yml')
     command = 'bundle exec rake db:create:all'
-    command << ' parallel:create' if file_containing?('Gemfile', /parallel_tests/)
+    command << ' parallel:create' if Util.file_containing?('Gemfile', /parallel_tests/)
 
     Util.system! command
   else

data/lib/geordi/commands/delete_dumps.rb

@@ -35,7 +35,7 @@ def delete_dumps(dump_directory = nil)
     success 'No dumps to delete' if deletable_dumps.empty?
     exit 0
   end
-  deletable_dumps.uniq!
+  deletable_dumps.uniq!.sort!
   note 'The following dumps can be deleted:'
   puts
   puts deletable_dumps

data/lib/geordi/commands/deploy.rb

@@ -68,10 +68,9 @@ def deploy(target_stage = nil)
   note "Deploy to #{target_stage}"
 
   if prompt('Go ahead with the deployment?', 'n', /y|yes/)
-    cap3 = file_containing?('Capfile', 'capistrano/setup')
     capistrano_call = "cap #{target_stage} deploy"
-    capistrano_call << ':migrations' unless cap3 || options.no_migrations
-    capistrano_call = "bundle exec #{capistrano_call}" if file_containing?('Gemfile', /capistrano/)
+    capistrano_call << ':migrations' unless Util.capistrano3? || options.no_migrations
+    capistrano_call = "bundle exec #{capistrano_call}" if Util.file_containing?('Gemfile', /capistrano/)
 
     invoke_cmd 'bundle_install'
 

data/lib/geordi/commands/migrate.rb

@@ -12,7 +12,7 @@ def migrate
   announce 'Migrating'
 
   if File.directory?('db/migrate')
-    if file_containing?('Gemfile', /parallel_tests/)
+    if Util.file_containing?('Gemfile', /parallel_tests/)
       note 'Development and parallel test databases'
       puts
 

data/lib/geordi/commands/rspec.rb

@@ -12,7 +12,7 @@ def rspec(*files)
 
     announce 'Running specs'
 
-    if file_containing?('Gemfile', /parallel_tests/) and files.empty?
+    if Util.file_containing?('Gemfile', /parallel_tests/) and files.empty?
       note 'All specs at once (using parallel_tests)'
       Util.system! 'bundle exec rake parallel:spec', :fail_message => 'Specs failed.'
 
@@ -28,7 +28,7 @@ def rspec(*files)
       command = ['bundle exec']
       # differentiate RSpec 1/2
       command << (File.exists?('script/spec') ? 'spec -c' : 'rspec')
-      command << '-r rspec_spinner -f RspecSpinner::Bar' if file_containing?('Gemfile', /rspec_spinner/)
+      command << '-r rspec_spinner -f RspecSpinner::Bar' if Util.file_containing?('Gemfile', /rspec_spinner/)
       command << files.join(' ')
 
       puts

data/lib/geordi/commands/security_update.rb

@@ -21,20 +21,19 @@ def security_update(step='prepare')
 
     success 'Successfully prepared for security update'
     puts
-    note 'Please apply the security update now.'
+    note 'Please apply the security update now and commit your changes.'
     note 'When you are done, run `geordi security-update finish`.'
 
 
-  when 'finish'
-    announce 'Finishing security update'
-
+  when 'f', 'finish'
     # ensure everything is committed
-    `git status --porcelain`.empty? or fail('There are uncommitted changes.')
-    note 'Working directory clean.'
+    `git status --porcelain`.empty? or fail('Please commit your changes before finishing the update.')
 
+    announce 'Finishing security update'
+    note 'Working directory clean.'
     prompt('Have you successfully run all tests?', 'n', /y|yes/) or fail 'Please run tests first.'
 
-    note 'About to: push production, checkout & pull master, merge production, push master, deploy all stages'
+    note 'About to: push production, checkout & pull master, merge production, push master'
     prompt('Continue?', 'n', /y|yes/) or fail 'Cancelled.'
 
     Util.system! 'git push', :show_cmd => true
@@ -43,7 +42,9 @@ def security_update(step='prepare')
     Util.system! 'git merge production', :show_cmd => true
     Util.system! 'git push', :show_cmd => true
 
-    invoke_cmd 'capistrano', 'deploy:migrations'
+    announce 'Deploying all targets'
+    deploy = Util.capistrano3? ? 'deploy' : 'deploy:migrations'
+    invoke_cmd 'capistrano', deploy
 
     success 'Successfully pushed and deployed security update'
     puts

data/lib/geordi/commands/with_rake.rb

@@ -1,6 +1,6 @@
 desc 'with-rake', 'Run tests with `rake`', :hide => true
 def with_rake
-  if file_containing?('Rakefile', /^task.+default.+(spec|test|feature)/)
+  if Util.file_containing?('Rakefile', /^task.+default.+(spec|test|feature)/)
     invoke_cmd 'bundle_install'
 
     announce 'Running tests with `rake`'

data/lib/geordi/util.rb

@@ -39,7 +39,7 @@ 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.inspect if options[:show_cmd]
+        note_cmd commands.join(' ') if options[:show_cmd]
 
         if options[:confirm]
           prompt('Run this now?', 'n', /y|yes/) or fail('Cancelled.')
@@ -111,6 +111,15 @@ module Geordi
       def stripped_lines(input_string)
         input_string.lines.map(&:chomp).map(&:strip)
       end
+
+      def capistrano3?
+        Util.file_containing? 'Capfile', 'capistrano/setup'
+      end
+
+      def file_containing?(file, regex)
+        File.exists?(file) and File.read(file).scan(regex).any?
+      end
+
     end
   end
 end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '1.9.0'
+  VERSION = '1.9.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor