bard 0.42.0 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ede698ef957275736c6d373ab637f83e9a676bf3a7214a789d4314ee69f3532
-  data.tar.gz: c0ac00d558f50fa633858358d2387f68095810e8741b13b4227a08cfd3f9c5c4
+  metadata.gz: 1d2474f2bb81c20829b7ca09fff60ecfce5591b079eabc5b278f84264a85af47
+  data.tar.gz: a2a64f425e92a13bd2fb13a8e31cf26c6515eb382612b5bb805e626be2df7447
 SHA512:
-  metadata.gz: a237a2cc3ddc4611486f1dfe6b14a8c282daa7656330bc0748c960f668c4e5ec213ebd7cb9b7cd0671de95476a4a61b0e6763bb5588cda63dc08ab2d0809f9f0
-  data.tar.gz: 6861a6cf67056c5762144eb4fafc809c3a7a1040a8213a5bcac5860bc4f33aec9d44dccd7567e761f96465b20e0f14e5fa4a45aadcd96217a47b92ac7c8ce008
+  metadata.gz: e6d10bdee8db0cd11175325e41ae74f34543f20be0b5dd6f37ef52e51c67ffad1690d7a608df746d811846044c3627efee8328ae2b6c6cea5db45122db8e58fd
+  data.tar.gz: 05e02cc97bc25bb51a6794effd9a29ad466fab9909193028b3d6151c51cb0e20224639a40d6732c86b0307084743a9a113aae5a6f61eff6ff954d8779edf9b2e

data/install_files/specified_node.rb

@@ -1,45 +1,31 @@
 module SpecifiedNode
-  class NVMError < StandardError; end
-
-  NVM_PATH = File.expand_path("~/.nvm/nvm.sh")
-
   extend self
 
+  NODE_VERSION = "v12.16.1"
+  NODE_PATH = "tmp/node-#{NODE_VERSION}-linux-x64/bin/node"
+
   def ensure!
-    install_nvm unless nvm_installed?
-    restart unless nvm_active?
     install_node unless node_installed?
-    "true"
+    install_binstub
+    "bin/node --version"
   end
 
   private
 
-  def install_nvm
-    system("curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash")\
-      or raise "Couldn't install nvm"
-  end
-
-  def nvm_installed?
-    File.exist?(NVM_PATH)
-  end
-
   def install_node
-    nvm "install" or raise NVMError.new($?.exitstatus)
-  end
-
-  def node_installed?
-    nvm "use"
+    system("wget -cO- https://nodejs.org/dist/#{NODE_VERSION}/node-#{NODE_VERSION}-linux-x64.tar.xz | tar xJ -C tmp/")
   end
 
-  def restart
-    exec %(bash -lc ". #{NVM_PATH}; #{$0}")
+  def install_binstub
+    system("cd bin && ln -fs ../#{NODE_PATH}")
   end
 
-  def nvm_active?
-    ENV.key?("NVM_DIR")
+  def node_installed?
+    File.exist?(NODE_PATH) && `#{NODE_PATH} --version`.chomp == NODE_VERSION
   end
 
-  def nvm command
-    system(". #{NVM_PATH}; nvm #{command}")
+  def binstub_installed?
+    File.exist?("bin/node")
   end
 end
+

data/install_files/specified_yarn.rb

@@ -1,34 +1,31 @@
 module SpecifiedYarn
   extend self
 
-  YARN_PATH = "node_modules/yarn/bin/yarn"
+  YARN_VERSION = "v1.22.0"
+  YARN_PATH = "tmp/yarn-#{YARN_VERSION}/bin/yarn.js"
 
   def ensure!
     install_yarn unless yarn_installed?
-    install_binstub unless binstub_installed?
+    install_binstub
     "bin/yarn install"
   end
 
   private
 
   def install_yarn
-    system(". ~/.nvm/nvm.sh && npm install yarn@#{version} --no-save")
+    system("wget -cO- https://github.com/yarnpkg/yarn/releases/download/#{YARN_VERSION}/yarn-#{YARN_VERSION}.tar.gz | tar -xz -C tmp/")
   end
 
   def install_binstub
-    system("cd bin && ln -s ../#{YARN_PATH}")
+    system("cd bin && ln -fs ../#{YARN_PATH}")
   end
 
   def yarn_installed?
-    File.exist?(YARN_PATH) && `#{YARN_PATH} --version`.chomp == version
+    File.exist?(YARN_PATH) && `bin/node #{YARN_PATH} --version`.chomp == YARN_VERSION[1..-1]
   end
 
   def binstub_installed?
     File.exist?("bin/yarn")
   end
-
-  def version
-    File.read("package.json")[/"yarn": "([0-9\.]+)"/, 1]
-  end
 end
 

data/install_files/yarn

@@ -0,0 +1,5 @@
+#!/bin/sh
+argv0=$(echo "$0" | sed -e 's,\\,/,g')
+basedir=$(dirname "$(readlink -f "$0" || echo "$argv0")")
+exec "$basedir/node" "$basedir/yarn.js" "$@"
+

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "0.42.0"
+  VERSION = "0.43.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.43.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -143,6 +143,7 @@ files:
 - install_files/specified_node.rb
 - install_files/specified_ruby.rb
 - install_files/specified_yarn.rb
+- install_files/yarn
 - lib/bard.rb
 - lib/bard/base.rb
 - lib/bard/ci.rb