bard 0.49.0 → 0.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cb419fc2b00c18d30f063e319aed724202e92a5fa90be7aedeaebbc9ffc7442
-  data.tar.gz: 7ed9b8e370081de8066f91c0ebc0096f1fd5ee68870f3c5e6653370f6457524e
+  metadata.gz: b0143951321b002520b2680aa29b95c809dd2e53b6bbffffee26f2846ec77da6
+  data.tar.gz: 27d3e89add08daf40c0ecdfc2e689d476015faa527e7cccaa9d2ff11159d89fb
 SHA512:
-  metadata.gz: 4363c68ed6e10896ada82d79dbe990af712465fd9ac7434194e16af61a235a315d3e9f9be8a03726f307f1449228104da894f1e1a77ba073fcce2a40d29f72a9
-  data.tar.gz: f8a3736d63072637a27a790765ef7fbbecd4ee61cdec14aa03af390f76105cd965a118ce2f9bbad80f19c752d2b5e9373d2c62416014edd617b34e0ed5158e56
+  metadata.gz: 909fd33f890a8429bf6013ad0cc133ee36ee7fdea69d8c17a7fff10c5df88126d0edce954a36c434baa653c8ca47deefeeb31042099ea15cbd3b14c52eeebf38
+  data.tar.gz: 9d65e8741eb39854403e7929ec93a829091ad2bd6bd041790537162be0b8c62b90941bf426547b3fec999a03150caaf3079ec224d2b7304ab01a8bec98fa2e22

data/install_files/.github/workflows/ci.yml

@@ -0,0 +1,31 @@
+name: ci
+on:
+  workflow_dispatch:
+    inputs:
+      git-ref:
+        description: Git Ref
+        default: master
+        required: true
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    env:
+      RAILS_ENV: test
+    steps:
+      - name: Set up MySQL
+        run: |
+          sudo /etc/init.d/mysql start
+          sudo mysql -uroot -proot -e"ALTER USER 'root'@'localhost' IDENTIFIED WITH caching_sha2_password BY '';"
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.inputs.git-ref }}
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Setup
+        run: bin/setup
+      - name: Run tests
+        run: bin/ci
+

data/install_files/apt_dependencies.rb

@@ -0,0 +1,10 @@
+module AptDependencies
+  def self.ensure!
+    deps = File.readlines("Aptfile", chomp: true)
+    deps.map do |dep|
+      "apt list #{dep} | grep '\\[installed\\]' || sudo apt install -y #{dep}"
+    end.join(" && ")
+  rescue Errno::ENOENT
+    "true"
+  end
+end

data/install_files/ci

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-require_relative './specified_ruby'
-SpecifiedRuby.ensure!
 ENV["RAILS_ENV"] = "test"
 load "Rakefile"
 Rake::Task["ci"].invoke

data/install_files/setup

@@ -1,15 +1,13 @@
 #!/usr/bin/env ruby
+require_relative './apt_dependencies'
 require_relative './specified_ruby'
 require_relative './specified_bundler'
-require_relative './specified_node'
-require_relative './specified_yarn'
 
 Dir.chdir File.expand_path("..", __dir__) do
   exec [
+    AptDependencies.ensure!,
     SpecifiedRuby.ensure!,
     SpecifiedBundler.ensure!,
-    SpecifiedNode.ensure!,
-    SpecifiedYarn.ensure!,
     "bin/rake bootstrap",
   ].join(" && ")
 end

data/install_files/specified_ruby.rb

@@ -1,9 +1,8 @@
-require 'rvm'
-
 module SpecifiedRuby
   extend self
 
   def ensure!
+    return "true" if native?
     install unless installed?
     restart unless current?
     "true"
@@ -11,6 +10,19 @@ module SpecifiedRuby
 
   private
 
+  def native?
+    begin
+      require "rvm"
+      false
+    rescue LoadError
+      native_version == version
+    end
+  end
+
+  def native_version
+    "ruby-#{`ruby -e 'puts RUBY_VERSION'`.chomp}"
+  end
+
   def version
     File.read(".ruby-version").chomp
   end
@@ -29,6 +41,7 @@ module SpecifiedRuby
   end
 
   def current?
+    require "rvm"
     RVM.use_from_path!(".")
     RVM.current.environment_name == [version, gemset].join("@")
   rescue RVM::IncompatibleRubyError
@@ -36,7 +49,7 @@ module SpecifiedRuby
   end
 
   def restart
-    exec "rvm-exec #{$0} && rvm-exec $SHELL"
+    exec "rvm-exec #{$0} #{"&& rvm-exec $SHELL" if ENV["RAILS_ENV"] == "development"}"
   end
 end
 

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "0.49.0"
+  VERSION = "0.50.0"
 end
 

data/lib/bard.rb

@@ -161,7 +161,7 @@ class Bard::CLI < Thor
   desc "install", "copies bin/setup and bin/ci scripts into current project."
   def install
     install_files_path = File.expand_path(File.join(__dir__, "../install_files/*"))
-    system "cp #{install_files_path} bin/"
+    system "cp -R #{install_files_path} bin/"
   end
 
   desc "ping [SERVER=production]", "hits the server over http to verify that its up."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.49.0
+  version: 0.50.0
 platform: ruby
 authors:
 - Micah Geisel
@@ -138,13 +138,12 @@ files:
 - features/support/env.rb
 - features/support/grit_ext.rb
 - features/support/io.rb
+- install_files/.github/workflows/ci.yml
+- install_files/apt_dependencies.rb
 - install_files/ci
 - install_files/setup
 - install_files/specified_bundler.rb
-- 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

data/install_files/specified_node.rb

@@ -1,31 +0,0 @@
-module SpecifiedNode
-  extend self
-
-  NODE_VERSION = "v12.16.1"
-  NODE_PATH = "tmp/node-#{NODE_VERSION}-linux-x64/bin/node"
-
-  def ensure!
-    install_node unless node_installed?
-    install_binstub
-    "bin/node --version"
-  end
-
-  private
-
-  def install_node
-    system("wget -cO- https://nodejs.org/dist/#{NODE_VERSION}/node-#{NODE_VERSION}-linux-x64.tar.xz | tar xJ -C tmp/")
-  end
-
-  def install_binstub
-    system("cd bin && ln -fs ../#{NODE_PATH}")
-  end
-
-  def node_installed?
-    File.exist?(NODE_PATH) && `#{NODE_PATH} --version`.chomp == NODE_VERSION
-  end
-
-  def binstub_installed?
-    File.exist?("bin/node")
-  end
-end
-

data/install_files/specified_yarn.rb

@@ -1,31 +0,0 @@
-module SpecifiedYarn
-  extend self
-
-  YARN_VERSION = "v1.22.0"
-  YARN_PATH = "tmp/yarn-#{YARN_VERSION}/bin/yarn.js"
-
-  def ensure!
-    install_yarn unless yarn_installed?
-    install_binstub
-    "bin/yarn install"
-  end
-
-  private
-
-  def install_yarn
-    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 -fs ../#{YARN_PATH}")
-  end
-
-  def yarn_installed?
-    File.exist?(YARN_PATH) && `bin/node #{YARN_PATH} --version`.chomp == YARN_VERSION[1..-1]
-  end
-
-  def binstub_installed?
-    File.exist?("bin/yarn")
-  end
-end
-

data/install_files/yarn

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