bard 0.41.2 → 0.44.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b56dfecf167ffd69e2e99c558c0392fc6265f374
-  data.tar.gz: 3e05c1a6fb673e9bd03e4ac4960ad91ed558aa22
+SHA256:
+  metadata.gz: 86e79ccc420d8bed3ff834d150b9f58da74e34981dc59a244dd92de38fb5e831
+  data.tar.gz: 816db71d99a04cb75aff222369e41e719de7da1b608fc518b74e9ec3ba5a5ec0
 SHA512:
-  metadata.gz: 3649d61bdf34b2340a1720c7b76ded57c6a0d3a015919f69d45210ed28556fe0d4efb3bed58b0cb1f34ecb4fc8c81543979cf8359afb0a00782e9a2f040cd975
-  data.tar.gz: e6b78253e0841ddc31e503cd515d1a56202483ba5fd29320343d78d6a1df24ff572f2fe0e80b2f6dd338caa820b29ec1d14a7d90e55b4f685a681942fc9cec58
+  metadata.gz: 70fedcdd193a7588a6342a7efee99ddf95598599d80b50d48206fb29674e1dcf002ac3a239c0e836630190a1b5e8552d2bfe8ecc53f600fc031e3d44330631ac
+  data.tar.gz: 1c2dc2a6b0f6c6b225b520f7d801f8ae0dfd16b4007302db9ab2b713036f1bf89a4a5e4cd9f0bd422e23c5c3830b45ea94095283a780540fb1e87c88c0559917

data/.gitignore

@@ -7,6 +7,7 @@ rdoc
 tmp
 .bundle
 .rvmrc
+.ruby-version
 Gemfile.lock
 pkg/*
 

data/bard.gemspec

@@ -19,11 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "thor", ">= 0.19.0"
-  spec.add_dependency "capistrano", "= 2.5.10"
-  spec.add_dependency "net-ssh", "~> 4.0"
   spec.add_dependency "rvm"
-  spec.add_dependency "rvm-capistrano"
-  spec.add_dependency "systemu", ">= 1.2.0"
   spec.add_dependency "term-ansicolor", ">= 1.0.3"
   spec.add_dependency "bard-rake", ">= 0.1.1"
 

data/features/support/env.rb

@@ -2,7 +2,6 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'ruby-debug'
 require 'grit'
 require 'spec/expectations'
-require 'systemu'
 gem 'sqlite3-ruby'
 
 ENV["PATH"] += ":#{File.dirname(File.expand_path(__FILE__))}/../../bin"

data/features/support/io.rb

@@ -1,5 +1,6 @@
+require "open3"
 def type(command)
-  @status, @stdout, @stderr = systemu command, :env => @env
+  @stdout, @stderr, @status = Open3.capture3(@env, command)
   if ENV['DEBUG']
     puts '-' * 20
     puts "Executing command: #{command}"

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

@@ -1,60 +1,72 @@
-$:.unshift File.expand_path(File.dirname(__FILE__))
-
 module Bard; end
 
 require "bard/base"
 require "bard/git"
 require "bard/ci"
+require "bard/data"
+
+require "bard/config"
 
 class Bard::CLI < Thor
+  def initialize(*args, **kwargs, &block)
+    super
+    @config = Config.new(project_name, "bard.rb")
+  end
+
   desc "data [FROM=production, TO=local]", "copy database and assets from FROM to TO"
-  def data(from = "production", to = "local")
-    exec "cap _2.5.10_ data:pull ROLES=#{from}" if to == "local"
-    exec "cap _2.5.10_ data:push ROLES=#{to}" if from == "local"
+  def data(from=nil, to="local")
+    from ||= @config.servers.key?(:production) ? "production" : "staging"
+    Data.new(self, from, to).call
   end
 
   method_options %w( verbose -v ) => :boolean
-  desc "stage", "pushes current branch, and stages it"
-  def stage
-    unless File.read("Capfile").include?("role :production")
+  desc "stage [BRANCH=HEAD]", "pushes current branch, and stages it"
+  def stage branch=Git.current_branch
+    unless @config.servers.key?(:production)
       raise Thor::Error.new("`bard stage` is disabled until a production server is defined. Until then, please use `bard deploy` to deploy to the staging server.")
     end
 
-    branch = Git.current_branch
-
     run_crucial "git push -u origin #{branch}", true
-    run_crucial "cap _2.5.10_ stage BRANCH=#{branch}", options.verbose?
+    command = "git fetch && git checkout -f origin/#{branch} && bin/setup"
+    run_crucial ssh_command(:staging, command)
     puts green("Stage Succeeded")
 
-    unless system("cap _2.5.10_ ping ROLES=staging >/dev/null 2>&1")
-      puts red("Staging is now down!")
-    end
+    ping :staging
   end
 
-  method_options %w( verbose -v ) => :boolean, %w( skip-ci ) => :boolean
-  desc "deploy [BRANCH=HEAD]", "checks that branch is a ff with master, checks with ci, and then merges into master and deploys to production, and deletes branch."
-  def deploy branch=Git.current_branch
+  method_options %w[verbose -v] => :boolean, %w[skip-ci] => :boolean, %w[local-ci -l] => :boolean
+  desc "deploy [TO=production]", "checks that current branch is a ff with master, checks with ci, merges into master, deploys to target, and then deletes branch."
+  def deploy to=nil
+    branch = Git.current_branch
+
     if branch == "master"
       run_crucial "git push origin master:master"
-      invoke :ci unless options["skip-ci"]
+      invoke :ci, [branch], options.slice("local-ci") unless options["skip-ci"]
 
     else
       run_crucial "git fetch origin master:master"
 
-      if not Git.fast_forward_merge? "origin/master", branch
+      unless 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}"
 
-      invoke :ci unless options["skip-ci"]
+      invoke :ci, [branch], options.slice("local-ci") unless options["skip-ci"]
 
       run_crucial "git push origin #{branch}:master"
       run_crucial "git fetch origin master:master"
     end
 
-    run_crucial "cap _2.5.10_ deploy", options.verbose?
+    if `git remote` =~ /\bgithub\b/
+      run_crucial "git push github"
+    end
+
+    to ||= @config.servers.key?(:production) ? :production : :staging
+
+    command = "git pull origin master && bin/setup"
+    run_crucial ssh_command(to, command)
 
     puts green("Deploy Succeeded")
 
@@ -62,26 +74,20 @@ class Bard::CLI < Thor
       puts "Deleting branch: #{branch}"
       run_crucial "git push --delete origin #{branch}"
 
-      case Git.current_branch
-      when branch
+      if branch == Git.current_branch
         run_crucial "git checkout master"
-        run_crucial "git branch -d #{branch}"
-      when "master"
-        run_crucial "git branch -d #{branch}"
-      else
-        run_crucial "git branch -D #{branch}"
       end
-    end
 
-    unless system("cap _2.5.10_ ping ROLES=production >/dev/null 2>&1")
-      puts red("Production is now down!")
+      run_crucial "git branch -D #{branch}"
     end
+
+    ping to
   end
 
-  method_options %w( verbose -v ) => :boolean
+  method_options %w[verbose -v] => :boolean, %w[local-ci -l] => :boolean
   desc "ci [BRANCH=HEAD]", "runs ci against BRANCH"
   def ci branch=Git.current_branch
-    ci = CI.new(project_name, `git rev-parse #{branch}`.chomp)
+    ci = CI.new(project_name, `git rev-parse #{branch}`.chomp, local: options["local-ci"])
     if ci.exists?
       puts "Continuous integration: starting build on #{branch}..."
 
@@ -100,9 +106,9 @@ class Bard::CLI < Thor
       if success
         puts
         puts "Continuous integration: success!"
-        if File.exist?("coverage")
+        if !options["local-ci"] && File.exist?("coverage")
           puts "Downloading test coverage from CI..."
-          run_crucial "cap _2.5.10_ download_ci_test_coverage"
+          download_ci_test_coverage
         end
         puts "Deploying..."
       else
@@ -120,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|
@@ -132,16 +145,16 @@ class Bard::CLI < Thor
     end
   end
 
-  method_options %w( home ) => :boolean
+  method_options %w[home] => :boolean
   desc "ssh [TO=production]", "logs into the specified server via SSH"
-  def ssh to="production"
-    if to == "gubs"
-      command = "exec $SHELL"
-      command = "cd Sites/#{project_name} && #{command}" unless options["home"]
-      command = %(ssh -t gubito@gubs.pagekite.me 'bash -l -c "exec ./vagrant \\"#{command}\\""')
-      exec command
+  def ssh to=:production
+    command = "exec $SHELL -l"
+    if to == "gubs" && !options["home"]
+      server = @config.servers[:gubs]
+      command = %(bash -lic "exec ./vagrant \\"cd #{server.path} && #{command}\\"")
+      exec ssh_command(to, command, home: true)
     else
-      exec "cap _2.5.10_ ssh ROLES=#{to}#{" NOCD=1" if options["home"]}"
+      exec ssh_command(to, command, home: options["home"])
     end
   end
 
@@ -150,5 +163,39 @@ class Bard::CLI < Thor
     install_files_path = File.expand_path(File.join(__dir__, "../install_files/*"))
     system "cp #{install_files_path} bin/"
   end
+
+  desc "ping [SERVER=production]", "hits the server over http to verify that its up."
+  def ping server=:production
+    server = @config.servers[server.to_sym]
+    return false if server.ping == false
+
+    url = server.default_ping
+    if server.ping =~ %r{^/}
+      url += server.ping
+    elsif server.ping.to_s.length > 0
+      url = server.ping
+    end
+
+    command = "curl -sfL #{url} 2>&1 1>/dev/null"
+    unless system command
+      puts "#{server.to_s.capitalize} is down!"
+      exit 1
+    end
+  end
+
+  desc "master_key [FROM=production, TO=local]", "copy master key from FROM to TO"
+  def master_key from="production", to="local"
+    if to == "local"
+      copy :from, from, "config/master.key"
+    end
+    if from == "local"
+      copy :to, to, "config/master.key"
+    end
+  end
+
+  desc "download_ci_test_coverage", "download latest test coverage information from CI"
+  def download_ci_test_coverage
+    rsync :from, :ci, "coverage"
+  end
 end
 

data/lib/bard/base.rb

@@ -1,28 +1,79 @@
 require "thor"
 require "term/ansicolor"
-require "systemu"
+require "open3"
 
 class Bard::CLI < Thor
   include Term::ANSIColor
 
   private
 
-  def fatal(message)
-    raise red("!!! ") + message
-  end
-
   def run_crucial(command, verbose = false)
-    status, stdout, stderr = systemu command
-    fatal "Running command: #{yellow(command)}: #{stderr}" if status.to_i.nonzero?
-    if verbose
+    stdout, stderr, status = Open3.capture3(command)
+    failed = status.to_i.nonzero?
+    if verbose || failed
       $stdout.puts stdout
       $stderr.puts stderr
     end
+    if failed
+      puts red("!!! ") + "Running command failed: #{yellow(command)}"
+      exit 1
+    end
     stdout.chomp
   end
 
   def project_name
     @project_name ||= File.expand_path(".").split("/").last
   end
+
+  def ssh_command server, command, home: false
+    server = @config.servers[server.to_sym]
+    uri = URI.parse("ssh://#{server.ssh}")
+    command = "cd #{server.path} && #{command}" unless home
+    command = "ssh -tt #{"-p#{uri.port} " if uri.port}#{uri.user}@#{uri.host} '#{command}'"
+    if server.gateway
+      uri = URI.parse("ssh://#{server.gateway}")
+      command = "ssh -tt #{" -p#{uri.port} " if uri.port}#{uri.user}@#{uri.host} \"#{command}\""
+    end
+    command
+  end
+
+  def copy direction, server, path
+    server = @config.servers[server.to_sym]
+
+    uri = URI.parse("ssh://#{server.gateway}")
+    port = uri.port ? "-p#{uri.port}" : ""
+    gateway = server.gateway ? "-oProxyCommand='ssh #{port} #{uri.user}@#{uri.host} -W %h:%p'" : ""
+
+    uri = URI.parse("ssh://#{server.ssh}")
+    port = uri.port ? "-P#{uri.port}" : ""
+    from_and_to = [path, "#{uri.user}@#{uri.host}:#{server.path}/#{path}"]
+
+    from_and_to.reverse! if direction == :from
+    command = "scp #{gateway} #{port} #{from_and_to.join(" ")}"
+
+    run_crucial command
+  end
+
+  def rsync direction, server, path
+    server = @config.servers[server.to_sym]
+
+    uri = URI.parse("ssh://#{server.gateway}")
+    port = uri.port ? "-p#{uri.port}" : ""
+    gateway = server.gateway ? "-oProxyCommand=\"ssh #{port} #{uri.user}@#{uri.host} -W %h:%p\"" : ""
+
+    uri = URI.parse("ssh://#{server.ssh}")
+    port = uri.port ? "-p#{uri.port}" : ""
+    ssh = "-e'ssh #{port} #{gateway}'"
+
+    dest_path = path.dup
+    dest_path = "./#{dest_path}"
+    from_and_to = [dest_path, "#{uri.user}@#{uri.host}:#{server.path}/#{path}"]
+    from_and_to.reverse! if direction == :from
+    from_and_to[-1].sub! %r(/[^/]+$), '/'
+
+    command = "rsync #{ssh} --delete -avz #{from_and_to.join(" ")}"
+
+    run_crucial command
+  end
 end
 

data/lib/bard/ci.rb

@@ -1,69 +1,146 @@
+require "json"
+require "forwardable"
+require "open3"
+
 class Bard::CLI < Thor
-  class CI < Struct.new(:project_name, :sha)
-    def run
-      last_time_elapsed = get_last_time_elapsed
-      start
-      sleep(2) until started?
+  class CI
+    def initialize project_name, sha, local: false
+      @project_name = project_name
+      @sha = sha
+      @local = !!local
+      @runner = @local ? Local.new(project_name, sha) : Remote.new(project_name, sha)
+    end
 
-      start_time = Time.new.to_i
-      while building?
-        elapsed_time = Time.new.to_i - start_time
-        yield elapsed_time, last_time_elapsed
-        sleep(2)
-      end
+    attr_reader :project_name, :sha, :runner
 
-      success?
+    def local?
+      @local
     end
 
-    def exists?
-      `curl -s -I #{ci_host}/?token=botandrose` =~ /\b200 OK\b/
-    end
+    extend Forwardable
 
-    def console
-      raw = `curl -s #{ci_host}/lastBuild/console?token=botandrose`
-      raw[%r{<pre.*?>(.+)</pre>}m, 1]
-    end
+    delegate [:run, :exists?, :console, :last_response] => :runner
 
-    attr_accessor :last_response
+    class Remote < Struct.new(:project_name, :sha)
+      def run
+        last_time_elapsed = get_last_time_elapsed
+        start
+        sleep(2) until started?
 
-    private
+        start_time = Time.new.to_i
+        while building?
+          elapsed_time = Time.new.to_i - start_time
+          yield elapsed_time, last_time_elapsed
+          sleep(2)
+        end
 
-    def get_last_time_elapsed
-      response = `curl -s #{ci_host}/lastStableBuild/api/xml?token=botandrose`
-      response.match(/<duration>(\d+)<\/duration>/)
-      $1 ? $1.to_i / 1000 : nil
-    end
+        success?
+      end
 
-    def ci_host
-      "http://botandrose:thecakeisalie!@ci.botandrose.com/job/#{project_name}"
-    end
+      def exists?
+        `curl -s -I #{ci_host}/` =~ /\b200 OK\b/
+      end
 
-    def start
-      command = "curl -s -I -X POST '#{ci_host}/buildWithParameters?token=botandrose&GIT_REF=#{sha}'"
-      output = `#{command}`
-      @queueId = output[%r{Location: .+/queue/item/(\d+)/}, 1].to_i
-    end
+      def console
+        raw = `curl -s #{ci_host}/lastBuild/console`
+        raw[%r{<pre.*?>(.+)</pre>}m, 1]
+      end
 
-    def started?
-      command = "curl -s -g '#{ci_host}/api/json?depth=1&tree=builds[queueId,number]'"
-      output = `#{command}`
-      output =~ /"queueId":#{@queueId}\b/
-    end
+      attr_accessor :last_response
+
+      private
 
-    def job_id
-      @job_id ||= begin
-        output = `curl -s -g '#{ci_host}/api/json?depth=1&tree=builds[queueId,number]'`
-        output[/"number":(\d+),"queueId":#{@queueId}\b/, 1].to_i
+      def get_last_time_elapsed
+        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://#{auth}@ci.botandrose.com/job/#{project_name}"
+      end
+
+      def start
+        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
+
+      def started?
+        command = "curl -s -g '#{ci_host}/api/json?depth=1&tree=builds[queueId,number]'"
+        output = `#{command}`
+        JSON.parse(output)["builds"][0]["queueId"] == @queueId
       end
-    end
 
-    def building?
-      self.last_response = `curl -s #{ci_host}/#{job_id}/api/json?tree=building,result`
-      last_response.include? '"building":true'
+      def job_id
+        @job_id ||= begin
+          output = `curl -s -g '#{ci_host}/api/json?depth=1&tree=builds[queueId,number]'`
+          output[/"number":(\d+),"queueId":#{@queueId}\b/, 1].to_i
+        end
+      end
+
+      def building?
+        self.last_response = `curl -s #{ci_host}/#{job_id}/api/json?tree=building,result`
+        if last_response.blank?
+          sleep(2) # retry
+          self.last_response = `curl -s #{ci_host}/#{job_id}/api/json?tree=building,result`
+          if last_response.blank?
+            raise "Blank response from CI twice in a row. Aborting!"
+          end
+        end
+        last_response.include? '"building":true'
+      end
+
+      def success?
+        last_response.include? '"result":"SUCCESS"'
+      end
     end
 
-    def success?
-      last_response.include? '"result":"SUCCESS"'
+    class Local < Struct.new(:project_name, :sha)
+      def run
+        start
+
+        start_time = Time.new.to_i
+        while building?
+          elapsed_time = Time.new.to_i - start_time
+          yield elapsed_time, nil
+          sleep(2)
+        end
+
+        @stdin.close
+        @console = @stdout_and_stderr.read
+        @stdout_and_stderr.close
+
+        success?
+      end
+
+      def exists?
+        true
+      end
+
+      def console
+        @console
+      end
+
+      attr_accessor :last_response
+
+      private
+
+      def start
+        @stdin, @stdout_and_stderr, @wait_thread = Open3.popen2e("bin/rake ci")
+      end
+
+      def building?
+        ![nil, false].include?(@wait_thread.status)
+      end
+
+      def success?
+        @wait_thread.value.success?
+      end
     end
   end
 end

data/lib/bard/config.rb

@@ -0,0 +1,91 @@
+class Bard::CLI < Thor
+  class Config
+    def initialize project_name, path
+      @project_name = project_name
+      @servers = {
+        local: Server.new(
+          project_name,
+          :local,
+          false,
+          "./",
+          false,
+        ),
+        gubs: Server.new(
+          project_name,
+          :gubs,
+          "gubito@gubs.pagekite.me",
+          "Sites/#{project_name}",
+          false,
+        ),
+        ci: Server.new(
+          project_name,
+          :ci,
+          "jenkins@ci.botandrose.com:22022",
+          "jobs/#{project_name}/workspace",
+          false,
+        ),
+        staging: Server.new(
+          project_name,
+          :staging,
+          "www@#{project_name}.botandrose.com:22022",
+        ),
+      }
+      load_local_config! path
+    end
+
+    attr_reader :servers
+
+    def server key, &block
+      @servers[key] ||= Server.new(@project_name, key)
+      @servers[key].instance_eval &block if block_given?
+      @servers[key]
+    end
+
+    def data *paths
+      if paths.length == 0
+        Array(@data)
+      else
+        @data = paths
+      end
+    end
+
+    private
+
+    def load_local_config! path
+      instance_eval File.read(File.expand_path(path)) if File.exist?(path)
+    end
+
+    class Server < Struct.new(:project_name, :key, :ssh, :path, :ping, :gateway)
+      def self.setting *fields
+        fields.each do |field|
+          define_method field do |*args|
+            if args.length == 1
+              send :"#{field}=", args.first
+            elsif args.length == 0
+              super()
+            else
+              raise ArgumentError
+            end
+          end
+        end
+      end
+
+      setting :ssh, :path, :ping, :gateway
+
+      def default_ping
+        uri = URI.parse("ssh://#{ssh}")
+        "http://#{uri.host}"
+      end
+
+      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
+end

data/lib/bard/data.rb

@@ -0,0 +1,49 @@
+class Bard::CLI < Thor
+  class Data < Struct.new(:bard, :from, :to)
+    def call
+      if to == "local"
+        data_pull_db from.to_sym
+        data_pull_assets from.to_sym
+      end
+      if from == "local"
+        data_push_db to.to_sym
+        data_push_assets to.to_sym
+      end
+    end
+
+    private
+
+    def data_pull_db server
+      bard.instance_eval do
+        run_crucial ssh_command(server, "bin/rake db:dump && gzip -9f db/data.sql")
+        copy :from, server, "db/data.sql.gz"
+        run_crucial "gunzip -f db/data.sql.gz && bin/rake db:load"
+      end
+    end
+
+    def data_push_db server
+      bard.instance_eval do
+        run_crucial "bin/rake db:dump && gzip -9f db/data.sql"
+        copy :to, server, "db/data.sql.gz"
+        run_crucial ssh_command(server, "gunzip -f db/data.sql.gz && bin/rake db:load")
+      end
+    end
+
+    def data_pull_assets server
+      bard.instance_eval do
+        @config.data.each do |path|
+          rsync :from, server, path
+        end
+      end
+    end
+
+    def data_push_assets server
+      bard.instance_eval do
+        @config.data.each do |path|
+          rsync :to, server, path
+        end
+      end
+    end
+  end
+end
+

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "0.41.2"
+  VERSION = "0.44.1"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.41.2
+  version: 0.44.1
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2021-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,34 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.0
-- !ruby/object:Gem::Dependency
-  name: capistrano
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.5.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.5.10
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rvm
   requirement: !ruby/object:Gem::Requirement
@@ -66,34 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rvm-capistrano
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: systemu
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -174,8 +118,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".gitmodules"
-- ".ruby-gemset"
-- ".ruby-version"
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -201,10 +143,12 @@ 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/capistrano.rb
 - lib/bard/ci.rb
+- lib/bard/config.rb
+- lib/bard/data.rb
 - lib/bard/git.rb
 - lib/bard/version.rb
 - spec/bard_spec.rb
@@ -228,8 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: CLI to automate common development tasks.

data/.ruby-gemset

@@ -1 +0,0 @@
-bard

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.4.3

data/lib/bard/capistrano.rb

@@ -1,131 +0,0 @@
-require 'uri'
-
-Capistrano::Configuration.instance(:must_exist).load do
-  require "rvm/capistrano"
-  set :rvm_type, :user
-  ruby_version = File.read(".ruby-version").chomp
-  ruby_gemset = File.read(".ruby-gemset").chomp
-  set :rvm_ruby_string, [ruby_version, ruby_gemset].join("@")
-
-  set :application, File.basename(Dir.pwd)
-
-  role :staging, "www@staging.botandrose.com:22022"
-  role :ci, "jenkins@ci.botandrose.com:22022"
-
-  set :asset_paths, []
-
-  namespace "data" do
-    namespace "pull" do
-      desc "pull data"
-      task "default" do
-        run "cd #{application} && bundle exec rake db:dump && gzip -9f db/data.sql"
-        transfer :down, "#{application}/db/data.sql.gz", "db/data.sql.gz"
-        system "gunzip -f db/data.sql.gz && bundle exec rake db:load"
-      end
-
-      desc "sync the static assets"
-      task "assets" do
-        uri = URI.parse("ssh://#{roles[ENV['ROLES'].to_sym].first.to_s}")
-        portopt = "-e'ssh -p#{uri.port}'" if uri.port
-
-        [asset_paths].flatten.each do |path|
-          dest_path = path.dup
-          dest_path.sub! %r(/[^/]+$), '/'
-          system "rsync #{portopt} --delete -avz #{uri.user}@#{uri.host}:#{application}/#{path} #{dest_path}"
-        end
-      end
-    end
-
-    namespace "push" do
-      desc "push data"
-      task "default" do
-        system "bundle exec rake db:dump && gzip -9f db/data.sql"
-        transfer :up, "db/data.sql.gz", "#{application}/db/data.sql.gz"
-        run "cd #{application} && gunzip -f db/data.sql.gz && bundle exec rake db:load"
-      end
-
-      desc "sync the static assets"
-      task "assets" do
-        uri = URI.parse("ssh://#{roles[ENV['ROLES'].to_sym].first.to_s}")
-        portopt = "-e'ssh -p#{uri.port}'" if uri.port
-
-        [asset_paths].flatten.each do |path|
-          dest_path = path.dup
-          dest_path.sub! %r(/[^/]+$), '/'
-          system "rsync #{portopt} --delete -avz #{path} #{uri.user}@#{uri.host}:#{application}/#{dest_path}"
-        end
-      end
-    end
-  end
-
-  after 'data:pull', 'data:pull:assets'
-  after 'data:push', 'data:push:assets'
-
-  desc "push app to production"
-  task :deploy do
-    deploy_roles = roles.keys.include?(:production) ? :production : :staging
-    ENV["ROLES"] = deploy_roles.to_s
-    find_and_execute_task "rvm:install_ruby"
-    system "git push github" if `git remote` =~ /\bgithub\b/
-    run "cd #{application} && git pull origin master && bin/setup", roles: deploy_roles
-  end
-
-  desc "push app to staging"
-  task :stage do
-    ENV["ROLES"] = "staging"
-    find_and_execute_task "rvm:install_ruby"
-    branch = ENV.fetch("BRANCH")
-    run "cd #{application} && git fetch && git checkout -f origin/#{branch} && bin/setup", :roles => :staging
-  end
-
-  desc "test app for downtime"
-  task :ping do
-    deploy_roles = roles.keys.include?(:production) ? :production : :staging
-    ENV["ROLES"] = deploy_roles.to_s
-    role_name = ENV.fetch("ROLES", "production").to_sym
-    server_definition = roles[role_name].first
-
-    url = server_definition.host
-    if role_name == :staging && server_definition.host == "staging.botandrose.com"
-      url = "#{application}.botandrose.com"
-    end
-
-    ping_option = server_definition.options.fetch(:ping, "")
-    if ping_option =~ %r{^/}
-      url += ping_option
-    elsif ping_option.to_s.length > 0
-      url = ping_option
-    end
-
-    command = "curl -sfL #{url} 2>&1 1>/dev/null"
-    unless system command
-      puts "#{role_name.to_s.capitalize} is down!"
-      exit 1
-    end
-  end
-
-  desc "push master key"
-  task :push_master_key do
-    transfer :up, "config/master.key", "#{application}/config/master.key"
-  end
-
-  desc "pull master key"
-  task :pull_master_key do
-    transfer :down, "#{application}/config/master.key", "config/master.key"
-  end
-
-  desc "log in via ssh"
-  task :ssh do
-    role = ENV['ROLES'].to_sym
-    path = role == :ci ? "jobs/#{application}/workspace" : application
-    uri = URI.parse("ssh://#{roles[role].first.to_s}")
-    exec "ssh -t #{"-p#{uri.port} " if uri.port}#{uri.user}@#{uri.host} '#{"cd #{path} && " unless ENV['NOCD']}exec $SHELL -l'"
-  end
-
-  desc "download latest test coverage information from CI"
-  task :download_ci_test_coverage do
-    uri = URI.parse("ssh://#{roles[:staging].first}")
-    portopt = "-e'ssh -p#{uri.port}'" if uri.port
-    system "rsync #{portopt} --delete -avz #{uri.user}@#{uri.host}:~jenkins/jobs/#{application}/workspace/coverage ./"
-  end
-end