synthdef 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ec5c7f7405fbd5da62bed4b75eb323c50e68561
-  data.tar.gz: 513086de792c8c371b912a3e0fb00ffff0280840
+  metadata.gz: f9c8588c67ed85ad21a8d99a8137c050943f0c2d
+  data.tar.gz: 89e2c2d3bd2cabcafa5b18c02200cbb0d7705b61
 SHA512:
-  metadata.gz: fabbd69d4e25c238f522f6eebb9ea075fda74f6ec3031779c802aee08f568f8151e47f52641523b7c53c27427efb241ca3a09e2de1bb26967202eaf0a16e73b9
-  data.tar.gz: 3ff9d9c6a2f850b7084b00ee19dcb3eb188b37027c4259d540a24679789f046a6bd3d2c317b97f482742f6bf1864993d7eb0fc5a87ef52d009902d08db2e223f
+  metadata.gz: 6c8aa4387cb4868107d233ff0773df514603c7ac1019a894526bf2c116a08955c3af04393f6bc6bad0841ba52d076d7aa400bb0354097ad6cb78b69e4ceac93a
+  data.tar.gz: 1aa642d35abdef185c5dfc1a5499a03d6d40e3e82c55e62b64ce57d6abe1a7c252659329c525ddf1d1c1755ad388622c409786e0a90a3300e44f24c228081731

data/bin/synthdef

@@ -1,5 +1,50 @@
 #!/usr/bin/env ruby
 require 'synthdef'
 require 'json'
+require 'optparse'
 
-puts JSON.pretty_generate(Synthdef.read(ARGF.read).snapshot)
+ARGV << '-h' if ARGV.empty?
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: synthdef [options] [path]"
+
+  opts.on("-c", "--convert [VERSION]", ["1", "2"], "Specify synthdef version of output") do |c|
+    options[:convert] = c
+  end
+
+	opts.on("-f", "--format [FORMAT]", ["json", "raw"], "Specify output format: json,  raw") do |f|
+		options[:format] = f
+	end
+
+	# Another typical switch to print the version.
+	opts.on_tail("-v", "--version", "Show version") do
+		puts "synthdef gem version #{Synthdef::VERSION}"
+    puts "Manipulate SuperCollider synthdef files from the command line"
+    puts opts
+		exit
+	end
+end.parse!
+
+## Work with STDIN and FILENAME and warn if not given
+begin
+if (ARGF.filename != "-" and File.exist?(File.expand_path(ARGF.filename))) or (not STDIN.tty? and not STDIN.closed?)
+  sdef = Synthdef.read(ARGF.read)
+end
+rescue Errno::ENOENT
+  $stderr.puts "Synthdef not found: #{ARGF.filename}"
+  exit 1
+end
+
+sdef[:file_version] = options[:convert].to_i if options[:convert]
+
+options[:format] ||= "json"
+case options[:format]
+when "json"
+	puts JSON.pretty_generate(sdef.snapshot)
+when "raw"
+  puts sdef.to_binary_s
+else
+  $stderr.puts "Invalid output format chosen"
+  exit 1
+end

data/lib/synthdef.rb

@@ -24,35 +24,35 @@ class Synthdef < BinData::Record
   array :synthdefs, initial_length: lambda { no_of_synthdefs } do
     pascal_string :name
 
-    choice        :no_of_constants, :selection => :check_version, :choices => {0 => :int16, 1 => :int32}
+    choice        :no_of_constants, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
     array         :constants, initial_length: lambda { no_of_constants } do
       float :constant
     end
 
-    choice        :no_of_params, :selection => :check_version, :choices => {0 => :int16, 1 => :int32}
+    choice        :no_of_params, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
     array        :params, initial_length: lambda { no_of_params } do
       float :initial_parameter_value
     end
 
-    choice        :no_of_param_names, :selection => :check_version, :choices => {0 => :int16, 1 => :int32}
+    choice        :no_of_param_names, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
     array        :param_names, initial_length: lambda { no_of_param_names } do
       pascal_string :param_name
-      choice        :param_index, :selection => :check_version, :choices => {0 => :int16, 1 => :int32}
+      choice        :param_index, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
     end
 
-    choice        :no_of_ugens, :selection => :check_version, :choices => {0 => :int16, 1 => :int32}
+    choice        :no_of_ugens, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
     array        :ugens, initial_length: lambda { no_of_ugens } do
       pascal_string :ugen_name
       int8          :rate
-      choice        :no_of_inputs, :selection => :check_version, :choices => {0 => :int16, 1 => :int32}
-      choice        :no_of_outputs, :selection => :check_version, :choices => {0 => :int16, 1 => :int32}
+      choice        :no_of_inputs, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
+      choice        :no_of_outputs, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
       int16         :special, initial_value: 0
       array         :inputs, initial_length: lambda { no_of_inputs } do
-        choice :src, :selection => :check_version, :choices => {0 => :int16, 1 => :int32}
+        choice :src, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
         if lambda { src == -1 }
-          choice :input_constant_index, :selection => :check_version, :choices => {0 => :int16, 1 => :int32}
+          choice :input_constant_index, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
         else
-          choice :input_ugen_index, :selection => :check_version, :choices => {0 => :int16, 1 => :int32}
+          choice :input_ugen_index, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
         end
       end
       array         :outputs, initial_length: lambda { no_of_outputs } do

data/lib/synthdef/version.rb

@@ -1,5 +1,5 @@
 require 'bindata'
 
 class Synthdef < BinData::Record
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/synthdef_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'active_support'
 
 describe Synthdef do
   let(:synthdef_binary) { IO.read(File.expand_path("../data/recorder.scsyndef", __FILE__)) }
@@ -27,4 +28,15 @@ describe Synthdef do
     expect(parsed_synthdef[:synthdefs].first[:ugens].last[:ugen_name]).to eq("Out")
     expect(parsed_synthdef[:synthdefs].first[:no_of_variants]).to eq(0)
   end
+
+  it 'converts a basic version 1 synthdef to a version 2 synthdef' do
+    parsed_synthdef = Synthdef.read(synthdef_binary)
+    parsed_synthdef[:file_version] = 2
+
+    converted_synthdef = Synthdef.read(parsed_synthdef.to_binary_s).snapshot
+    expect(converted_synthdef).to be_a(Hash)
+    expect(converted_synthdef).not_to be_empty
+    expect(converted_synthdef[:file_version]).to eq(2)
+    expect(converted_synthdef.to_h.except(:file_version)).to eq(parsed_synthdef.snapshot.to_h.except(:file_version))
+  end
 end

data/synthdef.gemspec

@@ -23,9 +23,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "activesupport"
+  # spec.add_development_dependency "guard"
+  # spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "pry-remote"
-  spec.add_development_dependency "pry-nav"
+  # spec.add_development_dependency "pry-remote"
+  # spec.add_development_dependency "pry-nav"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synthdef
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Xavier Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2016-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -67,21 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,34 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-remote
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-nav
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Use the power of Ruby to convert, edit and save synthdefs for SuperCollider
 email:
 - xavriley@hotmail.com
@@ -189,4 +147,3 @@ test_files:
 - spec/data/stereo_player.scsyndef
 - spec/spec_helper.rb
 - spec/synthdef_spec.rb
-has_rdoc: