mktorrent 1.2.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40013fae6c1b166f34155fe839dcb81ea1c9457d
-  data.tar.gz: b48e184f27de7f03296691733da993b99fa705fa
+  metadata.gz: f2c1e1c11c1f953694f5c37137f7bae096fcafef
+  data.tar.gz: ba510aa5d85d4d5ae56a1dd603e3e218d408d156
 SHA512:
-  metadata.gz: 2e5ea1994b7b8e5ee2609dec3d0c8e016e6962eff8399fe118c3b8df1fdb7287350c0743a430c4decb85f57148f0ac522a31050f5e6a9739e62ce577133d6beb
-  data.tar.gz: 6c8acd9ef4d10e7fdbbe8ccb60a750f5a7433edcbbf7fd431a88b99329032885239c93f108e07e2cb02f8adb825a88036c4298d05d7ce2e06739c23b01a4f712
+  metadata.gz: 27a025b8b1f7c17ac729610e5b85a4c41d84d4224f510738bfa32fa04277b82aaa37fb8d01bf102b339d27a9f76e815f5aa4fca9e3b22f847e30aed317fd111d
+  data.tar.gz: e3a661b103900c77446bda96cb45371462eea67094f681f277298854a919f7e1082a45c213c4711a68c20f7a45ea0811c976088ffa0ca39fd977fb039eb1bffd

data/lib/mktorrent.rb

@@ -46,11 +46,15 @@ class Torrent
       File.open(f.join("/")) do |fh|
         begin
           read = fh.read(length - buffer.length)
-          if (buffer.length + read.length) == length
-            yield(buffer + read)
-            buffer = ""
-          else
-            buffer += read
+
+          # Make sure file not empty
+          if not read.nil?
+            if (buffer.length + read.length) == length
+              yield(buffer + read)
+              buffer = ""
+            else
+              buffer += read
+            end
           end
         end until fh.eof?
       end
@@ -112,6 +116,21 @@ class Torrent
     end
   end
 
+  def add_directory(path)
+    # Using Dir.entries instead of glob so that non-escaped paths can be used
+    Dir.entries(path).each do |entry|
+      # Ignore unix current and parent directories
+      next if entry == '.' or entry == '..'
+
+      filename = path + File::SEPARATOR + entry
+      if File.directory?(filename)
+        add_directory(filename)
+      else 
+        add_file(filename)
+      end
+    end
+  end
+
   # Need to read the files in @piecelength chunks and hash against that
   def hash_pieces(files)
     offset = 0

data/test/mktorrent_test.rb

@@ -3,6 +3,7 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'mktorrent')
 
 class MktorrentTest < Minitest::Test
   TRACKER = "http://test.example.com"
+  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")
   VALIDFILENAME = "randomfile.vhd"
@@ -39,6 +40,11 @@ class MktorrentTest < Minitest::Test
     assert_raises(IOError) { @torrent.add_file(VALIDFILEPATH) }
   end
 
+  def test_add_directory
+    @torrent.add_directory(VALIDPATH)
+    assert_equal 2, @torrent.count
+  end
+
   def test_default_privacy
      @torrent.add_file(VALIDFILEPATH)
      assert_equal 0, @torrent.privacy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mktorrent
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Timothy Mukaibo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bencode
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rubygems-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 description: Create .torrent files easily with this gem. The code is ugly, but it
   works :)
 email: timothy@mukaibo.com
@@ -81,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Create .torrent files easily with this gem