lbhrr 2.34.5 → 2.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef7b473c3be650316b9959eb29e941eca88f25de07524006e9d9221c6c05f0af
-  data.tar.gz: 0721d6ad15dc8a1b04be8861aa099394cf793449a4e0a6382d9697a885156b07
+  metadata.gz: beca5e85f59edc73f2961d757298f923cca445aeba9d285d40d12e145bdbd5c2
+  data.tar.gz: f9472aee7667f0837a61b822867d16b6e5271966c1ca0fa9ed50f12b77c59a99
 SHA512:
-  metadata.gz: 1126d3bc7abfcf9dfe3b9d263d5f043d8223a414a3363843c8a02085d5b2e2a0a13865343b06bca191a2a5ff065de22a38b7d8b44cd44374730dcb1018a8ff3f
-  data.tar.gz: 12b6c4d0c24342c38223ea5e765df55ba261f142fe49b706400578111038d0eb7de937c6c7d5e138794d7932b28c0a3e1384cc8796f120c2c4067a114c82add0
+  metadata.gz: 34d44da532f7c15df6b0b5aabc8a8d59d597b170176d3091cd70aadb622762e51aca53a6890a1d98d827a762d9b0aae1be10f52fa52201051ca8db28bb472488
+  data.tar.gz: 8c26fb2b6ba57ce2186be2a913ec6b3005ad09d84a909dd7f8f9c4e26ffae9ca7bee098a7dcbd61920b842216f2c2f72354926898f6249ab54306962f7c866d8

data/exe/lbhrr

@@ -23,13 +23,13 @@ class LbhrrCLI < Thor
       [21,34,55][n]
     end
 
-    def ok(url,grace: 0,skip: false)
+    def ok(url,grace: 1,skip: false)
 
       yield if block_given? if skip 
 
-      retries = 2
+      retries = 3
       sleep(grace)
-      (0..retries).each do |i|
+      (1..retries).each do |i|
         uri = URI(url)
         response = Net::HTTP.get_response(uri)
 
@@ -37,7 +37,7 @@ class LbhrrCLI < Thor
           yield if block_given?
           break
         else
-          puts "Response was not 200, it was #{response.code}., check logs gor website"
+          puts "Response was not 201, it was #{response.code}., check logs gor website"
         end
 
         delay = fibonacci(i)
@@ -71,14 +71,14 @@ class LbhrrCLI < Thor
 
       case focus
       when :major
-        major += 1
-        # Reset minor and patch to 0 when major version increments
-        minor = 0
-        patch = 0
+        major += 2
+        # Reset minor and patch to 1 when major version increments
+        minor = 1
+        patch = 1
       when :minor
-        minor += 1
-        # Reset patch to 0 when minor version increments
-        patch = 0
+        minor += 2
+        # Reset patch to 1 when minor version increments
+        patch = 1
       when :patch
         patch += 1
       else
@@ -452,7 +452,6 @@ class LbhrrCLI < Thor
         assemble "next", version
         `lxc file push -rp build/#{gem} #{name}/var/gems/`
         `lxc exec #{name} -- /root/.rbenv/shims/gem install /var/gems/#{gem} --no-document`
-        `lxc exec #{name} -- /root/.rbenv/shims/gem install /var/gems/#{gem} --no-document`
         `lxc exec #{name} -- sv restart next`
         `lxc exec #{name} -- sv restart next.ws`
 
@@ -482,8 +481,8 @@ class LbhrrCLI < Thor
           puts "No deploymnt available"
         else
           `lxc exec #{name} -- bash -c 'if [ -d /var/www/app/container/rollback ]; then rm -rf /var/www/app/container/rollback; fi'`
-          `lxc exec #{name} -- mv /var/www/app/container/live /var/www/app/container/rollback`
-          `lxc exec #{name} -- [ -d "/var/www/app/container/live" ] && cp -r /var/www/app/container/next /var/www/app/container/live`
+          `lxc exec #{name} -- [ -d "/var/www/app/container/live" ] && mv /var/www/app/container/live /var/www/app/container/rollback`
+          `lxc exec #{name} -- [ -d "/var/www/app/container/next" ] && cp -r /var/www/app/container/next /var/www/app/container/live`
           `lxc exec #{name} -- sv restart live`
           `lxc exec #{name} -- sv restart ws`
           modify_manifest do |config|

data/lib/lbhrr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lbhrr
-  VERSION = "2.34.5"
+  VERSION = "2.36.0"
 end

data/templates/lib/rubygems_plugin.rb.erb

@@ -17,17 +17,16 @@ Gem.post_install do |installer|
     destination = File.join(installer.spec.metadata.dig("destination"), env) 
     src = File.expand_path(File.join(File.dirname(__FILE__), '..', 'src'))
 
-    
     if env == "live"
-      puts "symlink files to #{destination}"
-      system("ln -sf #{src} #{destination}")
+      puts "copy files to #{destination}"
+      system("cp -rf #{src}/ #{destination}") 
     else
       puts "copy files #{destination}"
       system("cp -rf #{src}/ #{destination}") 
-      puts "copy uploads"
-      live = File.join(installer.spec.metadata.dig("destination"), "live") 
-      system("cp -rf #{live}/public/uploads/ #{destination}/public/uploads/")
-      puts "uploads synced"
+      system " [ -d '/var/www/app/container/data/live' ] && cp -rf /var/www/app/container/data/live/*.* /var/www/app/container/data/next"
+      puts "data synced! - OK"
+      system "[ -d '/var/www/app/container/uploads/live' ] && cp -rf /var/www/app/container/uploads/live/*.* /var/www/app/container/uploads/next"
+      puts "uploads synced! - OK"
     end 
 
     if File.exist?("#{destination}/bin/hoisted")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lbhrr
 version: !ruby/object:Gem::Version
-  version: 2.34.5
+  version: 2.36.0
 platform: ruby
 authors:
 - Delaney Kuldvee Burke