example_file 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c27c0c37aed4d33ed7fdbaddc5ea08add611a904c5adeb588abc42178de8b2a4
-  data.tar.gz: 26812fb041b9727dc718da8f46a6e8e70e7ea58f3d684625fd9ccdbd28898cd8
+  metadata.gz: 49937d788050f9c348a9a71cff14864470ea4c1a10e6580d94e14f7fe7b59fe9
+  data.tar.gz: 07bc86ec61da5085249a6c242c46f78b625b408196d08f40b3d1a06b203e509e
 SHA512:
-  metadata.gz: e8008ba9546a72a9e79deafca628ed45cd77e634e25f903fa16f37ee3a68d8577f9ac652358f7ff3c9fdfde8835ad41121b63ac86c1297533f39b6d9645f40c2
-  data.tar.gz: d2159ad14738f0afda3f65a6e3d48b5d99ef8e82edcf07e25601c260768de6c6c01459822eb5e50a4d1b47eb2bbca2638be26fe861d9ecf79de6b1ae0c88ee5c
+  metadata.gz: a23aa29a4e08c6e7aeebe27bd6a93199ede3611529e226156a09573b6488f383e46eb7c17bfc8fe3cd629e0cdd31b786a3535ea8c8c55e6f7a78f0377c15a809
+  data.tar.gz: cb7298effcef870ab313fb7dd1469472c8b8dd925d4ba67bca3dce5829cf6411989e9c0d25ed49a9139d10356bb6baceaf23e103fa6febd15476fd7d707d20d8

data/CHANGELOG.md

@@ -2,8 +2,24 @@
 
 ## master (unreleased)
 
+## 0.3.1 (2021-04-16)
+
+## 0.3.0 (2021-04-16)
+
+*   Remake the question from "Do you want to edit?" to "What to do?".
+*   Add `replace-and-edit` answer.
+*   Change menu layout from inline to rows with numbers.
+    I have no idea how to make easier shortcut for `replace-and-edit`.
+*   Add Ruby 3 support and CI.
+*   Update development dependencies.
+
 ## 0.2.0 (2020-09-30)
 
+*   Abort program on try to edit file without `$EDITOR` environment variable.
+    Don't rely on external code, also abort only on try to edit.
+*   Update dependencies.
+*   Improve Cirrus CI config.
+
 ## 0.1.0 (2020-06-02)
 
 *   Initial release.

data/README.md

@@ -61,7 +61,8 @@ It'll act in these ways:
         *   ask for a further action:
             *   open the editor;
             *   just update regular without changes;
-            *   or replace regular file with a content from new example file.
+            *   replace regular file with a content from new example file;
+            *   or replace and then open the editor.
 *   If there is regular file with file modified time after example file:
     *   do nothing.
 

data/lib/example_file.rb

@@ -18,20 +18,24 @@ class ExampleFile
 		end
 	end
 
+	attr_reader :choices
+	attr_writer :question_prefix
+
 	def initialize(file_name)
 		@file_name = file_name
 		@regular_file_name = @file_name.sub SUFFIX, ''
 
-		@basename =
-			Paint[File.basename(@file_name), :green, :bold]
-		@regular_basename =
-			Paint[File.basename(@regular_file_name), :red, :bold]
+		@basename = Paint[File.basename(@file_name), :green, :bold]
+		@regular_basename = Paint[File.basename(@regular_file_name), :red, :bold]
+
+		@choices = DEFAULT_CHOICES.dup
+		@question_prefix = nil
 	end
 
 	def actualize_regular_file
 		return create_regular_file unless regular_file_exist?
 
-		return unless new?
+		return unless updated?
 
 		return update_regular_file if diff.chomp.empty?
 
@@ -40,7 +44,7 @@ class ExampleFile
 
 	private
 
-	def new?
+	def updated?
 		File.mtime(@file_name) > File.mtime(@regular_file_name)
 	end
 
@@ -63,26 +67,31 @@ class ExampleFile
 			.to_s(:color)
 	end
 
-	CHOICES = {
-		yes: proc { edit_file @regular_file_name },
+	DEFAULT_CHOICES = {
+		edit: proc { edit_file @regular_file_name },
 		replace: proc { rewrite_regular_file },
-		no: proc do
+		'replace-and-edit': proc do
+			rewrite_regular_file
+			edit_file @regular_file_name
+		end,
+		keep: proc do
 			update_regular_file
 			puts 'File modified time updated'
 		end
 	}.freeze
 
-	private_constant :CHOICES
+	private_constant :DEFAULT_CHOICES
 
 	def ask_question_and_make_actions
 		puts warning_with_diff
 
 		HIGHLINE.choose do |menu|
-			menu.layout = :one_line
+			## I don't know how to catch complex options like `replace-and-edit`, via shortcut like `rae`
+			# menu.layout = :one_line
 
-			menu.prompt = "Do you want to edit #{@regular_basename} ? "
+			menu.header = "What to do with #{@regular_basename} "
 
-			CHOICES.each do |answer, block|
+			choices.each do |answer, block|
 				menu.choice(answer) { instance_exec(&block) }
 			end
 		end
@@ -90,7 +99,7 @@ class ExampleFile
 
 	def warning_with_diff
 		<<~WARN
-			#{@basename} was modified after #{@regular_basename}.
+			#{@question_prefix}#{@basename} was modified after #{@regular_basename}.
 
 			```diff
 			#{diff}

data/lib/example_file/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ExampleFile
-	VERSION = '0.2.0'
+	VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: example_file
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Alexander Popov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: toys
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -142,28 +142,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.92.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.92.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 description: |
   Class helper for example files.
   Usualy it's the alternative to environment variables (and `.env` files).
@@ -224,13 +224,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '2.5'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Class helper for example files