c3d 0.4.13 → 0.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68fdaea8fa034d2aefb0e72483a761459e11dfcf
-  data.tar.gz: f358999385e9dbf5a7d9be9f0d51da89bd1def5c
+  metadata.gz: 5be93f53fc41227b1b7b3bf8bbc420f05345a552
+  data.tar.gz: a984a1d9cacecf345fadabad3218fdd4f85477fd
 SHA512:
-  metadata.gz: 997c6f2884c10755f65089e70da21b34e221da3ca26195e6ac00a62843504fcbfa17c29d98119130fb01e7a3f577d010fa4feffe839de8d4ed82ae1373425f35
-  data.tar.gz: bf21fa0a59af1902efe071a91417d8443d8b284f46fa9cbe716ad68d7fe56c30bddc0f396799af1366f45c2dbf81b623e0ecd406d819fd29f4a208bce9458502
+  metadata.gz: dc9936b7dce8606813bb74f2fd24472eb9d7ec3e8e829cd723a3e03d6201fcdbb41ac8e4bd1e4b888416dfe66771ffb9b8e50dff11ecb97cdc0af3be679f5220
+  data.tar.gz: 8c488bc47f2e04477b0ec4be94cc2a66eca7989dd0d5f84e2cf269ca511d7e878f6ec7e476ac746bc1350eacb61bf0e4463e273aa1e9be902bc0dbc7d665d80e

data/bin/c3d

@@ -15,7 +15,7 @@ command :start do |c|
   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
+    C3D.start options.key, true
     print "Server has started.\n"
   end
 end

data/lib/c3d.rb

@@ -24,11 +24,11 @@ Dir[File.dirname(__FILE__) + '/c3d/util/*.rb'].each       {|file| require file }
 module C3D
   extend self
 
-  def start key=''
+  def start key='', cli=false
     unless key == ''
       ENV['ETH_KEY'] = key
     end
-    C3D::SetupC3D.new
+    C3D::SetupC3D.new cli
     C3D::ConnectTorrent.supervise_as :puller, {
         username: ENV['TORRENT_USER'],
         password: ENV['TORRENT_PASS'],
@@ -49,7 +49,7 @@ module C3D
   end
 
   def blob args
-    C3D::SetupC3D.new
+    C3D::SetupC3D.new true
     C3D::ConnectTorrent.supervise_as :puller, {
         username: ENV['TORRENT_USER'],
         password: ENV['TORRENT_PASS'],

data/lib/c3d/util/processes.rb

@@ -3,24 +3,28 @@
 module C3D
   module TransmissionRunner
     extend self
-    def start_transmission
-      unless is_trans_running?
+    def start_transmission cli
+      unless is_trans_running? cli
         pid = spawn "transmission-daemon -f --no-incomplete-dir -o -C -p #{ENV['TORRENT_RPC'].split(':').last[0..3]} -w #{ENV['BLOBS_DIR']} -g #{File.join(ENV['HOME'], '.epm')}"
         sleep 3
         at_exit { Process.kill("INT", pid) }
       end
     end
 
-    def is_trans_running?
+    def is_trans_running? cli
       a = `ps ux`.split("\n").select{|e| e[/transmission-daemon/]}
       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
+        if cli
+          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
         else
-          exit 0
+          return true
         end
       end
       return (! a.empty?)

data/lib/c3d/util/setup.rb

@@ -4,13 +4,13 @@ module C3D
   class SetupC3D
     include Celluloid
 
-    def initialize
+    def initialize cli
       set_deps
       config = get_config
       set_the_env config
       set_trans_config config
       set_c3d_config config
-      start_processes config
+      start_processes config, cli
     end
 
     private
@@ -85,8 +85,8 @@ module C3D
       file_exist? ENV['IGNORE_FILE']
     end
 
-    def start_processes config
-      C3D::TransmissionRunner.start_transmission
+    def start_processes config, cli
+      C3D::TransmissionRunner.start_transmission, cli
       C3D::EthRunner.start_ethereum config
     end
 

data/lib/c3d/version.rb

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

metadata

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