sonic-pi-cli 0.0.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 04134a6ca8a18fa541d125769286b79471e73358
-  data.tar.gz: a0755613302da38527122b885ae2796c92a6e7be
+SHA256:
+  metadata.gz: 69fb6262128d0b144aeb03a3135b5fa19eeed8d52a3fefab4f5c6317356983cc
+  data.tar.gz: e3c6d4c4ccc9cb99675dd537d7f08ae5d9b00c0b31639ea4ffba1f2cf28cb17c
 SHA512:
-  metadata.gz: f0470ad219ef6f84ba7021ad0872a1c3ad31be0f661c06c631ba754cbaf1e9cf60af4865ca22d63bc0fcee21fa4995a8255bea4eadf588081ef36d95b45682f1
-  data.tar.gz: 48a73410ed6d6e86780b8a3e11d0dbf3da8bdf4baaadeae1b278f7696b92912f92c6bab578f96c65b2d6d53701da7cef81a63dacf2bfe7bcbb0748764f43a5ea
+  metadata.gz: 99d188d6b33023baf1cab49f51615b203f3dd0b0c6c436a4893027baf2e7a95aa5b602481e7b74c58e16e65c51b657172c38ae16bd8c76f31e232fbebef42a0b
+  data.tar.gz: 77010bf05ef77eec503f9eb0c31a4acbed999cfc25bce50e63968031a708c220e96e6c8ffc97acb77ecef75f3715ce7c69e8ead752361b8e7c95a7c8ecd0119d

data/bin/sonic_pi

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'sonic_pi'
+require "sonic_pi"
 
 def stdin
   unless STDIN.tty?
@@ -45,14 +45,16 @@ end
 def run
   app = SonicPi.new
 
-  app.test_connection!
-
   case args_and_stdin
-  when '--help', ''
+  when '--help', '-h', ''
     print_help
   when 'stop'
+    app.test_connection!
+
     app.stop
   else
+    app.test_connection!
+
     app.run(args_and_stdin)
   end
 end

data/lib/sonic_pi.rb

@@ -4,25 +4,30 @@ require 'osc-ruby'
 require 'securerandom'
 
 class SonicPi
+  PORT_LOG_REGEX = Regexp.compile(/Listen port:\s+(?<port>\d+)/)
+
+  def initialize(port=nil)
+    @port = port || find_port
+  end
+
   RUN_COMMAND = "/run-code"
   STOP_COMMAND = "/stop-all-jobs"
   SERVER = 'localhost'
-  PORT = 4557
   GUI_ID = 'SONIC_PI_CLI'
 
   def run(command)
-    client.send(run_command(command))
+    send_command(RUN_COMMAND, command)
   end
 
   def stop
-    client.send(stop_command)
+    send_command(STOP_COMMAND)
   end
 
   def test_connection!
     begin
-      OSC::Server.new(PORT)
-      abort("ERROR: Sonic Pi is not listening on #{PORT} - is it running?")
-
+      socket = UDPSocket.new
+      socket.bind(nil, @port)
+      abort("ERROR: Sonic Pi is not listening on #{@port} - is it running?")
     rescue
       # everything is good
     end
@@ -31,15 +36,33 @@ class SonicPi
   private
 
   def client
-    client ||= OSC::Client.new(SERVER, PORT)
+    @client ||= OSC::Client.new(SERVER, @port)
   end
 
-  def run_command(command)
-    OSC::Message.new(RUN_COMMAND, GUI_ID, "#{command}")
+  def send_command(call_type, command=nil)
+    prepared_command = OSC::Message.new(call_type, GUI_ID, command)
+    client.send(prepared_command)
   end
 
-  def stop_command
-    OSC::Message.new(STOP_COMMAND, GUI_ID)
+  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
 end
-

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sonic-pi-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Nick Johnstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2019-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: osc-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 description: A simple command line interface for Sonic Pi
 email: ncwjohnstone@gmail.com
 executables:
@@ -52,8 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Sonic Pi CLI