ucb_rails_cli 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd205173084a2b47a7eec534ff1ce614677b8ffc0b24b7097b1fe6221d5f5fb8
-  data.tar.gz: 037fda75b0e75ea624561adaee8513267c0f7e434c4cbbd8dad573c868e5f772
+  metadata.gz: e0103220bf27f390a8b9fce5b8cf6dfe7d59ed9556b711be88516634fe35c599
+  data.tar.gz: 8bc8a61fa94110b467e793803db39818044a27b8d47b9d23f2516bce2a2fc14d
 SHA512:
-  metadata.gz: 55477d920cfd9eddb2c4d527c4e202a9c71ea5c2a84dc6955e1ff8ca711d6b56b444036a2eb5925ff690f451a82c9a29f980b1bbb8978feb1acfb6a78716d2d7
-  data.tar.gz: 8e16fb1130a44059317f09006e2b1dde8ce9f96bbdf42c0fe15f3f32ccc89edbb4811ebd9c6c99c1b1e46c0252871a56827f1f5986fbe8809b1ceed46c9ed214
+  metadata.gz: 3d1a23f4ffdbf192b5970fec3be34617f6017859974153ad7a269062337c52fba0fd422928c7aa4707bde7ed42d93e8198fb3443d3b2e18f2c2d1d598601ac22
+  data.tar.gz: e298b4378a62dca4659401765505eb4b480aa7bd0f6735c9414fed6eac97cba633dcc8bd6a2002dd18bdbe57e6e31eb8dac280cd72beffeb952223f4647787a1

data/lib/ucb_rails_cli/cli.rb

@@ -2,8 +2,13 @@ require "thor"
 
 module UcbRailsCli
   class Cli < Thor
+    MASTER_KEY_PATH = File.expand_path("~/.ucb_rails_master_key")
+
     ## error messages
     INSTALL_RAILS = "Unable to find rails - please make sure you've installed Rails 5.1 or greater"
+    VERIFY_KEY = "Unable to find the master key for encrypted credentials\n" +
+      "in #{MASTER_KEY_PATH} or the RAILS_MASTER_KEY environment variable.\n" +
+      "Please set the master key in one of these two places before proceeding."
     GEMFILE_ERROR = "Unable to add new gems to Gemfile - check the console output for more info"
     LAYOUT_FILES = "Unable to copy view templates - check the console output for more info"
     HELPER_FILES = "Unable to copy helpers - check the console output for more info"
@@ -12,7 +17,6 @@ module UcbRailsCli
     MIGRATIONS = "Unable to copy migrations from ucb_rails_user gem - check the console output for more info"
     CONTROLLERS = "Unable to copy controllers - check the console output for more info"
     CONFIG_FILES = "Unable to copy config files - check the console output for more info"
-    GITIGNORE = "Unable to update .gitignore - check the console output for more info"
     RSPEC = "Unable to install RSpec - check the console output for more info"
 
     desc 'version', 'Display version'
@@ -28,6 +32,8 @@ module UcbRailsCli
 
       verify_rails or exit_with_error(INSTALL_RAILS)
 
+      verify_master_key or exit_with_error(VERIFY_KEY)
+
       create_rails_app(app_name) or exit_with_error
 
       add_to_gemfile(app_name) or exit_with_error(GEMFILE_ERROR)
@@ -44,8 +50,6 @@ module UcbRailsCli
 
       add_config_files(app_name) or exit_with_error(CONFIG_FILES)
 
-      update_gitignore(app_name) or exit_with_error(GITIGNORE)
-
       install_migrations(app_name) or exit_with_error(MIGRATIONS)
 
       setup_rspec(app_name) or exit_with_error(RSPEC)
@@ -61,10 +65,7 @@ From here, you should set up the database:
   bin/rake db:create
   bin/rake db:migrate
 
-then add the missing values in config/config.yml - you can get the
-credentials from another developer.
-
-At that point, you can start the server as usual:
+then start the server as usual:
 
   bin/rails server
 
@@ -91,6 +92,10 @@ Enjoy!
       end
     end
 
+    def verify_master_key
+      ENV["RAILS_MASTER_KEY"].to_s.length > 0 || FileTest.file?(MASTER_KEY_PATH)
+    end
+
     def create_rails_app(app_name)
       result = system("rails new #{app_name} #{options[:rails_options]}")
       return true if result
@@ -101,7 +106,6 @@ Enjoy!
     end
 
     def add_to_gemfile(app_name)
-      puts "Adding gems to Gemfile..."
       if system("cat #{template_dir}/Gemfile_additions >> #{app_name}/Gemfile")
         puts "Installing new gems..."
         system "cd #{app_name} && bundle install"
@@ -152,18 +156,35 @@ Enjoy!
 
     def add_config_files(app_name)
       puts "Installing config files..."
-      system("cp #{template_dir}/config/config.yml #{app_name}/config") &&
-        system("cp #{template_dir}/config/initializers/ucb_rails_user.rb #{app_name}/config/initializers")
-    end
-
-    def update_gitignore(app_name)
-      puts "Updating .gitignore..."
-      system "echo 'config/config.yml' >> #{app_name}/.gitignore"
+      system("cp #{template_dir}/config/initializers/ucb_rails_user.rb #{app_name}/config/initializers")
+      system("cp #{template_dir}/config/credentials.yml.enc #{app_name}/config/")
+
+      # add exeception_notification config to production.rb config
+      prod_config_addition = <<-END_CONFIG
+
+  config.middleware.use ExceptionNotification::Rack,
+    email: {
+      email_prefix: "[#{app_name}] ",
+      sender_address: %{"notifier" <notifier@example.com>},
+      exception_recipients: %w{ucb-ist-developers@berkeley.edu}
+    }
+end
+      END_CONFIG
+      prod_config_contents =
+        `cat #{app_name}/config/environments/production.rb`
+        .gsub(/end\s\Z/, prod_config_addition)
+      system "echo '#{prod_config_contents}' > #{app_name}/config/environments/production.rb"
+
+      # move master key, unless in ENV
+      unless ENV["MASTER_KEY_PATH"].to_s.length > 0
+        system "cp ~/.ucb_rails_master_key #{app_name}/config/master.key"
+      end
     end
 
     def install_migrations(app_name)
       puts "Installing migrations from ucb_rails_user..."
-      system "cd #{app_name} && bin/rails railties:install:migrations"
+      system "cd #{app_name} && bundle install"
+      system "cd #{app_name} && bundle exec rails railties:install:migrations"
     end
 
     def setup_rspec(app_name)

data/lib/ucb_rails_cli/templates/Gemfile_additions

@@ -6,6 +6,7 @@ gem "better_errors"
 gem "binding_of_caller"
 gem "ucb_rails_user", "~> 1.0"
 gem "rails_view_helpers", github: "ucb-ist-eas/rails_view_helpers", branch: "rails5"
+gem "exception_notification"
 
 group :development, :test do
   gem 'rspec-rails', '~> 3.5'

data/lib/ucb_rails_cli/templates/config/credentials.yml.enc

@@ -0,0 +1 @@
+5aYApt8O3JvcZLz7Ks7YBiyR1ByfGjQpMI75JSCj6YwkNDSFFkBlpTFyMa0ZIVzulckt2PTcatdvMf091gHQPEPhp+ak42wx3fJfOKS4ENfqWUjWdSTlvho4p8sTK74prBTZbXm2ZnxJtRsiqsW4JCgSauFWIdLK1l7paSWJxd+5+LEsgQ+UGucILgSx+XyTed30ia5GTjf9sfSbgReafsNzT7vugAS40dO+FA/klrG+GylkN9RU45CUikKYq+1UAnLSXB6E7ap9yAR2CPTUO8g8XQVry2Kre93mN6GhNrUQJdGElUR1d86Dm7q6pe2E8HZMeMiHFKQv8x/KEYnsfR1XSo1XBbGnEEAl9cTL+eZxDX0wsd2gdwc4R4l4yKCZsnnBjjfBj+viRf46cj9f9Jgf1LtJWDOxHteqSjF2Dkr++taWhyq0CtqVpbuTocgnxkunAlztEnCjY/mPd7whYbbAA5LotrxSbEXX748EpkzkHvzSbNGhamOtOxGe3bS44E5FYY3iCOYHJ9JVgCu9OqxBFbHyEni/a2ZZl4pPFnmthWK4ttd6wt+BpDBy51X8sI7qV98j1WtAlJgi+0l3/uNKKh6EypzLjbfwVo/AJ8GXJm102thes07dbXrSSK0bIANW4QHCOarkEHLe8XPI02FDvSgX73Azpyx//HFRuK5R/1YMAM7aH+cSk7EmChJJKsmM/obP/8iOg47undL68PtXBr95zLf6QaGVLU0P10hs44b0AWbsU6t37MAxBbYTGRomZvnYxQiBwWR3t9OM8cJfBWmLd25I1kzQsSjErOKSydbLnMuajuBNHxS+oUUI7eQv9CrZ3D61TMEnYxqG3mMVzDbl4E40rjFLHM9rDJPP6o7nW0rtpe8vuLvgBOwt6JVSwOjayjaEycHDJ4065QqcPmP4pdGZqol1+PozrnQB+n9MJsVo2HthZ/WSRgWqpWeEE+jJFtV7Gv6OXOZOzRFpVBW0K72X6CB9g3QeYE8fBsPpku+eAQkjJ8RURBbSardogyYuL+qd2ebQyOsOgb8j--L1pojtO3q6FJMDIz--xTFJPtWOpOvLygaaSKjX2g==

data/lib/ucb_rails_cli/templates/config/initializers/ucb_rails_user.rb

@@ -1,14 +1,14 @@
 ############################################################
-# Load configuration from config/config.yml
+# Load configuration from config/credentials.yml.enc
 ############################################################
 
-config = UcbRailsUser::Configuration::Configuration.new
+credentials = Rails.application.credentials
 
 ############################################################
 # ActionMailer
 ############################################################
 
-#UcbRails::Configuration::Email.configure(config.for('email'))
+UcbRailsUser::Configuration::Email.configure(credentials.email&.with_indifferent_access())
 
 ############################################################
 # Exception Notification
@@ -20,13 +20,13 @@ config = UcbRailsUser::Configuration::Configuration.new
 # UCB::LDAP
 ############################################################
 
-UcbRailsUser::Configuration::Ldap.configure(config.for('ldap'))
+UcbRailsUser::Configuration::Ldap.configure(credentials.ldap&.with_indifferent_access())
 
 ############################################################
 # OmniAuth
 ############################################################
 
-UcbRailsUser::Configuration::Cas.configure(config.for('cas'))
+UcbRailsUser::Configuration::Cas.configure(credentials.cas&.with_indifferent_access())
 
 ############################################################
 # UcbRails

data/lib/ucb_rails_cli/templates/views/application.html.haml

@@ -11,7 +11,7 @@
     %link{:rel => "stylesheet", :href => "https://stackpath.bootstrapcdn.com/bootstrap/4.1.2/css/bootstrap.min.css", :integrity => "sha384-Smlep5jCw/wG7hdkwQ/Z5nLIefveQRIY9nfy6xoR1uRYBtpZgI6339F5dgvm/e9B", :crossorigin => "anonymous"}
     %link{:rel => "stylesheet", :href => "https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css" }
     %link{:rel => "stylesheet", :href => "https://jqueryui.com/resources/demos/style.css" }
-    %link{:rel => "icon", :type => "image/ico", :href => "/assets/favicon.ico" }
+    = favicon_link_tag
 
     = stylesheet_link_tag "application", :media => "all", "data-turbolinks-track" => false
 

data/lib/ucb_rails_cli/version.rb

@@ -1,3 +1,3 @@
 module UcbRailsCli
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ucb_rails_cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Darin Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-11 00:00:00.000000000 Z
+date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -90,12 +90,13 @@ files:
 - lib/ucb_rails_cli.rb
 - lib/ucb_rails_cli/cli.rb
 - lib/ucb_rails_cli/templates/Gemfile_additions
-- lib/ucb_rails_cli/templates/config/config.yml
+- lib/ucb_rails_cli/templates/config/credentials.yml.enc
 - lib/ucb_rails_cli/templates/config/initializers/ucb_rails_user.rb
 - lib/ucb_rails_cli/templates/config/routes.rb
 - lib/ucb_rails_cli/templates/controllers/application_controller.rb
 - lib/ucb_rails_cli/templates/helpers/application_helper.rb
 - lib/ucb_rails_cli/templates/images/.keep
+- lib/ucb_rails_cli/templates/images/favicon.ico
 - lib/ucb_rails_cli/templates/images/logo-ucberkeley-white.png
 - lib/ucb_rails_cli/templates/javascripts/application.js
 - lib/ucb_rails_cli/templates/stylesheets/application.css

data/lib/ucb_rails_cli/templates/config/config.yml

@@ -1,69 +0,0 @@
-# You can have configuration per-environment by nesting under the
-# environment key, or have a top level.
-
- ldap:
-   host: "nds.berkeley.edu"
-   username:
-   password:
-
-development:
-
-  # Default behavior will do the right thing.  Only set if you want
-  # non-standard behavior.
-  # cas:
-  #   host: 'auth.berkeley.edu'
-  #   host: 'auth-test.berkeley.edu'
-
-  # email:
-  #   default:
-  #     from: user@gmail.com
-  #   default_url_options:
-  #     host: example.com
-  #   delivery_method: :smtp
-  #   # delivery_method: :sendmail
-  #   # delivery_method: :test
-  #   # delivery_method: :file
-  #   raise_delivery_errors: true
-  #   # send_mail_settings:
-  #   #   location: "/usr/sbin/sendmail"
-  #   #   arguments: "-i -t"
-  #   smtp_settings:
-  #     address: smtp.gmail.com
-  #     port: 587
-  #     domain: gmail.com
-  #     user_name: <username>
-  #     password: <password>
-  #     authentication: plain
-  #     enable_starttls_auto: true
-  #   subject_prefix: '[My App {env}] '
-
-  # exception_notification:
-  #   email:
-  #     email_prefix: '[My App - Error {env}] '
-  #     sender_address: user@example.com
-  #     exception_recipients:
-  #       - user1@example.com
-  #       - user2@example.com
-
-  # Default behavior will select the correct host.  No need to set anything if
-  # you aren't specifying username/password.
-  # ldap:
-  #   host: 'nds.berkeley.edu'
-  #   host: 'nds-test.berkeley.edu'
-  #   username: <username>
-  #   password: <password>
-  #   # by default test entries returned in all but PROD
-  #   include_test_entries: true
-  #   include_test_entries: false
-
-
-test:
-  email:
-    default:
-      from: test-user@examle.com
-    default_url_options:
-      host: example.com
-    delivery_method: :test
-    raise_delivery_errors: true
-    subject_prefix: '[My App {env}] '
-