svelte-on-rails 22.4.1 → 22.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61a1a506e531e729e27433251f92fae2e24e73916f9004fafd75efb52b1a073e
-  data.tar.gz: d0cad407740e263bfc0f7b1dd58468734b4e4ddc00623257191c847144ddd1d1
+  metadata.gz: 58df2a12a11fd0781c7e00d95418b4313d18effd284f913ed9d8d2ac79191adf
+  data.tar.gz: eb08daf8b9bf7f60531fd3090890462a873c1f14a688a15e766f714ff36e38a5
 SHA512:
-  metadata.gz: 7d4404822d86e3e1eb612a937e2bf65883067e462779d5c4d469f6f456d87c97ad126d0ea9b2844ba4526880b82d44eeb12b1d40b988bb8c9dab3d9189ab219f
-  data.tar.gz: e86f2bb86f30a21165ed9422b7ef23eca36317ce1aedcc0e433792760cd3b7c6b10dc9d9bdd9c4ddc55f726fab5dd1c3f0d97f4817b93c75c14464ce1b8b38c3
+  metadata.gz: 93853048bfc3ffdd8d874f94d012e555e9247f0bcf42db4850d1bfe2a9e450dc278f4ee4b85fef5ab721c61794e02f30e8041dd2a067bb4a2337c0966a100784
+  data.tar.gz: 4d504b58c5f9a32726ab1047dd8c1d14b37548c33642d13e5f37d2626bc9da7a3ee5e7cf85f004eca4aec8363f2de34e086fbc13773edc12afc1ce63f23680b7

data/lib/tasks/svelte_on_rails_tasks.rake

@@ -13,6 +13,21 @@ namespace :svelte_on_rails do
     ppid = (ppid_file.exist? ? File.read(ppid_file).chomp : nil)
     server_helpers = SvelteOnRails::SsrServerHelpers.new
     socket_path = server_helpers.socket_path(ppid: ppid)
+
+    unless File.socket?(socket_path)
+      puts "*" * 80
+      puts "ERROR: socket_path does not exist or is not a socket: #{socket_path}"
+      puts "Do you have set RAILS_ENV correctly?"
+      puts "*" * 80
+    end
+
+    unless ppid_file.exist?
+      puts "*" * 80
+      puts "ERROR: PPID File does not exist: #{ppid_file}"
+      puts "Is the app running?"
+      puts "*" * 80
+    end
+
     curl_installed = system('which curl > /dev/null 2>&1')
     if curl_installed
       curl_cmd = "curl --unix-socket #{socket_path} http://localhost"
@@ -20,12 +35,10 @@ namespace :svelte_on_rails do
       srv_details = (JSON.parse(stdout) rescue {})
     end
 
-    env_check = rails_env_check(socket_path)
-
     puts
     puts '=' * line_width
     puts "Svelte on Rails SSR Server Status:"
-    puts "  Rails env: #{Rails.env.upcase}"
+    puts "  Rails env: #{Rails.env}"
     if srv_details['uptime']
       puts "  Uptime: #{srv_details['uptime'].round(0)}sec"
     else
@@ -40,14 +53,8 @@ namespace :svelte_on_rails do
     puts label('SSR Server version') + configs.npm_package_version_test.to_s
     puts
     puts 'Rails instance'
-    if !server_helpers.ssr_server_ppid_file.exist?
-      puts label('Process.ppid') + "#{server_helpers.ssr_server_ppid_file} not found, rails seems not to run or the SsrServer is not initialized yet."
-    elsif env_check == :clearly_correct
-      puts label('Process.ppid') + ppid.to_s
-      puts label('Socket') + socket_path.to_s
-    else
-      puts 'Rails env could not be determinated, compared to the socket path, so, no socket path could be determined.'
-    end
+    puts label('Process.ppid') + ppid.to_s
+    puts label('Socket') + socket_path.to_s
     puts
     puts '=' * line_width
     puts
@@ -67,72 +74,28 @@ namespace :svelte_on_rails do
       puts "  • kill #{srv_details['pid']}" if srv_details['pid']
     end
     puts
-    if env_check == :clearly_correct
-      puts '=' * line_width
-      puts
-      puts 'NODE INSTANCE INFO:'
-      puts '  (output of the above mentioned curl command)'
-      puts
-      puts '-' * line_width
-      if curl_installed
-        stdout, stderr, status = Open3.capture3(curl_cmd)
-        if status.success?
-          puts stdout
-        else
-          puts "curl exited with status #{status.exitstatus}"
-          puts stderr unless stderr.to_s.strip.empty?
-        end
+
+    puts '=' * line_width
+    puts
+    puts 'NODE INSTANCE INFO:'
+    puts '  (output of the above mentioned curl command)'
+    puts
+    puts '-' * line_width
+    if curl_installed
+      stdout, stderr, status = Open3.capture3(curl_cmd)
+      if status.success?
+        puts stdout
       else
-        puts "curl is not installed on this machine, skipping execution."
+        puts "curl exited with status #{status.exitstatus}"
+        puts stderr unless stderr.to_s.strip.empty?
       end
-      puts
-      puts '=' * line_width
-      puts
-    end
-
-  end
-
-  def rails_env_check(socket_path)
-
-    line_width = 100
-
-    envs = guessed_rails_envs(socket_path.dirname)
-
-    if envs == [Rails.env]
-
-      :clearly_correct
-
-    elsif envs.empty?
-
-      puts
-      puts '*' * line_width
-      puts "WARNING: This Rails app seems not to run."
-      puts '*' * line_width
-      puts
-      :possible_correct
-
-    elsif envs.include?(Rails.env)
-
-      puts
-      puts '*' * line_width
-      puts "INFO: Based on the socket paths #{socket_path.dirname},"
-      puts "this Rails app may run in #{envs.join(' or ')}."
-      puts "You are running as #{Rails.env} (Rails.env) which may be right."
-      puts '*' * line_width
-      puts
-      :possible_correct
-
     else
-
-      puts
-      puts '*' * line_width
-      puts "WARNING: You are running as #{Rails.env} (Rails.env)"
-      puts "But the rails app seems to run in #{envs.join(' or ')}"
-      puts '*' * line_width
-      puts
-      :possible_wrong
-
+      puts "curl is not installed on this machine, skipping execution."
     end
+    puts
+    puts '=' * line_width
+    puts
+
   end
 
   def label(msg)
@@ -140,21 +103,6 @@ namespace :svelte_on_rails do
     "  #{msg}:"[0..20] + (msg.length > 22 ? ':' : '') + ' ' * (20 - l)
   end
 
-  def guessed_rails_envs(dir)
-    envs_dir = Rails.root.join('config', 'environments')
-    return [] unless File.directory?(envs_dir) && File.directory?(dir)
-
-    possible_envs = Dir.children(envs_dir)
-                       .select { |f| f.end_with?('.rb') }
-                       .map { |f| File.basename(f, '.rb') }
-
-    entries = Dir.children(dir)
-
-    possible_envs.select do |env|
-      entries.any? { |entry| entry.include?("-#{env}-") }
-    end
-  end
-
 end
 
 Rake::Task["assets:precompile"].enhance ["svelte_on_rails:precompile"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svelte-on-rails
 version: !ruby/object:Gem::Version
-  version: 22.4.1
+  version: 22.4.2
 platform: ruby
 authors:
 - Christian Sedlmair