heroku_rails_deploy 0.3.0 → 0.4.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59063858cd146cef356f6822b6a3e4b2828b7763
-  data.tar.gz: '0785252959606cd3a2ddec9bbd07ff321e071e3a'
+  metadata.gz: 011e522544ae6747ba888aa135ecf61bc5f41ca8
+  data.tar.gz: 2d8c4d7942848b6a842ef675cfa2861b35fd8e9f
 SHA512:
-  metadata.gz: ba03127adfc0f2601d57b3100247eba65cc2773cc8152f267d8183bb2ceb5356a5e385acdf5688245aa3c9e4425762c851c2aff3fa65cc35f7dc69c21ffa2eac
-  data.tar.gz: a554b5d01e12482f0acd011c1dfa356e249c11d8068242f16086851e33b53a52259f2af6be2f9e62612d442a4cbf7567f1af7c2cf7fc6ffe654189ffd75e50d4
+  metadata.gz: 8845289a2ff2d63b0813993d008f8c1e9954618fe7100e4a628d97d369457e7d132cce7f13f9016e332ff0e321bd6cd069f87066963fb80cc4bd2d7f708b2078
+  data.tar.gz: 4017936ca0d8eefab9823959880c9268cfcfb5c2facd2ad56b22900ac0de849ff62c88149fdd4ad969a53cad3fa0e8c111d9af7f119b97f7299cfb68b134a55e

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # heroku_rails_deploy
 
+## v0.4.0
+- Refactor to expose environment from `Deployer`.
+
 ## v0.3.0
 - Add support for Avro schema registration during deployment.
 - Refuse to deploy when there are uncommitted changes.

data/heroku_rails_deploy.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'rails'
+  spec.add_runtime_dependency 'private_attr'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/heroku_rails_deploy/deployer.rb

@@ -2,13 +2,17 @@ require 'optparse'
 require 'shellwords'
 require 'yaml'
 require 'english'
+require 'private_attr'
 
 module HerokuRailsDeploy
   class Deployer
+    extend PrivateAttr
+
     PRODUCTION_BRANCH_REGEX = /\A((master)|(release\/.+)|(hotfix\/.+))\z/
     PRODUCTION = 'production'.freeze
 
     attr_reader :config_file, :args
+    private_attr_reader :options, :app_registry
 
     class Options < Struct.new(:environment, :revision, :register_avro_schemas, :skip_avro_schemas)
       def self.create_default(app_registry)
@@ -17,43 +21,15 @@ module HerokuRailsDeploy
     end
 
     def initialize(config_file, args)
+      raise "Missing config file #{config_file}" unless File.file?(config_file)
+      @app_registry = YAML.load(File.read(config_file))
       @config_file = config_file
       @args = args
+      @options = parse_options
     end
 
     def run
-      raise "Missing config file #{config_file}" unless File.file?(config_file)
-      app_registry = YAML.load(File.read(config_file))
-
-      options = Options.create_default(app_registry)
-      OptionParser.new do |parser|
-        parser.on_tail('-h', '--help', 'Show this message') do
-          puts parser
-          # rubocop:disable Lint/NonLocalExitFromIterator
-          return
-          # rubocop:enable Lint/NonLocalExitFromIterator
-        end
-
-        parser.on('-e', '--environment ENVIRONMENT',
-                  "The environment to deploy to. Must be in #{app_registry.keys.join(', ')} (default #{app_registry.keys.first})") do |environment|
-          options.environment = environment
-        end
-
-        parser.on('-r', '--revision REVISION',
-                  'The git revision to push. (default HEAD)') do |revision|
-          options.revision = revision
-        end
-
-        parser.on('--register-avro-schemas',
-                  'Force the registration of Avro schemas when deploying to a non-production environment.') do |register_avro_schemas|
-          options.register_avro_schemas = register_avro_schemas
-        end
-
-        parser.on('--skip-avro-schemas',
-                  'Skip the registration of Avro schemas when deploying to production.') do |skip_avro_schemas|
-          options.skip_avro_schemas = skip_avro_schemas
-        end
-      end.parse!(args)
+      return unless options
 
       app_name = app_registry.fetch(options.environment) do
         raise OptionParser::InvalidArgument.new("Invalid environment '#{options.environment}'. " \
@@ -66,7 +42,7 @@ module HerokuRailsDeploy
 
       puts "Deploying to Heroku app #{app_name} for environment #{options.environment}"
 
-      if !options.skip_avro_schemas && (production?(options) || options.register_avro_schemas)
+      if !options.skip_avro_schemas && (production? || options.register_avro_schemas)
         puts 'Checking for pending Avro schemas'
         pending_schemas = list_pending_schemas(app_name)
         if pending_schemas.any?
@@ -91,10 +67,44 @@ module HerokuRailsDeploy
       end
     end
 
+    def production?
+      options.try(:environment) == PRODUCTION
+    end
+
     private
 
-    def production?(options)
-      options.environment == PRODUCTION
+    def parse_options
+      options = Options.create_default(app_registry)
+      OptionParser.new do |parser|
+        parser.on_tail('-h', '--help', 'Show this message') do
+          puts parser
+          # rubocop:disable Lint/NonLocalExitFromIterator
+          return
+          # rubocop:enable Lint/NonLocalExitFromIterator
+        end
+
+        parser.on('-e', '--environment ENVIRONMENT',
+                  "The environment to deploy to. Must be in #{app_registry.keys.join(', ')} (default #{app_registry.keys.first})") do |environment|
+          options.environment = environment
+        end
+
+        parser.on('-r', '--revision REVISION',
+                  'The git revision to push. (default HEAD)') do |revision|
+          options.revision = revision
+        end
+
+        parser.on('--register-avro-schemas',
+                  'Force the registration of Avro schemas when deploying to a non-production environment.') do |register_avro_schemas|
+          options.register_avro_schemas = register_avro_schemas
+        end
+
+        parser.on('--skip-avro-schemas',
+                  'Skip the registration of Avro schemas when deploying to production.') do |skip_avro_schemas|
+          options.skip_avro_schemas = skip_avro_schemas
+        end
+      end.parse!(args)
+
+      options
     end
 
     def production_branch?(revision)

data/lib/heroku_rails_deploy/version.rb

@@ -1,3 +1,3 @@
 module HerokuRailsDeploy
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0.rc0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_rails_deploy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0.rc0
 platform: ruby
 authors:
 - Salsify, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: private_attr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -151,9 +165,9 @@ 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.6.11