geordi 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f371a80f7bc536a88daf8b8d97bda49c835833433cb91b3765ba6d9e17da68f
-  data.tar.gz: 4032f7043edffcd155188d030a96df7122e8507208687c28ad050d7bde4d9da1
+  metadata.gz: dd4118d5ea35ff6c548d5ad3f158410fd2ac83edda2b181be2454f8228946825
+  data.tar.gz: b114780373ad8673f40eab2c65412dd334eecc6d97e6786a523fa7a3d9017958
 SHA512:
-  metadata.gz: 7db4044309628ecc8f965eb2f0e4b865e29421cf19c07dd5b74ddedd83f61a1f6f538f9643f6d0f5c8282f5250e3166e093e67dff2b9bf68c591da81ab3bbe25
-  data.tar.gz: 4976e69ed1eaa0d32b177b578610aa10608f17d4a1bf363fecb93317426e784147824704adc314e4fe94da5a8228e3daa52d4c686b60781bba7c68d045237b77
+  metadata.gz: 4523d1f1c32f42ebdd15a9d66b032bf9f220b94835c4aa71f9e3e24a2675b5c6806cec3ea80f225a03d8640002fa229e044fed72cc9e6392d56413bc01ee371b
+  data.tar.gz: 77c57c948d4f95880e9f55211d6ab3e7a079ac2bb0e4c4b1e0757aa291facaa224f56899ff435a3b846273dd8c5390a564235e17625cecc71735226a62d7c5c9

data/CHANGELOG.md

@@ -6,6 +6,16 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ## Unreleased
 
+## 2.1.0 2019-02-25
+
+### Compatible changes
+- Fixes [#59]: Removedb name prefix when reading whitelist
+- Fixes [#62]: Provide better error messages on whitelist editing errors.
+- Fixes [#63]: Allow explicit whitelisting of database names that would be considered derivative during db cleanup
+- Fixes [#64]: Remove VISUAL and EDITOR from editor choices for DB whitelist editing
+
+## 2.0.0 2019-02-20
+
 ### Breaking changes
 - Pivotal Tracker discontinued API V3 and V4. We now use API V5, which has a client library that does not support Ruby
   version < 2.1 anymore (all other geordi commands will still work for older Ruby versions).
@@ -13,7 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ### Compatible changes
 - Fixes [#54]: @solo features run first and are not skipped by accident on failures before
-- Fixes [#3]: Add spring support for RSpec
+- Fixes [#03]: Add spring support for RSpec
 - Fixes [#53]: Integrate yarn integrity
 - Fixes [#52]: Remote dumps are transmitted compressed
 

data/lib/geordi/db_cleaner.rb

@@ -47,8 +47,31 @@ HEREDOC
         db.sub!(@derivative_dbname, '')
         tmpfile_content.push(['drop', db])
       end
-      whitelisted_dbs.each do |db|
-        tmpfile_content.push(['keep', db])
+      warn_manual_whitelist = false
+      whitelisted_dbs.each do |db_name|
+        # Remove 'keep' word from whitelist entries. This is not normally required since geordi
+        # does not save 'keep' or 'drop' to the whitelist file on disk but rather saves a list
+        # of all whitelisted db names and just presents the keep/drop information while editing
+        # the whitelist to supply users a list of databases they can whitelist by changing the
+        # prefix to 'keep'. Everything prefixed 'drop' is not considered whitelisted and thus
+        # not written to the whitelist file on disk.
+        #
+        # However, if users manually edit their whitelist files they might use the keep/drop
+        # syntax they're familiar with.
+        if db_name.start_with? 'keep '
+          db_name.gsub!(/keep /, '')
+          db_name = db_name.split[1..-1].join(' ')
+          warn_manual_whitelist = true
+        end
+        tmpfile_content.push(['keep', db_name]) unless db_name.empty?
+      end
+      if warn_manual_whitelist
+        warn <<-ERROR_MSG.gsub(/^\s*/, '')
+        Your whitelist #{whitelist} seems to have been generated manually.
+        In that case, make sure to use only one database name per line and omit the 'keep' prefix."
+
+        Launching the editor.
+        ERROR_MSG
       end
       tmpfile_content.sort_by! { |k| k[1] }
       tmpfile_content.uniq!
@@ -64,8 +87,12 @@ HEREDOC
         lines = Geordi::Util.stripped_lines(wl_edited.read)
         lines.each do |line|
           next if line.start_with?('#')
-          fail 'Invalid edit to whitelist file' unless line.split.length == 2
-          fail 'Invalid edit to whitelist file' unless %w[keep drop k d].include? line.split[0]
+          unless line.split.length == 2
+            fail "Invalid edit to whitelist file: \`#{line}\` - Syntax is: ^[keep|drop] dbname$"
+          end
+          unless %w[keep drop k d].include? line.split.first
+            fail "Invalid edit to whitelist file: \`#{line}\` - must start with either drop or keep."
+          end
           db_status, db_name = line.split
           if db_status == 'keep'
             whitelisted_dbs.push db_name
@@ -223,7 +250,15 @@ HEREDOC
       else
         whitelist_content = Array.new
       end
-      whitelist_content.include? database_name.sub(@derivative_dbname, '')
+      # Allow explicit whitelisting of derivative databases like projectname_test2
+      if whitelist_content.include? database_name
+        true
+      # whitelisting `projectname` also whitelists `projectname_test\d+`, `projectname_development`
+      elsif whitelist_content.include? database_name.sub(@derivative_dbname, '')
+        true
+      else
+        false
+      end
     end
 
     def filter_whitelisted(dbtype, database_list)

data/lib/geordi/util.rb

@@ -82,7 +82,7 @@ module Geordi
 
       # try to guess user's favorite cli text editor
       def decide_texteditor
-        %w[$VISUAL $EDITOR /usr/bin/editor vi].each do |texteditor|
+        %w[/usr/bin/editor vi].each do |texteditor|
           if cmd_exists? texteditor and texteditor.start_with? '$'
             return ENV[texteditor[1..-1]]
           elsif cmd_exists? texteditor

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-20 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor