rigit 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b403c3545bfac4a469a6cd7cb1f5c7c11330ecc1bb31598a2975593d476f3f2
-  data.tar.gz: 8f17237e2151a52b6d3b02934af55cf0d4ecff8dec8426a15092fd333c08986b
+  metadata.gz: 61bc7c4f474a82ed1c5a4c74696972482fbf5c583f0784cc842efeb6d74ffa63
+  data.tar.gz: ac7e0abb56fc7877c35ca670264e2a0aebc63a87b5e055d5e79f17ae4738d8eb
 SHA512:
-  metadata.gz: e2ad0683933134b71cbf08b240b42870df0a47ad9481bab90851e20b2aaa3017e074822d8fc6c3821b3a41a3346ea8dfe8a7a5fbc5ae554231205671053492d9
-  data.tar.gz: d1289c4489be8169b9f13d9c63206af7361f3b2aeab78a2d8bc1d434b8520c68775ed08e2e5bd18d9e920fa44948def09f8a1ac018572d02554e1c7c5e0eb845
+  metadata.gz: 6ae8b817dbdddfcfd36fad2b0b5a8ba7f9ba58e5a5cbc0cce261bde1645e01e83b1066c97c468ed3865718740bf0e8cc4c5aedd4a5992605a3434f46dfd55904
+  data.tar.gz: f0622b36f6c9d8d5d75a4a4b4c67d1717f265ab8775dba8ff1e32b25e7b15d32b7b93e9294c682796bb979414f1fd4f1412c984a04305864733b5d07fe6d3ed9

data/README.md

@@ -214,7 +214,7 @@ params:
   spec: 
     prompt: Include RSpec files?
     type: yesno
-    default: y
+    default: yes
 
   console:
     prompt: "Select console:"
@@ -254,7 +254,7 @@ the below specifications:
 |-----------|----------------------------------------------------------|
 | `prompt`  | The text to display when asking for user input           |
 | `type`    | The variable tyoe. Can be `yesno`, `text` or `select`    |
-| `default` | The default value. When using `yesno`, use `y` and `n`   |
+| `default` | The default value. When using `yesno`, use `yes` or `no` |
 | `list`    | An array of allowed options (only used in `select` type) |
 
 ---

data/lib/rigit/commands/build.rb

@@ -11,6 +11,7 @@ module Rigit::Commands
     # Internal class to handle scaffolding for the {CommandLine} class.
     class BuildHandler
       attr_reader :args, :rig_name, :target_dir, :force
+      attr_accessor :overwrite_all, :skip_all
 
       include Colsole
 
@@ -26,18 +27,60 @@ module Rigit::Commands
         say config.intro if config.has_key? :intro
         verify_dirs
         arguments = prompt.get_input params
-        rig.scaffold arguments:arguments, target_dir: target_dir do |file|
-          if File.exist? file and !force
-            tty_prompt.yes? "Overwrite #{file}?", default: false
-          else
-            true
-          end
-        end
+
+        scaffold arguments
+
         say config.has_key?(:outro) ? config.outro : "Done"
       end
 
       private
 
+      # Call Rig#scaffold while checking each file to see if it should be
+      # overwritten or not.
+      def scaffold(arguments)
+        rig.scaffold arguments: arguments, target_dir: target_dir do |file|
+          overwrite_file? file
+        end
+      end
+
+      # Check various scenarios to decide if the file should be overwritten
+      # or not. These are the scenarios covered by this method:
+      # 1. The user provided +--focce+ in the command line
+      # 2. The user answered "overwrite all" or "skip all" when he asked 
+      #    about the first conflicting file.
+      # 3. In cases where an additive dir contains a file that was originally
+      #    new, approved or rejected - we use this existing knowledge (which
+      #    is stored in +response_log+.
+      def overwrite_file?(file)
+        return response_log[file] if response_log.has_key? file
+
+        response_log[file] = true
+
+        unless overwrite_all or force
+          if skip_all
+            response_log[file] = false
+          elsif File.exist? file
+            response_log[file] = prompt_user_to_overwrite file
+          end
+        end
+
+        response_log[file]
+      end
+
+      def prompt_user_to_overwrite(file)
+        say "File !txtgrn!#{file}!txtrst! already exists."
+        tty_prompt.expand "Overwrite?" do |menu|
+          menu.choice key: 'y', name: 'overwrite',     value: true
+          menu.choice key: 'n', name: 'skip',          value: false
+          menu.choice key: 'a', name: 'overwrite all'  do @overwrite_all = true; true end
+          menu.choice key: 's', name: 'skip all'       do @skip_all = true; false end
+        end
+      end
+
+      def response_log
+        @response_log ||= {}
+      end
+
       def rig
         @rig ||= Rigit::Rig.new rig_name
       end

data/lib/rigit/version.rb

@@ -1,3 +1,3 @@
 module Rigit
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rigit
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: super_docopt