bard 0.42.0 → 0.44.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ede698ef957275736c6d373ab637f83e9a676bf3a7214a789d4314ee69f3532
-  data.tar.gz: c0ac00d558f50fa633858358d2387f68095810e8741b13b4227a08cfd3f9c5c4
+  metadata.gz: 288f1c3a327eaae2a435b6eee1b594918a7ebbebadecfacad4528c0b2fcb449d
+  data.tar.gz: ded1ce27cbbea6cac5909f58c3a9af849bb1809c13bf3d3f0b6d14511cbd6341
 SHA512:
-  metadata.gz: a237a2cc3ddc4611486f1dfe6b14a8c282daa7656330bc0748c960f668c4e5ec213ebd7cb9b7cd0671de95476a4a61b0e6763bb5588cda63dc08ab2d0809f9f0
-  data.tar.gz: 6861a6cf67056c5762144eb4fafc809c3a7a1040a8213a5bcac5860bc4f33aec9d44dccd7567e761f96465b20e0f14e5fa4a45aadcd96217a47b92ac7c8ce008
+  metadata.gz: f1b77d4d3245b43c06ca21204a0c8df9331fb76cb2dfa1fcace64861125c456bf40f80a731c08ec00defa6736c915626b9edd6c253c043f78aba4895d5c8c10a
+  data.tar.gz: 35e484be233cd029d01afe30b53c345ab15f40c458ddfc5b5b2f4d294103896699fc8c9b75d047cf33309218a043c176e2d2d50a42b155d88338ec7f5d7c0c14

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.rb

@@ -14,7 +14,8 @@ class Bard::CLI < Thor
   end
 
   desc "data [FROM=production, TO=local]", "copy database and assets from FROM to TO"
-  def data(from="production", to="local")
+  def data(from=nil, to="local")
+    from ||= @config.servers.key?(:production) ? "production" : "staging"
     Data.new(self, from, to).call
   end
 
@@ -125,6 +126,13 @@ class Bard::CLI < Thor
     end
   end
 
+  desc "open [SERVER=production]", "opens the url in the web browser."
+  def open server=nil
+    server ||= @config.servers.key?(:production) ? :production : :staging
+    server = @config.servers[server.to_sym]
+    exec "xdg-open #{server.default_ping}"
+  end
+
   desc "hurt", "reruns a command until it fails"
   def hurt *args
     1.upto(Float::INFINITY) do |count|
@@ -170,7 +178,7 @@ class Bard::CLI < Thor
 
     command = "curl -sfL #{url} 2>&1 1>/dev/null"
     unless system command
-      puts "#{server.to_s.capitalize} is down!"
+      puts "#{server.key.to_s.capitalize} is down!"
       exit 1
     end
   end

data/lib/bard/ci.rb

@@ -38,11 +38,11 @@ class Bard::CLI < Thor
       end
 
       def exists?
-        `curl -s -I #{ci_host}/?token=botandrose` =~ /\b200 OK\b/
+        `curl -s -I #{ci_host}/` =~ /\b200 OK\b/
       end
 
       def console
-        raw = `curl -s #{ci_host}/lastBuild/console?token=botandrose`
+        raw = `curl -s #{ci_host}/lastBuild/console`
         raw[%r{<pre.*?>(.+)</pre>}m, 1]
       end
 
@@ -51,17 +51,21 @@ class Bard::CLI < Thor
       private
 
       def get_last_time_elapsed
-        response = `curl -s #{ci_host}/lastStableBuild/api/xml?token=botandrose`
+        response = `curl -s #{ci_host}/lastStableBuild/api/xml`
         response.match(/<duration>(\d+)<\/duration>/)
         $1 ? $1.to_i / 1000 : nil
       end
 
+      def auth
+        "botandrose:11cc2ba6ef2e43fbfbedc1f466724f6290"
+      end
+
       def ci_host
-        "http://botandrose:thecakeisalie!@ci.botandrose.com/job/#{project_name}"
+        "http://#{auth}@ci.botandrose.com/job/#{project_name}"
       end
 
       def start
-        command = "curl -s -I -X POST '#{ci_host}/buildWithParameters?token=botandrose&GIT_REF=#{sha}'"
+        command = "curl -s -I -X POST -L '#{ci_host}/buildWithParameters?GIT_REF=#{sha}'"
         output = `#{command}`
         @queueId = output[%r{Location: .+/queue/item/(\d+)/}, 1].to_i
       end

data/lib/bard/config.rb

@@ -77,8 +77,14 @@ class Bard::CLI < Thor
         "http://#{uri.host}"
       end
 
-      def path
-        super || project_name
+      def path(*args)
+        if args.length == 1
+          self.path = args.first
+        elsif args.length == 0
+          super() || project_name
+        else
+          raise ArgumentError
+        end
       end
     end
   end

data/lib/bard/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.44.2
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2021-04-27 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