bard 0.68.0 → 0.69.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d6ffeb50c8bcafe4462e42e462d34c81a1d44690c38cef2b44682e11fed4854
-  data.tar.gz: 602a01d2fd94765904b0f767945149e8984d84856b2598f8a44afceda82ac62b
+  metadata.gz: 8e77aaa3b46702d144f1ed078868c7992c7283d5a97cc74113eb47de070a9ecc
+  data.tar.gz: e3f5210ab5741c06f5ee6a9010b885718895eec302b69cdb75c1f53b2a5d573f
 SHA512:
-  metadata.gz: f5c40d167fe14e473dd56a3e14ccebe922068dcff113783b7074df31de8de100da799c10470a00779fc257cd85efa99568f8accf988886cafc7e0606f8423e6a
-  data.tar.gz: 97fa25538c174668498f4a38de33b9cc17e4d60304675256a4a130d50920bfd814fc77aa48c76b88dda2d2dbe44648323cdc45736debe4b184201b3bf82e2a55
+  metadata.gz: f162644185e01bb6ee64adc4e4973868195a27fcc5c1e7fafdf40cab8f2b45bc8bd43b5f3210086549de543f01eec3f88487525bc1cc7f40f5034208731cedfb
+  data.tar.gz: b8ce44b788f1ccb4f057498ed61049a66d4f6e1019d44f97fac272933ee7aa1aba3198ca80e6256d8da7a3cb090793bfd4a35046d7cce1905d97dea3db14b02c

data/bard.gemspec

@@ -9,7 +9,6 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Micah Geisel"]
   spec.email         = ["micah@botandrose.com"]
   spec.summary       = "CLI to automate common development tasks."
-  spec.description   = "CLI to automate common development tasks."
   spec.homepage      = "http://github.com/botandrose/bard"
   spec.license       = "MIT"
 
@@ -21,7 +20,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor", ">= 0.19.0"
   spec.add_dependency "rvm"
   spec.add_dependency "term-ansicolor", ">= 1.0.3"
-  spec.add_dependency "bard-rake", ">= 0.19.0"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "rspec"

data/bin/bard

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require "rubygems"
-require_relative "../lib/bard"
+require_relative "../lib/bard/cli"
 Bard::CLI.start ARGV
 

data/lib/bard/ci/github_actions.rb

@@ -1,8 +1,7 @@
-require "thor"
 require "time"
 require "bard/github"
 
-class Bard::CLI < Thor
+module Bard
   class CI
     class GithubActions < Struct.new(:project_name, :branch, :sha)
       def run

data/lib/bard/ci/jenkins.rb

@@ -1,6 +1,6 @@
 require "json"
 
-class Bard::CLI < Thor
+module Bard
   class CI
     class Jenkins < Struct.new(:project_name, :branch, :sha)
       def run

data/lib/bard/ci/local.rb

@@ -1,6 +1,6 @@
 require "open3"
 
-class Bard::CLI < Thor
+module Bard
   class CI
     class Local < Struct.new(:project_name, :branch, :sha)
       def run

data/lib/bard/ci.rb

@@ -1,6 +1,6 @@
 require "forwardable"
 
-class Bard::CLI < Thor
+module Bard
   class CI
     def initialize project_name, branch, local: false
       @project_name = project_name

data/lib/bard/cli.rb

@@ -0,0 +1,262 @@
+# this file gets loaded in the CLI context, not the Rails boot context
+
+require "thor"
+require "bard/git"
+require "bard/ci"
+require "bard/copy"
+require "bard/github"
+require "bard/ping"
+require "bard/config"
+require "bard/command"
+require "term/ansicolor"
+require "open3"
+require "uri"
+
+module Bard
+  class CLI < Thor
+    include Term::ANSIColor
+
+    class_option :verbose, type: :boolean, aliases: :v
+
+    desc "data --from=production --to=local", "copy database and assets from from to to"
+    option :from, default: "production"
+    option :to, default: "local"
+    def data
+      from = config[options[:from]]
+      to = config[options[:to]]
+
+      if to.key == :production
+        url = to.ping.first
+        puts yellow "WARNING: You are about to push data to production, overwriting everything that is there!"
+        answer = ask("If you really want to do this, please type in the full HTTPS url of the production server:")
+        if answer != url
+          puts red("!!! ") + "Failed! We expected #{url}. Is this really where you want to overwrite all the data?"
+          exit 1
+        end
+      end
+
+      puts "Dumping #{from.key} database to file..."
+      from.run! "bin/rake db:dump"
+
+      puts "Transfering file from #{from.key} to #{to.key}..."
+      from.copy_file "db/data.sql.gz", to: to, verbose: true
+
+      puts "Loading file into #{to.key} database..."
+      to.run! "bin/rake db:load"
+
+      config.data.each do |path|
+        puts "Synchronizing files in #{path}..."
+        from.copy_dir path, to: to, verbose: true
+      end
+    end
+
+    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
+
+      run! "git push -u origin #{branch}", verbose: true
+      config[:staging].run! "git fetch && git checkout -f origin/#{branch} && bin/setup"
+      puts green("Stage Succeeded")
+
+      ping :staging
+    end
+
+    option :"skip-ci", type: :boolean
+    option :"local-ci", type: :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=:production
+      branch = Git.current_branch
+
+      if branch == "master"
+        if !Git.up_to_date_with_remote?(branch)
+          run! "git push origin #{branch}:#{branch}"
+        end
+        invoke :ci, [branch], options.slice("local-ci") unless options["skip-ci"]
+
+      else
+        run! "git fetch origin master:master"
+
+        unless Git.fast_forward_merge?("origin/master", branch)
+          puts "The master branch has advanced. Attempting rebase..."
+          run! "git rebase origin/master"
+        end
+
+        run! "git push -f origin #{branch}:#{branch}"
+
+        invoke :ci, [branch], options.slice("local-ci") unless options["skip-ci"]
+
+        run! "git push origin #{branch}:master"
+        run! "git fetch origin master:master"
+      end
+
+      if `git remote` =~ /\bgithub\b/
+        run! "git push github"
+      end
+
+      config[to].run! "git pull origin master && bin/setup"
+
+      puts green("Deploy Succeeded")
+
+      if branch != "master"
+        puts "Deleting branch: #{branch}"
+        run! "git push --delete origin #{branch}"
+
+        if branch == Git.current_branch
+          run! "git checkout master"
+        end
+
+        run! "git branch -D #{branch}"
+      end
+
+      ping to
+    end
+
+    option :"local-ci", type: :boolean
+    option :status, type: :boolean
+    desc "ci [branch=HEAD]", "runs ci against BRANCH"
+    def ci branch=Git.current_branch
+      ci = CI.new(project_name, branch, local: options["local-ci"])
+      if ci.exists?
+        return puts ci.status if options["status"]
+
+        puts "Continuous integration: starting build on #{branch}..."
+
+        success = ci.run do |elapsed_time, last_time|
+          if last_time
+            percentage = (elapsed_time.to_f / last_time.to_f * 100).to_i
+            output = "  Estimated completion: #{percentage}%"
+          else
+            output = "  No estimated completion time. Elapsed time: #{elapsed_time} sec"
+          end
+          print "\x08" * output.length
+          print output
+          $stdout.flush
+        end
+
+        if success
+          puts
+          puts "Continuous integration: success!"
+          puts "Deploying..."
+        else
+          puts
+          puts ci.last_response
+          puts ci.console
+          puts red("Automated tests failed!")
+          exit 1
+        end
+
+      else
+        puts red("No CI found for #{project_name}!")
+        puts "Re-run with --skip-ci to bypass CI, if you absolutely must, and know what you're doing."
+        exit 1
+      end
+    end
+
+    desc "open [server=production]", "opens the url in the web browser."
+    def open server=:production
+      exec "xdg-open #{config[server].ping.first}"
+    end
+
+    desc "hurt <command>", "reruns a command until it fails"
+    def hurt *args
+      1.upto(Float::INFINITY) do |count|
+        puts "Running attempt #{count}"
+        system *args
+        unless $?.success?
+          puts "Ran #{count-1} times before failing"
+          break
+        end
+      end
+    end
+
+    option :home, type: :boolean
+    desc "ssh [to=production]", "logs into the specified server via SSH"
+    def ssh to=:production
+      config[to].exec! "exec $SHELL -l", home: options[:home]
+    end
+
+    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 -R #{install_files_path} bin/"
+      github_files_path = File.expand_path(File.join(__dir__, "../../install_files/.github"))
+      system "cp -R #{github_files_path} ./"
+    end
+
+    desc "setup", "installs app in nginx"
+    def setup
+      path = "/etc/nginx/sites-available/#{project_name}"
+      dest_path = path.sub("sites-available", "sites-enabled")
+      server_name = "#{project_name}.localhost"
+
+      system "sudo tee #{path} >/dev/null <<-EOF
+server {
+  listen 80;
+  server_name #{server_name};
+
+  root #{Dir.pwd}/public;
+  passenger_enabled on;
+
+  location ~* \\.(ico|css|js|gif|jp?g|png|webp) {
+    access_log off;
+    if (\\$request_filename ~ \"-[0-9a-f]{32}\\.\") {
+      expires max;
+      add_header Cache-Control public;
+    }
+  }
+  gzip_static on;
+}
+EOF"
+      system "sudo ln -sf #{path} #{dest_path}" if !File.exist?(dest_path)
+      system "sudo service nginx restart"
+    end
+
+    desc "ping [server=production]", "hits the server over http to verify that its up."
+    def ping server=:production
+      server = config[server]
+      down_urls = Bard::Ping.call(config[server])
+      down_urls.each { |url| puts "#{url} is down!" }
+      exit 1 if down_urls.any?
+    end
+
+    option :on, default: "production"
+    desc "command <command> --on=production", "run the given command on the remote server"
+    def command command
+      server = config[options[:on]]
+      server.run! remote_command, verbose: true
+    end
+
+    desc "master_key --from=production --to=local", "copy master key from from to to"
+    option :from, default: "production"
+    option :to, default: "local"
+    def master_key
+      from = config[options[:from]]
+      to = config[options[:to]]
+      from.copy_file "config/master.key", to:
+    end
+
+    desc "vim [branch=master]", "open all files that have changed since master"
+    def vim branch="master"
+      exec "vim -p `git diff #{branch} --name-only | grep -v sass$ | tac`"
+    end
+
+    def self.exit_on_failure? = true
+
+    private
+
+    def config
+      @config ||= Bard::Config.new(project_name, path: "bard.rb")
+    end
+
+    def project_name
+      @project_name ||= File.expand_path(".").split("/").last
+    end
+
+    def run!(...)
+      Bard::Command.run!(...)
+    end
+  end
+end
+

data/lib/bard/command.rb

@@ -0,0 +1,64 @@
+module Bard
+  class Command < Struct.new(:command, :on, :home)
+    def self.run! command, on: :local, home: false, verbose: false
+      new(command, on, home).run! verbose: verbose
+    end
+
+    def self.exec! command, on: :local, home: false
+      new(command, on, home).exec!
+    end
+
+    def run! verbose: false
+      failed = false
+
+      if verbose
+        failed = !(system full_command)
+      else
+        stdout, stderr, status = Open3.capture3(full_command)
+        failed = status.to_i.nonzero?
+        if failed
+          $stdout.puts stdout
+          $stderr.puts stderr
+        end
+      end
+
+      if failed
+        raise "Running command failed: #{full_command}"
+        # puts red("!!! ") + "Running command failed: #{yellow(command)}"
+        # exit 1
+      end
+    end
+
+    def exec!
+      exec full_command
+    end
+
+    private
+
+    def full_command
+      if on.to_sym == :local
+        command
+      else
+        remote_command
+      end
+    end
+
+    def remote_command
+      uri = URI.parse("ssh://#{on.ssh}")
+      ssh_key = on.ssh_key ? "-i #{on.ssh_key} " : ""
+      cmd = command
+      if on.env
+        cmd = "#{on.env} #{command}"
+      end
+      unless home
+        cmd = "cd #{on.path} && #{cmd}"
+      end
+      cmd = "ssh -tt #{ssh_key}#{"-p#{uri.port} " if uri.port}#{uri.user}@#{uri.host} '#{cmd}'"
+      if on.gateway
+        uri = URI.parse("ssh://#{on.gateway}")
+        cmd = "ssh -tt #{" -p#{uri.port} " if uri.port}#{uri.user}@#{uri.host} \"#{cmd}\""
+      end
+      cmd
+    end
+  end
+end

data/lib/bard/config.rb

@@ -1,4 +1,6 @@
 require "uri"
+require "bard/command"
+require "bard/copy"
 
 module Bard
   class Config
@@ -48,11 +50,20 @@ module Bard
     attr_reader :project_name, :servers
 
     def server key, &block
+      key = key.to_sym
       @servers[key] ||= Server.new(project_name, key)
       @servers[key].instance_eval &block if block_given?
       @servers[key]
     end
 
+    def [] key
+      key = key.to_sym
+      if @servers[key].nil? && key == :production
+        key = :staging
+      end
+      @servers[key]
+    end
+
     def data *paths
       if paths.length == 0
         Array(@data)
@@ -123,6 +134,26 @@ module Bard
           raise ArgumentError
         end
       end
+
+      def to_sym
+        key
+      end
+
+      def run! command, home: false, verbose: false
+        Bard::Command.run! command, on: self, home:, verbose:
+      end
+
+      def exec! command, home: false
+        Bard::Command.exec! command, on: self, home:
+      end
+
+      def copy_file path, to:, verbose: false
+        Bard::Copy.file path, from: self, to:, verbose:
+      end
+
+      def copy_dir
+        Bard::Copy.dir path, from: self, to:, verbose:
+      end
     end
   end
 end

data/lib/bard/copy.rb

@@ -0,0 +1,101 @@
+module Bard
+  class Copy < Struct.new(:path, :from, :to, :verbose)
+    def self.file path, from:, to:, verbose: false
+      new(path, from, to, verbose).scp
+    end
+
+    def self.dir path, from:, to:, verbose: false
+      new(path, from, to, verbose).rsync
+    end
+
+    def scp
+      if from.key == :local
+        scp_using_local :to, to
+      elsif to.key == :local
+        scp_using_local :from, from
+      else
+        scp_as_mediator
+      end
+    end
+
+    def scp_using_local direction, server
+      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'" : ""
+
+      ssh_key = server.ssh_key ? "-i #{server.ssh_key}" : ""
+
+      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} #{ssh_key} #{port} #{from_and_to.join(" ")}"
+
+      Bard::Command.run! command, verbose: verbose
+    end
+
+    def scp_as_mediator
+      raise NotImplementedError if from.gateway || to.gateway || from.ssh_key || to.ssh_key
+
+      from_uri = URI.parse("ssh://#{from.ssh}")
+      from_str = "scp://#{from_uri.user}@#{from_uri.host}:#{from_uri.port || 22}/#{from.path}/#{path}"
+
+      to_uri = URI.parse("ssh://#{to.ssh}")
+      to_str = "scp://#{to_uri.user}@#{to_uri.host}:#{to_uri.port || 22}/#{to.path}/#{path}"
+
+      command = "scp -o ForwardAgent=yes #{from_str} #{to_str}"
+
+      Bard::Command.run! command, verbose: verbose
+    end
+
+    def rsync
+      if from.key == :local
+        rsync_using_local :to, to
+      elsif to.key == :local
+        rsync_using_local :from, from
+      else
+        rsync_as_mediator from, to
+      end
+    end
+
+    def rsync_using_local direction, server
+      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\"" : ""
+
+      ssh_key = server.ssh_key ? "-i #{server.ssh_key}" : ""
+      uri = URI.parse("ssh://#{server.ssh}")
+      port = uri.port ? "-p#{uri.port}" : ""
+      ssh = "-e'ssh #{ssh_key} #{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 --info=progress2 -az #{from_and_to.join(" ")}"
+
+      Bard::Command.run! command, verbose: verbose
+    end
+
+    def rsync_as_mediator from, to
+      raise NotImplementedError if from.gateway || to.gateway || from.ssh_key || to.ssh_key
+
+      dest_path = path.dup
+      dest_path = "./#{dest_path}"
+
+      from_uri = URI.parse("ssh://#{from.ssh}")
+      from_str = "-p#{from_uri.port || 22} #{from_uri.user}@#{from_uri.host}"
+
+      to_uri = URI.parse("ssh://#{to.ssh}")
+      to_str = "#{to_uri.user}@#{to_uri.host}:#{to.path}/#{path}"
+      to_str.sub! %r(/[^/]+$), '/'
+
+      command = %(ssh -A #{from_str} 'rsync -e \"ssh -A -p#{to_uri.port || 22} -o StrictHostKeyChecking=no\" --delete --info=progress2 -az #{from.path}/#{path} #{to_str}')
+
+      Bard::Command.run! command, verbose: verbose
+    end
+  end
+end

data/lib/bard/git.rb

@@ -1,29 +1,31 @@
-module Bard::CLI::Git
-  module_function
+module Bard
+  module Git
+    module_function
 
-  def current_branch
-    ref = `git symbolic-ref HEAD 2>&1`.chomp
-    return false if ref =~ /^fatal:/
-    ref.sub(/refs\/heads\//, '') # refs/heads/master ... we want "master"
-  end
+    def current_branch
+      ref = `git symbolic-ref HEAD 2>&1`.chomp
+      return false if ref =~ /^fatal:/
+      ref.sub(/refs\/heads\//, '') # refs/heads/master ... we want "master"
+    end
 
-  def current_sha
-    sha_of("HEAD")
-  end
+    def current_sha
+      sha_of("HEAD")
+    end
 
-  def fast_forward_merge?(root, branch)
-    root_head = sha_of(root)
-    branch_head = sha_of(branch)
-    common_ancestor = `git merge-base #{root_head} #{branch_head}`.chomp
-    common_ancestor == root_head
-  end
+    def fast_forward_merge?(root, branch)
+      root_head = sha_of(root)
+      branch_head = sha_of(branch)
+      common_ancestor = `git merge-base #{root_head} #{branch_head}`.chomp
+      common_ancestor == root_head
+    end
 
-  def up_to_date_with_remote? branch
-    sha_of(branch) == sha_of("origin/#{branch}")
-  end
+    def up_to_date_with_remote? branch
+      sha_of(branch) == sha_of("origin/#{branch}")
+    end
 
-  def sha_of ref
-    `git rev-parse #{ref}`.chomp
+    def sha_of ref
+      `git rev-parse #{ref}`.chomp
+    end
   end
 end
 

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "0.68.0"
+  VERSION = "0.69.1"
 end
 

data/lib/bard.rb

@@ -1,253 +1,3 @@
-module Bard; end
-
-require "bard/base"
-require "bard/git"
-require "bard/ci"
-require "bard/data"
-require "bard/github"
-require "bard/ping"
-require "bard/config"
-require "bard/remote_command"
-
-class Bard::CLI < Thor
-  include Thor::Actions
-
-  def initialize(*args, **kwargs, &block)
-    super
-    @config = Bard::Config.new(project_name, path: "bard.rb")
-  end
-
-  desc "data --from=production --to=local", "copy database and assets from from to to"
-  method_options %w[from] => :string, %w[to] => :string
-  def data
-    default_from = @config.servers.key?(:production) ? "production" : "staging"
-    from = options.fetch(:from, default_from)
-    to = options.fetch(:to, "local")
-    Data.new(self, from, to).call
-  end
-
-  method_options %w( verbose -v ) => :boolean
-  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
-
-    run_crucial "git push -u origin #{branch}", verbose: true
-    command = "git fetch && git checkout -f origin/#{branch} && bin/setup"
-    run_crucial ssh_command(:staging, command)
-    puts green("Stage Succeeded")
-
-    ping :staging
-  end
-
-  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 #{branch}:#{branch}" if !Git.up_to_date_with_remote?(branch)
-      invoke :ci, [branch], options.slice("local-ci") unless options["skip-ci"]
-
-    else
-      run_crucial "git fetch origin master:master"
-
-      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, [branch], options.slice("local-ci") unless options["skip-ci"]
-
-      run_crucial "git push origin #{branch}:master"
-      run_crucial "git fetch origin master:master"
-    end
-
-    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")
-
-    if branch != "master"
-      puts "Deleting branch: #{branch}"
-      run_crucial "git push --delete origin #{branch}"
-
-      if branch == Git.current_branch
-        run_crucial "git checkout master"
-      end
-
-      run_crucial "git branch -D #{branch}"
-    end
-
-    ping to
-  end
-
-  method_options %w[verbose -v] => :boolean, %w[local-ci -l] => :boolean, %w[status -s] => :boolean
-  desc "ci [BRANCH=HEAD]", "runs ci against BRANCH"
-  def ci branch=Git.current_branch
-    ci = CI.new(project_name, branch, local: options["local-ci"])
-    if ci.exists?
-      return puts ci.status if options["status"]
-
-      puts "Continuous integration: starting build on #{branch}..."
-
-      success = ci.run do |elapsed_time, last_time|
-        if last_time
-          percentage = (elapsed_time.to_f / last_time.to_f * 100).to_i
-          output = "  Estimated completion: #{percentage}%"
-        else
-          output = "  No estimated completion time. Elapsed time: #{elapsed_time} sec"
-        end
-        print "\x08" * output.length
-        print output
-        $stdout.flush
-      end
-
-      if success
-        puts
-        puts "Continuous integration: success!"
-        if ci.jenkins? && File.exist?("coverage")
-          puts "Downloading test coverage from CI..."
-          download_ci_test_coverage
-        end
-        puts "Deploying..."
-      else
-        puts
-        puts ci.last_response
-        puts ci.console
-        puts red("Automated tests failed!")
-        exit 1
-      end
-
-    else
-      puts red("No CI found for #{project_name}!")
-      puts "Re-run with --skip-ci to bypass CI, if you absolutely must, and know what you're doing."
-      exit 1
-    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.ping.first}"
-  end
-
-  desc "hurt", "reruns a command until it fails"
-  def hurt *args
-    1.upto(Float::INFINITY) do |count|
-      puts "Running attempt #{count}"
-      system *args
-      unless $?.success?
-        puts "Ran #{count-1} times before failing"
-        break
-      end
-    end
-  end
-
-  method_options %w[home] => :boolean
-  desc "ssh [TO=production]", "logs into the specified server via SSH"
-  def ssh to=:production
-    command = "exec $SHELL -l"
-    if to == "theia" && !options["home"]
-      server = @config.servers[:theia]
-      command = %(bash -lic "exec ./vagrant \\"cd #{server.path} && #{command}\\"")
-      exec ssh_command(to, command, home: true)
-    else
-      exec ssh_command(to, command, home: options["home"])
-    end
-  end
-
-  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 -R #{install_files_path} bin/"
-    github_files_path = File.expand_path(File.join(__dir__, "../install_files/.github"))
-    system "cp -R #{github_files_path} ./"
-  end
-
-  desc "setup", "installs app in nginx"
-  def setup
-    path = "/etc/nginx/sites-available/#{project_name}"
-    dest_path = path.sub("sites-available", "sites-enabled")
-    server_name = "#{project_name}.localhost"
-
-    create_file path, <<~NGINX
-      server {
-        listen 80;
-        server_name #{server_name};
-
-        root #{Dir.pwd}/public;
-        passenger_enabled on;
-
-        location ~* \\.(ico|css|js|gif|jp?g|png|webp) {
-          access_log off;
-          if ($request_filename ~ "-[0-9a-f]{32}\\.") {
-            expires max;
-            add_header Cache-Control public;
-          }
-        }
-        gzip_static on;
-      }
-    NGINX
-
-    FileUtils.ln_sf(path, dest_path) if !File.exist?(dest_path)
-    run "service nginx restart"
-  rescue Errno::EACCES
-    raise InvocationError.new("please re-run with sudo")
-  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]
-    down_urls = Bard::Ping.call(server)
-    down_urls.each { |url| puts "#{url} is down!" }
-    exit 1 if down_urls.any?
-  end
-
-  desc "command <command> --on=production", "run the given command on the remote server"
-  method_options %w[on] => :string
-  def command command
-    default_from = @config.servers.key?(:production) ? "production" : "staging"
-    on = options.fetch(:on, default_from)
-    server = @config.servers[on.to_sym]
-    remote_command = Bard::RemoteCommand.new(server, command).local_command
-    run_crucial remote_command, verbose: true
-  end
-
-  desc "master_key --from=production --to=local", "copy master key from from to to"
-  method_options %w[from] => :string, %w[to] => :string
-  def master_key
-    default_from = @config.servers.key?(:production) ? "production" : "staging"
-    from = options.fetch(:from, default_from)
-    to = options.fetch(: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
-
-  desc "vim", "open all files that have changed since master"
-  def vim branch="master"
-    exec "vim -p `git diff #{branch} --name-only | grep -v sass$ | tac`"
-  end
-
-  def self.exit_on_failure? = true
+module Bard
 end
 

data/spec/bard/ci/github_actions_spec.rb

@@ -1,6 +1,6 @@
 require "bard/ci/github_actions"
 
-describe Bard::CLI::CI::GithubActions do
+describe Bard::CI::GithubActions do
   subject { described_class.new("metrc", "master", "0966308e204b256fdcc11457eb53306d84884c60") }
 
   xit "works" do
@@ -8,7 +8,7 @@ describe Bard::CLI::CI::GithubActions do
   end
 end
 
-describe Bard::CLI::CI::GithubActions::API do
+describe Bard::CI::GithubActions::API do
   subject { described_class.new("metrc") }
 
   describe "#last_successful_run" do
@@ -29,7 +29,7 @@ describe Bard::CLI::CI::GithubActions::API do
   end
 end
 
-describe Bard::CLI::CI::GithubActions::Client do
+describe Bard::Github do
   subject { described_class.new("metrc") }
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.68.0
+  version: 0.69.1
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-15 00:00:00.000000000 Z
+date: 2024-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
-- !ruby/object:Gem::Dependency
-  name: bard-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.19.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: CLI to automate common development tasks.
+description: 
 email:
 - micah@botandrose.com
 executables:
@@ -147,17 +133,17 @@ files:
 - install_files/specified_bundler.rb
 - install_files/specified_ruby.rb
 - lib/bard.rb
-- lib/bard/base.rb
 - lib/bard/ci.rb
 - lib/bard/ci/github_actions.rb
 - lib/bard/ci/jenkins.rb
 - lib/bard/ci/local.rb
+- lib/bard/cli.rb
+- lib/bard/command.rb
 - lib/bard/config.rb
-- lib/bard/data.rb
+- lib/bard/copy.rb
 - lib/bard/git.rb
 - lib/bard/github.rb
 - lib/bard/ping.rb
-- lib/bard/remote_command.rb
 - lib/bard/version.rb
 - spec/bard/ci/github_actions_spec.rb
 - spec/bard_spec.rb

data/lib/bard/base.rb

@@ -1,119 +0,0 @@
-require "thor"
-require "term/ansicolor"
-require "open3"
-require "uri"
-require "bard/remote_command"
-
-class Bard::CLI < Thor
-  include Term::ANSIColor
-
-  private
-
-  def run_crucial command, verbose: false
-    failed = false
-
-    if verbose
-      failed = !(system command)
-    else
-      stdout, stderr, status = Open3.capture3(command)
-      failed = status.to_i.nonzero?
-      if failed
-        $stdout.puts stdout
-        $stderr.puts stderr
-      end
-    end
-
-    if failed
-      puts red("!!! ") + "Running command failed: #{yellow(command)}"
-      exit 1
-    end
-  end
-
-  def project_name
-    @project_name ||= File.expand_path(".").split("/").last
-  end
-
-  def ssh_command server_name, command, home: false
-    server = @config.servers.fetch(server_name.to_sym)
-    Bard::RemoteCommand.new(server, command, home).local_command
-  end
-
-  def copy direction, server_name, path, verbose: false
-    server = @config.servers.fetch(server_name.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'" : ""
-
-    ssh_key = server.ssh_key ? "-i #{server.ssh_key}" : ""
-
-    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} #{ssh_key} #{port} #{from_and_to.join(" ")}"
-
-    run_crucial command, verbose: verbose
-  end
-
-  def move from_name, to_name, path, verbose: false
-    from = @config.servers.fecth(from_name.to_sym)
-    to = @config.servers.fetch(to_name.to_sym)
-    raise NotImplementedError if from.gateway || to.gateway || from.ssh_key || to.ssh_key
-
-    from_uri = URI.parse("ssh://#{from.ssh}")
-    from_str = "scp://#{from_uri.user}@#{from_uri.host}:#{from_uri.port || 22}/#{from.path}/#{path}"
-
-    to_uri = URI.parse("ssh://#{to.ssh}")
-    to_str = "scp://#{to_uri.user}@#{to_uri.host}:#{to_uri.port || 22}/#{to.path}/#{path}"
-
-    command = "scp -o ForwardAgent=yes #{from_str} #{to_str}"
-
-    run_crucial command, verbose: verbose
-  end
-
-  def rsync direction, server_name, path, verbose: false
-    server = @config.servers.fetch(server_name.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\"" : ""
-
-    ssh_key = server.ssh_key ? "-i #{server.ssh_key}" : ""
-    uri = URI.parse("ssh://#{server.ssh}")
-    port = uri.port ? "-p#{uri.port}" : ""
-    ssh = "-e'ssh #{ssh_key} #{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 --info=progress2 -az #{from_and_to.join(" ")}"
-
-    run_crucial command, verbose: verbose
-  end
-
-  def rsync_remote from_name, to_name, path, verbose: false
-    from = @config.servers.fetch(from_name.to_sym)
-    to = @config.servers.fetch(to_name.to_sym)
-    raise NotImplementedError if from.gateway || to.gateway || from.ssh_key || to.ssh_key
-
-    dest_path = path.dup
-    dest_path = "./#{dest_path}"
-
-    from_uri = URI.parse("ssh://#{from.ssh}")
-    from_str = "-p#{from_uri.port || 22} #{from_uri.user}@#{from_uri.host}"
-
-    to_uri = URI.parse("ssh://#{to.ssh}")
-    to_str = "#{to_uri.user}@#{to_uri.host}:#{to.path}/#{path}"
-    to_str.sub! %r(/[^/]+$), '/'
-
-    command = %(ssh -A #{from_str} 'rsync -e \"ssh -A -p#{to_uri.port || 22} -o StrictHostKeyChecking=no\" --delete --info=progress2 -az #{from.path}/#{path} #{to_str}')
-
-    run_crucial command, verbose: verbose
-  end
-end
-

data/lib/bard/data.rb

@@ -1,96 +0,0 @@
-class Bard::CLI < Thor
-  class Data < Struct.new(:bard, :from, :to)
-    def call
-      if to == "production"
-        server = bard.instance_variable_get(:@config).servers[to.to_sym]
-        url = server.ping.first
-        puts bard.yellow("WARNING: You are about to push data to production, overwriting everything that is there!")
-        answer = bard.ask("If you really want to do this, please type in the full HTTPS url of the production server:")
-        if answer != url
-          puts bard.red("!!! ") + "Failed! We expected #{url}. Is this really where you want to overwrite all the data?"
-          exit 1
-        end
-      end
-
-      if to == "local"
-        data_pull_db from.to_sym
-        data_pull_assets from.to_sym
-      elsif from == "local"
-        data_push_db to.to_sym
-        data_push_assets to.to_sym
-      else
-        data_move_db from.to_sym, to.to_sym
-        data_move_assets from.to_sym, to.to_sym
-      end
-    end
-
-    private
-
-    def data_pull_db server
-      bard.instance_eval do
-        puts "Dumping remote database to file..."
-        run_crucial ssh_command(server, "bin/rake db:dump")
-
-        puts "Downloading file..."
-        copy :from, server, "db/data.sql.gz", verbose: true
-
-        puts "Loading file into local database..."
-        run_crucial "bin/rake db:load"
-      end
-    end
-
-    def data_push_db server
-      bard.instance_eval do
-        puts "Dumping local database to file..."
-        run_crucial "bin/rake db:dump"
-
-        puts "Uploading file..."
-        copy :to, server, "db/data.sql.gz", verbose: true
-
-        puts "Loading file into remote database..."
-        run_crucial ssh_command(server, "bin/rake db:load")
-      end
-    end
-
-    def data_move_db from, to
-      bard.instance_eval do
-        puts "Dumping local database to file..."
-        run_crucial ssh_command(from, "bin/rake db:load")
-
-        puts "Uploading file..."
-        move from, to, "db/data.sql.gz", verbose: true
-
-        puts "Loading file into remote database..."
-        run_crucial ssh_command(to, "bin/rake db:load")
-      end
-    end
-
-    def data_pull_assets server
-      bard.instance_eval do
-        @config.data.each do |path|
-          puts "Downloading files..."
-          rsync :from, server, path, verbose: true
-        end
-      end
-    end
-
-    def data_push_assets server
-      bard.instance_eval do
-        @config.data.each do |path|
-          puts "Uploading files..."
-          rsync :to, server, path, verbose: true
-        end
-      end
-    end
-
-    def data_move_assets from, to
-      bard.instance_eval do
-        @config.data.each do |path|
-          puts "Copying files..."
-          rsync_remote from, to, path, verbose: true
-        end
-      end
-    end
-  end
-end
-

data/lib/bard/remote_command.rb

@@ -1,45 +0,0 @@
-module Bard
-  class RemoteCommand < Struct.new(:server, :command, :home)
-    def self.run! *args
-      new(*args).run!
-    end
-
-    def local_command
-      uri = URI.parse("ssh://#{server.ssh}")
-      ssh_key = server.ssh_key ? "-i #{server.ssh_key} " : ""
-      cmd = command
-      if server.env
-        cmd = "#{server.env} #{command}"
-      end
-      unless home
-        cmd = "cd #{server.path} && #{cmd}"
-      end
-      cmd = "ssh -tt #{ssh_key}#{"-p#{uri.port} " if uri.port}#{uri.user}@#{uri.host} '#{cmd}'"
-      if server.gateway
-        uri = URI.parse("ssh://#{server.gateway}")
-        cmd = "ssh -tt #{" -p#{uri.port} " if uri.port}#{uri.user}@#{uri.host} \"#{cmd}\""
-      end
-      cmd
-    end
-
-    def run! verbose: false
-      failed = false
-
-      if verbose
-        failed = !(system local_command)
-      else
-        stdout, stderr, status = Open3.capture3(local_command)
-        failed = status.to_i.nonzero?
-        if failed
-          $stdout.puts stdout
-          $stderr.puts stderr
-        end
-      end
-
-      if failed
-        raise "Running command failed: #{local_command}"
-      end
-    end
-  end
-end
-