blacklight_lando 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0a15bf9b2f3ad34326ff143d47ca2533281ab7385ebaf9b7852de17acfa7e0e
-  data.tar.gz: 75207c13914183bd17bb472474f8a0136856381da6726d336f171ca499e8f904
+  metadata.gz: eb0adea4f04fee66835a254ccaaaf0bebf71f046e440b3e3aafb0b2c37c36aca
+  data.tar.gz: 5887dacf7183092459c53904a8ffe8e45cda2c20a7c9125102729aace8e0a56d
 SHA512:
-  metadata.gz: c544b5c0f541d514efe44186f8ed9c5891238ebbbebccd5fb31744756310faec3eaa954a7a084e6c45e9d7c04e1454be41632244a8670c93e3589c0f49585712
-  data.tar.gz: 43eb5f6a63ab6eed1c0bbab1a13460c4aac105423608ec854b81bef3b8f8cb95ad72f208e0605f34f52befd791c41e00fa1223de755dcb6541c024451b704465
+  metadata.gz: 299882ca76e0b7c5af762798f8dee3a4e090bba52daa9a6b8d1b529ae9049c0e9b9ff1c27e6a8cff925416afdfbc1315da5d2af389010c8811f86d69e8c2cce9
+  data.tar.gz: 81ca4e608ecd207cf6f1302b692c457017bad092d26062314205d6cb9e465d0b76b5ba6beaf110077af06a45aedf19b4dde9cbea043d80e282fbe88bc3732152

data/CHANGELOG.md

@@ -4,8 +4,11 @@
 
 - Initial release
 
-## [0.2.0] - 2024-02-21
+## [0.2.0] - 2024-02-26
  - Add postgresql
 
-## [0.2.1] - 2024-02-21
- - Add pg gem to Gemfile
+## [0.2.1] - 2024-02-27
+ - Add pg gem to Gemfile
+
+## [0.3.0] - 2024-02-28
+ - Split the generators into a solr-only one and a solr and postgresql one. The Postgresql generator isn't working properly, so I need to use the solr-only one for a workshop.

data/README.md

@@ -9,13 +9,14 @@ 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.2"
+   gem "blacklight_lando", "~> 0.3"
    ```
 2. Run `bundle install`
-3. Run `rails generate blacklight_lando:lando`
+3. Run `rails generate blacklight_lando:run_solr`
 4. Start lando: `lando start`
 5. Start blacklight as normal: `bundle exec rails s`
 
+Your application should now be running against the instance of solr that lando is running in a docker container.
 
 ## Usage
 

data/lib/blacklight_lando/version.rb

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

data/lib/blacklight_lando.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "blacklight_lando/version"
-require_relative "generators/lando_generator"
+require_relative "generators/run_solr"
+require_relative "generators/run_solr_and_postgresql"
 
 # Configure a Blacklight application to use Lando for Solr and Postresql
 module BlacklightLando

data/lib/generators/run_solr.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "rails/generators"
+module BlacklightLando
+  # Generator for adding lando to a blacklight application and
+  # configuring it to use Solr
+  class RunSolr < Rails::Generators::Base
+    source_root ::File.expand_path("templates", __dir__)
+
+    # rubocop:disable Naming/HeredocDelimiterNaming
+    desc <<-EOF
+      This generator makes the following changes to your application:
+        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
+    EOF
+    # rubocop:enable Naming/HeredocDelimiterNaming
+
+    def create_lando_config
+      copy_file ".lando_solr.yml", ".lando.yml"
+      copy_file "lando_env.rb", "config/initializers/lando_env.rb"
+      copy_file "blacklight.yml", "config/blacklight.yml"
+    end
+  end
+end

data/lib/generators/{lando_generator.rb → run_solr_and_postgresql.rb}

@@ -3,7 +3,7 @@
 require "rails/generators"
 module BlacklightLando
   # Generator for adding lando to a blacklight application
-  class LandoGenerator < Rails::Generators::Base
+  class RunSolrAndPostgresql < Rails::Generators::Base
     source_root ::File.expand_path("templates", __dir__)
 
     # rubocop:disable Naming/HeredocDelimiterNaming
@@ -32,7 +32,7 @@ module BlacklightLando
     end
 
     def create_lando_config
-      copy_file ".lando.yml"
+      copy_file ".lando_solr_and_postgresql.yml", ".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"

data/lib/generators/templates/.lando_solr_and_postgresql.yml

@@ -0,0 +1,23 @@
+---
+name: blacklight
+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"
+  database:
+    type: postgres:15
+    portforward: true
+proxy:
+  test_solr:
+    - blacklight.test.solr.lndo.site:8983
+  development_solr:
+    - blacklight.dev.solr.lndo.site:8983

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_lando
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Bess Sadler
@@ -99,8 +99,10 @@ files:
 - Rakefile
 - lib/blacklight_lando.rb
 - lib/blacklight_lando/version.rb
-- lib/generators/lando_generator.rb
-- lib/generators/templates/.lando.yml
+- lib/generators/run_solr.rb
+- lib/generators/run_solr_and_postgresql.rb
+- lib/generators/templates/.lando_solr.yml
+- lib/generators/templates/.lando_solr_and_postgresql.yml
 - lib/generators/templates/blacklight.yml
 - lib/generators/templates/database.yml
 - lib/generators/templates/lando_env.rb