blacklight_lando 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3c3933b2aec55e04f6d9c426fb2bddda7ac1abe6d0b387a9809eb2d7043accf
-  data.tar.gz: b2650017b1fd50f106129c760558d4c76383af3b5dcc57f31f8d4f0246ea8fe8
+  metadata.gz: eb0adea4f04fee66835a254ccaaaf0bebf71f046e440b3e3aafb0b2c37c36aca
+  data.tar.gz: 5887dacf7183092459c53904a8ffe8e45cda2c20a7c9125102729aace8e0a56d
 SHA512:
-  metadata.gz: 2a926212e829cd7c85429408d3ce1c15278330120962de68917c1e8836c714435a7b47ff5c7f20f940e006dcd2e33415e0b3a4bfd2bcb00297e2bbb235f7575f
-  data.tar.gz: 5a005880f8814bb18b7bbf3469ea4fbb512edb6141914566c685b21f6220c229bdce2d706cf125424d42dc11a8bf4697493e6e5dd21514699ff9888fe9a94e51
+  metadata.gz: 299882ca76e0b7c5af762798f8dee3a4e090bba52daa9a6b8d1b529ae9049c0e9b9ff1c27e6a8cff925416afdfbc1315da5d2af389010c8811f86d69e8c2cce9
+  data.tar.gz: 81ca4e608ecd207cf6f1302b692c457017bad092d26062314205d6cb9e465d0b76b5ba6beaf110077af06a45aedf19b4dde9cbea043d80e282fbe88bc3732152

data/CHANGELOG.md

@@ -4,5 +4,11 @@
 
 - Initial release
 
-## [0.2.0] - 2024-02-21
- - Add postgresql
+## [0.2.0] - 2024-02-26
+ - Add postgresql
+
+## [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.0"
+  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/{lando_generator.rb → run_solr.rb}

@@ -2,8 +2,9 @@
 
 require "rails/generators"
 module BlacklightLando
-  # Generator for adding lando to a blacklight application
-  class LandoGenerator < Rails::Generators::Base
+  # 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
@@ -12,15 +13,13 @@ 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. Copies lando-configured config/database.yml into your application
     EOF
     # rubocop:enable Naming/HeredocDelimiterNaming
 
     def create_lando_config
-      copy_file ".lando.yml"
+      copy_file ".lando_solr.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"
     end
   end
 end

data/lib/generators/run_solr_and_postgresql.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "rails/generators"
+module BlacklightLando
+  # Generator for adding lando to a blacklight application
+  class RunSolrAndPostgresql < 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
+        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_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"
+    end
+  end
+end

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_lando
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Bess Sadler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-27 00:00:00.000000000 Z
+date: 2024-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -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