sugarjar 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e9576a717ef65aa68a0a7f46e883245fc7e288a9884924658484f68e5d78470
-  data.tar.gz: 420299217d7e184c8129634351f5b9dc3ee336207d9c4a5ee3dd3d5ea64b0c31
+  metadata.gz: 22bcfbf2376fe2665d068e42a3a2263c13602ac0a534fc958efbedd959e89862
+  data.tar.gz: c817adecadb1c3886cc8b8cfb105a1f844e5cfb90f32f351c17647d28ab21e68
 SHA512:
-  metadata.gz: 0d68dfb58e071f078ac63e3781db4dbea649a95ddbf0d9afce7b1361d74baa6ea0264df426260d3124f6a23a89cddeafc3efd83bc52670fb5210d388f2c28adb
-  data.tar.gz: c226c00b7332803a686d82cd2a916212f09c476c50afbe7ae7f0a95e510d59ba2ae2bd553fbaa0af3601f01e90ef5c63e6b56fde13b38ff180553a3c1f48e0a0
+  metadata.gz: 1e2d3c3cc050f9da5432333559e8338fcb9312fd42be1b254f31a9e553440f0c2f4b86da8d93ccc6c58f6647bed931808ba714a893a8e868e6d439b2e29e74b0
+  data.tar.gz: d74d2118706f4c3386b27a6a23bd594301c3c5621e2da72fd08c6dcd3e6c59917f0cef11cb9fad2c93f99e942ff175c512766510c8c510d7158240bd4d6ea3bc

data/bin/sj

@@ -144,6 +144,9 @@ end
 # we parse later. We also need a pristine copy in case we want to
 # run git as we were called.
 argv_copy = ARGV.dup
+
+# We don't have options yet, but we need an instance of SJ in order
+# to list public methods. We will recreate it
 sj = SugarJar::Commands.new(options)
 extra_opts = []
 
@@ -204,6 +207,9 @@ if ARGV.empty?
 end
 
 options = config.merge(options)
+
+# Recreate SJ with all of our options
+sj = SugarJar::Commands.new(options)
 SugarJar::Log.level = options['log_level'].to_sym if options['log_level']
 
 subcommand = argv_copy.reject { |x| x.start_with?('-') }.first

data/lib/sugarjar/commands.rb

@@ -11,6 +11,7 @@ class SugarJar
     include SugarJar::Util
 
     def initialize(options)
+      SugarJar::Log.debug("Commands.initialize options: #{options}")
       @ghuser = options['github_user']
       @ghhost = options['github_host']
       @repo_config = SugarJar::RepoConfig.config
@@ -231,10 +232,14 @@ class SugarJar
             return false
           end
           s = Mixlib::ShellOut.new(check).run_command
-          if s.error?
-            SugarJar::Log.info("#{type} #{check} failed\n#{s.stdout}")
-            return false
-          end
+          next unless s.error?
+
+          SugarJar::Log.info(
+            "#{type} #{check} failed, output follows (use debug for more)\n" +
+            s.stdout.to_s,
+          )
+          SugarJar::Log.debug(s.format_for_exception)
+          return false
         end
       end
     end
@@ -353,8 +358,18 @@ class SugarJar
     def gitup
       SugarJar::Log.debug('Fetching upstream')
       fetch_upstream
+      curr = current_branch
       SugarJar::Log.debug('Rebasing')
       base = tracked_branch
+      if curr != 'master' && base == "origin/#{curr}"
+        SugarJar::Log.warn(
+          "This branch is tracking origin/#{curr}, which is probably your " +
+          'downstream (where you push _to_) as opposed to your upstream ' +
+          '(where you pull _from_). This means that "sj up" is probably ' +
+          'rebasing on the wrong thing and doing nothing. You probably want ' +
+          'to do a "git branch -u upstream".',
+        )
+      end
       s = hub_nofail('rebase', base)
       s.error? ? nil : base
     end

data/lib/sugarjar/config.rb

@@ -6,7 +6,7 @@ class SugarJar
   # This is stuff like log level, github-user, etc.
   class Config
     DEFAULTS = {
-      'ghuser' => ENV['USER'],
+      'github_user' => ENV['USER'],
       'fallthru' => true,
     }.freeze
 

data/lib/sugarjar/version.rb

@@ -1,3 +1,3 @@
 class SugarJar
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sugarjar
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Phil Dibowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log