forest_liana 2.8.2 → 2.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14ab097ffc6a225f2195936253472b5c52a73e3b
-  data.tar.gz: 60a23d3c4b9a13db8f87c8debf710b80394651e9
+  metadata.gz: 3f8a110de97c7549661abca45b0a64d007761f81
+  data.tar.gz: e4f6330c222dde8972c7a265c550b846589e990b
 SHA512:
-  metadata.gz: 01f1d41c1d3b33fd91fdc3d1b1275a0ccbdbb29bc41b29b73d782883dfb7e5490eeebf2b409fa919f1cb40edb0c489a3a0fbb10571b17cd44e10ff1734b771f6
-  data.tar.gz: 38ed452888ca8f14d894395b2fb3cbae2319c2c9dcbdfea7bcd039e3439a77fc25d682e6390dffa26a85beae01f43d27e8a4d0cb732f5c74a0e6d9f998adefce
+  metadata.gz: 4873a75514f82752ea362470f7d28424b97b2ced4ef140d19970fed6fb959198a90f3ea88e86c1605ec1fd33a900277eff5b10dbc93ab231c3f51ecbd38b4372
+  data.tar.gz: df50c529a44f907d9414b713419cb2495216b18551494ad665d0c00e10872c23a867dd4b9d11c4afe6ebac68ce075484c08bae73bce4a0924593ad52838329cf

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "2.8.2"
+  VERSION = "2.8.3"
 end

data/lib/generators/forest_liana/install_generator.rb

@@ -7,32 +7,53 @@ module ForestLiana
     argument :env_secret, type: :string, required: true, desc: 'required', banner: 'env_secret'
 
     def install
-      route "mount ForestLiana::Engine => '/forest'"
-
-      initializer 'forest_liana.rb' do
-        "ForestLiana.env_secret = Rails.application.secrets.forest_env_secret" +
-        "\nForestLiana.auth_secret = Rails.application.secrets.forest_auth_secret"
+      if ForestLiana.env_secret.present?
+        puts "\nForest liana already installed on this app (environment secret: #{ForestLiana.env_secret})"
+        return
       end
 
+      route "mount ForestLiana::Engine => '/forest'"
+
       auth_secret = SecureRandom.urlsafe_base64
 
       puts "\nForest generated a random authentication secret to secure the " +
         "data access of your local project.\nYou can change it at any time in " +
         "your config/secrets.yml file.\n\n"
 
-      inject_into_file 'config/secrets.yml', after: "development:\n" do
-        "  forest_env_secret: #{env_secret}\n" +
-        "  forest_auth_secret: #{auth_secret}\n"
-      end
-
-      inject_into_file 'config/secrets.yml', after: "staging:\n", force: true do
-        "  forest_env_secret: <%= ENV[\"FOREST_ENV_SECRET\"] %>\n" +
-        "  forest_auth_secret: <%= ENV[\"FOREST_AUTH_SECRET\"] %>\n"
+      # NOTICE: If it is a Rails 5.2+ apps, the secrets.yml file might not exist
+      #         (replaced by credentials.yml.enc but still supported).
+      if File.exist? 'config/secrets.yml'
+        inject_into_file 'config/secrets.yml', after: "development:\n" do
+          "  forest_env_secret: #{env_secret}\n" +
+          "  forest_auth_secret: #{auth_secret}\n"
+        end
+
+        inject_into_file 'config/secrets.yml', after: "staging:\n", force: true do
+          "  forest_env_secret: <%= ENV[\"FOREST_ENV_SECRET\"] %>\n" +
+          "  forest_auth_secret: <%= ENV[\"FOREST_AUTH_SECRET\"] %>\n"
+        end
+
+        inject_into_file 'config/secrets.yml', after: "production:\n", force: true do
+          "  forest_env_secret: <%= ENV[\"FOREST_ENV_SECRET\"] %>\n" +
+          "  forest_auth_secret: <%= ENV[\"FOREST_AUTH_SECRET\"] %>\n"
+        end
+      else
+        create_file 'config/secrets.yml' do
+          "development:\n" +
+          "  forest_env_secret: #{env_secret}\n" +
+          "  forest_auth_secret: #{auth_secret}\n" +
+          "staging:\n" +
+          "  forest_env_secret: <%= ENV[\"FOREST_ENV_SECRET\"] %>\n" +
+          "  forest_auth_secret: <%= ENV[\"FOREST_AUTH_SECRET\"] %>\n" +
+          "production:\n" +
+          "  forest_env_secret: <%= ENV[\"FOREST_ENV_SECRET\"] %>\n" +
+          "  forest_auth_secret: <%= ENV[\"FOREST_AUTH_SECRET\"] %>\n"
+        end
       end
 
-      inject_into_file 'config/secrets.yml', after: "production:\n", force: true do
-        "  forest_env_secret: <%= ENV[\"FOREST_ENV_SECRET\"] %>\n" +
-        "  forest_auth_secret: <%= ENV[\"FOREST_AUTH_SECRET\"] %>\n"
+      initializer 'forest_liana.rb' do
+        "ForestLiana.env_secret = Rails.application.secrets.forest_env_secret" +
+        "\nForestLiana.auth_secret = Rails.application.secrets.forest_auth_secret"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.8.3
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails