mktorrent 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c56892f6cb759de12f6e04829f8985d5e08dc3d
-  data.tar.gz: 48ce59582b8df667828598f6562024d774193c2f
+  metadata.gz: 77a407ad2f074deddd8b6e6bdbce1597f8c17663
+  data.tar.gz: 32614d20a89d1598dd993c7bd30f68a6ef2592e9
 SHA512:
-  metadata.gz: d1f68f88860a011bdebbe20455be412fa7e8071839294874e7b8c18c201658d253c29550ec5018f882d42a97d016ebce8be3f9c5aa1c01cc76039dbec6a7811c
-  data.tar.gz: 8cb68e2cf5d9fc35b0be3fc9d0b36656773cfcac6f08d033713136535a1a5e795551d9bb00bd4d99fc7f94a5cb4a426c0f9062d9de36328097a8668dc2323b0c
+  metadata.gz: 567a4b4b6ea9dd3d9b31f9af8893be1e46f130a67b88220e4750ca2fffb574650e8ffb220e8e3c35f88ff301f4983c22879696b3c7257ab3ee9db234a33c6008
+  data.tar.gz: 85c02051c564166c4039ec3ecfc640eccc5aa1f83cd8f3c9af64ea123459edaea46805858cf0e904f4c2ed347e4ded6414e14dd481297ab394d8b092d7e4dcac

data/lib/mktorrent.rb

@@ -9,7 +9,7 @@ require 'uri'
 #t.write_torrent("~/Downloads/mytorrent.torrent")
 
 class Torrent
-  attr_reader :torrent_file
+  attr_reader :torrent_file, :infohash
   attr_accessor :info, :filehashes, :piecelength, :files, :defaultdir, :tracker, :size, :privacy, :webseed
 
   # optionally initialize filename
@@ -40,6 +40,7 @@ class Torrent
     buffer = ""
     files.each do |f|
       f = File.join(@dirbase, f) unless @dirbase.empty?
+      next if File.directory?(f)
       File.open(f) do |fh|
         begin
           read = fh.read(length - buffer.length)
@@ -74,10 +75,8 @@ class Torrent
     @info[:info][:pieces] = ""
     @info.merge({ "url-list" => @webseed }) unless @webseed.empty?
     if @files.count > 0
-      i = 0
       read_pieces(all_files, @piecelength) do |piece|
         @info[:info][:pieces] += Digest::SHA1.digest(piece)
-        i += 1
       end
     end
   end
@@ -88,7 +87,7 @@ class Torrent
     open(@torrent_file, 'wb') do |file|
       file.write self.to_s
     end
-    @torrent_file
+    set_infohash
   end
 
   # Return the .torrent file as a string
@@ -173,4 +172,8 @@ class Torrent
 
       path_for_torrent
     end
+
+    def set_infohash
+      @infohash = Digest::SHA1.hexdigest @info[:info].bencode
+    end
 end

data/test/mktorrent_acceptance_test.rb

@@ -25,6 +25,12 @@ class MktorrentAcceptanceTest < Minitest::Test
     assert_operator Dir.entries(VALIDPATH).count, :>, 3 # At least one file, include '.' and '..'
   end
 
+  # EXPECTED_INFOHASH can be found in the test_helper. It should be updated if you
+  # make any changes to the test data
+  def test_correct_infohash
+    assert_equal EXPECTED_INFOHASH, @torrent.infohash
+  end
+
   def test_torrent_passes_acceptance
     assert File.exist?(@torrent.torrent_file)
     command = set_validation_command!

data/test/mktorrent_test.rb

@@ -42,7 +42,7 @@ class MktorrentTest < Minitest::Test
 
   def test_add_directory_increments_file_count
     @torrent.add_directory(VALIDPATH)
-    assert_equal 2, @torrent.count
+    assert_equal 3, @torrent.count
   end
 
   def test_add_directory_uses_relative_paths

data/test/test_helper.rb

@@ -12,6 +12,7 @@ Minitest::Reporters.use! [
 
 TRACKER = "http://test.example.com"
 WEBSEED = "http://seed.example.com/webseed"
+EXPECTED_INFOHASH = "a8036d51ada8fb699c9f29d7861e5589f2d20cf9"
 VALIDPATH = File.expand_path("#{File.dirname(__FILE__)}/test_data")
 VALIDFILEPATH = File.expand_path("#{File.dirname(__FILE__)}/test_data/sample_file1.vhd")
 VALIDFILE2PATH = File.expand_path("#{File.dirname(__FILE__)}/test_data/sample_file2.vhd")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mktorrent
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Timothy Mukaibo