asciibuild 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f0d3264aa30a500f47d5f70ffa5f56c98c6db05
-  data.tar.gz: 676e1d167b275043f72ae25b2c93e50f84a2387c
+  metadata.gz: 922338459b20622c2db13aa5385780ab9e7bbdf4
+  data.tar.gz: ae4a575e4dae19ccd3d4b857a158d1fb4d0d93eb
 SHA512:
-  metadata.gz: 3e446ff07ce75a594d15da1d8a10319d0b29e1d1240c144c6af5e329107a8e605234a37b7213b0f8e684e6004a04f8a046607f5f35357178f91b653144c0d35c
-  data.tar.gz: c585d03b22f012322152df6f0fa3795c763214e6a65a8d3f9a1ea3e2e2dd2752953f3f4d938af1d569d167c167abf1f3b653a3ec1b54026aa0571e4151fd34f7
+  metadata.gz: 67661b19371cbcb7752babe66d80315f1ccd2471f4dea93d9d0279857726850f97885c4c4439eaab936b72b29a9cf9956c0ebfe0a232716a309cd408858ae5ea
+  data.tar.gz: 3932987a2e67af25533e95c761085d15bf9776bc06bfe980d5f7d664958b75523661dba80e00925a2804e04bc104c6604d8c5122856676f7bbe6c15d4b685f81

data/lib/asciibuild/extensions.rb

@@ -32,7 +32,7 @@ def get_lang lang
 end
 
 def write_file attrs, default_name, body
-  name = if attrs['file'] then attrs['file'] else default_name end
+  name = attrs['file'] ||= default_name
   mode = if attrs['overwrite'] == 'false' then File::WRONLY|File::CREAT|File::EXCL else 'w' end
   open(name, mode) do |f|
     f.write(body + "\n")
@@ -162,6 +162,13 @@ module Asciibuild
       end
 
       def process parent, reader, attrs
+        lang = get_lang attrs[2]
+        doctitle = parent.document.attributes['doctitle']
+        if not attrs['title']
+          attrs['title'] = lang
+        end
+        attrs['original_title'] = attrs['title']
+
         if not include_section?(parent, attrs)
           if parent.document.attributes["error"]
             puts "Section \"#{parent.title}\" skipped due to previous error."
@@ -175,8 +182,6 @@ module Asciibuild
           return create_open_block parent, ["[source,#{lang}]", "----"] + reader.lines + ["----"], attrs
         end
 
-        doctitle = parent.document.attributes["doctitle"]
-        attrs['original_title'] = attrs['title']
         body = Mustache.render(reader.read, parent.document.attributes)
 
         lines = []
@@ -187,8 +192,9 @@ module Asciibuild
           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
-          "docker build -t #{attrs['image']} #{attrs['build_opts']} -f #{name} ."
+          "docker build -t #{attrs['image']} #{attrs['build_opts']} -f #{fname} ."
         when 'erlang'
           write_file attrs, 'escript.erl', body
           "escript #{name} #{attrs['escript_opts']}"
@@ -196,16 +202,17 @@ module Asciibuild
           "pyspark #{attrs['spark_opts']}"
         when 'spark-shell'
           "spark-shell #{attrs['spark_opts']}"
+        when 'bash'
+          "bash -exs #{attrs['bash_opts']}"
         else
-          if attrs['container']
-            name = if attrs['container'] == 'true' then doctitle else attrs['container'] end
-            container_id = parent.document.attributes["#{name} container"]
-            "docker exec -i #{container_id} #{attrs['exec_opts']} #{attrs[2]}"
-          else
-            attrs[2]
-          end
+          attrs[2]
+        end
+        # Check to see if we run inside a container
+        if attrs['container']
+          name = if attrs['container'] == 'true' then doctitle else attrs['container'] end
+          container_id = parent.document.attributes["#{name} container"]
+          cmd = "docker exec -i #{container_id} #{attrs['exec_opts']} #{cmd}"
         end
-        lang = get_lang attrs[2]
 
         lines = ["[source,#{lang}]", "----", body, "", "----"]
 

metadata

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