guard-ragel 0.0.3 → 0.0.4

data/README.md

@@ -34,11 +34,20 @@ Defaults to writing to the same directory in the ruby output format.
 
 An input file of ragel.rl will output a file of ragel.rb in the same directory.
 
+The output format can be inferred from the input filename if it has multiple
+extensions, e.g:
+
+    example.rb.rl
+    
+will generate
+
+    example.rb
 
 ## Options
 
 ```ruby
-:output_format => :ruby             # The output format to generate, this defaults to :ruby but supports one of:
+:output_format => :ruby             # The default output format to generate, if
+                                    # one cannot be determined from the filename
                                     #
                                     # :c         The host language is C, C++, Obj-C or Obj-C++
                                     # :d         The host language is D

data/lib/guard/ragel.rb

@@ -7,20 +7,31 @@ module Guard
 
     RagelError = Class.new(RuntimeError)
 
-    OUTPUT_FORMATS = {
-      :c => ['-C', 'c'],
-      :d => ['-D', 'd'],
-      :go => ['Z', 'go'],
-      :java => ['J', 'java'],
-      :ruby => ['-R', 'rb'],
-      :csharp => ['-A', 'cs'],
-      :ocaml => ['-O', 'caml'],
+    EXTENSIONS = {
+      :c => 'c',
+      :d => 'd',
+      :go => 'go',
+      :java => 'java',
+      :ruby => 'rb',
+      :csharp => 'cs',
+      :ocaml => 'caml',
+    }
+    FORMAT_FLAGS = {
+      'c' => '-C',
+      'd' => '-D',
+      'go' => '-Z',
+      'java' => '-J',
+      'rb' => '-R',
+      'cs' => '-A',
+      'caml' => '-O'
     }
   
     DEFAULTS = {
-      :output_format => :ruby,       # Output format of ragel
+      :output_format => :ruby,       # Output format to use if it cannot be
+                                     # determined from the original filename 
       :options => '',                # Options to pass to ragel
       :notification => true,         # Enable notifications?
+      :extension => nil,             # Override output extension
     }
     
     def initialize(watchers = [], options = {})
@@ -33,14 +44,21 @@ module Guard
     # @return [String] filename generated by running ragel
     #
     def build_ragel(file)
-      # Determine name of the output file
-      filename = File.basename(file, File.extname(file))
       output_dir = options[:output] || File.dir(file)
-      output_extension = options[:extension] || format_options[1]
-      output_file = File.join(output_dir, "#{filename}.#{output_extension}")
+      
+      filename, extension = output_filename(file) 
+      format_type = options[:output_format]
+      extension ||= EXTENSIONS[format_type]
+      if extension.nil?
+        raise ArgumentError, "Unable to determine output format from #{filename} with default output #{format_type}" 
+      end
+      format_flag = FORMAT_FLAGS[extension]
 
-      # Flag to make the chosen format
-      format_flag =  format_options[0]
+      if override_extension = options[:extension]
+        extension = override_extension
+      end
+
+      output_file = File.join(output_dir, "#{filename}.#{extension}")
 
       result = system "ragel #{options[:options]} #{format_flag} #{file} -o #{output_file}"
       raise RagelError, $? unless result
@@ -59,16 +77,16 @@ module Guard
 
         begin
           output_file = build_ragel(file)
-          message = "Generated '#{output_file}' from '#{file}'"
-          ::Guard::UI.info "Guard::Ragel #{message}", :reset => true
+          message = "generated '#{output_file}' from '#{file}'"
+          ::Guard::UI.info "Guard::Ragel -> #{message}", :reset => true
           if options[:notification]
             ::Guard::Notifier.notify(message, :title => "Guard::Ragel", :image => :success)
           end
           output_file
 
         rescue RagelError => error
-          message = "Failed to generate '#{output_file}' from '#{file}', error #{error.message}"
-          ::Guard::UI.error "Guard::Ragel #{message}"
+          message = "failed to generate '#{output_file}' from '#{file}', error #{error.message}"
+          ::Guard::UI.error "Guard::Ragel -> #{message}"
           if options[:notification]
             ::Guard::Notifier.notify(message, :title => "Guard::Ragel", :image => :error) 
           end
@@ -90,12 +108,14 @@ module Guard
 
   private #####################################################################
 
-    def format_options
-      format_type = options[:output_format]
-      unless OUTPUT_FORMATS.key?(format_type)
-        raise ArgumentError, "Unknown output format #{format_type}" 
+    def output_filename(input_filename)
+      basename = File.basename(input_filename, File.extname(input_filename))
+      extension = File.extname(basename)
+
+      if extension[0, 1].eql?('.')
+        return [File.basename(basename, extension), extension.slice(1..-1)] 
       end
-      OUTPUT_FORMATS[format_type]
+      [basename]
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: guard-ragel
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
+  hash: 23
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - John Barker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 +08:00
+date: 2011-07-05 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,9 +51,25 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -66,11 +82,25 @@ dependencies:
         - rc
         version: 2.0.0.rc
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: guard-rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,7 +110,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id006
 description: Guard::Ragel automatically rebuilds ragel .rl files into their corresponding .rb files
 email: 
 - jebarker@gmail.com
@@ -127,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Guard gem for Ragel