bard 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30b53e09f78ef39dcc713fd006c886d507a4d935178cb7de92c478cb4aaee7cc
-  data.tar.gz: 057d81fda808b9a8d31f08bbffb898f208dda6013fb625bc7a2fc39aacf5a26d
+  metadata.gz: 50507cf111440a4f0d9f6cd1ee580f6749f81534c1c2f507fb32adcf7d49cbe7
+  data.tar.gz: e0386582b40d92ca6d5d003f1b83f03c34ad19968338b23e468f08778bdec968
 SHA512:
-  metadata.gz: 3f8cc746753d1c33ca28917892635c0379890314ba6e1e3f65a620b9e8688774f3c82c4b0b1c9aa44e527daddb2b9ea1e2fcda4bf5707a5082c2141cdd6323f1
-  data.tar.gz: 82764e32ae8357c3f020549993d1f6ccff9652fc0aafbee1b1d168c9068d10aaafd62a3ee7e71406428e5ce0bbb515065181ea56295d8aa24bf3713b8ececce7
+  metadata.gz: e3790197e55287ec52f6f4ee62b4e7df4cb02d148182520a913ac2ca235344cd7bb62f3b3a4ed53bb50e549cb08594d39de72c8a52de00fa441d65c52ecd696c
+  data.tar.gz: 8a6525ca5efc614ed59f51c811d39733bec7d5c5e9c1966510006d221d0d5654402098cb9f492e7ce3289cda3d43748b9af1b726a25a22e9b98718f461ec5c90

data/lib/bard/cli/command.rb

@@ -0,0 +1,19 @@
+require "delegate"
+
+class Bard::CLI::Command < SimpleDelegator
+  def self.desc command, description
+    @command = command
+    @method = command.split(" ").first.to_sym
+    @description = description
+  end
+
+  def self.setup cli
+    cli.desc @command, @description
+
+    method = @method # put in local variable so next block can capture it
+    cli.define_method method do |*args|
+      command = Bard::CLI::New.new(self)
+      command.send method, *args
+    end
+  end
+end

data/lib/bard/cli/deploy.rb

@@ -1,5 +1,6 @@
 require "bard/git"
 require "bard/command"
+require "bard/github_pages"
 
 module Bard::CLI::Deploy
   def self.included mod
@@ -7,6 +8,7 @@ module Bard::CLI::Deploy
 
       option :"skip-ci", type: :boolean
       option :"local-ci", type: :boolean
+      option :clone, 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 = Bard::Git.current_branch
@@ -37,7 +39,17 @@ module Bard::CLI::Deploy
           run! "git push github"
         end
 
-        config[to].run! "git pull origin master && bin/setup"
+        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! "bin/setup && bard setup"
+        else
+          if config[to].github_pages
+            Bard::GithubPages.new(self).deploy(config[to])
+          else
+            config[to].run! "git pull origin master && bin/setup"
+          end
+        end
 
         puts green("Deploy Succeeded")
 

data/lib/bard/cli/new.rb

@@ -0,0 +1,68 @@
+require "bard/cli/command"
+require "bard/github"
+
+class Bard::CLI::New < Bard::CLI::Command
+  desc "new <project-name>", "creates new bard app named <project-name>"
+  def new project_name
+    @project_name = project_name
+    validate
+    create_project
+    push_to_github
+    stage
+    puts green("Project #{project_name} created!")
+    puts "Please cd ../#{project_name}"
+  end
+
+  attr_accessor :project_name
+
+  private
+
+  def validate
+    if project_name !~ /^[a-z][a-z0-9]*\Z/
+      puts red("!!! ") + "Invalid project name: #{yellow(project_name)}."
+      puts "The first character must be a lowercase letter, and all following characters must be a lowercase letter or number." 
+      exit 1
+    end
+  end
+
+  def create_project
+    run! <<~BASH
+      env -i bash -lc '
+        export HOME=~
+        cd ..
+        source ~/.rvm/scripts/rvm
+        rvm use --create #{ruby_version}@#{project_name}
+
+        gem list rails -i && gem install rails --no-document
+        rails new #{project_name} --skip-kamal -m #{template_path}
+      '
+    BASH
+  end
+
+  def push_to_github
+    Bard::Github.new(project_name).create_repo
+    run! <<~BASH
+      cd ../#{project_name}
+      git add -A
+      git commit -m"initial commit."
+      git remote add origin git@github.com:botandrosedesign/#{project_name}
+      git push -u origin master
+    BASH
+  end
+
+  def stage
+    run! <<~BASH
+      cd ../#{project_name}
+      bard deploy --provision
+    BASH
+  end
+
+  def ruby_version
+    File.read(".ruby-version").chomp
+  end
+
+  def template_path
+    File.expand_path("new_rails_template.rb", __dir__)
+  end
+end
+

data/lib/bard/cli/new_rails_template.rb

@@ -0,0 +1,88 @@
+ruby_version, project_name = (`rvm current name`.chomp).split("@")
+
+file ".ruby-version", ruby_version
+file ".ruby-gemset", project_name
+
+file "Gemfile", <<~RUBY
+  source "https://rubygems.org"
+
+  gem "bootsnap", require: false
+  gem "rails", "~>8.0.0"
+  gem "bard-rails"
+  gem "sqlite3"
+
+  gem "sprockets-rails"
+  gem "dartsass-sprockets"
+  gem "bard-sass"
+
+  gem "importmap-rails"
+  gem "turbo-rails"
+  gem "stimulus-rails"
+
+  gem "solid_cache"
+  gem "solid_queue"
+  gem "solid_cable"
+
+  gem "image_processing"
+
+  group :development do
+    gem "web-console"
+  end
+
+  group :development, :test do
+    gem "debug", require: "debug/prelude"
+    gem "brakeman", require: false
+    gem "rubocop-rails-omakase", require: false
+  end
+
+  group :test do
+    gem "cucumber-rails", require: false
+    gem "cuprite-downloads"
+    gem "capybara-screenshot"
+    gem "database_cleaner"
+    gem "puma"
+    gem "chop"
+    gem "email_spec"
+    gem "timecop"
+    gem "rspec-rails"
+  end
+
+  group :production do
+    gem "foreman-export-systemd_user"
+    gem "puma"
+  end
+RUBY
+
+file "app/assets/config/manifest.js", <<~RUBY
+  //= link_tree ../images
+  //= link_directory ../stylesheets .css
+  //= link_tree ../../javascript .js
+RUBY
+
+run "rm -f app/assets/stylesheets/application.css"
+
+file "app/assets/stylesheets/application.sass", <<~SASS
+  body
+    border: 10px solid red
+SASS
+
+gsub_file "app/views/layouts/application.html.erb", "    <%# Includes all stylesheet files in app/assets/stylesheets %>\n", ''
+gsub_file "app/views/layouts/application.html.erb", 'stylesheet_link_tag :app,', 'stylesheet_link_tag :application,'
+
+file "app/views/static/index.html.slim", <<~SLIM
+  h1 #{project_name}
+SLIM
+
+insert_into_file "config/database.yml", <<~YAML, after: "database: storage/test.sqlite3"
+
+  staging:
+    <<: *default
+    database: storage/staging.sqlite3
+YAML
+
+after_bundle do
+  run "bard install"
+  run "bin/setup"
+  run "bard setup"
+end
+

data/lib/bard/cli.rb

@@ -31,8 +31,24 @@ module Bard
       include const_get(klass)
     end
 
+    {
+      new: "New",
+    }.each do |command, klass|
+      require "bard/cli/#{command}"
+      const_get(klass).setup(self)
+    end
+
     def self.exit_on_failure? = true
 
+    no_commands do
+      def run!(...)
+        Bard::Command.run!(...)
+      rescue Bard::Command::Error => e
+        puts red("!!! ") + "Running command failed: #{yellow(e.message)}"
+        exit 1
+      end
+    end
+
     private
 
     def config
@@ -42,13 +58,6 @@ module Bard
     def project_name
       @project_name ||= File.expand_path(".").split("/").last
     end
-
-    def run!(...)
-      Bard::Command.run!(...)
-    rescue Bard::Command::Error => e
-      puts red("!!! ") + "Running command failed: #{yellow(e.message)}"
-      exit 1
-    end
   end
 end
 

data/lib/bard/config.rb

@@ -75,5 +75,17 @@ module Bard
         raise ArgumentError
       end
     end
+
+    # short-hand for michael
+
+    def github_pages url=nil
+      server :production do
+        github_pages true
+        ssh false
+        ping url
+      end
+
+      backup false
+    end
   end
 end

data/lib/bard/github.rb

@@ -19,6 +19,14 @@ module Bard
       end
     end
 
+    def delete path, params={}
+      request(path) do |uri|
+        Net::HTTP::Delete.new(uri).tap do |r|
+          r.body = JSON.dump(params)
+        end
+      end
+    end
+
     def read_file path, branch: "master"
       metadata = get("contents/#{path}", ref: branch)
       Base64.decode64(metadata["content"])
@@ -28,6 +36,17 @@ module Bard
       post("keys", title:, key:)
     end
 
+    def create_repo
+      post("https://api.github.com/orgs/botandrosedesign/repos", {
+        name: project_name,
+        private: true,
+      })
+    end
+
+    def delete_repo
+      delete("https://api.github.com/repos/botandrosedesign/#{project_name}")
+    end
+
     private
 
     def github_apikey
@@ -63,7 +82,7 @@ module Bard
           response.body
         end
       else
-        raise [req.method, req.uri, req.to_hash, response].inspect
+        raise [req.method, req.uri, req.to_hash, response, response.body].inspect
       end
     end
   end

data/lib/bard/github_pages.rb

@@ -0,0 +1,112 @@
+require 'delegate'
+require 'fileutils'
+require 'bard/git'
+
+module Bard
+  class GithubPages < SimpleDelegator
+    def deploy server
+      @sha = Git.sha_of(Git.current_branch)
+      @build_dir = "tmp/github-build-#{@sha}"
+      @branch = "gh-pages"
+      @domain = server.ping.first
+
+      puts "Starting deployment to GitHub Pages..."
+
+      build_site
+      tree_sha = create_tree_from_build
+      new_commit = create_commit(tree_sha)
+      commit_and_push new_commit
+    end
+
+    private
+
+    def build_site
+      FileUtils.rm_rf "tmp/github-build-".sub(@sha, "*")
+      run! <<~BASH
+        bundle exec rake assets:clean assets:precompile
+        RAILS_ENV=production bundle exec rails s -p 3000 -d --pid tmp/pids/server.pid
+
+        # Create the output directory and enter it
+        BUILD=#{@build_dir}
+        rm -rf $BUILD
+        mkdir -p $BUILD
+        cp -R public/assets $BUILD/
+        cd $BUILD
+
+        # wait until server responds
+        curl --retry 5 --retry-delay 2 -s -o /dev/null "http://0.0.0.0:3000"
+
+        # Mirror the site to the build folder, ignoring links with query params
+        wget --reject-regex "(.*)\\?(.*)" -FEmnH http://0.0.0.0:3000/
+        echo #{@domain} > CNAME
+
+        # Kill the server
+        cd -
+        cat tmp/pids/server.pid | xargs -I {} kill {}
+
+        # Clean up the assets
+        rm -rf public/assets
+      BASH
+    end
+
+    def create_tree_from_build
+      # Create temporary index
+      git_index_file = ".git/tmp-index"
+      git = "GIT_INDEX_FILE=#{git_index_file} git"
+      run! "#{git} read-tree --empty"
+
+      # Add build files to temporary index
+      Dir.chdir(@build_dir) do
+        Dir.glob('**/*', File::FNM_DOTMATCH).each do |file|
+          next if file == '.' || file == '..'
+          if File.file?(file)
+            run! "#{git} update-index --add --cacheinfo 100644 $(#{git} hash-object -w #{file}) #{file}"
+          end
+        end
+      end
+
+      # Create tree object from index
+      tree_sha = `#{git} write-tree`.chomp
+
+      # Clean up temporary index
+      FileUtils.rm_f(git_index_file)
+
+      tree_sha
+    end
+
+    def create_commit tree_sha
+      # Get parent commit if branch exists
+      parent = get_parent_commit
+
+      # Create commit object
+      message = "'Deploying to #{@branch} from @ #{@sha} 🚀'"
+      args = ['commit-tree', tree_sha]
+      args += ['-p', parent] if parent
+      args += ['-m', message]
+
+      commit_sha = `git #{args.join(' ')}`.chomp
+
+      commit_sha
+    end
+
+    def get_parent_commit
+      sha = Git.sha_of("#{@branch}^{commit}")
+      return sha if $?.success?
+      nil # Branch doesn't exist yet
+    end
+
+    def commit_and_push commit_sha
+      if branch_exists?
+        run! "git update-ref refs/heads/#{@branch} #{commit_sha}"
+      else
+        run! "git branch #{@branch} #{commit_sha}"
+      end
+      run! "git push -f origin #{@branch}:refs/heads/#{@branch}"
+    end
+
+    def branch_exists?
+      system("git show-ref --verify --quiet refs/heads/#{@branch}")
+    end
+  end
+end
+

data/lib/bard/server.rb

@@ -3,7 +3,7 @@ require "bard/command"
 require "bard/copy"
 
 module Bard
-  class Server < Struct.new(:project_name, :key, :ssh, :path, :ping, :gateway, :ssh_key, :env)
+  class Server < Struct.new(:project_name, :key, :ssh, :path, :ping, :gateway, :ssh_key, :env, :github_pages)
     def self.define project_name, key, &block
       new(project_name, key).tap do |server|
         server.instance_eval &block
@@ -24,7 +24,7 @@ module Bard
       end
     end
 
-    setting :ssh, :path, :ping, :gateway, :ssh_key, :env
+    setting :ssh, :path, :ping, :gateway, :ssh_key, :env, :github_pages
 
     def ping(*args)
       if args.length == 0

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-26 00:00:00.000000000 Z
+date: 2024-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -139,11 +139,14 @@ files:
 - lib/bard/ci/local.rb
 - lib/bard/cli.rb
 - lib/bard/cli/ci.rb
+- lib/bard/cli/command.rb
 - lib/bard/cli/data.rb
 - lib/bard/cli/deploy.rb
 - lib/bard/cli/hurt.rb
 - lib/bard/cli/install.rb
 - lib/bard/cli/master_key.rb
+- lib/bard/cli/new.rb
+- lib/bard/cli/new_rails_template.rb
 - lib/bard/cli/open.rb
 - lib/bard/cli/ping.rb
 - lib/bard/cli/provision.rb
@@ -157,6 +160,7 @@ files:
 - lib/bard/copy.rb
 - lib/bard/git.rb
 - lib/bard/github.rb
+- lib/bard/github_pages.rb
 - lib/bard/ping.rb
 - lib/bard/provision.rb
 - lib/bard/provision/app.rb