smartmachine 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ead0adeacd301bcd2ef709762b390ebdd7391bd22b1281bfb5816c61d5e5898
-  data.tar.gz: 951b8525f250d09e74c2a9941e4f9ced364368094f3be6ab1c7f0a3d237f8b3c
+  metadata.gz: 399cf5ca8bd944f129d3731d93be76cf46ba86e3f25b97b5110ee42dc8650430
+  data.tar.gz: 2b0166c466312def05a5ee8930bf3943c0f31e3a224d582caeee878c68e43a8d
 SHA512:
-  metadata.gz: 42c85a60e0a958b1b0261c44cace2a9aedadb9615341e098e274068284e71643525ffe2793ecc026c55023fb017ae8b4cc2c6fb3c8cb2436b4c69f09eea5dd16
-  data.tar.gz: 1dfaf1d47f11b054831f69507c07acafd80f55ec3af82cceefd718212c72636fa6332d079e17a552741601957e313f59afe5d001ffcaaf89110a96b4e384e09c
+  metadata.gz: e1f029f440a058a7185f315137f2e2544fb3898ef21d3bffb7792f50350d1b7d476c3c116d7ebec2790a2fb8f0c11cc1151558b6fc42db37edfdf55688bb8f4d
+  data.tar.gz: d667cfb03e650d7f9497a6be4b816b3c2eb0c70e85760987746fdd083d9f2bc3496b48ff1d65df667934e6065b8dfa5355e27c48820bc72cfb3e578506c4267e

data/lib/smart_machine/buildpackers/buildpacker.rb

@@ -80,13 +80,9 @@ module SmartMachine
                 libdb-dev \
                 uuid-dev && \
               # ruby on rails
-              curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
-	      echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
 	      apt-get update && \
 	      apt-get install -y --no-install-recommends \
 		  tzdata \
-		  nodejs \
-		  yarn \
 		  libmariadb-dev \
 		  libvips42 \
 		  ffmpeg \
@@ -109,44 +105,6 @@ module SmartMachine
 
         format(file)
       end
-
-      # These swapfile methods can be used (after required modification), when you need to make swapfile for more memory.
-      # def self.create_swapfile
-      # 	# Creating swapfile for bundler to work properly
-      # 	unless system("sudo swapon -s | grep -ci '/swapfile'", out: File::NULL)
-      # 		print "-----> Creating swap swapfile ... "
-      # 		system("sudo install -o root -g root -m 0600 /dev/null /swapfile", out: File::NULL)
-      # 		system("sudo dd if=/dev/zero of=/swapfile bs=1k count=2048k", [:out, :err] => File::NULL)
-      # 		system("sudo mkswap /swapfile", out: File::NULL)
-      # 		system("sudo sh -c 'echo \"/swapfile       none    swap    sw      0       0\" >> /etc/fstab'", out: File::NULL)
-      # 		system("echo 10 | sudo tee /proc/sys/vm/swappiness", out: File::NULL)
-      # 		system("sudo sed -i '/^vm.swappiness = /d' /etc/sysctl.conf", out: File::NULL)
-      # 		system("echo vm.swappiness = 10 | sudo tee -a /etc/sysctl.conf", out: File::NULL)
-      # 		puts "done"
-      #
-      # 		print "-----> Starting swap swapfile ... "
-      # 		if system("sudo swapon /swapfile", out: File::NULL)
-      # 			puts "done"
-      # 		end
-      # 	end
-      # end
-      #
-      # def self.destroy_swapfile
-      # 	if system("sudo swapon -s | grep -ci '/swapfile'", out: File::NULL)
-      # 		print "-----> Stopping swap swapfile ... "
-      # 		if system("sudo swapoff /swapfile", out: File::NULL)
-      # 			system("sudo sed -i '/^vm.swappiness = /d' /etc/sysctl.conf", out: File::NULL)
-      # 			system("echo 60 | sudo tee /proc/sys/vm/swappiness", out: File::NULL)
-      # 			puts "done"
-      #
-      # 			print "-----> Removing swap swapfile ... "
-      # 			system("sudo sed -i '/^\\/swapfile/d' /etc/fstab", out: File::NULL)
-      # 			if system("sudo rm /swapfile", out: File::NULL)
-      # 				puts "done"
-      # 			end
-      # 		end
-      # 	end
-      # end
     end
   end
 end

data/lib/smart_machine/buildpackers/rails.rb

@@ -173,6 +173,66 @@ module SmartMachine
         system("alias bundler='bundler _#{bundler_version}_'")
         logger.info "Using bundler v" + bundler_version + "\n"
 
+        # Install nodejs
+        nodejs_version = `sed -n '/node/{p;n}' package.json`.strip.split(":").last&.strip&.delete_prefix('"')&.delete_suffix(',')&.delete_suffix('"')
+        if nodejs_version.nil? || nodejs_version.empty?
+          logger.error "Could not find nodejs version. Have you specified it explicitly in package.json with engines field and run yarn install?\n"
+          return false
+        end
+
+        unless system(user_bash("node -v"), [:out, :err] => File::NULL) && `#{user_bash('node -v')}`.strip&.delete_prefix('v') == nodejs_version
+          logger.info "Installing nodejs v#{nodejs_version}\n"
+
+          Open3.popen2e(user_bash("asdf plugin add nodejs https://github.com/asdf-vm/asdf-nodejs.git")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+          Open3.popen2e(user_bash("asdf plugin update nodejs")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+          Open3.popen2e(user_bash("asdf install nodejs #{nodejs_version}")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+          Open3.popen2e(user_bash("asdf local nodejs #{nodejs_version}")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+
+          unless `#{user_bash('node -v')}`.strip&.delete_prefix('v') == nodejs_version
+            logger.error "Could not install nodejs with version #{nodejs_version}. Please try another valid version that asdf supports.\n"
+            return false
+          end
+        end
+        logger.info "Using nodejs v" + `#{user_bash('node -v')}`.strip&.delete_prefix('v') + "\n"
+
+        # Install yarn
+        yarn_version = `sed -n '/yarn/{p;n}' package.json`.strip.split(":").last&.strip&.delete_prefix('"')&.delete_suffix(',')&.delete_suffix('"')
+        if yarn_version.nil? || yarn_version.empty?
+          logger.error "Could not find yarn version. Have you specified it explicitly in package.json with engines field and run yarn install?\n"
+          return false
+        end
+
+        unless system(user_bash("yarn -v"), [:out, :err] => File::NULL) && `#{user_bash('yarn -v')}`.strip == yarn_version
+          logger.info "Installing yarn v#{yarn_version}\n"
+
+          Open3.popen2e(user_bash("asdf plugin add yarn https://github.com/twuni/asdf-yarn.git")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+          Open3.popen2e(user_bash("asdf plugin update yarn")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+          Open3.popen2e(user_bash("asdf install yarn #{yarn_version}")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+          Open3.popen2e(user_bash("asdf local yarn #{yarn_version}")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+
+          unless `#{user_bash('yarn -v')}`.strip == yarn_version
+            logger.error "Could not install yarn with version #{yarn_version}. Please try another valid version that asdf supports.\n"
+            return false
+          end
+        end
+        logger.info "Using yarn v" + `#{user_bash('yarn -v')}`.strip + "\n"
+
         set_logger_formatter_arrow
 
         return true

data/lib/smart_machine/machine.rb

@@ -161,5 +161,47 @@ module SmartMachine
       ]
       run_on_machine(commands: commands)
     end
+
+    # These swapfile methods can be used (after required modification), when you need to make swapfile for more memory.
+    # def self.create_swapfile
+    # 	# Creating swapfile for bundler to work properly
+    # 	unless system("sudo swapon -s | grep -ci '/swapfile'", out: File::NULL)
+    # 		print "-----> Creating swap swapfile ... "
+    # 		system("sudo install -o root -g root -m 0600 /dev/null /swapfile", out: File::NULL)
+    # 		system("sudo dd if=/dev/zero of=/swapfile bs=1k count=2048k", [:out, :err] => File::NULL)
+    # 		system("sudo mkswap /swapfile", out: File::NULL)
+    # 		system("sudo sh -c 'echo \"/swapfile       none    swap    sw      0       0\" >> /etc/fstab'", out: File::NULL)
+    # 		system("echo 10 | sudo tee /proc/sys/vm/swappiness", out: File::NULL)
+    # 		system("sudo sed -i '/^vm.swappiness = /d' /etc/sysctl.conf", out: File::NULL)
+    # 		system("echo vm.swappiness = 10 | sudo tee -a /etc/sysctl.conf", out: File::NULL)
+    # 		system("echo 50 | sudo tee /proc/sys/vm/vfs_cache_pressure", out: File::NULL)
+    # 		system("sudo sed -i '/^vm.vfs_cache_pressure = /d' /etc/sysctl.conf", out: File::NULL)
+    # 		system("echo vm.vfs_cache_pressure = 50 | sudo tee -a /etc/sysctl.conf", out: File::NULL)
+    # 		puts "done"
+    #
+    # 		print "-----> Starting swap swapfile ... "
+    # 		if system("sudo swapon /swapfile", out: File::NULL)
+    # 			puts "done"
+    # 		end
+    # 	end
+    # end
+    #
+    # def self.destroy_swapfile
+    # 	if system("sudo swapon -s | grep -ci '/swapfile'", out: File::NULL)
+    # 		print "-----> Stopping swap swapfile ... "
+    # 		if system("sudo swapoff /swapfile", out: File::NULL)
+    # 			system("sudo sed -i '/^vm.swappiness = /d' /etc/sysctl.conf", out: File::NULL)
+    # 		 	system("echo 100 | sudo tee /proc/sys/vm/vfs_cache_pressure", out: File::NULL)
+    # 			system("echo 60 | sudo tee /proc/sys/vm/swappiness", out: File::NULL)
+    # 			puts "done"
+    #
+    # 			print "-----> Removing swap swapfile ... "
+    # 			system("sudo sed -i '/^\\/swapfile/d' /etc/fstab", out: File::NULL)
+    # 			if system("sudo rm /swapfile", out: File::NULL)
+    # 				puts "done"
+    # 			end
+    # 		end
+    # 	end
+    # end
   end
 end

data/lib/smart_machine/version.rb

@@ -17,7 +17,7 @@ module SmartMachine
   module VERSION
     MAJOR = 1
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartmachine
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - plainsource
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-17 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -417,8 +417,8 @@ licenses:
 metadata:
   homepage_uri: https://github.com/plainsource/smartmachine
   bug_tracker_uri: https://github.com/plainsource/smartmachine/issues
-  changelog_uri: https://github.com/plainsource/smartmachine/releases/tag/v1.2.2
-  source_code_uri: https://github.com/plainsource/smartmachine/tree/v1.2.2
+  changelog_uri: https://github.com/plainsource/smartmachine/releases/tag/v1.2.3
+  source_code_uri: https://github.com/plainsource/smartmachine/tree/v1.2.3
 post_install_message: 
 rdoc_options: []
 require_paths: