wielder_of_anor 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47f95532e9ef0f162cee99d705e5ff57d76e603f
-  data.tar.gz: 19b253f236f65500cc08ed86a79b4292d2e7ad1c
+  metadata.gz: 98ff99d194882de2e091e089a9185b491818c3df
+  data.tar.gz: eb20c71aa2dff09875da8db419955b2f96d2103e
 SHA512:
-  metadata.gz: cb7b6cdaeaf0762b20bdb52bf95d0129ff7b61060859f2b6872c8ba913c6bbc087777cf95ced720bdd2e2cf66ff4671711ca6d04034886d24ea14dc45b58caf4
-  data.tar.gz: f7aadde722183cd655b094feaee85aa976a24ad2bbdaa75eab375ddb5f3d05ec096d8eca3993f61a6057a1cf4fa9a0f913636fd0b3e7d2129c992f854218dd02
+  metadata.gz: 1eee1b20cc4cea88221cf2c3104e8de57f24aeca76ed93b682968f26da8d45c8bcfa8e33b0d5c72c8dc836a43a5dbfd8c794292bec82047864e25c41b2952854
+  data.tar.gz: 68573daf715a6e9967a223ab4a082a9a409de81d0ddbd72ce023e692badf2d89e18a020277d2dd9ce4821edd3fbf1e54330922f7b0e5c0191dd1aaaf244de4e7

data/.gitignore

@@ -3,4 +3,5 @@ docs/files_changed
 config/config.yaml
 Gemfile.lock
 .idea
-.bundle
+.bundle
+.pkg

data/Gemfile

@@ -1,4 +1,5 @@
 source "https://rubygems.org"
 
 gem 'rainbow', '~>2.1.0'
-gem 'gemspec'
+gem 'gemspec'
+gem 'iamsellek_cl_helper'

data/lib/wielder_of_anor.rb

@@ -2,12 +2,14 @@ require 'shellwords'
 require 'yaml'
 require 'rainbow'
 require 'fileutils'
+require 'iamsellek_cl_helper'
 
 require_relative 'wielder_of_anor/version'
 
 module WielderOfAnor
   class WielderOfAnor
     include WielderOfAnorVersion
+    include IamsellekClHelper
 
     def initialize
       set_app_directory
@@ -30,8 +32,9 @@ module WielderOfAnor
 
     def prepare(commit_message, force_commit)
       # 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"))
+      restore_settings('wielder_of_anor', VERSION) 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")
@@ -97,47 +100,6 @@ module WielderOfAnor
       abort
     end
 
-    # Attempt to restore settings from previous version.
-    def restore_settings
-      lines_pretty_print 'I see that you have a previous wielder_of_anor installation on this machine.'
-      lines_pretty_print Rainbow('Would you like to restore its settings?').yellow
-
-      answered = false
-
-      until answered
-        answer = STDIN.gets.strip!
-
-        single_space
-
-        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
-
-      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"
-      config = YAML.load_file(previous_config_file)
-      new_config_file = File.open("#{@app_directory}/lib/config.yaml", 'w')
-
-      YAML.dump(config, new_config_file)
-      new_config_file.close
-
-      lines_pretty_print 'Done! Please run me again when you\'re ready.'
-
-      abort
-    end
-
     def first_run
       lines_pretty_print 'Thanks for downloading Wielder of Anor! Let\'s run through the '\
            'initial setup!'
@@ -204,15 +166,15 @@ 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 just 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, just hit enter instead.').yellow unless forbidden_words.count == 0
         word = STDIN.gets.strip!
 
         single_space
 
-        if word == 'x211'
+        if word == ''
           done = true
         else
           forbidden_words << word
@@ -223,7 +185,7 @@ module WielderOfAnor
     end
 
     def git_diff
-      bash("git diff HEAD --name-only --staged > #{@files_changed_file_location}")
+      bash(@current_directory, "git diff HEAD --name-only --staged > #{@files_changed_file_location}")
     end
 
     def add_forbidden_word(word)
@@ -355,19 +317,13 @@ module WielderOfAnor
       single_space
 
       if input == 'yes' || input == 'y'
-        bash(%Q[git commit -m "#{@commit_message}"])
+        bash(@current_directory, %Q[git commit -m "#{@commit_message}"])
         single_space
         lines_pretty_print 'Committed.'
         single_space
       end
     end
 
-    def bash(command)
-      # Dir.chdir ensures all bash commands are being run from the correct
-      # directory.
-      Dir.chdir(@current_directory) { system "#{command}" }
-    end
-
     def set_app_directory
       @app_directory = File.expand_path(File.dirname(__FILE__)).chomp('/lib')
     end

data/lib/wielder_of_anor/version.rb

@@ -1,3 +1,3 @@
 module WielderOfAnorVersion
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wielder_of_anor
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Chris Sellek