parity 3.2.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4840de61e7085008005004e7c1c6a9f59115321504596c543fe35f024db752d5
-  data.tar.gz: 5168abae185e43bb8f2b0f32adf6e2c7613332657e17282ddead491f7fa12e45
+  metadata.gz: 7ee16d3e40ea984e2097512f153e70f697fc6621ace79745935fee0d8a921f77
+  data.tar.gz: 47b60c7616ead54c4d9f2d06757b278be7976901a43156488d6abce73e1cdfc3
 SHA512:
-  metadata.gz: '082cda1a7eba59a61a14a970ef50b0fe544a305c3223a3135bd1ac2c172c349dfdb235cc66a2973c1731ca7da5d414d8c875f28be4b55cb1ffe354a0ffd2a0c5'
-  data.tar.gz: 5be8e6c0cba78caa4ba1af4356674e432477629f3f6b42deb9ed3b2025a09cafb925abb6fe4b04e7ef79fa14d2c85e7686441978fb58fe4b50c612507bcad82e
+  metadata.gz: 1f1ac796f6f3ee3ea4ea4f7c59ba9f9ce123b22400b992bc1cc83fef6e7abddea3a505d83bd6b7935f9640249e81bfae19d1064b725a7e877e3e8f4e13ec5a9d
+  data.tar.gz: 1523534c0881decc98401235471ba433b44c53d023a4ab08fb639a9f318372be95dab0029fd62a1f04fa043be079d14da92d83dbd02aea1458b6848b282b8cfb

data/README.md

@@ -8,22 +8,11 @@ Shell commands for development, staging, and production parity for Heroku apps.
 Install
 -------
 
-On macOS, this installs everything you need:
+    gem install parity
 
-    brew tap thoughtbot/formulae
-    brew install parity
+Or bundle it in your project:
 
-On Debian:
-
-    wget -qO - https://apt.thoughtbot.com/thoughtbot.gpg.key | sudo apt-key add -
-    echo "deb http://apt.thoughtbot.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/thoughtbot.list
-    sudo apt-get update
-    sudo apt-get install parity
-
-On other systems you can:
-
-1. Download the package for your system from the [releases page][releases]
-1. Extract the tarball and place it so that `/bin` is in your `PATH`
+    gem "parity"
 
 [releases]: https://github.com/thoughtbot/parity/releases
 
@@ -33,10 +22,6 @@ Parity requires these command-line programs:
     heroku
     pg_restore
 
-On macOS, these programs are installed
-as Homebrew package dependencies of
-the `parity` Homebrew package.
-
 Usage
 -----
 
@@ -61,7 +46,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
@@ -92,18 +77,18 @@ Tail a log:
     staging tail
     pr_app 1234 tail
 
-Use [redis-cli][2] with your `REDIS_URL` add-on:
-
-    production redis-cli
-    staging redis-cli
-    pr_app 1234 redis-cli
-
 The scripts also pass through, so you can do anything with them that you can do
 with `heroku ______ --remote staging` or `heroku ______ --remote production`:
 
     watch production ps
     staging open
 
+You can optionally parallelize a DB restore by passing `--parallelize`
+as a flag to the `development` or `production` commands:
+```
+    development restore-from production --parallelize
+```
+
 [2]: http://redis.io/commands
 
 Convention
@@ -191,7 +176,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/backup.rb

@@ -10,6 +10,7 @@ module Parity
     def initialize(args)
       @from, @to = args.values_at(:from, :to)
       @additional_args = args[:additional_args] || BLANK_ARGUMENTS
+      @parallelize = args[:parallelize] || false
     end
 
     def restore
@@ -24,7 +25,9 @@ module Parity
 
     private
 
-    attr_reader :additional_args, :from, :to
+    attr_reader :additional_args, :from, :to, :parallelize
+
+    alias :parallelize? :parallelize
 
     def restore_from_development
       reset_remote_database
@@ -72,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}",
       )
@@ -105,20 +108,20 @@ module Parity
     end
 
     def development_db
-      YAML.load(database_yaml_file).
+      YAML.safe_load(database_yaml_file, aliases: true).
         fetch(DEVELOPMENT_ENVIRONMENT_KEY_NAME).
         fetch(DATABASE_KEY_NAME)
     end
 
     def database_yaml_file
-      IO.read(DATABASE_YML_RELATIVE_PATH)
+      ERB.new(IO.read(DATABASE_YML_RELATIVE_PATH)).result
     end
 
     def processor_cores
-      if ruby_version_over_2_2?
+      if parallelize? && ruby_version_over_2_2?
         Etc.nprocessors
       else
-        2
+        1
       end
     end
 

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 "\
@@ -57,6 +70,7 @@ module Parity
         Backup.new(
           from: arguments.first,
           to: environment,
+          parallelize: parallelize?,
           additional_args: additional_restore_arguments,
         ).restore
       end
@@ -72,10 +86,13 @@ module Parity
       arguments.include?("--force")
     end
 
+    def parallelize?
+      arguments.include?("--parallelize")
+    end
+
     def additional_restore_arguments
-      (arguments.drop(1) - ["--force"] + [restore_confirmation_argument]).
-        compact.
-        join(" ")
+      (arguments.drop(1) - ["--force", "--parallelize"] +
+        [restore_confirmation_argument]).compact.join(" ")
     end
 
     def restore_confirmation_argument
@@ -109,16 +126,6 @@ module Parity
       )
     end
 
-    def redis_cli
-      Kernel.system("redis-cli", "-u", raw_redis_url)
-    end
-
-    def raw_redis_url
-      @redis_to_go_url ||= Open3.
-        capture3(command_for_remote("config:get REDIS_URL"))[0].
-        strip
-    end
-
     def heroku_app_name
       HerokuAppName.new(environment).to_s
     end

data/lib/parity/version.rb

@@ -1,3 +1,3 @@
 module Parity
-  VERSION = "3.2.0".freeze
+  VERSION = "3.5.0".freeze
 end

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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parity
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Dan Croak
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Development/staging/production parity makes it easier for
@@ -54,8 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Shell commands for development, staging, and production parity.