blacklight_lando 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db4c85959afe781c562162efc621ba66f42b9f2caabe2c2e27099e91e818ee18
-  data.tar.gz: 5eb81a1f0cf4fcbd1d6ab6e3e3a6197f3fd0aada8b458b2db6874aadd5600208
+  metadata.gz: c0a15bf9b2f3ad34326ff143d47ca2533281ab7385ebaf9b7852de17acfa7e0e
+  data.tar.gz: 75207c13914183bd17bb472474f8a0136856381da6726d336f171ca499e8f904
 SHA512:
-  metadata.gz: cb050a766a19c495260d9f8b61d11a607961bce6d3017f51519885476170cd09b8ee2c3d18e4e280945b60f94f09511a8be287645671a3120af38d3cbca3c954
-  data.tar.gz: 8bf828001abe8bf23f6b67e8aa1605ac931782920d0041bf9f80663d8bbde2d80654b62bdf5c630ff5101ef5512c09b9a0eb6ff9fd4e2fff6966a6bafc1079b3
+  metadata.gz: c544b5c0f541d514efe44186f8ed9c5891238ebbbebccd5fb31744756310faec3eaa954a7a084e6c45e9d7c04e1454be41632244a8670c93e3589c0f49585712
+  data.tar.gz: 43eb5f6a63ab6eed1c0bbab1a13460c4aac105423608ec854b81bef3b8f8cb95ad72f208e0605f34f52befd791c41e00fa1223de755dcb6541c024451b704465

data/CHANGELOG.md

@@ -3,3 +3,9 @@
 ## [0.1.0] - 2024-02-21
 
 - Initial release
+
+## [0.2.0] - 2024-02-21
+ - Add postgresql
+
+## [0.2.1] - 2024-02-21
+ - Add pg gem to Gemfile

data/README.md

@@ -9,7 +9,7 @@ This gem creates a [Lando](https://lando.dev/) config file for running [Solr](ht
 ## Installation
 1. Add this gem to the `Gemfile` of your Blacklight application:
    ```
-   gem "blacklight_lando", "~> 0.1"
+   gem "blacklight_lando", "~> 0.2"
    ```
 2. Run `bundle install`
 3. Run `rails generate blacklight_lando:lando`

data/lib/blacklight_lando/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BlacklightLando
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

data/lib/blacklight_lando.rb

@@ -3,6 +3,11 @@
 require_relative "blacklight_lando/version"
 require_relative "generators/lando_generator"
 
+# Configure a Blacklight application to use Lando for Solr and Postresql
 module BlacklightLando
   class Error < StandardError; end
+
+  def self.root
+    File.dirname __dir__
+  end
 end

data/lib/generators/lando_generator.rb

@@ -12,13 +12,30 @@ module BlacklightLando
         1. Adds .lando.yml to your application
         2. Adds lando_env.rb to your application and includes it in application.rb
         3. Copies lando-configured config/blacklight.yml into your application
-        4. Adds rsolr to your Gemfile
+        4. Copies lando-configured config/database.yml into your application
     EOF
     # rubocop:enable Naming/HeredocDelimiterNaming
 
+    # Add postgres gem to Gemfile
+    def add_pg_gem
+      gem "pg"
+    end
+
+    def bundle_install
+      return if Rails.env.test?
+
+      inside destination_root do
+        Bundler.with_unbundled_env do
+          run "bundle install"
+        end
+      end
+    end
+
     def create_lando_config
       copy_file ".lando.yml"
       copy_file "lando_env.rb", "config/initializers/lando_env.rb"
+      copy_file "blacklight.yml", "config/blacklight.yml"
+      copy_file "database.yml", "config/database.yml"
     end
   end
 end

data/lib/generators/templates/.lando.yml

@@ -1,5 +1,5 @@
 ---
-name: search_app
+name: blacklight
 services:
   test_solr:
     type: solr:8.4
@@ -13,6 +13,9 @@ services:
     core: blacklight-core-dev
     config:
       dir: "solr/conf"
+  database:
+    type: postgres:15
+    portforward: true
 proxy:
   test_solr:
     - blacklight.test.solr.lndo.site:8983

data/lib/generators/templates/blacklight.yml

@@ -0,0 +1,13 @@
+load_defaults: 7.19.2
+development:
+  adapter: solr
+  url: <%= ENV['SOLR_URL'] || ENV['lando_development_solr'] %>
+test: &test
+  adapter: solr
+  url: <%= ENV['SOLR_URL'] ||  ENV['lando_test_solr'] %>
+production:
+  adapter: solr
+  url: <%= ENV['SOLR_URL'] %>
+staging:
+  adapter: solr
+  url: <%= ENV['SOLR_URL'] %>

data/lib/generators/templates/database.yml

@@ -0,0 +1,26 @@
+default: &default
+  adapter: postgresql
+  encoding: utf8
+  min_messages: warning
+  pool: <%= Integer(ENV.fetch("DB_POOL", 40)) %>
+  reaping_frequency: <%= Integer(ENV.fetch("DB_REAPING_FREQUENCY", 10)) %>
+  timeout: 5000
+  host: <%= ENV["lando_database_conn_host"] || ENV["APP_DB_HOST"] || "localhost" %>
+  port: <%= ENV["lando_database_conn_port"] || 5432 %>
+  username: <%= ENV["lando_database_creds_user"] || ENV["APP_DB_USERNAME"] %>
+  password: <%= ENV["lando_database_creds_password"] || ENV["APP_DB_PASSWORD"] %>
+  database: <%= ENV['APP_DB'] %>
+
+development:
+  <<: *default
+  database: <%= ENV["lando_database_creds_database"] || ENV["APP_DB"] %>
+
+test:
+  <<: *default
+  database: <%= ENV["lando_database_creds_database"] || ENV["APP_DB"] %>
+
+production:
+  <<: *default
+
+staging:
+  <<: *default

data/lib/generators/templates/lando_env.rb

@@ -2,7 +2,8 @@
 
 if Rails.env.development? || Rails.env.test?
   begin
-    lando_services = JSON.parse(`lando info --format json`, symbolize_names: true)
+    lando_info = `lando info --format json`
+    lando_services = JSON.parse(lando_info, symbolize_names: true)
     lando_services.each do |service|
       case service[:service]
       when "test_solr"
@@ -10,6 +11,11 @@ if Rails.env.development? || Rails.env.test?
       when "development_solr"
         ENV["lando_development_solr"] = "http://#{service[:external_connection][:host]}:#{service[:external_connection][:port]}/solr/#{service[:core]}"
       end
+      next unless service[:creds]
+
+      service[:creds].each do |key, value|
+        ENV["lando_#{service[:service]}_creds_#{key}"] = value
+      end
     end
   rescue StandardError
     nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_lando
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Bess Sadler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-26 00:00:00.000000000 Z
+date: 2024-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -90,8 +90,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".byebug_history"
-- ".lando.yml"
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
@@ -99,11 +97,12 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- config/lando_env.rb
 - lib/blacklight_lando.rb
 - lib/blacklight_lando/version.rb
 - lib/generators/lando_generator.rb
 - lib/generators/templates/.lando.yml
+- lib/generators/templates/blacklight.yml
+- lib/generators/templates/database.yml
 - lib/generators/templates/lando_env.rb
 - sig/blacklight_lando.rbs
 homepage: https://github.com/bess/blacklight_lando

data/.byebug_history

@@ -1,22 +0,0 @@
-n
-fixture_file_destination
-fixture_file
-exit
-generator.generate
-generator.shell.destination_stack
-generator.shell
-generator.shell.base.destination_stack
-generator.shell.base
-generator.shell.public_methods - Object.methods
-generator.shell
-generator.shell.destination_stack
-generator.shell
-generator.options
-generator
-generator.base
-generator
-generator.destination_stack
-generator
-exit
-BlacklightLando::LandoGenerator.generate
-BlacklightLando::LandoGenerator

data/.lando.yml

@@ -1,20 +0,0 @@
----
-name: search_app
-services:
-  test_solr:
-    type: solr:8.4
-    portforward: true
-    core: blacklight-core-test
-    config:
-      dir: "solr/conf"
-  development_solr:
-    type: solr:8.4
-    portforward: true
-    core: blacklight-core-dev
-    config:
-      dir: "solr/conf"
-proxy:
-  test_solr:
-    - blacklight.test.solr.lndo.site:8983
-  development_solr:
-    - blacklight.dev.solr.lndo.site:8983

data/config/lando_env.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-if Rails.env.development? || Rails.env.test?
-  begin
-    lando_services = JSON.parse(`lando info --format json`, symbolize_names: true)
-    lando_services.each do |service|
-      case service[:service]
-      when "test_solr"
-        ENV["lando_test_solr"] = "http://#{service[:external_connection][:host]}:#{service[:external_connection][:port]}/solr/#{service[:core]}"
-      when "development_solr"
-        ENV["lando_development_solr"] = "http://#{service[:external_connection][:host]}:#{service[:external_connection][:port]}/solr/#{service[:core]}"
-      end
-    end
-  rescue StandardError
-    nil
-  end
-end