git_fonky 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bd9807def500bd1e7286efca533211095677446bc0584da352701faff3b70a6
-  data.tar.gz: 2a0ea855b1bd0f879eb0a565b96543841f98ae930dde9957186f43a376ddcb2e
+  metadata.gz: 076cf7e6f05362ab912197732e48649abffb67bfaf179cd55916fda375f26115
+  data.tar.gz: 2a6005c936aa4fa6b3e4d4a19eeb4de34fd836483b128dc151d78fe0c631dd75
 SHA512:
-  metadata.gz: '0956e4742a538e2127bbd899673c4b0c02827961746e16fd7b4eb8f68e8f588a4660736269de450c6fcc73099891a6be7a9c819403cee078b757df985a28603a'
-  data.tar.gz: 978574bcfe3da9f6195aab61c15b9254f10690400f98f12656fb95d94ce733dc2f8527e2f7d0bff8bed43c4c7f5eec13f176f2677458ab821b832dcd40191c16
+  metadata.gz: d6d39a6139345648528b1520806bbf782df65fda3c46f2ec9c10b52c58454819a96ca4e3da40db4c92d338e9a514373c1f7db70e2ad53cce97f9476c74cb3afe
+  data.tar.gz: dc39a274c029ddf4aeb00a4ccd8bc5aca0e979818bc2277969d4ee6303395de858ea5202bb1b61b76da4f55e89983f3b630c5ae5dfc20f7dcea5bf33d544c8b0

data/lib/git_fonky/branch.rb

@@ -0,0 +1,13 @@
+module GitFonky
+  class Branch
+    attr_reader :name
+
+    def initialize(name)
+      @name = name
+    end
+
+    def valid?(pattern = /(main|master)/)
+      name.match?(pattern)
+    end
+  end
+end

data/lib/git_fonky/command.rb

@@ -1,10 +1,9 @@
 module GitFonky
   class Command
-    attr_reader :repo_dir, :reporter
+    attr_accessor :branch_name
 
-    def initialize(repo_dir:, reporter:)
-      @repo_dir = repo_dir
-      @reporter = reporter
+    def initialize(branch_name = nil)
+      @branch_name = branch_name
     end
 
     def current_branch
@@ -12,18 +11,15 @@ module GitFonky
     end
 
     def fetch_upstream
-      reporter.announce("fetching")
-      `git fetch upstream #{repo_dir.branch} 2>&1`
+      `git fetch upstream #{branch_name} 2>&1`
     end
 
     def pull_upstream
-      reporter.announce("pulling")
-      `git pull upstream #{repo_dir.branch} 2>&1`
+      `git pull upstream #{branch_name} 2>&1`
     end
 
     def push_to_origin
-      reporter.announce("pushing", "to", "origin")
-      `git push origin #{repo_dir.branch} 2>&1`
+      `git push origin #{branch_name} 2>&1`
     end
   end
 end

data/lib/git_fonky/message_formatter.rb

@@ -0,0 +1,26 @@
+module GitFonky
+  class MessageFormatter
+    def message_with_border(**params)
+      border = calculate_border_for(params[:msg], params.delete(:border_char) { "*" })
+      output_border_and_msg(border: border, **params)
+    end
+
+    private
+
+    def calculate_border_for(msg, border_char)
+      border_char * (msg.length + 20)
+    end
+
+    def output_border_and_msg(border:, msg:, sub_msg: nil, io_stream: STDERR, warn: true)
+      io_stream.puts border
+      io_stream.puts warning_header.center(border.length) if warn
+      io_stream.puts msg.center(border.length)
+      io_stream.puts sub_msg.center(border.length) if sub_msg
+      io_stream.puts border
+    end
+
+    def warning_header
+      "WARNING"
+    end
+  end
+end

data/lib/git_fonky/repo_dir.rb

@@ -1,37 +1,62 @@
-require_relative "reporter"
+require_relative "branch"
 require_relative "command"
+require_relative "reporter"
 
 module GitFonky
   class RepoDir
-    attr_reader :command, :dirname, :reporter
+    attr_reader :branch, :command, :dirname, :reporter
 
-    def initialize(dirname)
+    def initialize(dirname, command = Command, branch = Branch, reporter = Reporter)
       @dirname = dirname
-      @reporter = Reporter.new(self)
-      @command = Command.new(repo_dir: self, reporter: reporter)
+      @command = command.new
+      @branch = branch.new(@command.current_branch)
+      @command.branch_name = @branch.name
+      @reporter = reporter.new(@dirname, @branch.name)
     end
 
-    def branch
-      @branch ||= command.current_branch
+    def self.sync(dirname)
+      Dir.chdir(dirname) do
+        new(dirname).sync
+      end
     end
 
     def sync
-      Dir.chdir dirname do
-        reporter.announce_update
-        return reporter.invalid_branch_msg if on_invalid_branch?
+      catch(:skip_repo) do
+        announce_sync_attempt
+        fetch
+        pull
+        push
+        announce_sync_success
+      end
+    end
 
-        command.fetch_upstream
-        command.pull_upstream
+    private
 
-        return reporter.failed_pull_msg unless $?.success?
+    def announce_sync_attempt
+      branch.valid? ? reporter.announce_sync_attempt : throw(:skip_repo, reporter.invalid_branch_msg)
+    end
 
-        command.push_to_origin
-        reporter.announce_success
-      end
+    def fetch
+      command.fetch_upstream
+      process_successful? ? reporter.announce("fetched") : throw(:skip_repo, reporter.failed_fetch_msg)
+    end
+
+    def pull
+      command.pull_upstream
+      process_successful? ? reporter.announce("pulled") : throw(:skip_repo, reporter.failed_pull_msg)
+    end
+
+    def push
+      command.push_to_origin
+      process_successful? ? reporter.announce("pushed", "to", "origin") : throw(:skip_repo, reporter.failed_push_msg)
+    end
+
+    def announce_sync_success
+      reporter.announce_sync_success
     end
 
-    def on_invalid_branch?
-      !branch.match?(/(main|master)/)
+    def process_successful?
+      $?.success?
     end
   end
 end

data/lib/git_fonky/repo_names.rb

@@ -0,0 +1,3 @@
+module GitFonky
+  REPO_NAMES = %w[gorails hatchbox-v2 jumpstart-marketing jumpstart-pro-rails noticed pay]
+end

data/lib/git_fonky/reporter.rb

@@ -1,57 +1,51 @@
+require_relative "message_formatter"
 module GitFonky
   class Reporter
-    attr_reader :repo_dir
+    attr_reader :formatter, :repo_name, :repo_branch
 
-    def initialize(repo_dir)
-      @repo_dir = repo_dir
+    def initialize(repo_name, repo_branch, formatter = MessageFormatter)
+      @repo_name = repo_name
+      @repo_branch = repo_branch
+      @formatter = formatter.new
     end
 
     def announce(action, direction = "from", remote = "upstream")
-      puts "-----> #{action} #{direction} #{remote} #{repo_dir.branch}"
+      STDERR.puts "-----> #{action} #{direction} #{remote} #{repo_branch}"
     end
 
-    def announce_success
-      puts "-----> Successfully updated #{repo_dir.dirname} | #{repo_dir.branch} branch"
+    def announce_sync_success
+      puts "-----> Successfully synced #{repo_name} | #{repo_branch} branch"
     end
 
-    def announce_update
-      msg = "Updating -> #{repo_dir.dirname} | #{repo_dir.branch} branch "
-      border = calculate_border_for("=", msg)
-
-      output_border_and_msg(border, msg, warn: false)
+    def announce_sync_attempt
+      msg = "Attempting to sync -> #{repo_name} | #{repo_branch} branch "
+      formatter.message_with_border(msg: msg, border_char: "=", warn: false)
     end
 
     def invalid_branch_msg
       msg = "You are not on the main/master branch. Please checkout the main/master branch and try again."
-      sub_msg = "-----> skipping #{repo_dir.dirname} | #{repo_dir.branch} branch <-----"
-      border = calculate_border_for("*", msg)
-
-      output_border_and_msg(border, msg, sub_msg)
+      sub_msg = "-----> skipping #{repo_name} | #{repo_branch} branch <-----"
+      formatter.message_with_border(msg: msg, sub_msg: sub_msg)
     end
 
-    def failed_pull_msg
-      msg = "-----> Failed to pull upstream #{branch}. Moving on to next repo. <-----"
-      border = calculate_border_for(msg, "*")
-
-      output_border_and_msg(border, msg)
+    def failed_fetch_msg
+      msg = "-----> Failed to fetch from upstream #{repo_branch}. Moving on to next repo. <-----"
+      formatter.message_with_border(msg: msg)
     end
 
-    private
-
-    def calculate_border_for(border_char, msg)
-      border_char * (msg.length + 20)
+    def failed_pull_msg
+      msg = "-----> Failed to pull from upstream #{repo_branch}. Moving on to next repo. <-----"
+      formatter.message_with_border(msg: msg)
     end
 
-    def output_border_and_msg(border, msg, sub_msg = nil, warn: true)
-      puts border
-      puts warning_header.center(border.length) if warn
-      puts msg.center(border.length)
-      puts sub_msg.center(border.length) if sub_msg
-      puts border
+    def failed_push_msg
+      msg = "-----> Failed to push to origin #{repo_branch}. Moving on to next repo. <-----"
+      formatter.message_with_border(msg: msg)
     end
 
-    def warning_header
-      "WARNING"
+    def failed_sync_msg
+      msg = "-----> Failed to sync #{repo_name} | #{repo_branch}. Moving on to next repo. <-----"
+      formatter.message_with_border(msg: msg)
     end
   end
 end

data/lib/git_fonky/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitFonky
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/git_fonky.rb

@@ -2,15 +2,15 @@
 
 require_relative "git_fonky/version"
 require_relative "git_fonky/repo_dir"
-require_relative "git_fonky/work_repo_names"
+require_relative "git_fonky/repo_names"
 
 module GitFonky
   class Error < StandardError; end
 
   def self.sync_repos
     Dir.chdir "#{Dir.home}/code" do
-      WORK_REPO_NAMES.each do |dir|
-        RepoDir.new(dir).sync
+      REPO_NAMES.each do |dir|
+        RepoDir.sync(dir)
         puts "\n\n\n"
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_fonky
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Collin Jilbert
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-09 00:00:00.000000000 Z
+date: 2023-12-26 00:00:00.000000000 Z
 dependencies: []
 description: Do 'em all at once.
 email:
@@ -27,11 +27,13 @@ files:
 - bin/gfonk
 - git_fonky.gemspec
 - lib/git_fonky.rb
+- lib/git_fonky/branch.rb
 - lib/git_fonky/command.rb
+- lib/git_fonky/message_formatter.rb
 - lib/git_fonky/repo_dir.rb
+- lib/git_fonky/repo_names.rb
 - lib/git_fonky/reporter.rb
 - lib/git_fonky/version.rb
-- lib/git_fonky/work_repo_names.rb
 - sig/git_fonky.rbs
 homepage: https://github.com/cjilbert504/git_fonky
 licenses:
@@ -55,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.1
 signing_key:
 specification_version: 4
 summary: Sync all of your git repos with one command.

data/lib/git_fonky/work_repo_names.rb

@@ -1,3 +0,0 @@
-module GitFonky
-  WORK_REPO_NAMES = %w[gorails hatchbox-v2 jumpstart-marketing jumpstart-pro-rails noticed pay]
-end