sugarjar 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56cbf17ade9b12f891a658d7224a4571890da6517d9ea77a6f3688b4ff593261
-  data.tar.gz: c0c51ce8312f592cc8fd0fe273c563c2c7d3b2e033776ba64d267767755bd720
+  metadata.gz: 7b12b221b467eca9aeba30396d059870a82608120ce1739ded50b4aef55ce7ba
+  data.tar.gz: c84bcab24de60fc61a0241f7c2940d6da6d78bc7416fa3fb92500528a447f9c8
 SHA512:
-  metadata.gz: 3d49efb6124a04112ab8bd80b145a2459bdeb56f79c468524e0c89bbc9ef183dfce001fe199b8274562083b338aa2d81073e818676cd6fb9a43250c7be80c736
-  data.tar.gz: 0acc7fb90fed326a8976a1f029e3f5a9720259c855df686e8fb52aa70f8dc009f500f1bb36ef1c5957b7291b5d36cd3e4e59e902582fc23ed66409a58f73869a
+  metadata.gz: e041cd65eb939ea1d2153bf13a8a019e05f194fcf6ce4326c69d62a2de9e34e1d036cf759c5ea17b5b42d8e7e159fc99d65ee75470580a4ed15a854fffc7c87f
+  data.tar.gz: 2c47c2920b6a774ffb83ef16761183ac7dbfcc808a6885335bbeeee5470a29ceff343df4e3748897ab4e8e681e7c7d8b9a5fc3c7ed4d44fafaa40dda6c08b300

data/README.md

@@ -191,6 +191,13 @@ $ sj feature dependent-feature test-branch
 Created feature branch dependent-feature based on test-branch
 ```
 
+## Smartlog
+
+Smartlog will show you a tree diagram of your branches! Simply run `sj
+smartlog` or `sj sl` for short.
+
+![smartlog screenshot](https://github.com/jaymzh/sugarjar/blob/master/smartlog.png)
+
 ## And more!
 
 See `sj help` for more commands!

data/lib/sugarjar/commands.rb

@@ -165,7 +165,7 @@ class SugarJar
       reponame = File.basename(repo, '.git')
       dir ||= reponame
       SugarJar::Log.info("Cloning #{reponame}...")
-      hub('clone', repo, dir, *args)
+      hub('clone', canonicalize_repo(repo), dir, *args)
 
       Dir.chdir dir do
         # Now that we have a repo, if we have a hub host set it.
@@ -185,7 +185,7 @@ class SugarJar
           # newer 'hub's don't fail and do the right thing...
           SugarJar::Log.info("Fork (#{@ghuser}/#{reponame}) detected.")
           hub('remote', 'rename', 'origin', 'upstream')
-          hub('remote', 'add', 'origin', forked_path(repo, @ghuser))
+          hub('remote', 'add', 'origin', forked_repo(repo, @ghuser))
         else
           SugarJar::Log.info("Forked #{reponame} to #{@ghuser}")
         end
@@ -284,24 +284,36 @@ class SugarJar
       s.error?
     end
 
-    def extract_org(path)
-      if path.start_with?('http')
-        File.basename(File.dirname(path))
-      elsif path.start_with?('git@')
-        path.split(':')[1].split('/')[0]
+    def extract_org(repo)
+      if repo.start_with?('http')
+        File.basename(File.dirname(repo))
+      elsif repo.start_with?('git@')
+        repo.split(':')[1].split('/')[0]
       else
         # assume they passed in a hub-friendly name
-        path.split('/').first
+        repo.split('/').first
       end
     end
 
-    def forked_path(path, username)
-      repo = if path.start_with?('http', 'git@')
-               File.basename(path)
+    def forked_repo(repo, username)
+      repo = if repo.start_with?('http', 'git@')
+               File.basename(repo)
              else
-               "#{File.basename(path)}.git"
+               "#{File.basename(repo)}.git"
              end
-      "git@github.com:#{username}/#{repo}"
+      "git@#{@ghhost || 'github.com'}:#{username}/#{repo}"
+    end
+
+    # Hub will default to https, but we should always default to SSH
+    # unless otherwise specified since https will cause prompting.
+    def canonicalize_repo(repo)
+      # if they fully-qualified it, we're good
+      return repo if repo.start_with?('http', 'git@')
+
+      # otherwise, ti's a shortname
+      cr = "git@#{@ghhost || 'github.com'}:#{repo}.git"
+      SugarJar::Log.debug("canonicalized #{repo} to #{cr}")
+      cr
     end
 
     def set_hub_host
@@ -378,24 +390,53 @@ class SugarJar
         @repo_config[type].each do |check|
           SugarJar::Log.debug("Running #{type} #{check}")
 
-          unless File.exist?(check.split.first)
-            SugarJar::Log.error("Configured #{type} #{check} does not exist!")
+          short = check.split.first
+          unless File.exist?(short)
+            SugarJar::Log.error("Configured #{type} #{short} does not exist!")
             return false
           end
           s = Mixlib::ShellOut.new(check).run_command
-          unless s.error?
+
+          # Linters auto-correct, lets handle that gracefully
+          if type == 'lint' && dirty?
             SugarJar::Log.info(
-              "[#{type}] #{check}: #{color('OK', :green)}",
+              "[#{type}] #{short}: #{color('Corrected', :yellow)}",
+            )
+            SugarJar::Log.warn(
+              "The linter modified the repo. Here's the diff:\n",
             )
-            next
+            puts hub('diff').stdout
+            loop do
+              $stdout.print(
+                "\nWould you like to\n\t[q]uit and inspect\n\t[a]mend the " +
+                "changes to the current commit and re-run\n  > ",
+              )
+              ans = $stdin.gets.strip
+              case ans
+              when /^q/
+                SugarJar::Log.info('Exiting at user request.')
+                exit(1)
+              when /^a/
+                qamend('-a')
+                # break here, if we get out of this loop we 'redo', assuming
+                # the user chose this option
+                break
+              end
+            end
+            redo
           end
 
+          if s.error?
+            SugarJar::Log.info(
+              "[#{type}] #{short} #{color('failed', :red)}, output follows " +
+              "(see debug for more)\n#{s.stdout}",
+            )
+            SugarJar::Log.debug(s.format_for_exception)
+            return false
+          end
           SugarJar::Log.info(
-            "[#{type}] #{check} #{color('failed', :red)}, output follows " +
-            "(see debug for more)\n#{s.stdout}",
+            "[#{type}] #{short}: #{color('OK', :green)}",
           )
-          SugarJar::Log.debug(s.format_for_exception)
-          return false
         end
       end
     end

data/lib/sugarjar/util.rb

@@ -52,7 +52,8 @@ class SugarJar
           end
           SugarJar::Log.info('Re-running original hub command...')
           s = Mixlib::ShellOut.new([which('hub')] + args).run_command
-        when /^fatal: could not read Username/
+        when /^fatal: could not read Username/, /Anonymous access denied/
+
           # On http(s) URLs, git may prompt for username/passwd
           SugarJar::Log.info(
             'Hub was run but git prompted for authentication. This probably ' +

data/lib/sugarjar/version.rb

@@ -1,3 +1,3 @@
 class SugarJar
-  VERSION = '0.0.8'.freeze
+  VERSION = '0.0.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sugarjar
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Phil Dibowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: A git/github helper script