parity 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c834b388cde313695a88976083e26335e622880bb7e4ad212b1f177aa4a228c8
-  data.tar.gz: e842be2ab0f8a556a0da4d51de033e16eb2dc94e659fd1eadbd644c46a221450
+  metadata.gz: 848792197642939ee65244b1b52cf46e247aaed2cdd23b7d145f8d0377f6b679
+  data.tar.gz: 96c978c1fbd49f12a4b35951da33ca958115875057a35b5be6c0912d9b252f72
 SHA512:
-  metadata.gz: 53f990b9c44ac2e8bc38504b6a6730c61931e6fc05d7306bb74b757804a307c1d8219d31f95340dbdacf94e334cf2aa2659a23dd254533a245d9cd2f87380b06
-  data.tar.gz: '055856a6441a5e409bc0da279d3e937d30604308ccefb4ea0ed5315b715745eb55ef9279cb1adc902113e2eec5b9ab347fcade4598b26174dd68c0b890fe4d5b'
+  metadata.gz: f99f89a6f7d44c1223b699c32d80e6ab1279b34f06f6c2efb83d9e4974cd877d98fb4461768d509afb0010c30be0d58b2d86fa70f3f35032e69c29d188fdb864
+  data.tar.gz: bd98116578f9f6d492ecf99afd170ac0d242ad9c248f370cdc6f77ad957bd91d7a6bcbfb73cd0261edcc854cfe85484064c63d71efacc6a22bef5f0748022e53

data/README.md

@@ -61,7 +61,7 @@ Push your local development database backup up to staging:
 
     staging restore development
 
-Deploy master to production (note that prior versions of Parity would run
+Deploy main to production (note that prior versions of Parity would run
 database migrations, that's now better handled using [Heroku release phase]):
 
     production deploy
@@ -197,7 +197,7 @@ See guidelines in [`RELEASING.md`](RELEASING.md) for details
 License
 -------
 
-Parity is © 2013-2018 thoughtbot, inc.
+Parity is © 2013-2021 thoughtbot, inc.
 It is free software,
 and may be redistributed under the terms specified in the [LICENSE] file.
 

data/bin/pr_app

@@ -9,7 +9,7 @@ if ARGV.empty?
 else
   review_app_number = ARGV.first
   staging_git_remote = Open3.capture3("git remote get-url staging")[0].strip
-  review_app_prefix = staging_git_remote.split("/").last.gsub(/\.git\Z/, "")[0, 22]
+  review_app_prefix = staging_git_remote.split("/").last.gsub(/\.git\Z/, "")[0, 20]
 
   exit Parity::Environment.new(
     "#{review_app_prefix}-pr-#{review_app_number}",

data/lib/parity.rb

@@ -4,6 +4,7 @@ require "parity/heroku_app_name"
 require "parity/version"
 require "parity/environment"
 require "parity/usage"
+require "erb"
 require "open3"
 require "pathname"
 require "uri"

data/lib/parity/backup.rb

@@ -75,7 +75,7 @@ module Parity
 
     def restore_from_local_temp_backup
       Kernel.system(
-        "pg_restore tmp/latest.backup --verbose --clean --no-acl --no-owner "\
+        "pg_restore tmp/latest.backup --verbose --no-acl --no-owner "\
           "--dbname #{development_db} --jobs=#{processor_cores} "\
           "#{additional_args}",
       )
@@ -114,7 +114,7 @@ module Parity
     end
 
     def database_yaml_file
-      IO.read(DATABASE_YML_RELATIVE_PATH)
+      ERB.new(IO.read(DATABASE_YML_RELATIVE_PATH)).result
     end
 
     def processor_cores

data/lib/parity/environment.rb

@@ -41,14 +41,27 @@ module Parity
 
     def deploy
       if production?
-        Kernel.system("git push production master")
+        Kernel.system("git push production #{branch_ref}")
       else
         Kernel.system(
-          "git push #{environment} HEAD:master --force",
+          "git push #{environment} HEAD:#{branch_ref} --force",
         )
       end
     end
 
+    def branch_ref
+      main_ref_exists = system("git show-ref --verify --quiet refs/heads/main")
+      master_ref_exists = system(
+        "git show-ref --verify --quiet refs/heads/master",
+      )
+
+      if main_ref_exists && !master_ref_exists
+        "main"
+      else
+        "master"
+      end
+    end
+
     def restore
       if production? && !forced?
         $stdout.puts "Parity does not support restoring backups into your "\

data/lib/parity/version.rb

@@ -1,3 +1,3 @@
 module Parity
-  VERSION = "3.3.0".freeze
+  VERSION = "3.4.0".freeze
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: parity
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Dan Croak
 - Geoff Harcourt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Development/staging/production parity makes it easier for
@@ -39,7 +39,7 @@ homepage: https://github.com/thoughtbot/parity
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -54,8 +54,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Shell commands for development, staging, and production parity.
 test_files: []