asciibuild 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2c30824fc02df2f417b338f1009740077fcb7d9
-  data.tar.gz: 98f4fdaaaacd26c26ef375dd99a117f21a8ac4ec
+  metadata.gz: d25e361a066c8441cf36861379f0fbd8267ca4b0
+  data.tar.gz: 1ddd0ac9f4239d900eca176ee6476f8de099c82a
 SHA512:
-  metadata.gz: 8ce5ac3266186050381a94ad654102847f522a0c9109aca74616d88dc0eae2480ba219549f5a4492892cd4ac8d7275547c5d0964e0353685597517e9f65b2bf4
-  data.tar.gz: 779badcf11c72d88359a2088beeb1d52f7e79b9cc687381258d73010b0c885a5bf4eb38634008a973c0faf4cc6371eb2de4f5a1055a1d1a7b2941ce95a5c1fde
+  metadata.gz: 6ad1c41326d6ac1581e7490c52161adee5be8aedf898088c82ec5aeb8eab7b6a53cfd650ac837343cb6ab525f459761ae7e19aac5866fb4b3e35811fb94e937e
+  data.tar.gz: 38d9561df46e46c17d21a64f50181139726bef4d071af0c9ff35f03b4cd764eb350622f04ab9823e1a72f1a293863ce1488ecb4301acd41ba7ef17d8b8b41916

data/bin/asciibuild

@@ -26,6 +26,9 @@ options = {
 OptionParser.new do |opts|
   opts.banner = "Usage: asciibuild [options] file.adoc..."
 
+  opts.on('-d', '--outdir DIR', 'Directory to output processed documents to') do |d|
+    options[:to_dir] = d
+  end
   opts.on('-s', '--stylesheet NAME', 'Stylesheet name') do |v|
     attrs["stylesheet"] = find_stylesheet(v)
   end
@@ -56,7 +59,8 @@ ARGV.each do |f|
   basedir = File.join options[:to_dir], dirname
   options[:to_dir] = basedir
   attrs["outdir"] = basedir
-  options[:to_file] = "#{basename}-#{Time.now.getutc.to_i}.html"
+  outfile = "#{basename}-#{Time.now.getutc.to_i}.html"
+  options[:to_file] = outfile
 
   Asciidoctor.convert_file f, options
 end

data/lib/asciibuild/extensions.rb

@@ -37,6 +37,8 @@ def get_lang lang
     'python'
   when 'spark-shell'
     'scala'
+  when 'docker-compose'
+    'yaml'
   else
     lang
   end
@@ -48,6 +50,7 @@ def write_file attrs, default_name, body
   open(name, mode) do |f|
     f.write(body + "\n")
   end
+  name
 end
 
 def normalize parent, attrs, lines
@@ -224,24 +227,30 @@ module Asciibuild
         stderr_lines = []
 
         cmd = case attrs[2]
+        when 'bash'
+          "bash -exs #{attrs['bash_opts']}"
         when 'Dockerfile'
           if not attrs['image']
             raise 'Missing image name. Add attribute of image={name} to the [asciibuild,Dockerfile] style.'
           end
-          fname = attrs['file'] ||= 'Dockerfile'
-          write_file attrs, 'Dockerfile', body
+          fname = write_file attrs, 'Dockerfile', body
           "docker build -t #{attrs['image']} #{attrs['build_opts']} -f #{fname} ."
+        when 'docker-compose'
+          dc_cmd = attrs['command'] ||= 'build'
+          fname = write_file attrs, 'docker-compose.yml', body
+          "docker-compose -f #{fname} #{compose_opts} #{dc_cmd}"
         when 'erlang'
-          write_file attrs, 'escript.erl', body
-          "escript #{name} #{attrs['escript_opts']}"
+          fname = write_file attrs, 'escript.erl', body
+          "escript #{fname} #{attrs['escript_opts']}"
+        when 'Makefile'
+          "make -f - #{attrs['make_opts']} #{attrs['target']}"
         when 'pyspark'
           "pyspark #{attrs['spark_opts']}"
         when 'spark-shell'
           "spark-shell #{attrs['spark_opts']}"
-        when 'bash'
-          "bash -exs #{attrs['bash_opts']}"
         else
-          attrs[2]
+          opts = attrs["#{attrs[2]}_opts"]
+          "#{attrs[2]} #{opts}"
         end
         # Check to see if we run inside a container
         if attrs['container']
@@ -274,7 +283,7 @@ module Asciibuild
             lines << line.chomp
           end
           while line=stderr.gets do
-            puts line
+            STDERR.puts line
             stderr_lines << line.chomp
           end
 
@@ -299,7 +308,6 @@ module Asciibuild
 
         after_end cmd, parent, normalize(parent, attrs, lines), attrs
       end
-
     end
 
     Asciidoctor::Extensions.register do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciibuild
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jon Brisbin