wielder_of_anor 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 090d66633dff2b9e498891c7e6d9489e246916b4
-  data.tar.gz: fcc8ccb38e9922feaad5a64ec8d4644c2336984e
+  metadata.gz: 67aeb5b09bfba58a5a26a768a35d35cb9bae1cd6
+  data.tar.gz: 6808e6fa94ec66058aceacbbae676c4f0a1e46a7
 SHA512:
-  metadata.gz: a0f729c87f2271421ab419a617c007be6b814a82df2144b2b104d6b330822797bba33f4ea9b85c42e389c2ab0a4d96b04620fd58218fd876554eeefe487bd68b
-  data.tar.gz: 30d630f1a1f4842d9519cb54dc1dae53412e08d87906835f169520edbfa450f93fc76777d6e7647603f477a024fbd93693fd065ea1da40a33f6a45c51b04cb75
+  metadata.gz: e2e49996bf345071b50f14226d38b80b50c996817afc35ad1b23969c142c35a9e60de09ab9f94d0609a12876ee9118b862a0ed3ad85f7c59dc9d7555d7133548
+  data.tar.gz: b65fa2f77f4f67e7a61f3beecbda5a0c1e90dc54c16754ded3739eddf69265981bafcdad1b3757df7f9f396a5a7960907d6843d56bb58bd75e4a9bd755a68ed1

data/lib/wielder_of_anor.rb

@@ -1,9 +1,14 @@
 require 'shellwords'
 require 'yaml'
 require 'rainbow'
+require 'fileutils'
+
+require_relative 'wielder_of_anor/version'
 
 module WielderOfAnor
   class WielderOfAnor
+    include WielderOfAnorVersion
+
     def initialize
       set_app_directory
 
@@ -24,8 +29,9 @@ module WielderOfAnor
     ##############################################################################
 
     def prepare(commit_message, force_commit)
-      set_app_directory
-
+      # If there's just one, it's the current version. Don't run if the current config is present.
+      restore_settings if Dir.glob("#{@app_directory.chomp("/wielder_of_anor-#{VERSION}")}/wielder_of_anor*").length > 1 &&
+                          !(File.exists?("#{@app_directory}/lib/config.yaml"))
       first_run unless File.exists?("#{@app_directory}/lib/config.yaml")
 
       config = YAML.load_file("#{@app_directory}/lib/config.yaml")
@@ -41,8 +47,7 @@ module WielderOfAnor
       git_diff
 
       @files_changed_file = File.open(@files_changed_file_location, "r")
-
-      get_forbidden_words(config['forbidden_words_file_location'])
+      @forbidden_words = config['forbidden_words']
     end
 
     def help
@@ -72,20 +77,18 @@ module WielderOfAnor
       set_app_directory
       config = YAML.load_file("#{@app_directory}/lib/config.yaml")
 
-      unless config
+      unless config && config['forbidden_words']
         lines_pretty_print Rainbow('You have yet to set your forbidden words! Please run the app with the parameter '\
                                    '\'config\' to set up your configurations and forbidden words.').red
 
         abort
       end
 
-      get_forbidden_words(config['forbidden_words_file_location'])
-
       lines_pretty_print Rainbow('Your forbidden words are:').yellow
 
       single_space
 
-      @forbidden_words.each do |word|
+      config['forbidden_words'].each do |word|
         lines_pretty_print Rainbow(word).yellow
       end
 
@@ -94,51 +97,58 @@ module WielderOfAnor
       abort
     end
 
-    def first_run
-      lines_pretty_print 'Thanks for downloading Wielder of Anor! Let\'s run through the '\
-           'initial setup!'
-      lines_pretty_print Rainbow('**Please ensure your file locations are correct. Wielder of Anor '\
-           'does not currently check your input for validity.**').red
+    # Attempt to restore settings from previous version.
+    def restore_settings
+      lines_pretty_print 'I see that I\'ve been recently updated.'
+      lines_pretty_print Rainbow('Would you like to restore the settings from the previous installation?').yellow
 
-      STDIN.gets
+      answered = false
 
-      files_changed_file_location = set_files_changed_file_location
+      until answered
+        answer = STDIN.gets.strip!
 
-      forbidden_words_file_location = set_forbidden_words_file_location
+        single_space
 
-      commit_for_user = set_commit_for_user
+        if answer == 'yes' || answer == 'y' || answer == 'no' || answer == 'n'
+          answered = true
+        else
+          lines_pretty_print Rainbow('Please input either \'yes\' or \'no\'.').yellow
+        end
+      end
+
+      return if answer == 'no' || answer == 'n'
+
+      lines_pretty_print 'One moment, please.'
 
       single_space
 
-      set_configs(files_changed_file_location, forbidden_words_file_location, commit_for_user)
+      all_gems = Dir.glob("#{@app_directory.chomp("/wielder_of_anor-#{VERSION}")}/wielder_of_anor*")
+
+      # glob orders things in the array alphabetically, so the second-to-last one in the array is the
+      # most recent version that is not the current version.
+      previous_config_file = "#{all_gems[-2]}/lib/config.yaml"
+      FileUtils.copy_file(previous_config_file, "#{@app_directory}/lib/config.yaml")
+
+      lines_pretty_print 'Done! Please run me again when you\'re ready.'
 
-      set_forbidden_words(forbidden_words_file_location)
+      abort
     end
 
-    def set_files_changed_file_location
-      set_app_directory
+    def first_run
+      lines_pretty_print 'Thanks for downloading Wielder of Anor! Let\'s run through the '\
+           'initial setup!'
+
+      STDIN.gets
 
-      lines_pretty_print 'Whenever you run Wielder of Anor, it will first run a git diff and '\
-           'export the results to a file (so that it\'s only checking the files '\
-           'you have actually changed and not your entire code base!). Where '\
-           'would you like that file to be located?'
-      lines_pretty_print Rainbow('(Just hit enter to accept the default, which is'\
-           " #{@app_directory}/lib/files_changed.)").yellow
-      files_changed_file_location = STDIN.gets.strip!
-      files_changed_file_location = "#{@app_directory}/lib/files_changed" if files_changed_file_location == ''
+      files_changed_file_location = "#{@app_directory}/lib/files_changed"
 
-      files_changed_file_location
-    end
+      commit_for_user = set_commit_for_user
 
-    def set_forbidden_words_file_location
-      lines_pretty_print 'Your \'forbidden words\' are stored in a file. Where would like that'\
-           ' file to be located?'
-      lines_pretty_print Rainbow('(Just hit enter to accept the default, which is'\
-           " #{@app_directory}/lib/forbidden_words.)").yellow
-      forbidden_words_file_location = STDIN.gets.strip!
-      forbidden_words_file_location = "#{@app_directory}/lib/forbidden_words" if forbidden_words_file_location == ""
+      single_space
 
-      forbidden_words_file_location
+      forbidden_words = set_forbidden_words
+
+      set_configs(files_changed_file_location, forbidden_words, commit_for_user)
     end
 
     def set_commit_for_user
@@ -157,25 +167,30 @@ module WielderOfAnor
       commit_for_user
     end
 
-    def set_configs(files_changed_file_location, forbidden_words_file_location, commit_for_user)
+    def set_configs(files_changed_file_location, forbidden_words, commit_for_user)
       config = {}
       config['files_changed_file_location'] = files_changed_file_location
-      config['forbidden_words_file_location'] = forbidden_words_file_location
 
       if commit_for_user == 'yes' || commit_for_user == 'y'
         config['commit_for_user'] = true
-      elsif commit_for_user == 'no' || commit_for_user == 'n'
+      else
         config['commit_for_user'] = false
       end
 
+      config['forbidden_words'] = forbidden_words
+
       file = File.open("#{@app_directory}/lib/config.yaml", 'w')
       YAML.dump(config, file)
       file.close
+
+      lines_pretty_print 'And with that, we\'re done! Feel free to run Wielder of Anor again if'\
+           ' you\'d like to check your code now!'
+
+      abort
     end
 
-    def set_forbidden_words(forbidden_words_file_location)
-      forbidden_words_file = File.open(forbidden_words_file_location, 'w')
-      forbidden_words_count = 0
+    def set_forbidden_words
+      forbidden_words = []
 
       done = false
 
@@ -185,48 +200,32 @@ module WielderOfAnor
 
       until done do
         lines_pretty_print Rainbow('Enter a forbidden word and hit enter. If you are done entering '\
-                           'forbidden words, type \'x211\' and hit enter instead.').yellow unless forbidden_words_count > 0
+                           'forbidden words, type \'x211\' and hit enter instead.').yellow unless forbidden_words.count > 0
 
         lines_pretty_print Rainbow('Added! Enter another forbidden word and hit enter. If you are done '\
-                                   'entering forbidden words, type \'x211\' and hit enter instead.').yellow unless forbidden_words_count == 0
+                                   'entering forbidden words, type \'x211\' and hit enter instead.').yellow unless forbidden_words.count == 0
         word = STDIN.gets.strip!
+
         single_space
 
         if word == 'x211'
           done = true
         else
-          forbidden_words_file.puts word
-          forbidden_words_count += 1
+          forbidden_words << word
         end
       end
 
-      forbidden_words_file.close
-
-      lines_pretty_print 'And with that, we\'re done! Feel free to run Wielder of Anor again if'\
-           ' you\'d like to check your code now!'
-
-      abort
+      forbidden_words
     end
 
     def git_diff
       bash("git diff HEAD --name-only --staged > #{@files_changed_file_location}")
     end
 
-    def get_forbidden_words(file_location)
-      forbidden_words_file = File.open(file_location)
-
-      forbidden_words_file.each_line do |line|
-        @forbidden_words << line.strip
-      end
-
-      forbidden_words_file.close
-    end
-
     def add_forbidden_word(word)
       set_app_directory
-      config = YAML.load_file("#{@app_directory}/lib/config.yaml")
-      forbidden_words_file = File.open(config['forbidden_words_file_location'], 'a')
-      get_forbidden_words(config['forbidden_words_file_location'])
+      config_yaml = YAML.load_file("#{@app_directory}/lib/config.yaml")
+      config_file = File.open("#{@app_directory}/lib/config.yaml", 'w')
 
       if word.nil?
         lines_pretty_print Rainbow('Please submit your word as a second parameter.').red
@@ -234,14 +233,15 @@ module WielderOfAnor
         abort
       end
 
-      if @forbidden_words.include?(word)
+      if config_yaml['forbidden_words'].include?(word)
         lines_pretty_print Rainbow("''#{word}'' is already a forbidden word!").red
 
         abort
       end
 
-      forbidden_words_file.puts word
-      forbidden_words_file.close
+      config_yaml['forbidden_words'] << word
+
+      YAML.dump(config_yaml, config_file)
 
       lines_pretty_print 'Added!'
 

data/lib/wielder_of_anor/version.rb

@@ -1,3 +1,3 @@
-module WielderOfAnor
-  VERSION = "0.2.2"
+module WielderOfAnorVersion
+  VERSION = "0.3.0"
 end

data/wielder_of_anor.gemspec

@@ -5,7 +5,7 @@ require 'wielder_of_anor/version'
 
 Gem::Specification.new do |spec|
   spec.name           = 'wielder_of_anor'
-  spec.version        = WielderOfAnor::VERSION
+  spec.version        = WielderOfAnorVersion::VERSION
   spec.authors        = ['Chris Sellek']
   spec.email          = ['iamsellek@gmail.com']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wielder_of_anor
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Sellek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow