cuesnap 1.1.0 → 1.1.1

data/README.md

@@ -11,6 +11,7 @@ _Tested on Mac OS X 10.7 (Lion)._
 **Prerequisites**
 
  1. [Mac OS X](http://store.apple.com)
+ 1. [Homebrew](http://mxcl.github.com/homebrew/)
  1. [Ruby 1.8.7 or Greater](http://ruby-lang.org/) _Comes pre-installed in OS X_
 
 **Okay, let's go**
@@ -56,16 +57,22 @@ _Tested on Mac OS X 10.7 (Lion)._
 
  That's it, now code something awesome and tell me about it.
 
+## Changelog
+
+### 1.1.1
+
+ * Now properly escaping shell characters found in file names
+
 ## Todo
 
  1. Unicode Support _Fail test is already in_.
- 2. Error Message when mp3splt is missing.
+ 1. Error Message when mp3splt is missing.
 
 ## Contributing
 
 1. [Fork it](https://github.com/mutewinter/cuesnap/fork_select).
-2. Create your feature branch (`git checkout -b my_sweet_feature`).
-3. Write some kickass code.
-3. Commit your changes (`git commit -am 'Added a sweet feature'`).
-4. Push to the branch (`git push origin my_sweet_feature`).
-5. Create new [Pull Request](https://github.com/mutewinter/cuesnap/pulls).
+1. Create your feature branch (`git checkout -b my_sweet_feature`).
+1. Write some kickass code.
+1. Commit your changes (`git commit -am 'Added a sweet feature'`).
+1. Push to the branch (`git push origin my_sweet_feature`).
+1. Create new [Pull Request](https://github.com/mutewinter/cuesnap/pulls).

data/bin/cuesnap

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'bundler/setup'
 
 begin
-  require 'cuesnap/cli'
+  require 'cuesnap'
   CueSnap::CLI.go!
 rescue Interrupt => e
   puts "\nQuitting..."

data/lib/cuesnap/cli.rb

@@ -1,8 +1,6 @@
 require 'methadone'
 require 'pathname'
 
-require 'cuesnap/splitter'
-
 module CueSnap
   class CLI
     include Methadone::Main
@@ -12,12 +10,18 @@ module CueSnap
       # no-numbers comes in false when it's set, I know, crazy.
       options[:no_numbers] = !options[:'no-numbers'] if options.has_key?(:'no-numbers')
 
-      file_not_found mp3_file unless File.exists? mp3_file
-
-      splitter = CueSnap::Splitter.new(mp3_file, cue_file, options)
+      begin
+        splitter = CueSnap::Splitter.new(mp3_file, cue_file, options)
+      rescue FileNotFound => e
+        file_not_found e.message
+      end
 
       if File.exists? splitter.cue_file
-        splitter.split!
+        begin
+          splitter.split!
+        rescue Iconv::IllegalSequence => e
+          exit_now! "Unicode isn't quite working yet, sorry. Strip it out of your .cue file for a temporary fix."
+        end
       else
         file_not_found splitter.cue_file
       end

data/lib/cuesnap/splitter.rb

@@ -1,8 +1,15 @@
 require 'hashie'
 require 'rubycue'
+require 'shellwords'
 
 module CueSnap
+  class FileNotFound < StandardError; end
+  class MP3FileNotFound < FileNotFound; end
+  class CueFileNotFound < FileNotFound; end
+
   class Splitter
+    attr_reader :mp3_file, :cue_file, :output_folder, :options
+
     # Public: Loads an mp3 and a RubyCue cuesheet.
     #
     # mp3_file  - String file path to an mp3 file.
@@ -15,6 +22,8 @@ module CueSnap
     #
     # Returns the initalized object.
     def initialize(mp3_file, cue_file = nil, options = {})
+      raise CueSnap::MP3FileNotFound, mp3_file unless File.exists? mp3_file
+
       @mp3_file = mp3_file
       if cue_file and cue_file.strip != ''
         @cue_file = cue_file
@@ -22,6 +31,8 @@ module CueSnap
         @cue_file = File.expand_path("#{mp3_filename}.cue", File.dirname(@mp3_file))
       end
 
+      raise CueSnap::CueFileNotFound, @cue_file unless File.exists? @cue_file
+
       @options = Hashie::Mash.new options
       @output_folder = @options.output_folder
       @output_folder ||= mp3_filename
@@ -66,14 +77,14 @@ module CueSnap
       format = "#{number_format} #{format}" unless @options.no_numbers
 
       # Got to esape the spaces for the shell
-      format.gsub!(/\s/, '\\ ')
+      format = Shellwords.escape format
 
       command = ['mp3splt',
-                 "-d #{output_folder}",
+                 "-d #{escaped_output_folder}",
                  "-o #{format}",
-                 "-c #@cue_file"]
+                 "-c #{escaped_cue_file}"]
       command.push '-Q' if @options.quiet
-      command.push @mp3_file
+      command.push escaped_mp3_file
 
       system command.join(' ')
     end
@@ -83,7 +94,27 @@ module CueSnap
       File.basename(@mp3_file, '.mp3')
     end
 
-    attr_reader :mp3_file, :cue_file, :output_folder, :options
+    # Public: The space-escaped mp3 file path.
+    def escaped_mp3_file
+      escape_path @mp3_file
+    end
+
+    # Public: The space-escaped output folder path.
+    def escaped_output_folder
+      escape_path @output_folder
+    end
+
+    # Public: The space-escaped cue file path.
+    def escaped_cue_file
+      escape_path @cue_file
+    end
+
+    private
+
+    # Internal: Escape a path for the shell.
+    def escape_path(file)
+      Shellwords.escape file
+    end
 
   end
 end

data/lib/cuesnap/version.rb

@@ -1,3 +1,3 @@
 module CueSnap
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuesnap
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubycue