literate-programming 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75f62b03242c7d1b19adbd5d328d430bba322347
-  data.tar.gz: e0477f1d1a7988d864afd190dcb22640f25047fb
+  metadata.gz: caa6c1610f672cf8ca1c7aaba23fe02f6ff8a1e0
+  data.tar.gz: 3890ff2d8c978e7b1d6da14f62e2cc490d309c90
 SHA512:
-  metadata.gz: 4f17f6e77b5878728d04119e8d9914c4b93fba4ec574f45eae4f807de0030a8031339b93ca0257af42a5a300aca59c4617b7a9cb0e4106f31599f821fb1cd61d
-  data.tar.gz: c118b8b572c5af87b2720d2368ca33bc8d64d4fac041d2ec6b38893810adc6d8cdfa32dfae4a4a22e2c2824e25ddf3f122d0173a24e136b7c684fea9d0c6fe6f
+  metadata.gz: ccd29169106d20cdc50d702bf5126a01d423dc731d4d321997e37592a7a35e50578be3e3e4ff4438634a127ffa2586444c57de2d3ffb7a1514a9fd2d69821313
+  data.tar.gz: 3c4b91aa9bac60784c83af41d7e18d1540ac2d184df42745540cbaaf2e692f98c6a6aaf1008dbfd9d40342e897de5cd1caacf0b829b761c231ed9b9b9d6f9df1

data/bin/rtangle

@@ -8,28 +8,67 @@ def usage
 Usage: rtangle [command]... source.wrb...
 
  commands:
-  -h -? --help --usage    show this message and exit
+  -c, --concat              Read all sources,
+                            then output to single file.
+                            default: false
+  -e, --expandtab           Indent with spaces.
+                            default: true
+  -h, -?, --help, --usage   Show this message and exit.
+  -oFILE, --output=FILE     Set output file name.
+                            If set this option,
+                            --concat option will also set.
+  -tSTOP, --tabstop=STOP    Specifies how many spaces
+                            per one indent.
+                            default: 2
   EOM
   exit
 end
 
 def main
-  options = {}
+  options = {c: false, e: true, t: 2}
   begin
     GetoptLong.new.set_options(
+      %w/-c --concat/ << GetoptLong::OPTIONAL_ARGUMENT,
+      %w/-e --expandtab/ << GetoptLong::OPTIONAL_ARGUMENT,
       %w/-h -? --help --usage/ << GetoptLong::NO_ARGUMENT,
+      %w/-o --output/ << GetoptLong::REQUIRED_ARGUMENT,
+      %w/-t --tabstop/ << GetoptLong::REQUIRED_ARGUMENT,
     ).each_option do |name, value|
-      options[name.sub(/^--?/, '').gsub(/-/, '_').to_sym] = value
+      option = name.sub(/^--?/, '').gsub(/-/, '_')
+      if %w/c e/.member? option then
+        case value
+        when '', /^t(r(ue?)?)?$/, /^y(es?)?$/
+          value = true
+        when /^f(a(l(se?)?)?)?$/, /^no?$/
+          value = false
+        else
+          raise "unrecognized value #{name}#{value}"
+        end
+      elsif %w/t/.member? option then
+        value = value.to_i
+      end
+      options[option.to_sym] = value
     end
   rescue GetoptLong::Error
     usage
   end
 
   usage if ARGV.length == 0 or options.member? :h
-  ARGV.each do |ifname|
-    inst = Literate::Programming.new File.open(ifname, 'r').read
-    ofname = File.dirname(ifname) + '/' + File.basename(ifname, '.wrb') + '.rb'
-    File.open(ofname, 'w').write inst.to_ruby
+  if options.member? :o or options[:c] then
+    inst = Literate::Programming.new ARGV.collect { |path|
+      File.open(path, 'r').read
+    }.join($/), tabstop: options[:t], expandtab: options[:e]
+    if options.member? :o then
+      File.open(options[:o], 'w').write inst.to_ruby
+    else
+      File.open('a.rb', 'w').write inst.to_ruby
+    end
+  else
+    ARGV.each do |ifname|
+      inst = Literate::Programming.new File.open(ifname, 'r').read, tabstop: options[:t], expandtab: options[:e]
+      ofname = File.dirname(ifname) + '/' + File.basename(ifname, '.wrb') + '.rb'
+      File.open(ofname, 'w').write inst.to_ruby
+    end
   end
 end
 

data/bin/rweave

@@ -8,9 +8,20 @@ def usage
 Usage: rweave [command]... source.wrb...
 
  commands:
-  -h, -?, --help, --usage     show this message and exit
-  -fFORMAT, --format=FORMAT   specify output format
-                              default: Markdown
+  -c, --concat                Read all sources,
+                              then output to single file.
+                              default: false
+  -e, --expandtab             Indent with spaces.
+                              default: true
+  -fFORMAT, --format=FORMAT   Specifies output format.
+                              default: md
+  -h, -?, --help, --usage     Show this message and exit.
+  -oFILE, --output=FILE       Set output file name.
+                              If set this option,
+                              --concat option will also set.
+  -tSTOP, --tabstop=STOP      Specifies how many spaces
+                              per indent depth.
+                              default: 2
 
  formats:
   md    Markdown
@@ -20,30 +31,72 @@ Usage: rweave [command]... source.wrb...
 end
 
 def main
-  options = {}
+  options = {c: false, e: true, f: 'md', t: 2}
   begin
     GetoptLong.new.set_options(
-      %w/-h -? --help --usage/ << GetoptLong::NO_ARGUMENT,
+      %w/-c --concat/ << GetoptLong::OPTIONAL_ARGUMENT,
+      %w/-e --expandtab/ << GetoptLong::OPTIONAL_ARGUMENT,
       %w/-f --format/ << GetoptLong::REQUIRED_ARGUMENT,
+      %w/-h -? --help --usage/ << GetoptLong::NO_ARGUMENT,
+      %w/-o --output/ << GetoptLong::REQUIRED_ARGUMENT,
+      %w/-t --tabstop/ << GetoptLong::REQUIRED_ARGUMENT,
     ).each_option do |name, value|
-      options[name.sub(/^--?/, '').gsub(/-/, '_').to_sym] = value
+      option = name.sub(/^--?/, '').gsub(/-/, '_')
+      if %w/c e/.member? option then
+        case value
+        when '', /^t(r(ue?)?)?$/, /^y(es?)?$/
+          value = true
+        when /^f(a(l(se?)?)?)?$/, /^no?$/
+          value = false
+        else
+          raise "unrecognized value #{name}=#{value}"
+        end
+      elsif %w/t/.member? option then
+        value = value.to_i
+      end
+      options[option.to_sym] = value
     end
   rescue GetoptLong::Error
     usage
   end
 
   usage if ARGV.length == 0 or options.member? :h
-  ARGV.each do |ifname|
-    inst = Literate::Programming.new File.open(ifname, 'r').read
-    case options[:f]
-    when 'md', nil
-      ofname = File.dirname(ifname) + '/' + File.basename(ifname, '.wrb') + '.md'
-      File.open(ofname, 'w').write inst.to_md
-    when 'tex'
-      ofname = File.dirname(ifname) + '/' + File.basename(ifname, '.wrb') + '.tex'
-      File.open(ofname, 'w').write inst.to_tex
+  if options.member? :o or options.member? :c then
+    inst = Literate::Programming.new ARGV.collect { |path|
+      File.open(path, 'r').read
+    }.join($/), tabstop: options[:t], expandtab: options[:e]
+    if options.member? :o then
+      case options[:f]
+      when 'md'
+        File.open(options[:o], 'w').write inst.to_md
+      when 'tex'
+        File.open(options[:o], 'w').write inst.to_tex
+      else
+        raise 'unknown format ' + options[:f]
+      end
     else
-      raise 'unknown format ' + options[:f]
+      case options[:f]
+      when 'md'
+        File.open('a.md', 'w').write inst.to_md
+      when 'tex'
+        File.open('a.tex', 'w').write inst.to_tex
+      else
+        raise 'unknown format ' + options[:f]
+      end
+    end
+  else
+    ARGV.each do |ifname|
+      inst = Literate::Programming.new File.open(ifname, 'r').read, tabstop: options[:t], expandtab: options[:e]
+      case options[:f]
+      when 'md'
+        ofname = File.dirname(ifname) + '/' + File.basename(ifname, '.wrb') + '.md'
+        File.open(ofname, 'w').write inst.to_md
+      when 'tex'
+        ofname = File.dirname(ifname) + '/' + File.basename(ifname, '.wrb') + '.tex'
+        File.open(ofname, 'w').write inst.to_tex
+      else
+        raise 'unknown format ' + options[:f]
+      end
     end
   end
 end

data/lib/literate/programming.rb

@@ -2,9 +2,12 @@ require "literate/programming/version"
 
 module Literate
   class Programming
-    def initialize(src = "", source: nil, tabstop: 2)
+    attr_writer :tabstop, :expandtab
+
+    def initialize(src = "", source: nil, tabstop: 2, expandtab: true)
       @source = source || src
       @tabstop = tabstop
+      @expandtab = expandtab
       @eval_context = BasicObject.new
       @eval_context.instance_eval <<-EOC
         def gensym
@@ -13,6 +16,14 @@ module Literate
       EOC
     end
 
+    def inspect
+      return "#<Literate::Programming:0x#{object_id.to_s(16)} tabstop=#{@tabstop} expandtab=#{@expandtab}>"
+    end
+
+    def <<(append)
+      @source << append
+    end
+
     def to_ruby
       convert[:rb]
     end
@@ -25,6 +36,7 @@ module Literate
       convert[:tex]
     end
 
+   private
     def convert
       current_mode = :text
       md = ""
@@ -94,11 +106,11 @@ module Literate
       end
       if current_mode == :code then
         case operator
-          when :assign
-            table[current_label] = current_code
-          when :append
-            table[current_label] ||= ''
-            table[current_label] << $/ << current_code
+        when :assign
+          table[current_label] = current_code
+        when :append
+          table[current_label] ||= ''
+          table[current_label] << $/ << current_code
         end
         md << '```' << $/
         tex << '\\end{lstlisting}' << $/
@@ -164,7 +176,7 @@ module Literate
     end
 
     def indent_code(code)
-      indent_level_stack = [-@tabstop]
+      indent_level_stack = [-1]
       ret = ''
       code.split($/).each do |line|
         ret, indent_level_stack = pretty_print_ruby ret, indent_level_stack, line
@@ -179,7 +191,7 @@ module Literate
       text.split($/).each do |line|
         if mode == :text and line.match /^```/ then
           mode = :code
-          indent_level_stack = [-@tabstop]
+          indent_level_stack = [-1]
           ret << line << $/
         elsif mode == :text then
           ret << line << $/
@@ -200,7 +212,7 @@ module Literate
       text.split($/).each do |line|
         if mode == :text and line.match /^\\begin{lstlisting}/ then
           mode = :code
-          indent_level_stack = [-@tabstop]
+          indent_level_stack = [-1]
           ret << line << $/
         elsif mode == :text then
           ret << line << $/
@@ -220,12 +232,14 @@ module Literate
       elsif line.match /\b(end)\b/ then
         current_indent_level = indent_level_stack.pop
       else
-        current_indent_level = indent_level_stack[-1] + @tabstop
+        current_indent_level = indent_level_stack[-1] + 1
       end
       if line.match /^[ \t]*$/ then
         buffer << $/
+      elsif @expandtab then
+        buffer << ' ' * current_indent_level * @tabstop << line << $/
       else
-        buffer << ' ' * current_indent_level << line << $/
+        buffer << '\t' * current_indent_level << line << $/
       end
       if line.match /^[ \t]*(begin|class|def|for|while|module)\b/
         indent_level_stack.push current_indent_level

data/lib/literate/programming/version.rb

@@ -1,5 +1,5 @@
 module Literate
   class Programming
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: literate-programming
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - pixie-grasper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler