cardano-up 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c55536463a8a275a7a370bac31474072c837a1411e08455934aa23a9b9d18932
-  data.tar.gz: b884c70ea66053c81bb91c3eefdef6447bd855e5a91595f0d7cf6ea0d5216b23
+  metadata.gz: 97b0c3e82b8f3c963327000c3baf309a9844c69de0d93e4f2c32405e5f21ded3
+  data.tar.gz: cd87f4af35c07c65ea108f5b6f9418dd8a56633d8cbb145cf1e9855a027bae51
 SHA512:
-  metadata.gz: 84a039aeab642b1e9eb5adcc30ebf1eccc8af53edbf6aebb28025ade0a69a858c9f8f8f7cb66ea4c84f1ff547065c19682347e7e4e5eef1039f47dfec70d14c4
-  data.tar.gz: 948ba5bad9619f2aaacad6c0cc6a9c1e5f114b8aa3eb1ea40c47141922b6d373eba19be5e8ff586db6f770296ab6cb868efa09773c82523b9fa61b6823e22b34
+  metadata.gz: 7fd6b704ef5ee77a7398415452f03dbf8c3a5b44fd68ea19c42c26fa9b09ad318e3f66489c745da663ef7e626ad038d16a57a34d94fa218717ef89da972626be
+  data.tar.gz: ab22622009628fdfea1a7c326a49d98d7e9d9f8c95d5a5e9cd3e376f1e920fab794e56a6ff9d452a37cc3052c77c544f646cdb405e276cdb0661013beb408af4

data/bin/cardano-up

@@ -14,7 +14,7 @@ doc = <<~DOCOPT
     #{File.basename(__FILE__)} ls
     #{File.basename(__FILE__)} config [--set-default] [--bindir <path>] [--configdir <path>] [--logdir <path>] [--statedir <path>]
     #{File.basename(__FILE__)} <env> [(node|wallet)] [(up|down|ping)] [--port <port>] [--session <name>]
-    #{File.basename(__FILE__)} <env> (node|wallet) tail [--session <name>]
+    #{File.basename(__FILE__)} <env> (node|wallet) tail [--lines <num_lines>] [--session <name>]
     #{File.basename(__FILE__)} -v | --version
     #{File.basename(__FILE__)} -e | --examples
     #{File.basename(__FILE__)} -h | --help
@@ -29,6 +29,7 @@ doc = <<~DOCOPT
                             ones from latest release.
     down                    Stop particular service.
     tail                    Follow logs for particular service.
+    -n --lines <num_lines>  Number of lines to show from the end of the log file. [default: 10]
     ping                    Ping service to check its status.
     ls                      List sessions.
     -p --port <port>        Specify wallet port. [default: 8090]
@@ -122,7 +123,7 @@ Check health of node and wallet on mainnet:
 Monitor mainnet wallet and node logs (Ctrl + c to stop):
 
     $ #{File.basename(__FILE__)} mainnet node tail
-    $ #{File.basename(__FILE__)} mainnet wallet tail
+    $ #{File.basename(__FILE__)} mainnet wallet tail -n 100
 
 Stop preprod node:
 
@@ -316,14 +317,15 @@ Stop mainnet node and wallet:
   elsif o['tail'] == true
     env = o['<env>']
     session_name = o['--session']
+    lines = o['--lines'].to_i
     begin
       log_dir = File.join(CardanoUp.config[:log_dir], session_name, env)
       if o['node']
         log_file = File.join(log_dir, 'node.log')
-        CardanoUp::Tail.tail(log_file)
+        CardanoUp::Tail.tail(log_file, lines)
       elsif o['wallet']
         log_file = File.join(log_dir, 'wallet.log')
-        CardanoUp::Tail.tail(log_file)
+        CardanoUp::Tail.tail(log_file, lines)
       end
     rescue CardanoUp::EnvNotSupportedError => e
       warn(e.message)

data/lib/cardano-up/launcher.rb

@@ -113,23 +113,34 @@ module CardanoUp
         }
       }
       CardanoUp::Session.create_or_update(session_name, service_details)
-      if CardanoUp::Utils.win?
-        # Turn off p2p for Windows
-        # TODO: remove after https://github.com/input-output-hk/ouroboros-network/issues/3968 released
-        config_win = CardanoUp::Utils.from_json("#{config_dir}/config.json")
-        config_win[:EnableP2P] = false
-        CardanoUp::Utils.to_json("#{config_dir}/config.json", config_win)
-        topology = {
-          Producers: [
-            {
-              addr: "#{env}-node.world.dev.cardano.org",
-              port: 30_002,
-              valency: 2
-            }
-          ]
-        }
-        CardanoUp::Utils.to_json("#{config_dir}/topology.json", topology)
 
+      # Turn off p2p in config.json and topology.json
+      config_json = CardanoUp::Utils.from_json("#{config_dir}/config.json")
+      config_json[:EnableP2P] = false
+      CardanoUp::Utils.to_json("#{config_dir}/config.json", config_json)
+      addr = env == 'mainnet' ? 'relays-new.cardano-mainnet.iohk.io' : "#{env}-node.world.dev.cardano.org"
+      port = case env
+             when 'mainnet'
+               3001
+             when 'preprod'
+               30_000
+             when 'preview'
+               30_002
+             else
+               30_000
+             end
+      topology_json = {
+        Producers: [
+          {
+            addr: addr,
+            port: port,
+            valency: 2
+          }
+        ]
+      }
+      CardanoUp::Utils.to_json("#{config_dir}/topology.json", topology_json)
+
+      if CardanoUp::Utils.win?
         # create cardano-node.bat file
         File.write("#{bin_dir}/cardano-node.bat", node_cmd)
         install_node = "nssm install #{node_service} #{bin_dir}/cardano-node.bat"

data/lib/cardano-up/tail.rb

@@ -3,11 +3,12 @@
 module CardanoUp
   # Tail log file
   module Tail
-    def self.tail(file_path)
+    def self.tail(file_path, lines = nil)
+      lines_back = lines || 10
       File.open(file_path) do |log|
         log.extend(File::Tail)
         log.interval
-        log.backward(10)
+        log.backward(lines_back.to_i)
         log.tail { |line| warn line }
       end
     end

data/lib/cardano-up/version.rb

@@ -2,5 +2,5 @@
 
 # Version
 module CardanoUp
-  VERSION ||= '0.1.3'
+  VERSION ||= '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cardano-up
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Piotr Stachyra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-25 00:00:00.000000000 Z
+date: 2023-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt