kuby-core 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8202396d9daaa1ccba46f2b607f90b64e615b9d44a2f87cbfef1682dadd8a8d1
-  data.tar.gz: a6ad5b2436b1aacdc097ffd2ff03a2ad993d62747f6e8a54126239c0c42ac628
+  metadata.gz: f61bf7246e7fed1b51421252d1fee25da0bf1ad35da792e9f705d306ad5aeeba
+  data.tar.gz: fcaed876fd5da816cd1458c41c19fc735a7d3e5de2d23879427c526f2f0f94ea
 SHA512:
-  metadata.gz: 2f1c577697475d726c38a74f20ec881613e03be19de90dc4843cee795fe54ec69cdfd23296e60c56db3611707fc397408ca7bbddf257b8a70c84af65d5cf2edd
-  data.tar.gz: a732245dd7b3a23aa7a0bfeaa8c53b7f057c1a60ac5d4a667b11c966fcc31354df068276624e0c5d8a8c893ef1ea6e779d602087a6ed86ccbdb507664e69abbf
+  metadata.gz: 78f6cad56fd00b1265a43ac36169da5d46b15c50ceb5afce6f519ef175ff3949f84204ccf40ad9531b9dbb6b357d38ac0396e6969d848bfb17b42ba1c273ba6d
+  data.tar.gz: 056b9a151fd6f11079eb87fd5c0b7c4f92087cd8455a361ac7e668e9b94e4fc99a866b91c4f30d0a3eda582b0c2cafaac2e3ee882daebec0a52f1fd748786871

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.10.0
+* Set default database user and password in dev environment.
+* Add ability to run rake tasks in dev environment.
+* Disallow running rails and rake tasks in non-dev environments.
+* Don't run database config through ERB.
+  - Rails env often isn't loaded, so ERB rendering can blow up with `NoMethodError`s, etc.
+  - All we really need to know is what database engine to stand up.
+* Require database user/password to be added manually to Kuby config.
+
 ## 0.9.1
 * Run dev setup when asked to.
   - Bug caused dev setup to be skipped even when requested.

data/lib/kuby.rb

@@ -23,6 +23,8 @@ module Kuby
   autoload :TrailingHash,   'kuby/trailing_hash'
 
   DEFAULT_ENV = 'development'.freeze
+  DEFAULT_DB_USER = 'root'.freeze
+  DEFAULT_DB_PASSWORD = 'password'.freeze
 
   class UndefinedEnvironmentError < StandardError; end
   class MissingConfigError < StandardError; end
@@ -52,6 +54,11 @@ module Kuby
         kubernetes do
           add_plugin(:rails_app) do
             tls_enabled false
+
+            database do
+              user(DEFAULT_DB_USER) if respond_to?(:user)
+              password(DEFAULT_DB_PASSWORD) if respond_to?(:password)
+            end
           end
 
           provider :docker_desktop

data/lib/kuby/commands.rb

@@ -17,9 +17,9 @@ module Kuby
     # is no singleton class version of #prepend in the Ruby language).
     singleton_class.send(:prepend, Module.new do
       def run(args)
-        if idx = args.index('rails')
-          @rails_options = args[(idx + 1)..-1]
-          super(args[0..(idx + 1)])
+        if idx = args.index('rails') || idx = args.index('rake')
+          @rails_options = args[idx..-1]
+          super(args[0..idx])
         else
           super
         end
@@ -27,7 +27,13 @@ module Kuby
     end)
 
     def self.tasks
-      Kuby::Tasks.new(Kuby.definition.environment)
+      Kuby::Tasks.new(Kuby.environment)
+    end
+
+    def self.must_be_dev_env!
+      unless Kuby.environment.development?
+        fail "Command not supported in the '#{Kuby.environment.name}' environment"
+      end
     end
 
     program_desc 'Kuby command-line interface. Kuby is a convention '\
@@ -57,9 +63,16 @@ module Kuby
     # commands are handled by the RailsCommands class.
     desc 'Runs a Rails command.'
     command :rails do |rc|
+      rc.action do |global_options, options, args|
+        must_be_dev_env!
+        exit 1 unless tasks.dev_deployment_ok
+        Kuby::RailsCommands.run(@rails_options)
+      end
+
       rc.desc 'Runs the rails server (run `rails server --help` for options)'
       rc.command [:server, :s] do |c|
         c.action do |global_options, options, args|
+          must_be_dev_env!
           exit 1 unless tasks.dev_deployment_ok
           Kuby::RailsCommands.run(@rails_options)
         end
@@ -68,6 +81,7 @@ module Kuby
       rc.desc 'Runs a script in the Rails environment (run `rails runner --help` for options)'
       rc.command [:runner, :r] do |c|
         c.action do |global_options, options, args|
+          must_be_dev_env!
           exit 1 unless tasks.dev_deployment_ok
           Kuby::RailsCommands.run(@rails_options)
         end
@@ -77,12 +91,22 @@ module Kuby
         '(run `rails console --help` for options)'
       rc.command [:console, :c] do |c|
         c.action do |global_options, options, args|
+          must_be_dev_env!
           exit 1 unless tasks.dev_deployment_ok
           Kuby::RailsCommands.run(@rails_options)
         end
       end
     end
 
+    desc 'Runs a rake task.'
+    command :rake do |rc|
+      rc.action do |global_options, options, args|
+        must_be_dev_env!
+        exit 1 unless tasks.dev_deployment_ok
+        Kuby::RailsCommands.run(@rails_options)
+      end
+    end
+
     desc 'Builds the Docker image.'
     command :build do |c|
       c.action do |global_options, options, args|

data/lib/kuby/plugins/rails_app/database.rb

@@ -1,4 +1,3 @@
-require 'erb'
 require 'yaml'
 
 module Kuby
@@ -51,7 +50,7 @@ module Kuby
         end
 
         def db_configs
-          @db_configs ||= YAML.load(ERB.new(File.read(db_config_path)).result)
+          @db_configs ||= YAML.load(File.read(db_config_path))
         end
 
         def db_config_path

data/lib/kuby/plugins/rails_app/generators/kuby.rb

@@ -6,10 +6,14 @@ class KubyGenerator < Rails::Generators::Base
     create_file(
       'kuby.rb',
       <<~END
+        require 'active_support/core_ext'
         require 'active_support/encrypted_configuration'
 
         # Define a production Kuby deploy environment
         Kuby.define(:production) do
+          # Because the Rails environment isn't always loaded when
+          # your Kuby config is loaded, provide access to Rails
+          # credentials manually.
           app_creds = ActiveSupport::EncryptedConfiguration.new(
             config_path: File.join('config', 'credentials.yml.enc'),
             key_path: File.join('config', 'master.key'),
@@ -35,7 +39,13 @@ class KubyGenerator < Rails::Generators::Base
 
           kubernetes do
             # Add a plugin that facilitates deploying a Rails app.
-            add_plugin :rails_app
+            add_plugin :rails_app do
+              # configure database credentials
+              database do
+                user app_creds[:KUBY_DB_USER]
+                password app_creds[:KUBY_DB_PASSWORD]
+              end
+            end
 
             # Use Docker Desktop as the provider.
             # See: https://www.docker.com/products/docker-desktop

data/lib/kuby/plugins/rails_app/mysql.rb

@@ -12,9 +12,6 @@ module Kuby
         def initialize(environment, configs)
           @environment = environment
           @configs = configs
-
-          user(config['username'])
-          password(config['password'])
         end
 
         def name

data/lib/kuby/plugins/rails_app/plugin.rb

@@ -32,6 +32,7 @@ module Kuby
           @asset_url = DEFAULT_ASSET_URL
           @packs_url = DEFAULT_PACKS_URL
           @asset_path = DEFAULT_ASSET_PATH
+          @database = Database.get(self)
         end
 
         def configure(&block)
@@ -41,7 +42,7 @@ module Kuby
         def after_configuration
           context = self
 
-          if @database = Database.get(self)
+          if database
             environment.kubernetes.plugins[database.plugin_name] = @database.plugin
             environment.kubernetes.add_plugin(:kube_db)
 
@@ -70,6 +71,10 @@ module Kuby
           end
         end
 
+        def database_host
+          database.plugin.host
+        end
+
         def before_deploy(manifest)
           # Make sure plugin has been configured. If not, do nothing.
           if cert_manager = environment.kubernetes.plugin(:cert_manager)
@@ -109,7 +114,7 @@ module Kuby
         end
 
         def database(&block)
-          @database.instance_eval(&block) if block
+          @database.plugin.instance_eval(&block) if block
           @database
         end
 

data/lib/kuby/rails_commands.rb

@@ -34,23 +34,29 @@ module Kuby
   end
 
   class RailsCommands
-    PREFIX = %w(bundle exec rails).freeze
+    PREFIX = %w(bundle exec).freeze
     SERVER_ARG_ALIASES = [['--binding', '-b'], ['-p', '--port']].freeze
 
     class << self
       def run(args = ARGV)
-        subcommand = args[0]
-        arglist = nil
-
-        case subcommand
-          when 'server', 's'
-            arglist = Args.new([*PREFIX, *args], SERVER_ARG_ALIASES)
-            arglist['-b'] ||= '0.0.0.0'
-            arglist['-p'] ||= '3000'
-          when 'runner', 'r'
-          when 'console', 'c'
-          else
-            return
+        command = args[0]
+
+        if command == 'rails'
+          subcommand = args[1]
+          arglist = nil
+
+          case subcommand
+            when 'server', 's'
+              arglist = Args.new([*PREFIX, *args], SERVER_ARG_ALIASES)
+              arglist['-b'] ||= '0.0.0.0'
+              arglist['-p'] ||= '3000'
+            when 'runner', 'r'
+            when 'console', 'c'
+            else
+              return
+          end
+        elsif command == 'rake'
+          arglist = Args.new([*PREFIX, *args])
         end
 
         setup
@@ -63,13 +69,7 @@ module Kuby
       private
 
       def setup
-        require 'rubygems'
-        require 'bundler'
-
-        Bundler.setup
-
         require 'kuby'
-
         Kuby.load!
       end
 

data/lib/kuby/tasks.rb

@@ -146,7 +146,7 @@ module Kuby
         STDOUT.write('Set up development environment? (y/n): ')
         answer = STDIN.gets.strip.downcase
         return false unless answer =~ /ye?s?/
-        DevSetup.new(environment).run
+        return DevSetup.new(environment).run
       else
         depl = deployments.first
         deployed_checksum = depl.dig('metadata', 'annotations', 'getkuby.io/dockerfile-checksum')
@@ -161,7 +161,7 @@ module Kuby
           # return true here to prevent letting an out-of-date deployment
           # stop us from running commands
           return true unless answer =~ /ye?s?/
-          DevSetup.new(environment).run
+          return DevSetup.new(environment).run
         end
       end
 

data/lib/kuby/version.rb

@@ -1,3 +1,3 @@
 module Kuby
-  VERSION = '0.9.1'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-core
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize