musica 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7def5733a1fb7f5b9d36a812d3cbf6e615d88ec49f34bdf4eb6bbcf3127f613
-  data.tar.gz: 1d07b3cf2461f9e5e91fe29b72272c49b53c06ce2d3e6ec0c56ce2663566d713
+  metadata.gz: 68997c53cdcb8c578599e7ede93568d15db73adf953c7c6d674e382aed778ee5
+  data.tar.gz: f5591c92f6bae98c446a2a8bce0be35f6c18749475fe9f553a8fdd79d36c779a
 SHA512:
-  metadata.gz: 1341f4bf9097a0aba074697a3f9335fe36e73b113ef2fb841920f2b3bcca0ed711084437451ea68ac0b9f20b78c2d764b4d3916bb0cef149bbcdf359d10c4b42
-  data.tar.gz: 2688cf16ee45c9f0f676eea0f938b0c232968e1178b45a2459e88633f564fd239036d35ea7d7befe60451f56a224921007f72b82507b91647fcd72f80feacb44
+  metadata.gz: 7945760f5d031faf50a9dd0b0161a2b26e5c127214a78c0b15cefeb58d165980640bd7c52d91a02f98d7f71906748d65143e39fb094a2678d4c5c582bbd0b736
+  data.tar.gz: 4ba20cab7bb5ac547b172936eabf69b6d154b6a450faaa3da4f0f57fe7f6eed95f9e11d9bf849dea6eb95b8bd62913dd5b25e8533f0bb44355b0d7360b6c149c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.3.0] - 2026-10-19
+
+- Turn plain requests into commands by default, without `-n`
+- Send AppleScript commands as is with `-s`/`--script`, which was the default before
+- Add `-h`/`--help` and `-v`/`--version`
+
 ## [0.2.0] - 2026-10-19
 
 - Add natural language commands with `-n`, using Apple's on-device model through `fm`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    musica (0.2.0)
+    musica (0.3.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -15,24 +15,25 @@ If bundler is not being used to manage dependencies, install the gem by executin
 
 ## Usage
 
-Musica passes its arguments straight to your music player as an AppleScript
-command, so `musica <command>` runs:
+Tell Musica what you want in plain words:
 
-```applescript
-tell application "<player>" to <command>
-```
+    $ musica skip this song
+    $ musica turn it down a bit
+    $ musica play Digital Love by Daft Punk
+    $ musica play something by Queen
+    $ musica play the album Adore
 
-Any command in the player's AppleScript dictionary works (open it in Script
-Editor with File > Open Dictionary). For example:
+Musica uses Apple's on-device model, through the `fm` command, to turn the
+request into a command for your music player. This needs macOS 26 with Apple
+Intelligence.
 
-    $ musica play
-    $ musica pause
-    $ musica playpause
-    $ musica next track
-    $ musica previous track
-    $ musica set sound volume to 50
+It understands play, pause, next and previous track, volume changes, and
+playing a track or album from your library by name, artist or album. To play
+an album in order, Musica fills a playlist named "Musica" with its tracks and
+plays that playlist, replacing what was in it before. Playing from your library
+only works with Music.
 
-After each command, Musica prints the current status: the artist and track
+After each request, Musica prints the current status: the artist and track
 while playing, otherwise the player state:
 
     $ musica play
@@ -40,31 +41,23 @@ while playing, otherwise the player state:
     $ musica pause
     🎧 paused
 
-Run `musica` without arguments to print the status alone.
-
-Commands can differ between players. For example, Music uses
-`set shuffle enabled to true` and Spotify uses `set shuffling to true`. Wrap
-commands that contain quotes in single quotes so the shell keeps them:
+Run `musica` without arguments to print the status alone, `musica --help` for
+a summary of the options, and `musica --version` for the version.
 
-    $ musica 'play playlist "Favorite Songs"'
+### AppleScript
 
-### Natural language
+With `-s` (or `--script`), Musica sends its arguments to the player as an
+AppleScript command, without `fm`. Any command in the player's AppleScript
+dictionary works (open it in Script Editor with File > Open Dictionary):
 
-With `-n`, Musica uses Apple's on-device model, through the `fm` command, to
-turn a plain request into a command. This needs macOS 26 with Apple
-Intelligence.
+    $ musica -s playpause
+    $ musica -s set sound volume to 50
 
-    $ musica -n skip this song
-    $ musica -n turn it down a bit
-    $ musica -n play Digital Love by Daft Punk
-    $ musica -n play something by Queen
-    $ musica -n play the album Adore
+Commands can differ between players. For example, Music uses
+`set shuffle enabled to true` and Spotify uses `set shuffling to true`. Wrap
+commands that contain quotes in single quotes so the shell keeps them:
 
-It understands play, pause, next and previous track, volume changes, and
-playing a track or album from your library by name, artist or album. To play
-an album in order, Musica fills a playlist named "Musica" with its tracks and
-plays that playlist, replacing what was in it before. Playing from your library
-only works with Music.
+    $ musica -s 'play playlist "Favorite Songs"'
 
 ## Configuration
 

data/lib/musica/cli.rb

@@ -2,25 +2,61 @@
 
 module Musica
   class Cli
-    def initialize(argv, player: Player.new(application: Config.player), interpreter: Interpreter.new, out: $stdout)
-      @natural = argv.first == "-n"
-      @prompt = argv.drop(@natural ? 1 : 0).join(" ")
+    HELP = <<~TEXT
+      Usage: musica [request]
+             musica -s <applescript>
+
+      Without arguments, print what's playing. With a request, turn it into a
+      command using fm, send it to the music player, then print what's playing.
+
+      Options:
+        -s, --script   Send an AppleScript command to the player as is
+        -h, --help     Show this help
+        -v, --version  Show the version
+
+      Examples:
+        musica skip this song
+        musica play the album Adore
+        musica -s set sound volume to 50
+
+      The player is set in musica/config.yml, under $XDG_CONFIG_HOME or ~/.config.
+    TEXT
+
+    def initialize(argv, player: nil, interpreter: nil, out: $stdout)
+      @argv = argv
       @player = player
       @interpreter = interpreter
       @out = out
     end
 
     def run
-      player.tell command unless prompt.empty?
-      out << "\u{1F3A7} #{player.status}\n"
+      case argv.first
+      when "-h", "--help"
+        out << HELP
+      when "-v", "--version"
+        out << "musica #{VERSION}\n"
+      when "-s", "--script"
+        play argv.drop(1).join(" ")
+      else
+        play(argv.empty? ? "" : interpreter.call(argv.join(" ")))
+      end
     end
 
     private
 
-    attr_reader :interpreter, :natural, :out, :player, :prompt
+    attr_reader :argv, :out
+
+    def play(command)
+      player.tell command unless command.empty?
+      out << "\u{1F3A7} #{player.status}\n"
+    end
+
+    def player
+      @player ||= Player.new(application: Config.player)
+    end
 
-    def command
-      natural ? interpreter.call(prompt) : prompt
+    def interpreter
+      @interpreter ||= Interpreter.new
     end
   end
 end

data/lib/musica/interpreter.rb

@@ -28,7 +28,7 @@ module Musica
 
       output
     rescue Errno::ENOENT
-      raise Error, "Natural language commands need fm (macOS 26 with Apple Intelligence)"
+      raise Error, "Requests need fm (macOS 26 with Apple Intelligence); use -s to send AppleScript instead"
     end
 
     COMMANDS = {

data/lib/musica/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Musica
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musica
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ariel Rzezak
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.17
+rubygems_version: 4.0.23
 specification_version: 4
 summary: Control macOS music players from the command-line
 test_files: []