c3d 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cd2e94fbf6300728d6faec28283a0567f40bbce
-  data.tar.gz: 471eda4d6f81893e0993508d82a1ef8c0d1a4b1e
+  metadata.gz: 2c6e74fa7d05adf9592342735028198f944390d3
+  data.tar.gz: 3c368529abe2a59a94d9f4e8a2abd6bc189c675f
 SHA512:
-  metadata.gz: faedca142f322138286c3f984d9ce96328229a7f3b5fe3e1e415da9df789d6d0cd8ca6212c61e7291acc31bd6052c6a41dfda54176769520342f142be0be0f72
-  data.tar.gz: 734b5031720469dd505a13958139ff4d1c5cc28747e0ccb614f650e8b5506d89cee7f284796850d0fcf597c0cf64f9b909c081a4903429399ac804fe24b55cc9
+  metadata.gz: a66fdeb4b4a3efb6a0c922f2bfd869dad919f389969c71493a8daae7c7e02f78c45fdbce30262ea591902678446f16066f3249b2bc8657fc2537e87c18e2c06d
+  data.tar.gz: 7d9456a552b429fc3363b101b918df35cd98ff43541f2e166e80850b72f4b7602af28f8f05966d8fa1f735019089f47799cfbe95449bb1667cef9f7e5d88bb51

data/lib/c3d/util/setup.rb

@@ -6,6 +6,7 @@ module C3D
 
     def initialize cli=false
       set_deps
+      #todo - pull these from utility module rather than use here.
       config = get_config
       set_the_env config
       set_trans_config config

data/lib/c3d/util/util.rb

@@ -12,5 +12,60 @@ module C3D
       ENV['ETH_KEY'] = config["primary_account_key"]
       File.open(config_file, 'w'){|f| f.write(JSON.pretty_generate(config))}
     end
+
+    def set_config
+      config = get_config
+      set_the_env config
+    end
+
+    def get_config
+      dir_exist? File.join(ENV['HOME'], '.epm')
+      config_file  = File.join(ENV['HOME'], '.epm', 'c3d-config.json')
+      config_example = File.join(File.dirname(__FILE__), '..', '..', '..', 'settings', 'c3d-config.json')
+      unless File.exists? config_file
+        tmp = File.read config_example
+        until ! tmp[/(\{\{USERHOME\}\})/]
+          tmp.gsub!("{{USERHOME}}", ENV["HOME"])
+        end
+        print "Before we begin, I need to ask you two personal questions:\n"
+        print "What is your primary account which I should be using to send transactions?\n\n"
+        account = STDIN.gets.chomp
+        print "Thanks. #{account} is what I will use.\n"
+        print "Thanks. Now what is the private key for that account which I should be using?\n\n"
+        secret = STDIN.gets.chomp
+        print "Thanks. #{secret} is what I will use.\n"
+        account = "0x#{account}" if account[0..1] != '0x'
+        secret = "0x#{secret}" if secret[0..1] != '0x'
+        tmp.gsub!("{{0xACCT}}", account)
+        tmp.gsub!("{{0xSEC}}", secret)
+        File.open(config_file, 'w'){|f| f.write(tmp)}
+      end
+      return JSON.load(File.read(config_file))
+    end
+
+    def set_the_env config
+      ENV['SWARM_DIR']     = config['swarm_dir']
+      ENV['TORRENTS_DIR']  = config['torrents_dir']
+      ENV['BLOBS_DIR']     = config['blobs_dir']
+      ENV['WATCH_FILE']    = config['watch_file']
+      ENV['IGNORE_FILE']   = config['ignore_file']
+      ENV['TORRENT_RPC']   = config['torrent_rpc']
+      ENV['TORRENT_USER']  = config['torrent_user']
+      ENV['TORRENT_PASS']  = config['torrent_pass']
+      ENV['UI_RESPOND']    = config['ui_respond']
+      ENV['UI_ANNOUNCE']   = config['ui_announce']
+      ENV['ETH_CONNECTOR'] = config['eth_connector']
+      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['GAS_PRICE']     = config['gas_price'] || '100000000000000'
+    end
+
+    def dir_exist? directry
+      unless File.directory? directry
+        FileUtils.mkdir_p directry
+      end
+    end
   end
 end

data/lib/c3d/util/watch.rb

@@ -5,24 +5,28 @@ module C3D
     extend self
 
     def subscribe contract
+      C3D::Utility.set_config
       subscribe_file = ENV['WATCH_FILE']
       subscribed = loader subscribe_file
       adder subscribed, subscribe_file, contract
     end
 
     def unsubscribe contract
+      C3D::Utility.set_config
       subscribe_file = ENV['WATCH_FILE']
       subscribed = loader subscribe_file
       remover subscribed, subscribe_file, contract
     end
 
     def ignore contract
+      C3D::Utility.set_config
       ignore_file = ENV['IGNORE_FILE']
       ignore = loader ignore_file
       adder ignored, ignore_file, contract
     end
 
     def unignore contract
+      C3D::Utility.set_config
       ignore_file = ENV['IGNORE_FILE']
       ignore = loader ignore_file
       remover ignored, ignore_file, contract
@@ -45,7 +49,10 @@ module C3D
 
       def adder object, file, contract
         unless object.include? contract
+          p contract
+          p contract.class
           object << contract if contract.class == (String || Array)
+          p object
           object.flatten if contract.class == Array
           saver object, file
           return true

data/lib/c3d/version.rb

@@ -1 +1 @@
-VERSION ||= "0.5.3"
+VERSION ||= "0.5.4"

metadata

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