sonic-pi-cli 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e8a35a28ae7c1fbbca157b1abd9a440bd111fb65
-  data.tar.gz: b12c2724e73572e864d2c22a4fe9abf55c913673
+SHA256:
+  metadata.gz: 56c7ffafe6adcba49b7448fbf712920476cb7c1cec31a0e117b4fa9b466c015c
+  data.tar.gz: aaef39b5888f51b5889d6860b5759c2118668f600bff6c2ed23598482198b060
 SHA512:
-  metadata.gz: 8defef082afe8732928650355b39bcfa33680368041c236c717394cdf1f2ec0ac946191676a34474e70abe90da7df89a13f4dce50c82ce350e7f425515daa13a
-  data.tar.gz: c13f61e4981f17fa517cddcae1d8ced5022c8f55c2ad5a207dc0459e7a5c262f6a0209213d98fa0a4e0c767ada22b840e308f3e1ee3643a0fb323c0ace207f0f
+  metadata.gz: f27cf2472303f9fd0458370da7947aa812ac2e150bd2db7b618286baf750b65d014eb6a749fe16ea1eb95da5a13eb1114ace445ee64177a8f7713f98bed018db
+  data.tar.gz: 49877b80ce03c869ccbf126c72f65e043d011b9b1e81461750bbb853b7aed10d1496b1c9d7cb30a9ee0d370e6519a0b1af1c12f74f4b335885fe3268043e0d51

data/bin/sonic_pi

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'sonic_pi'
+require "sonic_pi"
+
+PORT_LOG_REGEX = Regexp.compile(/Listen port:\s+(?<port>\d+)/)
 
 def stdin
   unless STDIN.tty?
@@ -8,6 +10,28 @@ def stdin
   end
 end
 
+def find_port
+  port = 4557
+
+  begin
+    log_path = File.join(Dir.home, ".sonic-pi", "log", "server-output.log")
+
+    File.open(log_path, 'r') do |f|
+      port_log_entry =
+        f.each_line
+         .lazy
+         .map { |line| line[PORT_LOG_REGEX, "port"] }
+         .find { |match| !!match }
+
+      port = port_log_entry.to_i if port_log_entry
+    end
+  rescue Errno::ENOENT
+    # not to worry if the file doesn't exist
+  end
+
+  port
+end
+
 def args
   ARGV.join(' ')
 end
@@ -43,7 +67,7 @@ HELP
 end
 
 def run
-  app = SonicPi.new
+  app = SonicPi.new(find_port)
 
   case args_and_stdin
   when '--help', '-h', ''

data/lib/sonic_pi.rb

@@ -4,10 +4,13 @@ require 'osc-ruby'
 require 'securerandom'
 
 class SonicPi
+  def initialize(port=4557)
+    @port=port
+  end
+
   RUN_COMMAND = "/run-code"
   STOP_COMMAND = "/stop-all-jobs"
   SERVER = 'localhost'
-  PORT = 4557
   GUI_ID = 'SONIC_PI_CLI'
 
   def run(command)
@@ -21,8 +24,8 @@ class SonicPi
   def test_connection!
     begin
       socket = UDPSocket.new
-      socket.bind(nil, PORT)
-      abort("ERROR: Sonic Pi is not listening on #{PORT} - is it running?")
+      socket.bind(nil, @port)
+      abort("ERROR: Sonic Pi is not listening on #{@port} - is it running?")
     rescue
       # everything is good
     end
@@ -31,7 +34,7 @@ class SonicPi
   private
 
   def client
-    @client ||= OSC::Client.new(SERVER, PORT)
+    @client ||= OSC::Client.new(SERVER, @port)
   end
 
   def send_command(call_type, command=nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sonic-pi-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Nick Johnstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2019-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: osc-ruby
@@ -52,8 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Sonic Pi CLI