c3d 0.4.7 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c496f93bbf5c8060470bf6d0615ae1842d1caf4
-  data.tar.gz: f95355f2f631fbd5e656a7c5573c27ecf2756587
+  metadata.gz: 186a27dd5c70f1d4b4fd474b699fc194e588fea0
+  data.tar.gz: 1b60ed82f414718ca74112ca74407e7ba9922763
 SHA512:
-  metadata.gz: 24cdc7831a657716a6fb42f098580c76039aeec2b6161e0623219ff295ed136ba2e84f68e67c9a10c60aa520e42e9bc1c0a0f5dba8ec2db8116266f13b036f34
-  data.tar.gz: 7ca634f3b9eef8fd7cd5e2a778b32a2777b6456b28757f1e416e8f0b1f1b73ad946095f1a350a597fe32f9a13f894b5624402b05a01bc5d0cd43a48399fff76f
+  metadata.gz: 5ecda352a43aa3ef2c4338ea1258b1e17e6edaf241df0bcb59de5d4f0acd7b80221f393f12595854faaad1b658e03037cffc5dc182caae3c0105076e0cdd9df4
+  data.tar.gz: 5ebc156d74ce1f539608b57587e9dbddaca4cafee7ffdea1ea3243c76faaa0004dbabeb39bf4b8a4bf410ec6de49cceeffca9f128fa51452f32d606ffa0728d1

data/lib/c3d.rb

@@ -31,11 +31,6 @@ module C3D
         password: ENV['TORRENT_PASS'],
         url:      ENV['TORRENT_RPC'] }
     C3D::ConnectEth.supervise_as :eth, :cpp
-
-    # todo, need to trap_exit on these actors if they crash
-    $puller = Celluloid::Actor[:puller]
-    $eth    = Celluloid::Actor[:eth]
-
     C3D::Utility.save_key
     sleep
   end
@@ -51,10 +46,10 @@ module C3D
 
   def blob args
     C3D::SetupC3D.new
-    opts = { username: ENV['TORRENT_USER'],
+    C3D::ConnectTorrent.supervise_as :puller, {
+        username: ENV['TORRENT_USER'],
         password: ENV['TORRENT_PASS'],
         url:      ENV['TORRENT_RPC'] }
-    $puller = C3D::ConnectTorrent.new opts
     until args.empty?
       file = args.shift
       c = C3D::Blobber.new file

data/lib/c3d/actors/assemble.rb

@@ -80,7 +80,7 @@ module C3D
       end
 
       def send_query contract, storage
-        $eth.get_storage_at contract, storage
+        Celluloid::Actor[:eth].get_storage_at contract, storage
       end
 
       def ab? contract
@@ -117,7 +117,7 @@ module C3D
             end
           else
             link = "magnet:?xt=urn:btih:" + btih + "&dn=" + dn
-            torrent  = $puller.create link
+            torrent  = Celluloid::Actor[:puller].create link
             @content << { contract => "currently acquiring please check back." }
           end
           return false

data/lib/c3d/actors/crawler.rb

@@ -24,7 +24,7 @@ module C3D
       end
 
       def send_query contract, storage
-        $eth.get_storage_at contract, storage
+        Celluloid::Actor[:eth].get_storage_at contract, storage
       end
   end
 end

data/lib/c3d/actors/getter.rb

@@ -11,7 +11,7 @@ module C3D
       btih    = blob_id[0..39]
       dn      = blob_id[40..-1]
       mag_link = "magnet:?xt=urn:btih:" + btih + "&dn=" + dn
-      $puller.create mag_link
+      Celluloid::Actor[:puller].create mag_link
       puts "[C3D::#{Time.now.strftime( "%F %T" )}] Getting >>\t\t" + mag_link
     end
   end

data/lib/c3d/util/blobber.rb

@@ -74,7 +74,7 @@ module C3D
       end
 
       def publish_torrent
-        torrent  = $puller.create @tor_file
+        torrent  = Celluloid::Actor[:puller].create @tor_file
         begin
           @btih     = torrent["torrent-added"]['hashString']
         rescue

data/lib/c3d/util/purger.rb

@@ -7,9 +7,9 @@ module C3D
     def initialize blob
       begin
         dn   = blob[14..-1]
-        currently_downloading = $puller.all
+        currently_downloading = Celluloid::Actor[:puller].all
         downloading = currently_downloading.select{|t| t["name"] == dn}.first["id"]
-        $puller.destroy downloading if downloading
+        Celluloid::Actor[:puller].destroy downloading if downloading
         blob_file = File.join(ENV['BLOBS_DIR'], dn)
         if File.exists? blob_file
           File.delete blob_file

data/lib/c3d/util/trees.rb

@@ -148,7 +148,7 @@ module C3D
       end
 
       def send_query contract, storage
-        $eth.get_storage_at contract, storage
+        Celluloid::Actor[:eth].get_storage_at contract, storage
       end
 
       def ab? contract
@@ -185,7 +185,7 @@ module C3D
           btih = blob[2..41]
           dn   = blob[42..-1]
           link = "magnet:?xt=urn:btih:" + btih + "&dn=" + dn
-          torrent  = $puller.create link
+          torrent  = Celluloid::Actor[:puller].create link
           return true
         rescue
           return false

data/lib/c3d/util/util.rb

@@ -5,7 +5,7 @@ module C3D
     extend self
 
     def save_key
-      key = $eth.get_key
+      key = Celluloid::Actor[:eth].get_key
       config_file  = File.join(ENV['HOME'], '.epm', 'c3d-config.json')
       config = JSON.load(File.read(config_file))
       config["primary_account_key"] = key if config["primary_account_key"] != key

data/lib/c3d/version.rb

@@ -1 +1 @@
-VERSION ||= "0.4.7"
+VERSION ||= "0.4.9"

data/spec/spec_helper.rb

@@ -22,10 +22,7 @@ def get_set_up
       username: ENV['TORRENT_USER'],
       password: ENV['TORRENT_PASS'],
       url:      ENV['TORRENT_RPC'] }
-  $puller           = Celluloid::Actor[:puller]
-
   C3D::ConnectEth.supervise_as :eth, :cpp
-  $eth              = Celluloid::Actor[:eth]
 
   unless check_for_doug
     print "\nThere is No DOUG. Please Fix That."
@@ -43,7 +40,7 @@ def check_for_doug
     log  = File.read log_file
     doug = log.split("\n").map{|l| l.split(',')}.select{|l| l[0] == ("Doug" || "DOUG" || "doug")}[-1][-1]
   end
-  doug_check = $eth.get_storage_at doug, '0x10'
+  doug_check = Celluloid::Actor[:eth]h.get_storage_at doug, '0x10'
   if doug_check != '0x'
     return true
   else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: c3d
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.9
 platform: ruby
 authors:
 - Casey Kuhlman