Added ability for methods to be overrode, through the pretend and quiet

options, skipping their default behaviour if so.

lib/homesick/actions/file_actions.rb

@@ -8,7 +8,7 @@ module Homesick
         destination = Pathname.new(destination + source.basename)
 
         if destination.exist?
-          say_status :conflict, "#{destination} exists", :red unless options[:quiet]
+          say_status :conflict, "#{destination} exists", :red
 
           FileUtils.mv source, destination if (options[:force] || shell.file_collision(destination) { source }) && !options[:pretend]
         else
@@ -18,7 +18,7 @@ module Homesick
       end
 
       def rm_rf(dir)
-        say_status "rm -rf #{dir}", '', :green unless options[:quiet]
+        say_status "rm -rf #{dir}", '', :green
         FileUtils.rm_r dir, force: true
       end
 
@@ -26,20 +26,20 @@ module Homesick
         target = Pathname.new(target)
 
         if target.symlink?
-          say_status :unlink, "#{target.expand_path}", :green unless options[:quiet]
+          say_status :unlink, "#{target.expand_path}", :green
           FileUtils.rm_rf target
         else
-          say_status :conflict, "#{target} is not a symlink", :red unless options[:quiet]
+          say_status :conflict, "#{target} is not a symlink", :red
         end
       end
 
       def rm(file)
-        say_status "rm #{file}", '', :green unless options[:quiet]
+        say_status "rm #{file}", '', :green
         FileUtils.rm file, force: true
       end
 
       def rm_r(dir)
-        say_status "rm -r #{dir}", '', :green unless options[:quiet]
+        say_status "rm -r #{dir}", '', :green
         FileUtils.rm_r dir
       end
 
@@ -64,16 +64,16 @@ module Homesick
       def handle_symlink_action(action, source, destination)
         case action
         when :identical
-          say_status :identical, destination.expand_path, :blue unless options[:quiet]
+          say_status :identical, destination.expand_path, :blue
         when :symlink_conflict
           say_status :conflict,
                      "#{destination} exists and points to #{destination.readlink}",
-                     :red unless options[:quiet]
+                     :red
 
           FileUtils.rm destination
           FileUtils.ln_s source, destination, force: true unless options[:pretend]
         when :conflict
-          say_status :conflict, "#{destination} exists", :red unless options[:quiet]
+          say_status :conflict, "#{destination} exists", :red
 
           if collision_accepted?
             FileUtils.rm_r destination, force: true unless options[:pretend]
@@ -82,7 +82,7 @@ module Homesick
         else
           say_status :symlink,
                      "#{source.expand_path} to #{destination.expand_path}",
-                     :green unless options[:quiet]
+                     :green
           FileUtils.ln_s source, destination unless options[:pretend]
         end
       end

lib/homesick/actions/git_actions.rb

@@ -12,12 +12,12 @@ module Homesick
         FileUtils.mkdir_p destination.dirname
 
         if destination.directory?
-          say_status :exist, destination.expand_path, :blue unless options[:quiet]
+          say_status :exist, destination.expand_path, :blue
         else
           say_status 'git clone',
                      "#{repo} to #{destination.expand_path}",
-                     :green unless options[:quiet]
-          system "git clone -q --config push.default=upstream --recursive #{repo} #{destination}" unless options[:pretend]
+                     :green
+          system "git clone -q --config push.default=upstream --recursive #{repo} #{destination}"
         end
       end
 
@@ -26,10 +26,10 @@ module Homesick
 
         inside path do
           if path.join('.git').exist?
-            say_status 'git init', 'already initialized', :blue unless options[:quiet]
+            say_status 'git init', 'already initialized', :blue
           else
-            say_status 'git init', '' unless options[:quiet]
-            system 'git init >/dev/null' unless options[:pretend]
+            say_status 'git init', ''
+            system 'git init >/dev/null'
           end
         end
       end
@@ -39,55 +39,55 @@ module Homesick
         existing_remote = nil if existing_remote == ''
 
         if existing_remote
-          say_status 'git remote', "#{name} already exists", :blue unless options[:quiet]
+          say_status 'git remote', "#{name} already exists", :blue
         else
-          say_status 'git remote', "add #{name} #{url}" unless options[:quiet]
-          system "git remote add #{name} #{url}" unless options[:pretend]
+          say_status 'git remote', "add #{name} #{url}"
+          system "git remote add #{name} #{url}"
         end
       end
 
       def git_submodule_init(config = {})
-        say_status 'git submodule', 'init', :green unless options[:quiet]
-        system 'git submodule --quiet init' unless options[:pretend]
+        say_status 'git submodule', 'init', :green
+        system 'git submodule --quiet init'
       end
 
       def git_submodule_update(config = {})
-        say_status 'git submodule', 'update', :green unless options[:quiet]
-        system 'git submodule --quiet update --init --recursive >/dev/null 2>&1' unless options[:pretend]
+        say_status 'git submodule', 'update', :green
+        system 'git submodule --quiet update --init --recursive >/dev/null 2>&1'
       end
 
       def git_pull(config = {})
-        say_status 'git pull', '', :green unless options[:quiet]
-        system 'git pull --quiet' unless options[:pretend]
+        say_status 'git pull', '', :green
+        system 'git pull --quiet'
       end
 
       def git_push(config = {})
-        say_status 'git push', '', :green unless options[:quiet]
-        system 'git push' unless options[:pretend]
+        say_status 'git push', '', :green
+        system 'git push'
       end
 
       def git_commit_all(config = {})
-        say_status 'git commit all', '', :green unless options[:quiet]
+        say_status 'git commit all', '', :green
         if config[:message]
-          system "git commit -a -m '#{config[:message]}'" unless options[:pretend]
+          system "git commit -a -m '#{config[:message]}'"
         else
-          system 'git commit -v -a' unless options[:pretend]
+          system 'git commit -v -a'
         end
       end
 
       def git_add(file, config = {})
-        say_status 'git add file', '', :green unless options[:quiet]
-        system "git add '#{file}'" unless options[:pretend]
+        say_status 'git add file', '', :green
+        system "git add '#{file}'"
       end
 
       def git_status(config = {})
-        say_status 'git status', '', :green unless options[:quiet]
-        system 'git status' unless options[:pretend]
+        say_status 'git status', '', :green
+        system 'git status'
       end
 
       def git_diff(config = {})
-        say_status 'git diff', '', :green unless options[:quiet]
-        system 'git diff' unless options[:pretend]
+        say_status 'git diff', '', :green
+        system 'git diff'
       end
     end
   end