Decrease complexity by using instance variables

Author: Flurin Egger

lib/roger/release/finalizers/git_branch.rb

@@ -55,15 +55,15 @@ def commit_and_push_release(clone_dir, branch)
       ::Dir.chdir(clone_dir) do
         # 3. Copy changes
         FileUtils.rm_rf("*")
-        FileUtils.cp_r release.build_path.to_s + "/.", clone_dir.to_s
+        FileUtils.cp_r @release.build_path.to_s + "/.", clone_dir.to_s
 
         commands = [
           %w(git add .), # 4. Add all files
-          %w(git commit -a -m) << "Release #{release.scm.version}" # 5. Commit
+          %w(git commit -a -m) << "Release #{@release.scm.version}" # 5. Commit
         ]
 
         # 6. Git push if in options
-        commands << (%w(git push origin) << branch) if options[:push]
+        commands << (%w(git push origin) << branch) if @options[:push]
 
         commands.each do |command|
           `#{Shellwords.join(command)}`

lib/roger/release/finalizers/rsync.rb

@@ -54,8 +54,8 @@ def check_rsync_command(command)
 
     def rsync(command, local_path, remote_path)
       target_path = remote_path
-      target_path = "#{options[:host]}:#{target_path}" if options[:host]
-      target_path = "#{options[:username]}@#{target_path}" if options[:username]
+      target_path = "#{@options[:host]}:#{target_path}" if @options[:host]
+      target_path = "#{@options[:username]}@#{target_path}" if @options[:username]
 
       command = [
         options[:rsync],
@@ -73,15 +73,15 @@ def rsync(command, local_path, remote_path)
 
     def prompt_for_upload
       !options[:ask] ||
-        (prompt("Do you wish to upload to #{options[:host]}? [y/N]: ")) =~ /\Ay(es)?\Z/
+        prompt("Do you wish to upload to #{@options[:host]}? [y/N]: ") =~ /\Ay(es)?\Z/
     end
 
     def validate_options!
       must_have_keys = [:remote_path]
-      return if (options.keys & must_have_keys).size == must_have_keys.size
+      return if (@options.keys & must_have_keys).size == must_have_keys.size
 
-      release.log(self, "Missing options: #{(must_have_keys - options.keys).inspect}")
-      fail "Missing keys: #{(must_have_keys - options.keys).inspect}"
+      release.log(self, "Missing options: #{(must_have_keys - @options.keys).inspect}")
+      fail "Missing keys: #{(must_have_keys - @options.keys).inspect}"
     end
 
     def prompt(question = "Do you wish to continue?")

lib/roger/release/processors/mockup.rb

@@ -95,9 +95,9 @@ def target_path(path)
     def log_call
       release.log(self, "Processing mockup files")
 
-      release.log(self, "  Matching: #{options[:match].inspect}", true)
-      release.log(self, "  Skiping : #{options[:skip].inspect}", true)
-      release.log(self, "  Env     : #{options[:env].inspect}", true)
+      release.log(self, "  Matching: #{@options[:match].inspect}", true)
+      release.log(self, "  Skiping : #{@options[:skip].inspect}", true)
+      release.log(self, "  Env     : #{@options[:env].inspect}", true)
       release.log(self, "  Files   :", true)
     end
   end