c3d 0.4.12 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d74b66d041f5ad6b24889ef21a086c8d00bc7ea
-  data.tar.gz: e3f7cb4c12b40a0e396cbe1a125ed43b6415c6d1
+  metadata.gz: 68fdaea8fa034d2aefb0e72483a761459e11dfcf
+  data.tar.gz: f358999385e9dbf5a7d9be9f0d51da89bd1def5c
 SHA512:
-  metadata.gz: f65899b6e35b8846d6c4ee3a59560fb9fc6b998684ef8e9e1d0b80fa3c71f1cf23aa8b29482f9346f1587b9399c8f2d832a5c42f0c12156bd24019c73156ad19
-  data.tar.gz: 05fcea1dd59daaa97fade0a460f7674b7911647941cd9ca5580742cf02143fe7b2959902cbd59337aed563557f4ff7c88b173d3018f7cc5468e0696cd9230ef0
+  metadata.gz: 997c6f2884c10755f65089e70da21b34e221da3ca26195e6ac00a62843504fcbfa17c29d98119130fb01e7a3f577d010fa4feffe839de8d4ed82ae1373425f35
+  data.tar.gz: bf21fa0a59af1902efe071a91417d8443d8b284f46fa9cbe716ad68d7fe56c30bddc0f396799af1366f45c2dbf81b623e0ecd406d819fd29f4a208bce9458502

data/bin/c3d

@@ -10,11 +10,12 @@ program :description, 'Contract Controlled Content Dissemination Server.'
 ## Package Workflow Commands
 ##
 command :start do |c|
-  c.syntax = 'c3d start'
+  c.syntax = 'c3d start [key]'
+  c.option '--key STRING', String, 'Start the server with a specific public key'
   c.description = 'Start your default c3d server.'
-  c.action do
+  c.action do |args, options|
     print "Please be patient, this will take a few seconds.\n"
-    C3D.start
+    C3D.start options.key
     print "Server has started.\n"
   end
 end

data/lib/c3d.rb

@@ -24,9 +24,11 @@ Dir[File.dirname(__FILE__) + '/c3d/util/*.rb'].each       {|file| require file }
 module C3D
   extend self
 
-  def start
+  def start key=''
+    unless key == ''
+      ENV['ETH_KEY'] = key
+    end
     C3D::SetupC3D.new
-
     C3D::ConnectTorrent.supervise_as :puller, {
         username: ENV['TORRENT_USER'],
         password: ENV['TORRENT_PASS'],
@@ -41,8 +43,9 @@ module C3D
   end
 
   def restart
+    key = Celluloid::Actor[:eth].get_key
     C3D.stop
-    C3D.start
+    C3D.start key
   end
 
   def blob args

data/lib/c3d/util/processes.rb

@@ -13,12 +13,17 @@ module C3D
 
     def is_trans_running?
       a = `ps ux`.split("\n").select{|e| e[/transmission-daemon/]}
-      b = `ps ux`.split("\n").select{|e| e[/transmission-daemon/]}
-      if ! a.empty? and b.empty?
-        p "Please stop your default Transmission Server with `sudo service transmission-daemon stop` and then restart."
-        exit 0
+      if ! a.empty?
+        print "Please stop your default Transmission Server with `sudo service transmission-daemon stop` and then restart.\n"
+        print "Would you like to override this message and start c3d anyway? (Y/n)\n"
+        override = STDIN.gets.chomp
+        if override == 'Y' || override == 'y'
+          return true
+        else
+          exit 0
+        end
       end
-      return (! b.empty?)
+      return (! a.empty?)
     end
   end
 
@@ -45,7 +50,7 @@ module C3D
         elsif mine == ("on" || "true")
           mine = "-m on"
         end
-        key = settings["primary_account_key"] || ""
+        key = ENV['ETH_KEY'] || ""
         if key != ""
           key = "-s #{key}"
         end

data/lib/c3d/util/setup.rb

@@ -59,7 +59,7 @@ module C3D
       ENV['ETH_ZMQ_ADDR']  = config['eth_zmq_addr']
       ENV['ETH_HOST']      = config['eth_rpc_host']
       ENV['ETH_PORT']      = config['eth_rpc_port']
-      ENV['ETH_KEY']       = config['primary_account_key']
+      ENV['ETH_KEY']       ||= config['primary_account_key']
     end
 
     def set_trans_config config

data/lib/c3d/version.rb

@@ -1 +1 @@
-VERSION ||= "0.4.12"
+VERSION ||= "0.4.13"

metadata

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