bard 1.3.4 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa717f489274f4bb6340a42930201281ab1c012d368b9cbdee3263bac15ec62b
-  data.tar.gz: 010036ea949f34ac503ec179ebbace96f95762b0bdd7e35674a0674b8c2dc924
+  metadata.gz: 5053dc8c4726e144736e568b70eaccff71dc0f6dced2d87c9d5dc3e18ded0906
+  data.tar.gz: a350973b973785621969f862e981dada65e46a1bacbe7bdabb30c5ab188c1779
 SHA512:
-  metadata.gz: 39bce499b49e7d9c33cf9147190a3b4ee986fe383b905d9c31e2fb9dfff79cdb819050943eb50615c230f96c7133e1b4816563afecb8cf0e4f4adc1854f46de6
-  data.tar.gz: 7765e288e7184d9d124e4a2c8b55aeda92fd6ab35f99c8d35ec3e887ecdb7b60b6009f7726e5095bf21c1accf59d8a862175b6b9110dff46673088ee3b30edc0
+  metadata.gz: a87bf99bf8b8374906254753fae5b18a7374d2f51c5e6fe3c3841828807f12b61233dc205a7a9ea11ee9a4f91e5bb0b9ff61395240fc30ef7fd4ef2ce763f8d7
+  data.tar.gz: 371d04cb10632a937c7a65a761498df299f06a26a7d7d05e0c6f8cf941fadf5a99581c64e07d235bccc2c029e5ad67fa948dfe0d24c1094094ef5c1824bde5bb

data/lib/bard/cli/command.rb

@@ -9,10 +9,11 @@ class Bard::CLI::Command < SimpleDelegator
 
   def self.setup cli
     cli.desc @command, @description
-
-    method = @method # put in local variable so next block can capture it
+    # put in local variables so next block can capture it
+    command_class = self
+    method = @method
     cli.define_method method do |*args|
-      command = Bard::CLI::New.new(self)
+      command = command_class.new(self)
       command.send method, *args
     end
   end

data/lib/bard/cli/deploy.rb

@@ -40,8 +40,8 @@ module Bard::CLI::Deploy
         end
 
         if options[:clone]
-          config[to].run! "git clone git@github.com:botandrosedesign/#{project_name}", home: true
-          invoke :master_key, nil, from: "local", to: to
+          config[to].run! "git clone git@github.com:botandrosedesign/#{project_name} #{config[to].path}", home: true
+          invoke :master_key, [], from: "local", to: to
           config[to].run! "bin/setup && bard setup"
         else
           if config[to].github_pages

data/lib/bard/cli/new.rb

@@ -34,7 +34,7 @@ class Bard::CLI::New < Bard::CLI::Command
         rvm use --create #{ruby_version}@#{project_name}
 
         gem list rails -i || gem install rails --no-document
-        rails new #{project_name} --skip-git --skip-kamal -m #{template_path}
+        rails new #{project_name} --skip-git --skip-kamal --skip-test -m #{template_path}
       '
     BASH
   end
@@ -54,7 +54,7 @@ class Bard::CLI::New < Bard::CLI::Command
   def stage
     run! <<~BASH
       cd ../#{project_name}
-      bard deploy --provision
+      bard deploy --clone
     BASH
   end
 

data/lib/bard/cli/new_rails_template.rb

@@ -2,6 +2,34 @@ ruby_version, project_name = (`rvm current name`.chomp).split("@")
 
 file ".ruby-version", ruby_version
 file ".ruby-gemset", project_name
+file ".gitignore", <<~GITIGNORE
+  # See https://help.github.com/articles/ignoring-files for more about ignoring files.
+  #
+  # If you find yourself ignoring temporary files generated by your text editor
+  # or operating system, you probably want to add a global ignore instead:
+  #   git config --global core.excludesfile '~/.gitignore_global'
+
+  # Ignore bundler config.
+  /.bundle
+
+  # Ignore all logfiles and tempfiles.
+  /log/*
+  /tmp/*
+  !/log/.keep
+  !/tmp/.keep
+
+  # Ignore master key for decrypting credentials and more.
+  /config/master.key
+
+  /db/*.sqlite3
+  /db/data.*
+
+  # Ignore Syncthing
+  .stfolder/
+
+  # Thank Apple!
+  .DS_Store
+GITIGNORE
 
 file "Gemfile", <<~RUBY
   source "https://rubygems.org"
@@ -24,6 +52,7 @@ file "Gemfile", <<~RUBY
   gem "solid_cable"
 
   gem "image_processing"
+  gem "puma"
 
   group :development do
     gem "web-console"
@@ -40,7 +69,6 @@ file "Gemfile", <<~RUBY
     gem "cuprite-downloads"
     gem "capybara-screenshot"
     gem "database_cleaner"
-    gem "puma"
     gem "chop"
     gem "email_spec"
     gem "timecop"
@@ -49,7 +77,6 @@ file "Gemfile", <<~RUBY
 
   group :production do
     gem "foreman-export-systemd_user"
-    gem "puma"
   end
 RUBY
 

data/lib/bard/cli/provision.rb

@@ -1,15 +1,10 @@
+require "bard/cli/command"
 require "bard/provision"
 
-module Bard::CLI::Provision
-  def self.included mod
-    mod.class_eval do
-
-      desc "provision [ssh_url]", "takes an optional ssh url to a raw ubuntu 22.04 install, and readies it in the shape of :production"
-      def provision ssh_url=config[:production].ssh
-        Bard::Provision.call(config, ssh_url.dup) # dup unfreezes the string for later mutation
-      end
-
-    end
+class Bard::CLI::Provision < Bard::CLI::Command
+  desc "provision [ssh_url]", "takes an optional ssh url to a raw ubuntu 22.04 install, and readies it in the shape of :production"
+  def provision ssh_url=config[:production].ssh
+    Bard::Provision.call(config, ssh_url.dup) # dup unfreezes the string for later mutation
   end
 end
 

data/lib/bard/cli.rb

@@ -22,7 +22,6 @@ module Bard
       open: "Open",
       ssh: "SSH",
       install: "Install",
-      provision: "Provision",
       ping: "Ping",
       hurt: "Hurt",
       vim: "Vim",
@@ -32,6 +31,7 @@ module Bard
     end
 
     {
+      provision: "Provision",
       new: "New",
     }.each do |command, klass|
       require "bard/cli/#{command}"
@@ -47,16 +47,14 @@ module Bard
         puts red("!!! ") + "Running command failed: #{yellow(e.message)}"
         exit 1
       end
-    end
-
-    private
 
-    def config
-      @config ||= Bard::Config.new(project_name, path: "bard.rb")
-    end
+      def config
+        @config ||= Bard::Config.new(project_name, path: "bard.rb")
+      end
 
-    def project_name
-      @project_name ||= File.expand_path(".").split("/").last
+      def project_name
+        @project_name ||= File.expand_path(".").split("/").last
+      end
     end
   end
 end

data/lib/bard/provision/authorizedkeys.rb

@@ -5,10 +5,10 @@ class Bard::Provision::AuthorizedKeys < Bard::Provision
     print "Authorized Keys:"
 
     KEYS.each do |search_text, full_key|
-      provision_server.run! <<~BASH #, quiet: true
-        file=~/.ssh/authorized_keys
-        if ! grep -F -q "#{search_text}" $file; then
-          echo "#{full_key}" >> $file
+      file = "~/.ssh/authorized_keys"
+      provision_server.run! <<~BASH, home: true
+        if ! grep -F -q "#{search_text}" #{file}; then
+          echo "#{full_key}" >> #{file}
         fi
       BASH
     end

data/lib/bard/provision/deploy.rb

@@ -0,0 +1,10 @@
+# run bard deploy
+
+class Bard::Provision::Deploy < Bard::Provision
+  def call
+    print "Deploy:"
+    config[:local].run! "bard deploy"
+    puts " ✓"
+  end
+end
+

data/lib/bard/provision.rb

@@ -3,7 +3,7 @@ module Bard
     def self.call(...) = new(...).call
 
     def call
-      %w[SSH User AuthorizedKeys Apt MySQL Repo MasterKey RVM App Passenger Data HTTP LogRotation].each do |step|
+      %w[SSH User AuthorizedKeys Apt MySQL Repo MasterKey RVM App Passenger Data HTTP LogRotation Deploy].each do |step|
         require "bard/provision/#{step.downcase}"
         self.class.const_get(step).call(*values)
       end

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "1.3.4"
+  VERSION = "1.3.6"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.6
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-31 00:00:00.000000000 Z
+date: 2025-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -167,6 +167,7 @@ files:
 - lib/bard/provision/apt.rb
 - lib/bard/provision/authorizedkeys.rb
 - lib/bard/provision/data.rb
+- lib/bard/provision/deploy.rb
 - lib/bard/provision/http.rb
 - lib/bard/provision/logrotation.rb
 - lib/bard/provision/masterkey.rb