Skip to content

Commit 3d6fe50

Browse files
committed
Cleanup in preparation for 1.0.0
1 parent 889194c commit 3d6fe50

File tree

10 files changed

+187
-191
lines changed

10 files changed

+187
-191
lines changed

Gemfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
files_in_my_diff (0.1.0)
4+
files_in_my_diff (1.0.0)
55
git (~> 2.3)
66

77
GEM
@@ -23,7 +23,7 @@ GEM
2323
public_suffix (>= 2.0.2, < 7.0)
2424
ast (2.4.2)
2525
base64 (0.2.0)
26-
benchmark (0.3.0)
26+
benchmark (0.4.0)
2727
bigdecimal (3.1.8)
2828
concurrent-ruby (1.3.4)
2929
connection_pool (2.4.1)
@@ -35,12 +35,12 @@ GEM
3535
rchardet (~> 1.8)
3636
i18n (1.14.6)
3737
concurrent-ruby (~> 1.0)
38-
json (2.7.5)
38+
json (2.8.1)
3939
language_server-protocol (3.17.0.3)
4040
logger (1.6.1)
4141
minitest (5.25.1)
4242
parallel (1.26.3)
43-
parser (3.3.5.1)
43+
parser (3.3.6.0)
4444
ast (~> 2.4.1)
4545
racc
4646
process_executer (1.2.0)
@@ -60,7 +60,7 @@ GEM
6060
rubocop-ast (>= 1.32.2, < 2.0)
6161
ruby-progressbar (~> 1.7)
6262
unicode-display_width (>= 2.4.0, < 3.0)
63-
rubocop-ast (1.33.1)
63+
rubocop-ast (1.34.1)
6464
parser (>= 3.3.1.0)
6565
rubocop-minitest (0.36.0)
6666
rubocop (>= 1.61, < 2.0)

lib/files_in_my_diff.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ class ValidationError < Error; end
1010
require_relative 'files_in_my_diff/version'
1111
require_relative 'files_in_my_diff/tmp_dir'
1212
require_relative 'files_in_my_diff/git'
13-
require_relative 'files_in_my_diff/commit'
13+
require_relative 'files_in_my_diff/resolver'
1414

1515
module FilesInMyDiff
1616
def self.root
1717
File.expand_path('..', __dir__)
1818
end
1919

2020
def self.checkout(folder:, revision:)
21-
Commit::Main.new(folder:, revision:).call
21+
Resolver.new(folder:, revision:).call
2222
end
2323
end

lib/files_in_my_diff/commit.rb

Lines changed: 0 additions & 31 deletions
This file was deleted.

lib/files_in_my_diff/resolver.rb

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# frozen_string_literal: true
2+
3+
module FilesInMyDiff
4+
class Resolver
5+
def initialize(folder:, revision:, file_strategy: TmpDir::FileStrategy, git_strategy: Git::Adapter.new(folder:))
6+
@folder = folder
7+
@revision = revision
8+
@file_strategy = file_strategy
9+
@git_strategy = git_strategy
10+
end
11+
12+
def call
13+
validate_folder!
14+
diff = @git_strategy.diff(@revision)
15+
diff.validate!
16+
rd = @file_strategy.revision_dir(diff.sha)
17+
rd.create!
18+
@git_strategy.checkout_worktree(rd.dir, diff.sha)
19+
rd.decorate(diff.changes)
20+
end
21+
22+
private
23+
24+
def validate_folder!
25+
raise ValidationError, 'Folder is required' if @folder.nil?
26+
raise ValidationError, 'Folder does not exist' unless @file_strategy.dir_exists?(@folder)
27+
end
28+
end
29+
end

lib/files_in_my_diff/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

33
module FilesInMyDiff
4-
VERSION = '0.1.0'
4+
VERSION = '1.0.0'
55
end

test/commit/main_test.rb

Lines changed: 0 additions & 152 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)