parity 0.9.2 → 0.9.3.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47092d2b84eab5f31ee447bdb4ae550cc1d27c57
-  data.tar.gz: 5114e430f72ab8f95fdb21f80e22e2e0949dd2d4
+  metadata.gz: 308a5394f878999734f67e7cf5eeb7292eca9de5
+  data.tar.gz: 0f144357d9ce25752690d2ade17779732194fa01
 SHA512:
-  metadata.gz: 498aed54f624cdeaa0788895647a4488aae3fd67e2aec7857936f87b8ac636897506201bc0db9f4059162ee29e47e62d7042529f8f3ddca4358af339a5140b1f
-  data.tar.gz: 5c49877c088765a4099d959c5f17556cfb2cbdc648e5ea19b148618e476eb1e150ddef56e3e7042ba33582828080f965eb3578ca2fe67a4feff33168c0f220e7
+  metadata.gz: dbcc327fdad16ce467a8e720caec5708fb9adcc1863f2b9195e7c0599fd9c3f9300de2dcc7ea90171cdd7637b3864f6ef7f3a670c7f29af93b965c2ebfd648cc
+  data.tar.gz: 6d395b0d355e7bbde331e5b9fa369f40a968bde44a7e5e9b700f6d072a2bf76150dea765aae1ed278331fa7d90935793887bf481cf41d57969bb5de7f38496aa

data/README.md

@@ -36,7 +36,7 @@ Backup a database:
     production backup
     staging backup
 
-Restore a production or staging database backup into development:
+Restore a production or staging database backup into development (`restore-from` is an alias for `restore`):
 
     development restore production
     development restore staging
@@ -49,11 +49,18 @@ Push your local development database backup up to staging:
 
     staging restore development
 
-Deploy from master, and migrate and restart the dynos if necessary:
+Deploy from master to production
+and migrate and restart the dynos if necessary:
 
     production deploy
+
+Deploy the current branch to staging or a feature branch
+and migrate and restart the dynos if necessary:
+
     staging deploy
 
+_Note that deploys to non-production environments use `git push --force`._
+
 Open a console:
 
     production console
@@ -91,8 +98,6 @@ Parity expects:
 * A `production` remote pointing to the production Heroku app.
 * There is a `config/database.yml` file that can be parsed as YAML for
   `['development']['database']`.
-* The Heroku apps are named like `app-staging` and `app-production`
-  where `app` is equal to `basename $PWD`.
 
 Customization
 -------------
@@ -139,7 +144,7 @@ See guidelines in [`RELEASING.md`](RELEASING.md) for details
 License
 -------
 
-Parity is © 2013-2015 thoughtbot, inc.
+Parity is © 2013-2016 thoughtbot, inc.
 It is free software,
 and may be redistributed under the terms specified in the [LICENSE] file.
 

data/lib/parity.rb

@@ -3,6 +3,9 @@ $LOAD_PATH << File.expand_path("..", __FILE__)
 require "parity/version"
 require "parity/environment"
 require "parity/usage"
+require "git"
+require "dotenv"
 require "open3"
 require "pathname"
 require "uri"
+require "yaml"

data/lib/parity/backup.rb

@@ -1,16 +1,19 @@
-require 'yaml'
-
 module Parity
   class Backup
+    BLANK_ARGUMENTS = "".freeze
+    DATABASE_YML_RELATIVE_PATH = "config/database.yml".freeze
+    DEVELOPMENT_ENVIRONMENT_KEY_NAME = "development".freeze
+    DATABASE_KEY_NAME = "database".freeze
+
     def initialize(args)
       @from, @to = args.values_at(:from, :to)
-      @additional_args = args[:additional_args] || ""
+      @additional_args = args[:additional_args] || BLANK_ARGUMENTS
     end
 
     def restore
-      if to == "development"
+      if to == DEVELOPMENT_ENVIRONMENT_KEY_NAME
         restore_to_development
-      elsif from == "development"
+      elsif from == DEVELOPMENT_ENVIRONMENT_KEY_NAME
         restore_from_development
       else
         restore_to_remote_environment
@@ -46,10 +49,6 @@ module Parity
       )
     end
 
-    def pg_restore
-      "pg_restore --verbose --clean --no-acl --no-owner -d #{development_db}"
-    end
-
     def restore_to_remote_environment
       Kernel.system(
         "heroku pg:backups restore #{backup_from} --remote #{to} "\
@@ -66,8 +65,15 @@ module Parity
     end
 
     def development_db
-      yaml_file = IO.read("config/database.yml")
-      YAML.load(yaml_file)['development']['database']
+      YAML.load(parsed_database_yml).
+        fetch(DEVELOPMENT_ENVIRONMENT_KEY_NAME).
+        fetch(DATABASE_KEY_NAME)
+    end
+
+    def parsed_database_yml
+      Dotenv.load
+      yaml_file = IO.read(DATABASE_YML_RELATIVE_PATH)
+      ERB.new(yaml_file).result
     end
   end
 end

data/lib/parity/environment.rb

@@ -19,10 +19,8 @@ module Parity
     attr_accessor :environment, :subcommand, :arguments
 
     def run_command
-      if subcommand == "redis-cli"
-        redis_cli
-      elsif self.class.private_method_defined?(subcommand)
-        send(subcommand)
+      if self.class.private_method_defined?(methodized_subcommand)
+        send(methodized_subcommand)
       else
         run_via_cli
       end
@@ -71,6 +69,8 @@ module Parity
       end
     end
 
+    alias :restore_from :restore
+
     def production?
       environment == "production"
     end
@@ -125,12 +125,12 @@ module Parity
       )[0].strip
     end
 
-    def heroku_app_name
-      [basename, environment].join('-')
+    def git_remote
+      Git.init.remote(environment).url
     end
 
-    def basename
-      Dir.pwd.split("/").last
+    def heroku_app_name
+      git_remote.split(":").last.split(".").first
     end
 
     def run_migrations?
@@ -155,5 +155,9 @@ module Parity
         git diff --quiet #{environment}/master..master -- db/migrate
       })
     end
+
+    def methodized_subcommand
+      subcommand.gsub("-", "_").to_sym
+    end
   end
 end

data/lib/parity/usage.rb

@@ -1,7 +1,7 @@
 module Parity
   class Usage
     def to_s
-      File.read(readme).match(/Usage\n-----\n([^\/.]*)staging open/)[1]
+      File.read(readme).match(/Usage\n-----\n(.+)\nConvention\n------/m)[1]
     end
 
     private

data/lib/parity/version.rb

@@ -1,3 +1,3 @@
 module Parity
-  VERSION = "0.9.2".freeze
+  VERSION = "0.9.3.beta".freeze
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: parity
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3.beta
 platform: ruby
 authors:
 - Dan Croak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
-dependencies: []
+date: 2016-02-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
 description: |2
       Development/staging/production parity makes it easier for
       those who write the code to deploy the code.
@@ -46,12 +74,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Shell commands for development, staging, and production parity.