bard 0.37.1 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d679d96650e54e2cceed8e2df0d38b383e1903da
-  data.tar.gz: e654d4014bf6f6b0838e4bc6f5d2b87125941b24
+  metadata.gz: ad6c6dd51289d7cb6595a4fe877d62be3e77060e
+  data.tar.gz: 210071b747c8402d99ec65645b908662513048ce
 SHA512:
-  metadata.gz: ec5be7e4bd20e4ecbb32f8fdc492a518b1532b58bf8b9b397e54d83964af4119c03de7049163bde847c68db92c3ab328c1251bbd96189a168f066f4c587a9ef0
-  data.tar.gz: 8041d817cd17541185e733a0480bec3108aaddc2c251ce9d648081a6147aaf9ebdb87386aee0b863bceeaad96ca44528945cf0094419dc6d12567b2b70ce5111
+  metadata.gz: 70a0edbbc9d106e9a68ffc7cb219fcda5e5012d35daada8532592767416ce0c77b0ba7c6bca4dae13f05d926f231c2186990a78813eaf310ab3e449e4415a343
+  data.tar.gz: 661c0fcc2f256135c0b3e43406d79588da0bed14a540ce1763b5ce508a795956dd53afe49ad38290f2ad7ae4b56d878a742bcc996ecba533cf66cd72e10ab0b4

data/bard.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.executables   = ["bard"]
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 

data/bin/setup

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/install_files/setup

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

data/install_files/specified_bundler.rb

@@ -3,6 +3,7 @@ module SpecifiedBundler
 
   def ensure!
     system("gem install bundler --conservative --version=#{bundler_version}") or raise "Cannot install bundler!"
+    "bundle check || bundle install"
   end
 
   private

data/install_files/specified_node.rb

@@ -0,0 +1,45 @@
+module SpecifiedNode
+  class NVMError < StandardError; end
+
+  NVM_PATH = File.expand_path("~/.nvm/nvm.sh")
+
+  extend self
+
+  def ensure!
+    install_nvm unless nvm_installed?
+    restart unless nvm_active?
+    install_node unless node_installed?
+    "true"
+  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"
+  end
+
+  def restart
+    exec %(bash -lc ". #{NVM_PATH}; #{$0}")
+  end
+
+  def nvm_active?
+    ENV.key?("NVM_DIR")
+  end
+
+  def nvm command
+    system(". #{NVM_PATH}; nvm #{command}")
+  end
+end

data/install_files/specified_ruby.rb

@@ -6,6 +6,7 @@ module SpecifiedRuby
   def ensure!
     install unless installed?
     restart unless current?
+    "true"
   end
 
   private

data/install_files/specified_yarn.rb

@@ -0,0 +1,34 @@
+module SpecifiedYarn
+  extend self
+
+  YARN_PATH = "node_modules/yarn/bin/yarn"
+
+  def ensure!
+    install_yarn unless yarn_installed?
+    install_binstub unless binstub_installed?
+    "bin/yarn install"
+  end
+
+  private
+
+  def install_yarn
+    system(". ~/.nvm/nvm.sh && npm install yarn@#{version} --no-save")
+  end
+
+  def install_binstub
+    system("cd bin && ln -s ../#{YARN_PATH}")
+  end
+
+  def yarn_installed?
+    File.exist?(YARN_PATH) && `#{YARN_PATH} --version`.chomp == version
+  end
+
+  def binstub_installed?
+    File.exist?("bin/yarn")
+  end
+
+  def version
+    File.read("package.json")[/"yarn": "([0-9\.]+)"/, 1]
+  end
+end
+

data/lib/bard.rb

@@ -41,8 +41,9 @@ class Bard::CLI < Thor
     else
       run_crucial "git fetch origin master:master"
 
-      if not Git.fast_forward_merge? "master", branch
-        raise "The master branch has advanced since last deploy, probably due to a bugfix.\n  Rebase your branch on top of it, and check for breakage."
+      if not Git.fast_forward_merge? "origin/master", branch
+        puts "The master branch has advanced. Attempting rebase..."
+        run_crucial "git rebase origin/master"
       end
 
       run_crucial "git push -f origin #{branch}:#{branch}"

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "0.37.1"
+  VERSION = "0.38.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.37.1
+  version: 0.38.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -182,6 +182,7 @@ files:
 - Rakefile
 - bard.gemspec
 - bin/bard
+- bin/setup
 - features/bard_check.feature
 - features/bard_deploy.feature
 - features/bard_pull.feature
@@ -197,7 +198,9 @@ files:
 - 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
 - lib/bard.rb
 - lib/bard/base.rb
 - lib/bard/capistrano.rb
@@ -226,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: CLI to automate common development tasks.