vps 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19a1e8448e7c6d7549da881d3c4410dffd9eee99
-  data.tar.gz: 8ed547a6a851bfc83a7be9df20d8781d8bf39d6b
+  metadata.gz: 933bc1ae373f67158e536ef0f9fba44ce4dc7173
+  data.tar.gz: 4dc3addd296f9b7d7fd836ff3a82262572b21344
 SHA512:
-  metadata.gz: 589a2204c45d5eb76a578258d6ac56b053f7efd99fec980ed81b8b9f58e2d86d25918ddd0eff90cb91be63ba1d5f0bae4b26e9bedb7636d264a1e6c377693391
-  data.tar.gz: 477b312e229c9cef09c4f75a9e7e8f0aff05be8d9882940b9c03721049563addc569ace2c57739cb73c4a32390c8fdd78f8743af161037183be871745652d791
+  metadata.gz: 7eb4e3894ac019a90d984987761c5f03e57f1bdf35f9417bb1aa1df4ec817c9d3071d8715217516b4a6e0da237a0ddc9baacd413e807746ed243205f9ee256b7
+  data.tar.gz: c913b9fd13f1180e99dfda46425187f7989064d5ba19c021f24d9913a89123b4a381b3aa4ce45fc708440d83c36d046e79aff86a42df1ac6c1c367d689549c6a

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## VPS CHANGELOG
 
+### Version 0.2.1 (January 2, 2020)
+
+* Support NodeJS based applications
+* Clean up default upstream specs
+* Set container name when adding upstream
+
 ### Version 0.2.0 (December 31, 2019)
 
 * Provide ability to add both custom HTTP and HTTPS Nginx configs

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.1

data/lib/vps.rb

@@ -1,3 +1,4 @@
+require "tmpdir"
 require "vps/version"
 
 module VPS

data/lib/vps/cli/domain.rb

@@ -11,7 +11,7 @@ module VPS
 
         if (upstream = config[:upstreams].detect{|upstream| upstream[:name] == name})
           upstream[:email] = email if email
-          upstream[:domains].push(domain).uniq!
+          (upstream[:domains] ||= []).push(domain).uniq!
           VPS.write_config(host, config)
         end
       end

data/lib/vps/cli/upstream.rb

@@ -10,16 +10,12 @@ module VPS
 
         unless config[:upstreams].any?{|upstream| upstream[:name] == name}
           spec = derive_upstream(path)
-          spec[:nginx] ||= {
-            :http => nil,
-            :https => nil
-          }
           config[:upstreams].push(spec.merge({
             :name => name || File.basename(path),
             :path => path,
-            :domains => [],
-            :email => nil,
-            :compose => nil
+            :compose => {
+              :container_name => name || File.basename(path)
+            }
           }))
           VPS.write_config(host, config)
         end
@@ -87,6 +83,20 @@ module VPS
               }
             end
           end
+        elsif Dir["#{path}/package.json"].any?
+          tmpfile = "#{Dir.tmpdir}/vps-debug.log"
+          pid = spawn("cd #{path} && npm start", :out => tmpfile, :err => "/dev/null")
+          Process.detach(pid)
+          sleep 5
+          `ps aux | grep -e "no[d]e #{path}"`.strip.split("\n").collect do |line|
+            `kill -9 #{line.split(" ")[1]}`
+          end
+          port = File.read(tmpfile).match(/on port (\d+)/).captures.first.to_i
+          {
+            type: "node",
+            node_version: `$SHELL -l -c 'cd #{path} && node -v'`.match(/[\d\.?]+/).to_s,
+            port: port
+          }
         end
       end
 

data/lib/vps/version.rb

@@ -1,7 +1,7 @@
 module VPS
   MAJOR = 0
   MINOR = 2
-  TINY  = 0
+  TINY  = 1
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/templates/docker/upstream/Dockerfile.node.erb

@@ -0,0 +1,12 @@
+FROM node:<%= upstream.node_version %>-alpine
+
+RUN apk update \
+&& apk --no-cache --update add \
+  build-base nodejs tzdata
+
+WORKDIR /opt/app
+COPY . .
+
+ENV NODE_ENV=production
+RUN npm install
+CMD ["npm", "start"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vps
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-31 00:00:00.000000000 Z
+date: 2020-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -174,6 +174,7 @@ files:
 - script/console
 - templates/docker/data/nginx/app.conf.erb
 - templates/docker/docker-compose.yml.erb
+- templates/docker/upstream/Dockerfile.node.erb
 - templates/docker/upstream/Dockerfile.phoenix.erb
 - templates/docker/upstream/Dockerfile.plug.erb
 - templates/docker/upstream/Dockerfile.rack.erb