sonic-pi-cli 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56c7ffafe6adcba49b7448fbf712920476cb7c1cec31a0e117b4fa9b466c015c
-  data.tar.gz: aaef39b5888f51b5889d6860b5759c2118668f600bff6c2ed23598482198b060
+  metadata.gz: 69fb6262128d0b144aeb03a3135b5fa19eeed8d52a3fefab4f5c6317356983cc
+  data.tar.gz: e3c6d4c4ccc9cb99675dd537d7f08ae5d9b00c0b31639ea4ffba1f2cf28cb17c
 SHA512:
-  metadata.gz: f27cf2472303f9fd0458370da7947aa812ac2e150bd2db7b618286baf750b65d014eb6a749fe16ea1eb95da5a13eb1114ace445ee64177a8f7713f98bed018db
-  data.tar.gz: 49877b80ce03c869ccbf126c72f65e043d011b9b1e81461750bbb853b7aed10d1496b1c9d7cb30a9ee0d370e6519a0b1af1c12f74f4b335885fe3268043e0d51
+  metadata.gz: 99d188d6b33023baf1cab49f51615b203f3dd0b0c6c436a4893027baf2e7a95aa5b602481e7b74c58e16e65c51b657172c38ae16bd8c76f31e232fbebef42a0b
+  data.tar.gz: 77010bf05ef77eec503f9eb0c31a4acbed999cfc25bce50e63968031a708c220e96e6c8ffc97acb77ecef75f3715ce7c69e8ead752361b8e7c95a7c8ecd0119d

data/bin/sonic_pi

@@ -2,36 +2,12 @@
 
 require "sonic_pi"
 
-PORT_LOG_REGEX = Regexp.compile(/Listen port:\s+(?<port>\d+)/)
-
 def stdin
   unless STDIN.tty?
     $stdin.read
   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
@@ -67,7 +43,7 @@ HELP
 end
 
 def run
-  app = SonicPi.new(find_port)
+  app = SonicPi.new
 
   case args_and_stdin
   when '--help', '-h', ''

data/lib/sonic_pi.rb

@@ -4,8 +4,10 @@ require 'osc-ruby'
 require 'securerandom'
 
 class SonicPi
-  def initialize(port=4557)
-    @port=port
+  PORT_LOG_REGEX = Regexp.compile(/Listen port:\s+(?<port>\d+)/)
+
+  def initialize(port=nil)
+    @port = port || find_port
   end
 
   RUN_COMMAND = "/run-code"
@@ -41,4 +43,26 @@ class SonicPi
     prepared_command = OSC::Message.new(call_type, GUI_ID, command)
     client.send(prepared_command)
   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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sonic-pi-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Nick Johnstone
@@ -14,16 +14,16 @@ dependencies:
   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: