autowow 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70a57e753c44cf9f997b913dc482efb02cb3aeecb83f2c10a0188266213e1d85
-  data.tar.gz: 680c9293783c4aceee7202e26ffafdce6e343930a7e015edb15a6da194d5750c
+  metadata.gz: 1f55bfd872a119778b302703a39cefb379d5338b3fe7e7bdab919d70d73fe350
+  data.tar.gz: a1194055e1a2ffa4e0c813a98e7e71e002a971a0cbeaa0615862bd5960f131f6
 SHA512:
-  metadata.gz: 3456ebc8902996a1fbe51f4a180c75dd47118af1f3f38c88aef7bba6dff02802a3f0c7547bfe2a90d1480713d0e483594c5ef23278ec3bbcba4ebbff61b35685
-  data.tar.gz: 456e92d320ce52568ea579ab1670b08f3d336eca9d5e9e77567f2907b9637c1607470f25463b35c234357536847bf2f3109dd2c76844c8ad2f02cb37c5d42211
+  metadata.gz: 1b912bfef14595af0c6900b51d6e36471b7cd1224dc0af0d6df8501610ef1cefe6019bde1082156bf4f26200c164e074c4b2bb1ef62abb0a8e85f3f7cee5fe1b
+  data.tar.gz: bf0a0804a2223c4472d8d4276f3b0af60a9de92494903c7a2671db1aba886d01b03a4c9ce364dce429ee98e515fb7b67daafcd174cef8d926adfd9b2c1ac7535

data/.gitignore

@@ -13,3 +13,4 @@
 .idea
 
 *.gem
+notes.*

data/README.md

@@ -3,7 +3,7 @@
 #### Set of commands to [auto]mate [w]ay [o]f [w]orking
 
 <!--- Version informartion -->
-*You are viewing the README of version [v0.16.0](https://github.com/thisismydesign/autowow/releases/tag/v0.16.0). You can find other releases [here](https://github.com/thisismydesign/autowow/releases).*
+*You are viewing the README of version [v0.16.1](https://github.com/thisismydesign/autowow/releases/tag/v0.16.1). You can find other releases [here](https://github.com/thisismydesign/autowow/releases).*
 <!--- Version informartion end -->
 
 | Branch | Status |

data/lib/autowow/commands/rbenv.rb

@@ -1,6 +1,10 @@
 module Autowow
   module Commands
     module Rbenv
+      def rbenv
+        ["rbenv"]
+      end
+
       def version
         ["rbenv", "local"]
       end

data/lib/autowow/commands/vcs.rb

@@ -14,11 +14,11 @@ module Autowow
       end
 
       def changes_not_on_remote(branch)
-        cmd + terminal_options + ["log", branch, "--not", "--remotes"]
+        cmd + terminal_options + ["log", "--not", "--remotes", branch]
       end
 
       def branch_list
-        cmd + ["for-each-ref", "--format=%(refname)", "refs/heads/"]
+        cmd + ["for-each-ref", "--format='%(refname:short)'", "refs/heads/"]
       end
 
       def push(branch = nil, remote = nil)
@@ -93,9 +93,16 @@ module Autowow
         cmd + ["reset", "--hard", branch]
       end
 
-      # Doesn't work on Windows
-      def current_branch_remote
-        cmd + ["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"]
+      def upstream_tracking(branch)
+        cmd + ["for-each-ref", "--format=%'(upstream:short)'", "refs/heads/#{branch}"]
+      end
+
+      def current_ref
+        cmd + ["symbolic-ref", "--quiet", "HEAD"]
+      end
+
+      def show_ref(branch)
+        cmd + ["show-ref", branch]
       end
 
       include ReflectionUtils::CreateModuleFunctions

data/lib/autowow/features/rbenv.rb

@@ -12,6 +12,14 @@ module Autowow
       include Executor
       include StringDecorator
 
+      def exists?
+        begin
+          quiet.run!(rbenv).success?
+        rescue SystemCallError
+          false
+        end
+      end
+
       def ruby_versions
         logger.info(used_versions)
       end

data/lib/autowow/features/vcs.rb

@@ -46,6 +46,10 @@ module Autowow
         greet(latest_project_info)
       end
 
+      def is_tracked?(branch)
+        !quiet.run!(Vcs.upstream_tracking(branch).join(" ")).out.strip.empty?
+      end
+
       def self.force_pull
         pretty_with_output.run(git_status)
         branch = working_branch
@@ -199,7 +203,11 @@ module Autowow
       end
 
       def branch_pushed(branch)
-        quiet.run(changes_not_on_remote(branch)).out.empty?
+        is_tracked?(branch) && commits_pushed?(branch)
+      end
+
+      def commits_pushed?(branch)
+        quiet.run(changes_not_on_remote(branch)).out.strip.empty?
       end
 
       def greet(latest_project_info = nil)
@@ -211,6 +219,9 @@ module Autowow
           logger.info(latest_project_info)
           check_projects_older_than(1, :months)
         end
+
+        return unless Rbenv.exists?
+
         obsolete_rubies = Rbenv.obsolete_versions
         if obsolete_rubies.any?
           logger.info("\nThe following Ruby versions are not used by any projects, maybe consider removing them?")
@@ -223,7 +234,7 @@ module Autowow
       def check_projects_older_than(quantity, unit)
         old_projects = Fs.older_than(git_projects, quantity, unit)
         deprecated_projects = old_projects.reject do |project|
-          Dir.chdir(project) { branches.reject { |branch| branch_pushed(branch) }.any? }
+          Dir.chdir(project) { any_branch_not_pushed? || uncommitted_changes?(quiet.run(git_status).out) }
         end
 
         logger.info("The following projects have not been touched for more than #{quantity} #{unit} and all changes have been pushed, maybe consider removing them?") unless deprecated_projects.empty?
@@ -233,6 +244,10 @@ module Autowow
         end
       end
 
+      def any_branch_not_pushed?
+        branches.reject { |branch| branch_pushed(branch) }.any?
+      end
+
       def get_latest_repo_info
         latest = latest_repo
         time_diff = TimeDifference.between(File.mtime(latest), Time.now).humanize_higher_than(:days).downcase
@@ -245,7 +260,7 @@ module Autowow
       end
 
       def branches
-        quiet.run(branch_list).out.clean_lines.map { |line| line[%r{(?<=refs/heads/)(.*)}] }
+        quiet.run(branch_list.join(" ")).out.clean_lines
       end
 
       def uncommitted_changes?(status)

data/lib/autowow/version.rb

@@ -1,3 +1,3 @@
 module Autowow
-  VERSION = "0.16.0"
+  VERSION = "0.16.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autowow
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - thisismydesign
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_logging