git_fonky 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25baa00e3edcbddf36eb6d5565e3932666268d06a2429734fd51b842bec0fac3
-  data.tar.gz: e43f2d96ce2b617994ef2d898e18cfdf6d8ad78f2ccb3c10652cc24da11f3159
+  metadata.gz: 2d9e659e91221b3600b3d9924a209748976b7880108f49d724d4ffaaf2189ff6
+  data.tar.gz: 947bf8009681841bd4fcdd46c962bcc2d824b39851161aefa3777e75f5b0cd0b
 SHA512:
-  metadata.gz: 71e58c2e8f0494c80d7f92fa3c68de56ad34dfdca3312aabec1e9cb29e8e19789b0fe68549feda406372ab9efae32df3f38116f97b3cf54804b4f41375852f96
-  data.tar.gz: bb929fdc4346b7281d7b8bed3c7f063e22a4bbf1b323063f4610886c1173b5092368860ee3a174151a61e713561f2c3e70b81afd5162b9a6a5d284c823107d0d
+  metadata.gz: 83e34338ffc13a6af5f9fe7d6684066bc74796037353122c9ee5bdc73a86e424d9438325d1634a8d5ba35cebd2ef86d3e3ecce2fcc8762bed39624b7e7ae0381
+  data.tar.gz: 2601863350da5d6a26b5a263cf9e9b903f43ec5b85858737c760ab122479467b7f535e3531a49255b1aab2b53324a9207d80a0e6e022b6dcc6e4d059dd433f47

data/lib/git_fonky/command.rb

@@ -0,0 +1,29 @@
+module GitFonky
+  class Command
+    attr_reader :repo_dir, :reporter
+
+    def initialize(repo_dir:, reporter:)
+      @repo_dir = repo_dir
+      @reporter = reporter
+    end
+
+    def current_branch
+      `git branch --show-current`.strip
+    end
+
+    def fetch_upstream
+      reporter.announce("fetching")
+      `git fetch upstream #{repo_dir.branch} 2>&1`
+    end
+
+    def pull_upstream
+      reporter.announce("pulling")
+      `git pull upstream #{repo_dir.branch} 2>&1`
+    end
+
+    def push_to_origin
+      reporter.announce("pushing", "to", "origin")
+      `git push origin #{repo_dir.branch} 2>&1`
+    end
+  end
+end

data/lib/git_fonky/repo_dir.rb

@@ -1,97 +1,37 @@
+require_relative "reporter"
+require_relative "command"
+
 module GitFonky
   class RepoDir
-    attr_reader :dirname
+    attr_reader :command, :dirname, :reporter
 
     def initialize(dirname)
       @dirname = dirname
+      @reporter = Reporter.new(self)
+      @command = Command.new(repo_dir: self, reporter: reporter)
     end
 
     def branch
-      @branch ||= `git branch --show-current`.strip
+      @branch ||= command.current_branch
     end
 
     def sync
       Dir.chdir dirname do
-        announce_update
-        next invalid_branch_msg if on_invalid_branch?
-        fetch_upstream
-        pull_upstream
-        if $?.success?
-          push_to_origin
-          announce_success
-        else
-          failed_pull_msg
-        end
-      end
-      puts "\n\n"
-    end
-
-    def on_invalid_branch?
-      !branch.match?(/(main|master)/)
-    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 #{dirname} | #{branch} branch <-----"
-      border = border_for(msg, "*")
-
-      puts border
-      puts warning_header.center(border.length)
-      puts msg.center(border.length)
-      puts sub_msg.center(border.length)
-      puts border
-    end
-
-    private
-
-    def failed_pull_msg
-      msg = "-----> Failed to pull upstream #{branch}. Moving on to next repo. <-----"
-      border = border_for(msg, "*")
-
-      puts border
-      puts warning_header.center(border.length)
-      puts msg.center(border.length)
-      puts border
-    end
+        reporter.announce_update
+        return reporter.invalid_branch_msg if on_invalid_branch?
 
-    def announce_update
-      msg = "Updating -> #{dirname} | #{branch} branch "
-      border = border_for(msg, "=")
+        command.fetch_upstream
+        command.pull_upstream
 
-      puts border
-      puts msg.center(border.length)
-      puts border
-    end
-
-    def announce_success
-      puts "-----> Successfully updated #{dirname} | #{branch} branch"
-    end
-
-    def announce(action, direction = "from", remote = "upstream")
-      puts "-----> #{action} #{direction} #{remote} #{branch}"
-    end
-
-    def fetch_upstream
-      announce("fetching")
-      `git fetch upstream #{branch} 2>&1`
-    end
+        return reporter.failed_pull_msg unless $?.success?
 
-    def pull_upstream
-      announce("pulling")
-      `git pull upstream #{branch} 2>&1`
-    end
-
-    def push_to_origin
-      announce("pushing", "to", "origin")
-      `git push origin #{branch} 2>&1`
-    end
-
-    def warning_header
-      "WARNING"
+        command.push_to_origin
+        reporter.announce_success
+      end
     end
 
-    def border_for(msg, border_char)
-      border_char * (msg.length + 20)
+    def on_invalid_branch?
+      !branch.match?(/(main|master)/)
     end
   end
 end

data/lib/git_fonky/reporter.rb

@@ -0,0 +1,57 @@
+module GitFonky
+  class Reporter
+    attr_reader :repo_dir
+
+    def initialize(repo_dir)
+      @repo_dir = repo_dir
+    end
+
+    def announce(action, direction = "from", remote = "upstream")
+      puts "-----> #{action} #{direction} #{remote} #{repo_dir.branch}"
+    end
+
+    def announce_success
+      puts "-----> Successfully updated #{repo_dir.dirname} | #{repo_dir.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)
+    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)
+    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)
+    end
+
+    private
+
+    def calculate_border_for(border_char, msg)
+      border_char * (msg.length + 20)
+    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
+    end
+
+    def warning_header
+      "WARNING"
+    end
+  end
+end

data/lib/git_fonky/version.rb

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

data/lib/git_fonky.rb

@@ -11,6 +11,7 @@ module GitFonky
     Dir.chdir "#{Dir.home}/code" do
       WORK_REPO_NAMES.each do |dir|
         RepoDir.new(dir).sync
+        puts "\n\n\n"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_fonky
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Collin Jilbert
@@ -27,7 +27,9 @@ files:
 - bin/gfonk
 - git_fonky.gemspec
 - lib/git_fonky.rb
+- lib/git_fonky/command.rb
 - lib/git_fonky/repo_dir.rb
+- lib/git_fonky/reporter.rb
 - lib/git_fonky/version.rb
 - lib/git_fonky/work_repo_names.rb
 - sig/git_fonky.rbs