groundskeeper-bitcore 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79fab46f840dcb22b53fc55e4cdc362e77f393e3
-  data.tar.gz: bf56a82bf703d2148ec68ba65e45fad8a69f0a9d
+  metadata.gz: 5226b29a0e4aca883b307266416d0e2fe9a03418
+  data.tar.gz: d2389f396c568033925b7ecab7d858239a518924
 SHA512:
-  metadata.gz: c1d1fe310cef1e8f3df71cc2c93af055c9e490456ef43eac0a322a47f384e3c04fbc435910fd8c5d8e72bdebb4ae219e0686eeb79180333c2b51b5225c034730
-  data.tar.gz: 012d6f338c90a6fed4ed6f0a8abb9ad1ddf8171c3a40d88e69169fe5b4c0ef73130da7c86163e4eee47cf8c7543bfedd1e204dfdc8a7739abe1c9b97e6fc9164
+  metadata.gz: 73c185b483f7ef22a19904c79c58cd9d7ff5681fc5c29987c85014bf32a31cfdf0a770cbc23eede4ccd8285df8ce26f1a88b4e323f404ce096064a84a6f18c71
+  data.tar.gz: f38b7f11652c93e865decd469f0f879c83caf67793ca8a41244d950025a9135aa783d6206a59361e840f99652d8cc6f62c27e68d9acf43519a2d1f26fbbfd532

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.3.4 - 2019-01-04
+
+* GROUN-21 format virtual host and Rails config files nicely (#88)
+* GROUN-22 Move mina whenever command to launch block of deploy (#87)
+* GROUN-16 consolidate sentry public/private keys (#86)
+* GROUN-19 move servers configuration to project_details (#85)
+* GROUN-9 should warn about any missing environment variables or executables (#84)
+
 ## 0.3.3 - 2018-11-16
 
 * GROUN-17 should mark versions released in Jira after deploying to production (#83)

data/config/deploy.rb

@@ -103,10 +103,10 @@ task deploy: :remote_environment do
     invoke :'bundle:install'
     invoke :'rails:db_migrate'
     invoke :'rails:assets_precompile'
-    invoke(:'whenever:update') if ENV["whenever"]
     invoke :'deploy:cleanup'
 
     on :launch do
+      invoke(:'whenever:update') if ENV["whenever"]
       invoke :restart
     end
   end

data/config/rails_config.rb.erb

@@ -1,88 +1,87 @@
 <% project = fetch :project %>
 Rails.application.configure do
-  # For catching exceptions
-  config.sentry_dsn = '<%= project.sentry_dsn %>'
-  config.sentry_public_dsn = '<%= project.sentry_public_dsn %>'
+    # For catching exceptions
+    config.sentry_dsn = '<%= project.sentry_dsn %>'
 
-  # Settings specified here will take precedence over those in config/application.rb.
+    # Settings specified here will take precedence over those in config/application.rb.
 
-  # Code is not reloaded between requests.
-  config.cache_classes = true
+    # Code is not reloaded between requests.
+    config.cache_classes = true
 
-  # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both thread web servers
-  # and those relying on copy on write to perform better.
-  # Rake tasks automatically ignore this option for performance.
-  config.eager_load = true
+    # Eager load code on boot. This eager loads most of Rails and
+    # your application in memory, allowing both thread web servers
+    # and those relying on copy on write to perform better.
+    # Rake tasks automatically ignore this option for performance.
+    config.eager_load = true
 
-  # Full error reports are disabled and caching is turned on.
-  config.consider_all_requests_local       = false
-  config.action_controller.perform_caching = true
+    # Full error reports are disabled and caching is turned on.
+    config.consider_all_requests_local       = false
+    config.action_controller.perform_caching = true
 
-  # Disable serving static files from the `/public` folder by default since
-  # Apache or NGINX already handles this.
-  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
+    # Disable serving static files from the `/public` folder by default since
+    # Apache or NGINX already handles this.
+    config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
-  # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
-  # config.assets.css_compressor = :sass
+    # Compress JavaScripts and CSS.
+    config.assets.js_compressor = :uglifier
+    # config.assets.css_compressor = :sass
 
-  # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
+    # Do not fallback to assets pipeline if a precompiled asset is missed.
+    config.assets.compile = false
 
-  # Specifies the header that your server uses for sending files.
-  config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+    # Specifies the header that your server uses for sending files.
+    config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for apache
+    # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
 
-  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  config.force_ssl = true
+    # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+    config.force_ssl = true
 
-  # Set to :debug to see everything in the log.
-  config.log_level = :info
+    # Set to :debug to see everything in the log.
+    config.log_level = :info
 
-  # Prepend all log lines with the following tags.
-  config.log_tags = [ :request_id ]
+    # Prepend all log lines with the following tags.
+    config.log_tags = [ :request_id ]
 
-  # Use a different logger for distributed setups.
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+    # Use a different logger for distributed setups.
+    # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
-  # Use a different cache store in production.
-  # config.cache_store = :mem_cache_store
+    # Use a different cache store in production.
+    # config.cache_store = :mem_cache_store
 
-  config.action_mailer.perform_caching = false
+    config.action_mailer.perform_caching = false
 
-  # Precompile additional assets.
-  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-  # config.assets.precompile += %w( search.js )
+    # Precompile additional assets.
+    # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+    # config.assets.precompile += %w( search.js )
 
-  # Ignore bad email addresses and do not raise email delivery errors.
-  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-  config.action_mailer.default_url_options = { host: '<%= fetch :domain %>' }
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.raise_delivery_errors = false
-  config.action_mailer.perform_deliveries = true
-  config.action_mailer.smtp_settings = {
-    authentication: :plain,
-    address: 'smtp.mailgun.org',
-    port: 587,
-    domain: 'cbits.northwestern.edu',
-    user_name: ENV['mailgun_db_username'],
-    password: ENV['mailgun_db_password']
-  }
+    # Ignore bad email addresses and do not raise email delivery errors.
+    # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+    config.action_mailer.default_url_options = { host: '<%= fetch :domain %>' }
+    config.action_mailer.delivery_method = :smtp
+    config.action_mailer.raise_delivery_errors = false
+    config.action_mailer.perform_deliveries = true
+    config.action_mailer.smtp_settings = {
+      authentication: :plain,
+      address: 'smtp.mailgun.org',
+      port: 587,
+      domain: 'cbits.northwestern.edu',
+      user_name: ENV['mailgun_db_username'],
+      password: ENV['mailgun_db_password']
+    }
 
-  Rails.application.routes.default_url_options[:host] = '<%= fetch :domain %>'
-  Rails.application.routes.default_url_options[:protocol] = 'https'
+    Rails.application.routes.default_url_options[:host] = '<%= fetch :domain %>'
+    Rails.application.routes.default_url_options[:protocol] = 'https'
 
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found).
-  config.i18n.fallbacks = true
+    # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+    # the I18n.default_locale when a translation can not be found).
+    config.i18n.fallbacks = true
 
-  # Send deprecation notices to registered listeners.
-  config.active_support.deprecation = :notify
+    # Send deprecation notices to registered listeners.
+    config.active_support.deprecation = :notify
 
-  # Disable automatic flushing of the log to improve performance.
-  # config.autoflush_log = false
+    # Disable automatic flushing of the log to improve performance.
+    # config.autoflush_log = false
 
-  # Use default logging formatter so that PID and timestamp are not suppressed.
-  config.log_formatter = ::Logger::Formatter.new
+    # Use default logging formatter so that PID and timestamp are not suppressed.
+    config.log_formatter = ::Logger::Formatter.new
 end

data/config/vhost_config.conf.erb

@@ -1,49 +1,49 @@
 <% project = fetch :project -%>
 <VirtualHost *:80>
-  ServerName <%= fetch :domain %>
-  Redirect permanent / https://<%= fetch :domain -%>/
-</VirtualHost>
-
-<VirtualHost *:443>
-  PassengerFriendlyErrorPages off
-  PassengerAppEnv <%= fetch :stage %>
-  PassengerRuby /usr/local/rvm/wrappers/ruby-<%= fetch :rvm_ruby_version -%>/ruby
-  # Always have at least 1 process in existence for the application
-  PassengerMinInstances 1
-
-  ServerName <%= fetch :domain %>
-
-  SSLEngine On
-  SSLCertificateFile <%= project.ssl_certificate_file(fetch(:stage).to_sym) %>
-  SSLCertificateChainFile <%= project.ssl_certificate_chain_file(fetch(:stage).to_sym) %>
-  SSLCertificateKeyFile <%= project.ssl_certificate_key_file(fetch(:stage).to_sym) %>
-
-  DocumentRoot <%= fetch :deploy_to -%>/current/public
-  RailsBaseURI /
-  PassengerDebugLogFile /var/log/httpd/passenger.log
-
-  <Directory <%= fetch :deploy_to -%>/current/public >
-    Allow from all
-    Options -MultiViews
-  </Directory>
-
-  AddOutputFilterByType DEFLATE text/html text/css application/javascript
-
-  RewriteEngine On
-
-  # Show maintenance page if it exists
-  ErrorDocument 503 /system/maintenance.html
-  RewriteCond %{REQUEST_URI} !\.(css|gif|jpg|png)$
-  RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
-  RewriteCond %{SCRIPT_FILENAME} !maintenance.html
-  RewriteRule ^.*$  -  [redirect=503,last]
-
-  <Location /assets/>
-    # RFC says only cache for 1 year
-    ExpiresActive On
-    ExpiresDefault \"access plus 1 year\"
-  </Location>
-</VirtualHost>
+    ServerName <%= fetch :domain %>
+    Redirect permanent / https://<%= fetch :domain -%>/
+  </VirtualHost>
+
+  <VirtualHost *:443>
+    PassengerFriendlyErrorPages off
+    PassengerAppEnv <%= fetch :stage %>
+    PassengerRuby /usr/local/rvm/wrappers/ruby-<%= fetch :rvm_ruby_version -%>/ruby
+    # Always have at least 1 process in existence for the application
+    PassengerMinInstances 1
+
+    ServerName <%= fetch :domain %>
+
+    SSLEngine On
+    SSLCertificateFile <%= project.ssl_certificate_file(fetch(:stage).to_sym) %>
+    SSLCertificateChainFile <%= project.ssl_certificate_chain_file(fetch(:stage).to_sym) %>
+    SSLCertificateKeyFile <%= project.ssl_certificate_key_file(fetch(:stage).to_sym) %>
+
+    DocumentRoot <%= fetch :deploy_to -%>/current/public
+    RailsBaseURI /
+    PassengerDebugLogFile /var/log/httpd/passenger.log
+
+    <Directory <%= fetch :deploy_to -%>/current/public >
+      Allow from all
+      Options -MultiViews
+    </Directory>
+
+    AddOutputFilterByType DEFLATE text/html text/css application/javascript
+
+    RewriteEngine On
+
+    # Show maintenance page if it exists
+    ErrorDocument 503 /system/maintenance.html
+    RewriteCond %{REQUEST_URI} !\.(css|gif|jpg|png)$
+    RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
+    RewriteCond %{SCRIPT_FILENAME} !maintenance.html
+    RewriteRule ^.*$  -  [redirect=503,last]
+
+    <Location /assets/>
+      # RFC says only cache for 1 year
+      ExpiresActive On
+      ExpiresDefault \"access plus 1 year\"
+    </Location>
+  </VirtualHost>
 
 # Start the application before the first access
 PassengerPreStart https://<%= fetch :domain -%>:443/

data/lib/groundskeeper/commands.rb

@@ -105,13 +105,16 @@ module Groundskeeper
     end
     # rubocop:enable Metrics/AbcSize
 
-    # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     def release(options = {})
       is_initial_release = !version_file.exists?
 
       return missing_jira_credentials unless jira.credentials?
+      return missing_github_credentials unless git_hub.credentials?
       return unless check_groundskeeper_version
       return unrecognized_version unless version_file.rails?
+
       version_file.create_initial_version! unless version_file.exists?
       Executable.verbose = options[:verbose]
       pull_project_details
@@ -127,8 +130,8 @@ module Groundskeeper
       ask_add_version_to_jira_issues unless is_initial_release
       open_pull_request_page
     end
-    # rubocop:enable Metrics/AbcSize,Metrics/CyclomaticComplexity
-    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/MethodLength, Metrics/PerceivedComplexity
 
     # :nocov:
     def predeploy(options = {})
@@ -142,11 +145,12 @@ module Groundskeeper
     # :nocov:
 
     # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
-    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity
     def deploy(options = {})
       return unrecognized_version unless version_file.exists?
       return unrecognized_tag unless tag_present_in_git?(ENV[TAG])
       return missing_jira_credentials unless jira.credentials?
+      return missing_sentry_credentials unless sentry.credentials?
       return unless check_groundskeeper_version
       Executable.verbose = options[:verbose]
       pull_project_details
@@ -159,7 +163,7 @@ module Groundskeeper
       add_version_to_sentry
     end
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
-    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/MethodLength, Metrics/PerceivedComplexity
 
     private
 
@@ -330,6 +334,20 @@ module Groundskeeper
       )
     end
 
+    def missing_sentry_credentials
+      console.say(
+        "Please configure your Sentry environment variables.",
+        :red
+      )
+    end
+
+    def missing_github_credentials
+      console.say(
+        "Please configure your GitHub environment variables.",
+        :red
+      )
+    end
+
     def open_pull_request_page
       return unless did_checkout_branch && did_push_to_remote
 

data/lib/groundskeeper/git_hub.rb

@@ -5,6 +5,7 @@ module Groundskeeper
   class GitHub
     attr_reader :opener, :username, :repository_name
 
+    GITHUB_API_TOKEN = "GITHUB_API_TOKEN"
     COMMAND = "open"
     URL_BASE = "https://github.com/"
 
@@ -28,5 +29,9 @@ module Groundskeeper
 
       opener.execute(url)
     end
+
+    def credentials?
+      ENV[GITHUB_API_TOKEN].present?
+    end
   end
 end

data/lib/groundskeeper/project.rb

@@ -9,7 +9,7 @@ module Groundskeeper
     attr_reader :details, :servers, :repo_name
 
     DETAILS_PATH = "~/.project_details/projects.yml"
-    SERVERS_PATH = "../../servers.yml"
+    SERVERS_PATH = "~/.project_details/servers.yml"
     JIRA_PREFIX_KEY = "jira_prefix"
     PROJECT_NAME_KEY = "name"
     SOURCE_CONTROL_USERNAME_KEY = "scm_username"
@@ -17,7 +17,6 @@ module Groundskeeper
     RVM_RUBY_VERSION_KEY = "ruby_version"
     DB_ENV_VARIABLES_KEY = "db_env_variables"
     SENTRY_DSN_KEY = "sentry_dsn"
-    SENTRY_PUBLIC_DSN_KEY = "sentry_public_dsn"
     SENTRY_PROJECT_KEY = "sentry_project"
     SSL_CERTIFICATE_FILE_KEY = "SSLCertificateFile"
     SSL_CERTIFICATE_CHAIN_FILE_KEY = "SSLCertificateChainFile"
@@ -81,12 +80,6 @@ module Groundskeeper
     end
     # :nocov:
 
-    # :nocov:
-    def sentry_public_dsn
-      details[SENTRY_PUBLIC_DSN_KEY] || ""
-    end
-    # :nocov:
-
     def sentry_project
       details[SENTRY_PROJECT_KEY] || ""
     end

data/lib/groundskeeper/sentry.rb

@@ -4,6 +4,8 @@ module Groundskeeper
   # Wraps Sentry CLI executable.
   class Sentry
     COMMAND = "sentry-cli"
+    SENTRY_AUTH_TOKEN = "SENTRY_AUTH_TOKEN"
+    SENTRY_ORG = "SENTRY_ORG"
     # sentry-cli arguments
     RELEASE = "releases new -p %<project>s \"%<version>s\""
     ASSOCIATE = "releases set-commits --auto \"%<version>s\""
@@ -47,5 +49,9 @@ module Groundskeeper
     def version_name(version)
       "#{version_prefix} #{version}"
     end
+
+    def credentials?
+      ENV[SENTRY_AUTH_TOKEN].present? && ENV[SENTRY_ORG].present?
+    end
   end
 end

data/lib/groundskeeper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Groundskeeper
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groundskeeper-bitcore
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - BIT Core
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - certs/ericcf.pem
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jira-ruby
@@ -186,7 +186,6 @@ files:
 - lib/groundskeeper/string_utils.rb
 - lib/groundskeeper/version.rb
 - lib/groundskeeper/website.rb
-- servers.yml
 homepage: https://github.com/NU-CBITS/groundskeeper.git
 licenses:
 - MIT

data/servers.yml

@@ -1,16 +0,0 @@
-cbits-railsapps-staging:
-  domain: cbits-railsapps-staging.nubic.northwestern.edu
-cbits-railsapps:
-  domain: cbits-railsapps.nubic.northwestern.edu
-vtfsmcbitsapps01:
-  domain: vtfsmcbitsapps01.fsm.northwestern.edu
-vfsmcbitsapps10:
-  domain: vfsmcbitsapps10.fsm.northwestern.edu
-vfsmcbitsapps11:
-  domain: vfsmcbitsapps11.fsm.northwestern.edu
-vfsmcbitsapps12:
-  domain: vfsmcbitsapps12.fsm.northwestern.edu
-vfsmcbitsapps13:
-  domain: vfsmcbitsapps13.fsm.northwestern.edu
-isgmh_staging_1:
-  domain: vtfsmisgmhapp01.fsm.northwestern.edu