stack_car 0.16.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f65e5a4cb61c3b0ae89c7a41866723cfb7caf9e1853a566279eb178181746774
-  data.tar.gz: 6624f7b9f2bb1dc6faea803a4d8f19cf97fdc03939a90082c20600c4021066f6
+  metadata.gz: a6ed8d5c6219471376a05ccc900ef285e6dd0409c4b6954a115282280fdbfb38
+  data.tar.gz: f87e0c76404381eda7bcf77e08ea24a937f197556cb77ad0e677540db09eba08
 SHA512:
-  metadata.gz: ef5bd6bfac0e8c0301778a79bdb17cb7f23d22cdab0e661d951f734b16de61a69288eb4c923aee552de339811f0a45b55a5645e55042b067e86965cb0421ac30
-  data.tar.gz: b7fd067e699c6a93f38d4c384de5f7270b6a7fc61b6e28fce4c380bdf77599e278f57d762e825a80f893fe2c435c73679c7542aff9fee32fe37ebb5fa8c7c702
+  metadata.gz: 348b12ba0d514385f5b1b1263581e987aae3e2714c8a61aa888305a69fff5ce18b1a83906f04a349054dd4dd275a7df9d7ccbc005ecf3b03be0f0769ab1f25e0
+  data.tar.gz: c83f60d3aadd3b9e8aae2bd2fec26ed27759fdf4a8be6a1ef088f1e76eb841625cc00ce2982aab1f1c6261579f06a06eafe303953092aa90125053da970a3c7e

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,18 @@
+# Story
+
+# Acceptance Criteria
+
+- [ ]
+
+# Screenshots / Video
+
+<details>
+<summary></summary>
+
+</details>
+
+# Testing Instructions and Sample Files
+
+-
+
+# Notes

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+# Story
+
+Refs
+
+- #issuenumber
+
+# Expected Behavior Before Changes
+
+# Expected Behavior After Changes
+
+# Screenshots / Video
+
+<details>
+<summary></summary>
+
+</details>
+
+# Notes

data/lib/stack_car/cli.rb

@@ -2,7 +2,7 @@ require 'thor'
 require 'erb'
 require 'dotenv'
 require 'json'
-require 'byebug'
+
 module StackCar
   class HammerOfTheGods < Thor
     include Thor::Actions
@@ -18,11 +18,11 @@ module StackCar
     method_option :service, default: 'web', type: :string, aliases: '-s'
     method_option :build, default: false, type: :boolean, aliases: '-b'
     method_option :logs, default: true, type: :boolean
-    desc "up", "starts docker compose with rebuild and orphan removal, defaults to web"
+    desc "up", "starts docker compose with rebuild, defaults to web"
     def up
       setup
       ensure_development_env
-      args = ['--remove-orphans']
+      args = []
       args << '--build' if options[:build]
       if options[:build]
         run("#{dotenv} docker compose pull #{options[:service]}")
@@ -42,7 +42,6 @@ module StackCar
 
     method_option :volumes, aliases: '-v'
     method_option :rmi
-    method_option :'remove-orphans'
     method_option :service, aliases: '-s'
     method_option :timeout, aliases: '-t'
     method_option :all, aliases: '-a'
@@ -75,13 +74,12 @@ module StackCar
 
       args = []
       if options[:all]
-        prompt_run_confirmation('--all will remove all containers, volumes, networks, local images, and orphaned containers. Continue?')
+        prompt_run_confirmation('--all will remove all containers, volumes, networks, and local images. Continue?')
 
-        args = %w[--volumes --rmi=local --remove-orphans]
+        args = %w[--volumes --rmi=local]
       else
         args << '--volumes' if options[:volumes]
         args << '--rmi=local' if options[:rmi]
-        args << '--remove-orphans' if options[:'remove-orphans']
         args << '--timeout' if options[:timeout]
       end
 
@@ -172,7 +170,7 @@ module StackCar
       sha = `git rev-parse HEAD`[0..8]
       registry = "#{ENV['REGISTRY_HOST']}#{ENV['REGISTRY_URI']}"
       tag = ENV["TAG"] || 'latest'
-      unless File.exists?("#{ENV['HOME']}/.docker/config.json") && File.readlines("#{ENV['HOME']}/.docker/config.json").grep(/#{ENV['REGISTRY_HOST']}/).size > 0
+      unless File.exist?("#{ENV['HOME']}/.docker/config.json") && File.readlines("#{ENV['HOME']}/.docker/config.json").grep(/#{ENV['REGISTRY_HOST']}/).size > 0
         run_with_exit("#{dotenv(environment)} docker login #{ENV['REGISTRY_HOST']}")
       end
       run_with_exit("#{dotenv(environment)} docker tag #{registry}:#{tag} #{registry}:#{environment}-#{timestamp}")
@@ -284,7 +282,7 @@ module StackCar
       template("solrcloud-assign-configset.sh", "bin/solrcloud-assign-configset.sh")
      end
 
-     if File.exists?('README.md')
+     if File.exist?('README.md')
        prepend_to_file "README.md" do
          File.read("#{self.class.source_root}/README.md")
        end
@@ -385,7 +383,7 @@ module StackCar
 
     def find_config(dir)
       path = File.join(dir, '.stackcar_rc')
-      if File.exists?(path)
+      if File.exist?(path)
         return path
       elsif dir == "/"
         return nil
@@ -395,7 +393,7 @@ module StackCar
     end
 
     def ensure_development_env
-      if !File.exists?('.env.development')
+      if !File.exist?('.env.development')
         template(".env.development.erb", ".env.development")
       end
     end
@@ -405,7 +403,7 @@ module StackCar
     end
 
     def setup
-      if File.exists?('stack_car')
+      if File.exist?('stack_car')
         @sc_dir = true
         Dir.chdir('stack_car')
         self.destination_root += "/stack_car"

data/lib/stack_car/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StackCar
-  VERSION = '0.16.0'
+  VERSION = '0.18.0'
 end

data/lib/stack_car.rb

@@ -2,6 +2,16 @@ require "stack_car/version"
 require "stack_car/cli"
 require "stack_car/dot_rc"
 
+##
+# Ruby 3.x removed {File.exists?} in favor of {File.exist?}.  This shim ensures that we can run
+# stack_car in both Ruby 2.7 and Ruby 3.x land.
+unless File.respond_to?(:exists?)
+  # We're aliasing the class method exist?, hence the `class << File` antics.
+  class << File
+    alias exists? exist?
+  end
+end
+
 module StackCar
   # Your code goes here...
 end

data/stack_car.gemspec

@@ -19,14 +19,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "byebug"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "yard"
   spec.add_development_dependency "yard-thor"
   spec.add_development_dependency "pry"
-  spec.add_runtime_dependency "dotenv", "~> 2.2"
+  spec.add_runtime_dependency "dotenv"
   spec.add_runtime_dependency "json", "~> 2.3"
   spec.add_runtime_dependency "thor", "~> 0.19"
 end

data/templates/decrypt-secrets

@@ -13,7 +13,7 @@ Dir.chdir(File.join(parent_dir))
 ].each do |files|
   Dir.glob(files).each do |file|
     if file.match(/enc/)
-      next unless File.exists?(file)
+      next unless File.exist?(file)
       cmd = "sops --decrypt #{file} > #{file.gsub(/.enc$/, '')}"
       puts cmd
       `#{cmd}`

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: stack_car
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-14 00:00:00.000000000 Z
+date: 2024-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-- !ruby/object:Gem::Dependency
-  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -42,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +98,16 @@ dependencies:
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +145,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/rspec-action.yaml"
 - ".gitignore"
 - ".gitlab-ci.yml"
@@ -267,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: A tool to make rails + docker easy