Skip to content

Commit be6cd9e

Browse files
committed
Fix BagAdapter references
1 parent d24709d commit be6cd9e

File tree

3 files changed

+27
-11
lines changed

3 files changed

+27
-11
lines changed

lib/bag_courier.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def deliver
108108
begin
109109
track!(status: BagStatus::BAGGING)
110110
bag_path = File.join(@working_dir, @bag_id.to_s)
111-
bag = BagAdapter::BagAdapter.new(bag_path, @detect_hidden)
111+
bag = BagAdapter::BagAdapter.new(target_dir: bag_path, detect_hidden: @detect_hidden)
112112

113113
track!(status: BagStatus::COPYING)
114114
logger.measure_info("Copied data for bag #{@bag_id} in #{@working_dir}.") do

test/test_bag_courier.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ def setup
5858
FileUtils.rm_r(@test_dir_path) if File.exist?(@test_dir_path)
5959
FileUtils.mkdir_p([@test_dir_path, @prep_path, @export_path, @package_path])
6060
@detect_hidden = true
61-
innerbag = BagAdapter::BagAdapter.new(@package_path, @detect_hidden)
61+
innerbag = BagAdapter::BagAdapter.new(
62+
target_dir: @package_path, detect_hidden: @detect_hidden
63+
)
6264

6365
File.write(
6466
File.join(@package_path, "data", "something.txt"),

test/test_bag_validator.rb

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,13 @@
2727
file.puts "Some sample text for testing inner bag"
2828
end
2929
@detect_hidden_no = false
30-
@innerbag = BagAdapter::BagAdapter.new(@data_dir_path, @detect_hidden_no)
30+
@innerbag = BagAdapter::BagAdapter.new(
31+
target_dir: @data_dir_path, detect_hidden: @detect_hidden_no)
3132
@innerbag.add_manifests
3233

33-
@bag = BagAdapter::BagAdapter.new(@test_dir_path, @detect_hidden_no)
34+
@bag = BagAdapter::BagAdapter.new(
35+
target_dir: @test_dir_path, detect_hidden: @detect_hidden_no
36+
)
3437
@test_data_dir = @bag.data_dir
3538
@bag.add_manifests
3639
end
@@ -80,15 +83,18 @@
8083
file.puts "Some sample text for testing inner bag"
8184
end
8285
@detect_hidden_yes = true
83-
@innerbag = BagAdapter::BagAdapter.new(@data_dir_path, @detect_hidden_yes)
86+
@innerbag = BagAdapter::BagAdapter.new(
87+
target_dir: @data_dir_path, detect_hidden: @detect_hidden_yes
88+
)
8489
@innerbag.add_manifests
8590

86-
@bag = BagAdapter::BagAdapter.new(@test_dir_path, @detect_hidden_yes)
91+
@bag = BagAdapter::BagAdapter.new(
92+
target_dir: @test_dir_path, detect_hidden: @detect_hidden_yes)
8793
@test_data_dir = @bag.data_dir
8894
@bag.add_manifests
8995
end
9096

91-
it "returns true if the bag is valid" do
97+
it "returns true if the bag is valid" do
9298
result = InnerBagValidator.new(@inner_bag_path, @detect_hidden_yes).validate(@test_data_dir)
9399
assert(result)
94100
end
@@ -157,10 +163,14 @@
157163
file.write(@txt_file_content)
158164
end
159165

160-
@innerbag = BagAdapter::BagAdapter.new(@data_dir_path, @detect_hidden_yes)
166+
@innerbag = BagAdapter::BagAdapter.new(
167+
target_dir: @data_dir_path, detect_hidden: @detect_hidden_yes
168+
)
161169
@innerbag.add_manifests
162170

163-
@bag = BagAdapter::BagAdapter.new(@test_dir_path, @detect_hidden_yes)
171+
@bag = BagAdapter::BagAdapter.new(
172+
target_dir: @test_dir_path, detect_hidden: @detect_hidden_yes
173+
)
164174
@test_data_dir = @bag.data_dir
165175
@bag.add_manifests
166176
end
@@ -234,10 +244,14 @@
234244
file.write(@txt_file_content)
235245
end
236246

237-
@innerbag = BagAdapter::BagAdapter.new(@data_dir_path, @detect_hidden_no)
247+
@innerbag = BagAdapter::BagAdapter.new(
248+
target_dir: @data_dir_path, detect_hidden: @detect_hidden_no
249+
)
238250
@innerbag.add_manifests
239251

240-
@bag = BagAdapter::BagAdapter.new(@test_dir_path, @detect_hidden_no)
252+
@bag = BagAdapter::BagAdapter.new(
253+
target_dir: @test_dir_path, detect_hidden: @detect_hidden_no
254+
)
241255
@test_data_dir = @bag.data_dir
242256
@bag.add_manifests
243257
end

0 commit comments

Comments
 (0)