chords 0.3 → 0.3.1

data/lib/chords/command_line_parser.rb

@@ -49,7 +49,7 @@ module Chords
         @tuning = Chords::Fretboard::TUNINGS[t.to_sym]
       end
       
-      @opts.on("--pdf", "Output to pdf. Requires Prawn") do
+      @opts.on("--pdf", "Output to pdf. Requires Prawn.") do
         begin
           require 'chords/pdf_formatter'
         rescue LoadError => e
@@ -59,7 +59,7 @@ module Chords
         @formatter = Chords::PDFFormatter
       end
       
-      @opts.on("--html", "Output to html. Requires RMagick") do
+      @opts.on("--html", "Output to html. Requires RMagick.") do
         begin
           require 'chords/html_formatter'
         rescue LoadError => e

data/lib/chords/html_formatter.rb

@@ -25,11 +25,14 @@ module Chords
         html += get_element(fingering)
       end
       
-      File.open('chords.html', 'w') do |file|
-        file.write html
+      if opts[:inline]
+        html
+      else 
+        File.open('chords.html', 'w') do |file|
+          file.write html
+        end
+        puts "Wrote chords.html"
       end
-      
-      puts "Wrote chords.html"
     end
     
     private

data/lib/chords/pdf_formatter.rb

@@ -25,8 +25,12 @@ module Chords
         end
       end
       
-      @pdf.render_file('chords.pdf')
-      puts "Wrote chords.pdf"
+      if opts[:inline]
+        @pdf.render
+      else
+        @pdf.render_file('chords.pdf')
+        puts "Wrote chords.pdf"
+      end
     end
     
     private

data/lib/chords/text_formatter.rb

@@ -17,16 +17,24 @@ module Chords
       end
       
       idx = 0
+      output = ''
+      
       while rows.first.length > idx
         parts = []
         rows.each_with_index do |row, i| 
           parts << "#{@fretboard.open_notes[i].title.rjust(2, ' ')}: " + row[idx...(idx+75)]
         end
-        puts "\n" + (parts.reverse.join("\n")) + "\n\n"
+        output += "\n" + (parts.reverse.join("\n")) + "\n\n"
         idx += 75
       end
       
-      puts "Total #{fingerings.size} fingerings."
+      output += "Total #{fingerings.size} fingerings."
+      
+      if opts[:inline]
+        output
+      else
+        puts output
+      end
     end
     
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chords
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  version: "0.3"
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Antti Hakala