c3d 0.4.19 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 732bfef0a0d9ef6ddca346ede589b867a508d554
-  data.tar.gz: 127eaab3487b080044f7cb1934bfaea7424696b3
+  metadata.gz: c3ec46264e71438151af388f23965d4c8d6f217b
+  data.tar.gz: 865d16441bc4f484658f46b23a905a2ce3c405b3
 SHA512:
-  metadata.gz: dd7f39dfcca892b6223c284acc31e00df94078857b5a941b43e937d84ad4fb771546c71b098da64a0db76134a4f6316a0e4d39c37f74b7bd350c2e73ab034d2d
-  data.tar.gz: 28268f2a22a87eecc4bcb57b3297c18bf40bc584c646a598f0fb75d2381f89e9a71355eed11dece95e8393a71c5b6ddf42718b54c8f0dd656daef15f56feca03
+  metadata.gz: bc3e8f1a3afcadad99c50a2f9e8736df31b1cbcee30b89a45c515985ab63e4dc44bfabda02cdbd687d8a88ddf48cbbfa40c23bf712c193d2665f9a1ba1a92900
+  data.tar.gz: a6dc2fa7781345d3ed4e5b82918d2db33d89b9f11de3ae024688da29e2f6cb4947f45b2b2a2031ccba9c29be9eba89b87489d01a0231354a14cc9ce4bc1feef2

data/bin/c3d

@@ -10,12 +10,17 @@ program :description, 'Contract Controlled Content Dissemination Server.'
 ## Package Workflow Commands
 ##
 command :start do |c|
-  c.syntax = 'c3d start [key]'
+  c.syntax = 'c3d start [key] [tr-override]'
   c.option '--key STRING', String, 'Start the server with a specific public key'
+  c.option '--tr BOOLEAN', false, 'Ignore the check for transmission'
   c.description = 'Start your default c3d server.'
   c.action do |args, options|
     print "Please be patient, this will take a few seconds.\n"
-    C3D.start options.key, true
+    unless options.tr
+      C3D.start options.key, true
+    else
+      C3D.start options.key, false
+    end
     print "Server has started.\n"
   end
 end
@@ -31,7 +36,6 @@ end
 
 command :restart do |c|
   c.syntax = 'c3d restart'
-  c.summary = ''
   c.description = 'Restart your default c3d server.'
   c.action do
     print "Please be patient, this will take a few seconds.\n"
@@ -40,12 +44,42 @@ command :restart do |c|
   end
 end
 
-
 command :blob do |c|
-  c.syntax = 'c3d blob'
-  c.summary = ''
+  c.syntax = 'c3d blob [FILE]'
   c.description = 'Blob a file and throw into the default torrent client.'
   c.action do |args|
     mag_link = C3D.blob args
   end
+end
+
+command :subscribe do |c|
+  c.syntax = 'c3d subscribe [CONTRACT(S)]'
+  c.description = 'Subscribe to a contract.'
+  c.action do |args|
+    C3D.subscribe args
+  end
+end
+
+command :unsubscribe do |c|
+  c.syntax = 'c3d unsubscribe [CONTRACT(S)]'
+  c.describption = 'Unsubscribe to a contract.'
+  c.action do |args|
+    C3D.unsubscribe args
+  end
+end
+
+command :ignore do |c|
+  c.syntax = 'c3d ignore [CONTRACT(S)]'
+  c.description = 'Ignore a contract.'
+  c.action do |args|
+    C3D.ignore args
+  end
+end
+
+command :unignore do |c|
+  c.syntax = 'c3d unignore [CONTRACT(S)]'
+  c.description = 'Unignore a contract.'
+  c.action do |args|
+    C3D.unignore args
+  end
 end

data/lib/c3d/connectors/connect_ethereum.rb

@@ -43,7 +43,7 @@ module C3D
       send_command request
     end
 
-    def transact recipient, data='', value='', gas='100000', gas_price='100000000000000'
+    def transact recipient, data='', value='', gas_price=ENV['GAS_PRICE'], gas='100000'
       sleep 0.5 if ( Time.now - @last_push < 0.5 )
       recipient = guard_addresses recipient
       data = build_data data

data/lib/c3d/util/processes.rb

@@ -12,7 +12,7 @@ module C3D
     end
 
     def is_trans_running? cli
-      a = `ps ux`.split("\n").select{|e| e[/transmission-daemon/]}
+      a = `ps aux`.split("\n").select{|e| e[/transmission-daemon/]}
       if ! a.empty?
         if cli
           print "Please stop your default Transmission Server with `sudo service transmission-daemon stop` and then restart.\n"

data/lib/c3d/util/setup.rb

@@ -60,6 +60,7 @@ module C3D
       ENV['ETH_HOST']      = config['eth_rpc_host']
       ENV['ETH_PORT']      = config['eth_rpc_port']
       ENV['ETH_KEY']       ||= config['primary_account_key']
+      ENV['GAS_PRICE']     = config['gas_price'] || '100000000000000'
     end
 
     def set_trans_config config

data/lib/c3d/version.rb

@@ -1 +1 @@
-VERSION ||= "0.4.19"
+VERSION ||= "0.5.0"

data/lib/c3d.rb

@@ -13,6 +13,7 @@ require 'fileutils'
 require 'httparty'
 require 'bencode'
 require 'celluloid/autostart'
+require 'timers'
 
 # This Gem
 Dir[File.dirname(__FILE__) + '/c3d/*.rb'].each            {|file| require file }
@@ -35,7 +36,9 @@ module C3D
         url:      ENV['TORRENT_RPC'] }
     C3D::ConnectEth.supervise_as :eth, :cpp
     C3D::Utility.save_key
-    sleep
+    timers = Timers::Group.new
+    every_minute = timers.every(60) { C3D::Subscribe.new }
+    loop { timers.wait }
   end
 
   def stop
@@ -61,6 +64,34 @@ module C3D
     end
   end
 
+  def subscribe args
+    until args.empty?
+      contract = args.shift
+      C3D::EyeOfZorax.subscribe contract
+    end
+  end
+
+  def unsubscribe args
+    until args.empty?
+      contract = args.shift
+      C3D::EyeOfZorax.unsubscribe contract
+    end
+  end
+
+  def ignore args
+    until args.empty?
+      contract = args.shift
+      C3D::EyeOfZorax.ignore contract
+    end
+  end
+
+  def unignore args
+    until args.empty?
+      contract = args.shift
+      C3D::EyeOfZorax.unignore contract
+    end
+  end
+
   def version
     return VERSION
   end

data/settings/c3d-config.json

@@ -22,6 +22,7 @@
   "download_dir": "{{USERHOME}}/.cache/c3d/downloading",
   "download-queue-size": "50",
   "queue-stalled-minutes": "98",
+  "gas_price":"100000000000000",
   "primary_account":"{{0xACCT}}",
   "primary_account_key":"{{0xSEC}}"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c3d
 version: !ruby/object:Gem::Version
-  version: 0.4.19
+  version: 0.5.0
 platform: ruby
 authors:
 - Casey Kuhlman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty