mktorrent 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77a407ad2f074deddd8b6e6bdbce1597f8c17663
-  data.tar.gz: 32614d20a89d1598dd993c7bd30f68a6ef2592e9
+  metadata.gz: f0121cae40e34b235dbdb5146784d4623bace715
+  data.tar.gz: 3c4334027500373162a40884d90c24a747f194d6
 SHA512:
-  metadata.gz: 567a4b4b6ea9dd3d9b31f9af8893be1e46f130a67b88220e4750ca2fffb574650e8ffb220e8e3c35f88ff301f4983c22879696b3c7257ab3ee9db234a33c6008
-  data.tar.gz: 85c02051c564166c4039ec3ecfc640eccc5aa1f83cd8f3c9af64ea123459edaea46805858cf0e904f4c2ed347e4ded6414e14dd481297ab394d8b092d7e4dcac
+  metadata.gz: 225390bdd81561840ce1184d1d215bb269306689806258f0db286666cb69a44359485f2118e94b362a7070f7696087edbab75366287da3f1b5e2181e92a46312
+  data.tar.gz: 5c83eb10cf3dd3880963458dbc2893f329a403a983af769b188eb7afd75da8ac7450b0f34035a88cdf7f59dac65be54071eb042e8590ae6a7fe06cbeff9aa0d1

data/lib/mktorrent.rb

@@ -27,7 +27,7 @@ class Torrent
   end
 
   def all_files
-    unless @files.count < 1
+    if @files.any?
       @files.collect { |file| file[:path] }
     end
   end
@@ -36,10 +36,18 @@ class Torrent
     @files.count
   end
 
+  def path_for_reading_pieces(f)
+    if @dirbase.empty? # it's a single file torrent
+      f = File.join(File.join(f))
+    end
+    f = File.join(@dirbase, f) unless @dirbase.empty?
+    f
+  end
+
   def read_pieces(files, length)
     buffer = ""
-    files.each do |f|
-      f = File.join(@dirbase, f) unless @dirbase.empty?
+    files.each do |file|
+      f = path_for_reading_pieces(file)
       next if File.directory?(f)
       File.open(f) do |fh|
         begin

data/test/mktorrent_test.rb

@@ -45,10 +45,11 @@ class MktorrentTest < Minitest::Test
     assert_equal 3, @torrent.count
   end
 
+  # When adding a directory, only the folder that's added (and everything below) should appear in the metadata
   def test_add_directory_uses_relative_paths
     assert [ VALIDFILEPATH, VALIDFILE2PATH ].each { |p| p.start_with?(VALIDPATH) }
     @torrent.add_directory(VALIDPATH)
-    assert @torrent.files.each { |f| ! f[:path].join('/').start_with?(VALIDPATH) }
+    assert @torrent.files.each { |f| ! f[:path].join('/').start_with?(File.basename(File.dirname(VALIDPATH))) }
   end
 
   def test_default_privacy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mktorrent
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Timothy Mukaibo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bencode