rails_app_generator 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0470af9a31da0f8b53b53c9fb7f4dbe832ecd8d778adea006047d933e17e056f
-  data.tar.gz: b4889acbaaaa9fb37af410fedd68a3368213e40efdf7af72d81d47b28a6ec7a2
+  metadata.gz: 92848a2f101d1eacb68fced1c5f1a3ab28b4c8314a24d34b2cf7bec51212bce6
+  data.tar.gz: 1028fb8c5a896879cdca537b6efd4d631504ddeddc2faa5dcd02e0fabbefcf43
 SHA512:
-  metadata.gz: d1de0b5079f06786e8872ee9302fb25a020c58d6c5b82b82759800c439c48627f32fd3db642a7fcc1b1df821fdc97385b951824248ca6da9d87cebc24d86deed
-  data.tar.gz: 7e885bdbf52d97ef963a45a57cca5f4ff557434ba0c93dd5699bfe69d60329257901bf07f22bd381ecb10ef8f50b45a2d9d1c0c5a40a8c0e2d1188a775f50c2f
+  metadata.gz: 9617e90e25bef8a51ea05bfac6baac98561a7e376c8d25b78ad941a12349eb38063114f79b42824a776ee5b6eb7fb6a66d1b3248bacb82232890811379e41805
+  data.tar.gz: 5df793375d8f32e1cf33628e0370405f3ade92c6c5596277aea6062f3c4d8819d41e4ecf34e88de2e3e43d89983e315905c2119fd9ae5f138ffa9e59c34d91ee

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.0.12](https://github.com/klueless-io/rails_app_generator/compare/v0.0.11...v0.0.12) (2022-07-25)
+
+
+### Bug Fixes
+
+* add support for open in editor in diff tool ([9d94e26](https://github.com/klueless-io/rails_app_generator/commit/9d94e261c6bac8d17c65da00d6d7d8e2907422ae))
+
 ## [0.0.11](https://github.com/klueless-io/rails_app_generator/compare/v0.0.10...v0.0.11) (2022-07-25)
 
 

data/lib/rails_app_generator/diff/compare_info.rb

@@ -31,32 +31,6 @@ module RailsAppGenerator
         segment_files(lhs_path, lhs_files, rhs_path, rhs_files)
       end
 
-      def lhs_file_info(type)
-        case type
-        when :lhs_only
-          rel_abs_file(lhs_path, lhs_only)
-        when :rhs_only
-          [] # there should be no right hand side files for the left hand path
-        when :same
-          rel_abs_file(lhs_path, same)
-        when :diff
-          rel_abs_file(lhs_path, diff)
-        end
-      end
-
-      def rhs_file_info(type)
-        case type
-        when :lhs_only
-          [] # there should be no left hand side files for the right hand path
-        when :rhs_only
-          rel_abs_file(rhs_path, rhs_only)
-        when :same
-          rel_abs_file(rhs_path, same)
-        when :diff
-          rel_abs_file(rhs_path, diff)
-        end
-      end
-
       def debug
         debug_stats
         debug_files('left only'   , lhs_only)
@@ -73,14 +47,14 @@ module RailsAppGenerator
         rhs_only = rhs_files - lhs_files
         matching_files = lhs_files & rhs_files
 
-        @lhs_only = lhs_only.map { |file| FilePair.new(file, lhs_absolute_file: File.join(lhs_path, file)) }
-        @rhs_only = rhs_only.map { |file| FilePair.new(file, rhs_absolute_file: File.join(rhs_path, file)) }
+        @lhs_only = lhs_only.map { |file| FilePair.new(file, lhs_file: File.join(lhs_path, file)) }
+        @rhs_only = rhs_only.map { |file| FilePair.new(file, rhs_file: File.join(rhs_path, file)) }
 
         matching_files.each do |file|
           file_pair = FilePair.new(
             file,
-            lhs_absolute_file: File.join(lhs_path, file),
-            rhs_absolute_file: File.join(rhs_path, file)
+            lhs_file: File.join(lhs_path, file),
+            rhs_file: File.join(rhs_path, file)
           )
 
           if FileUtils.compare_file(File.join(lhs_path, file), File.join(rhs_path, file))

data/lib/rails_app_generator/diff/file_pair.rb

@@ -4,14 +4,14 @@ module RailsAppGenerator
   module Diff
     # FilePair stores the relative file path, plus the absolute file for both Left and Right site
     class FilePair
-      attr_reader :file
-      attr_reader :lhs_absolute_file
-      attr_reader :rhs_absolute_file
+      attr_reader :file       # relative file
+      attr_reader :lhs_file   # absolute file for left hand side
+      attr_reader :rhs_file   # absolute file for right hand side
 
-      def initialize(file, lhs_absolute_file: nil, rhs_absolute_file: nil)
+      def initialize(file, lhs_file: nil, rhs_file: nil)
         @file = file
-        @lhs_absolute_file = lhs_absolute_file
-        @rhs_absolute_file = rhs_absolute_file
+        @lhs_file = lhs_file
+        @rhs_file = rhs_file
       end
     end
   end

data/lib/rails_app_generator/diff/open_in_editor.rb

@@ -31,7 +31,7 @@ module RailsAppGenerator
 
       def open_files(files)
         files.map do |f|
-          system("code --diff #{f.lhs_absolute_file} #{f.rhs_absolute_file}")
+          system("code --diff #{f.lhs_file} #{f.rhs_file}")
         end
       end
     end

data/lib/rails_app_generator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsAppGenerator
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "rails_app_generator",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "rails_app_generator",
-      "version": "0.0.12",
+      "version": "0.0.13",
       "devDependencies": {
         "@klueless-js/semantic-release-rubygem": "github:klueless-js/semantic-release-rubygem",
         "@semantic-release/changelog": "^6.0.1",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rails_app_generator",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "Create new Rails Application with custom opinions",
   "scripts": {
     "release": "semantic-release"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_app_generator
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - David Cruwys