foobara-empty-ruby-project-generator 0.0.19 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee5a04e4065cfa11933993dcd5f18f8c8827e67003cc3dae230b970fb1a6e44b
-  data.tar.gz: 68f85120e9f5ad5d877b0cb8ce4d39de30772f6c6ec387a2b644f8bffff27e2c
+  metadata.gz: f2b61d99024ebd625a84d1c39fa2dbc52a9535f67d38c55b5b34268e31d3c37a
+  data.tar.gz: 3059a9f887c3bfa08d9a059d8019be6e8267559be9992a12657b0ebf5edd1a62
 SHA512:
-  metadata.gz: bb4b4d4d233d637b87e769a703886601963477b0ce13e92a264939623c46f000db6624a1cbd8d5a356c6a32ff7f55f745691fdc9d3c92e0b1f6bed2279ce2748
-  data.tar.gz: 2b7eaef91dd9906014c8e0d1897693587ea535e83caf2aa3367cb1dc43aef579fa894adf9e495a16197b8c17a14fd33fcb806800a51b0ef2bad360b54ab46c76
+  metadata.gz: 3f6d0cd0812dea545d4dc7e2498bb4830e2688dfc63109d0877fb9a3dde07b26fc29d56214977f14ad41c9f41884a6855a35b266e44637867a8463aba439680d
+  data.tar.gz: d1e492b3b824500c4675f8f69d2d74816617341bd0742bb627a89b30ad177d3d1e3c2f4beed2d1022b0991368b724f6f5e4cafca100ea26be5a51bdf1bc48881

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.0.21] - 2025-05-03
+
+- Make optional things fail-safe when shelling out and simplify the code a bit, too
+
+## [0.0.20] - 2025-05-03
+
+- Add use_git, push_to_github, and turn_on_rbenv_bundler options and default them to false
+
 ## [0.0.19] - 2025-05-03
 
 - Do not fail just because gh isn't installed

data/src/manifests/project_config.rb

@@ -19,7 +19,9 @@ module Foobara
           author_names [:string]
           author_emails [:string]
           homepage_url :string
-          # Probably need a better default such as not licensed.
+          use_git :boolean, default: false
+          push_to_github :boolean, default: false
+          turn_on_rbenv_bundler :boolean, default: false
           license :string, :allow_nil, one_of: ["MIT", "Apache-2.0", "MPL-2.0", "Apache-2.0 OR MIT"]
         end
 

data/src/write_empty_ruby_project_to_disk.rb

@@ -35,6 +35,8 @@ module Foobara
           output
         end
 
+        attr_accessor :use_git_failed, :push_to_github_failed
+
         def create_output_directory_if_needed
           FileUtils.mkdir_p output_directory
         end
@@ -61,6 +63,18 @@ module Foobara
           project_config.org_slash_project_kebab
         end
 
+        def push_to_github?
+          project_config.push_to_github
+        end
+
+        def turn_on_rbenv_bundler?
+          project_config.turn_on_rbenv_bundler
+        end
+
+        def use_git?
+          project_config.use_git
+        end
+
         def generate_file_contents
           puts "generating..."
           # TODO: just pass this in as the inputs instead of the command??
@@ -72,35 +86,37 @@ module Foobara
             bundle_install
             make_bin_files_executable
             rubocop_autocorrect
-            git_init unless extract_from_another_repo?
-            git_add_all
-            git_commit
-            github_create_repo
-            git_add_remote_origin
-            git_branch_main
-            push_to_github
-            rbenv_bundler_on
+
+            if use_git?
+              git_init unless extract_from_another_repo?
+              git_add_all
+              git_commit
+              git_branch_main
+
+              if push_to_github?
+                github_create_repo
+                git_add_remote_origin
+                push_to_github
+              end
+
+              if turn_on_rbenv_bundler?
+                rbenv_bundler_on
+              end
+            end
           end
         end
 
         def bundle_install
           puts "bundling..."
-          do_it = proc do
-            Open3.popen3("bundle install") do |_stdin, _stdout, stderr, wait_thr|
-              exit_status = wait_thr.value
-              unless exit_status.success?
-                # :nocov:
-                raise "could not bundle install. #{stderr.read}"
-                # :nocov:
-              end
-            end
-          end
+          cmd = "bundle install"
 
           if Bundler.respond_to?(:with_unbundled_env)
-            Bundler.with_unbundled_env(&do_it)
+            Bundler.with_unbundled_env do
+              run_cmd_and_return_output(cmd)
+            end
           else
             # :nocov:
-            do_it.call
+            run_cmd_and_return_output(cmd)
             # :nocov:
           end
         end
@@ -108,15 +124,15 @@ module Foobara
         def rubocop_autocorrect
           puts "linting..."
 
-          do_it = -> { run_cmd_and_return_output("bundle exec rubocop --no-server -A") }
+          cmd = "bundle exec rubocop --no-server -A"
 
           if Bundler.respond_to?(:with_unbundled_env)
             Bundler.with_unbundled_env do
-              do_it.call
+              run_cmd_and_return_output(cmd)
             end
           else
             # :nocov:
-            do_it.call
+            run_cmd_and_return_output(cmd)
             # :nocov:
           end
         end
@@ -124,90 +140,106 @@ module Foobara
         def make_bin_files_executable
           Dir["bin/*"].each do |file|
             if File.file?(file)
-              system("chmod u+x #{file}")
+              cmd = "chmod u+x #{file}"
+              begin
+                run_cmd_and_return_output(cmd)
+              rescue CouldNotExecuteError => e
+                # :nocov:
+                warn e.message
+                # :nocov:
+              end
             end
           end
         end
 
         def git_init
-          cmd = "git init"
+          return if use_git_failed
 
-          Open3.popen3(cmd) do |_stdin, _stdout, stderr, wait_thr|
-            exit_status = wait_thr.value
-            unless exit_status.success?
-              # :nocov:
-              raise "could not #{cmd}\n#{stderr.read}"
-              # :nocov:
-            end
-          end
+          cmd = "git init"
+          run_cmd_and_return_output(cmd)
+        rescue CouldNotExecuteError => e
+          # :nocov:
+          self.use_git_failed = true
+          warn e.message
+          # :nocov:
         end
 
         def git_add_all
-          cmd = "git add ."
+          return if use_git_failed
 
-          Open3.popen3(cmd) do |_stdin, _stdout, stderr, wait_thr|
-            exit_status = wait_thr.value
-            unless exit_status.success?
-              # :nocov:
-              raise "could not #{cmd}\n#{stderr.read}"
-              # :nocov:
-            end
-          end
+          cmd = "git add ."
+          run_cmd_and_return_output(cmd)
+        rescue CouldNotExecuteError => e
+          # :nocov:
+          self.use_git_failed = true
+          warn e.message
+          # :nocov:
         end
 
         def git_commit
-          # TODO: set author/name with git config in CI so we don't have to skip this
+          return if use_git_failed
+
+          cmd = "git commit -m 'Create ruby project files'"
+          run_cmd_and_return_output(cmd)
+        rescue CouldNotExecuteError => e
           # :nocov:
-          Open3.popen3("git commit -m 'Create ruby project files'") do |_stdin, stdout, stderr, wait_thr|
-            exit_status = wait_thr.value
-            unless exit_status.success?
-              raise "could not git commit -m 'Initial commit'. OUTPUT\n#{stdout.read}\nERROR:#{stderr.read}"
-            end
-          end
+          self.use_git_failed = true
+          warn e.message
           # :nocov:
         end
 
         def github_create_repo
+          return if push_to_github_failed
+
           puts "pushing to github..."
 
           cmd = "gh repo create --private #{project_config.org_slash_project_kebab}"
-          run_cmd_and_write_output(cmd, raise_if_fails: false)
+          exit_status = run_cmd_and_write_output(cmd, raise_if_fails: false)
+
+          unless exit_status&.success?
+            self.push_to_github_failed = true
+          end
         end
 
         def git_add_remote_origin
-          unless system("git remote add origin git@github.com:#{project_config.org_slash_project_kebab}.git")
+          return if push_to_github_failed
+
+          cmd = "git remote add origin git@github.com:#{project_config.org_slash_project_kebab}.git"
+          exit_status = run_cmd_and_write_output(cmd, raise_if_fails: false)
+
+          unless exit_status&.success?
             # :nocov:
-            raise "could not git remote add origin git@github.com:#{project_config.org_slash_project_kebab}.git"
+            self.push_to_github_failed = true
             # :nocov:
           end
         end
 
         def git_branch_main
-          unless system("git branch -M main")
+          return if use_git_failed
+
+          cmd = "git branch -M main"
+          exit_status = run_cmd_and_write_output(cmd, raise_if_fails: false)
+
+          unless exit_status&.success?
             # :nocov:
-            raise "could not git branch -M main"
+            self.use_git_failed = true
             # :nocov:
           end
         end
 
         def push_to_github
-          Open3.popen3("git push -u origin main") do |_stdin, _stdout, stderr, wait_thr|
-            exit_status = wait_thr.value
-            unless exit_status.success?
-              warn "WARNING: could not git push -u origin main \n #{stderr.read}"
-            end
-          end
+          return if push_to_github_failed
+
+          cmd = "git push -u origin main"
+          run_cmd_and_return_output(cmd)
+        rescue CouldNotExecuteError => e
+          self.push_to_github_failed = true
+          warn e.message
         end
 
         def rbenv_bundler_on
-          # :nocov:
-          Open3.popen3("rbenv bundler on") do |_stdin, _stdout, stderr, wait_thr|
-            exit_status = wait_thr.value
-            unless exit_status.success?
-              warn "WARNING: could not rbenv bundler on \n #{stderr.read}"
-            end
-          end
-          # :nocov:
+          cmd = "rbenv bundler on"
+          run_cmd_and_write_output(cmd, raise_if_fails: false)
         end
 
         def output

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara-empty-ruby-project-generator
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.21
 platform: ruby
 authors:
 - Miles Georgi