org-converge 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd70719da7320b3897953946f0a2963b7357af63
-  data.tar.gz: 7132c1734caa2456114f35c029dad12615188073
+  metadata.gz: 80a71a84d944ea98cb325e2480e14143b116f475
+  data.tar.gz: 76039b9b0128a1234831a9c72f790d28ac4a0cf8
 SHA512:
-  metadata.gz: a11513f0b8d6395a12cf9372d8ebc5fcbf7afeb45ff2dffae3bb6230b3137c4c163b3eea5282ff895793d4d00854345a2d7352d28d3a7ab5ba5987ca2ac7f329
-  data.tar.gz: 50ef8e63011189ffd2f02dacbb4f32357b2b4d8c2ad410611a2b79eb4873ed282a95877e1f5a6b5e748bf6d538a99d7f95b9998ce9d7e9ef4b819056983b6045
+  metadata.gz: 3f5742da864b2ace8cd17435ee42e07262996fc19c4c60e42a06fb6165336449d8bd8c1f754e21a96fb5ca092ed147852a541e5afab4184e9e572a745d423669
+  data.tar.gz: 3159fa01c575fe5bff5ff51ea1837cfd44f54879cdca9207fcc3f61c7ef8b5dce25f8521163f991d7f3ff82ed0665839581b68d9c92cc094e99a1f3f95b883df

data/lib/org-converge/babel_output_buffer.rb

@@ -67,7 +67,8 @@ module Orgmode
             :after   => line.block_header_arguments[':after'],
             :procs   => line.block_header_arguments[':procs'],
           }
-          @scripts[@scripts_counter][:lang] = line.block_lang
+          @scripts[@scripts_counter][:lang] = normalize_lang(line.block_lang)
+          
         # TODO: have a way to specify which are the default binaries to be used per language
         # when binary_detected?(@block_lang)
         else
@@ -126,5 +127,19 @@ module Orgmode
         "#{$1}#{$3}#{$4}"
       end
     end
+
+    # TODO: This should be done with something which inspects the system for binaries
+    #       or by parsing the path to the binary from the :shebang
+    private
+    def normalize_lang(lang)
+      case lang
+      when 'js'
+        'node'
+      when 'sh'
+        'bash'
+      else
+        lang
+      end
+    end
   end
 end

data/lib/org-converge/version.rb

@@ -1,3 +1,3 @@
 module OrgConverge
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/converge_examples/basic_run_example/setup.org

@@ -6,7 +6,7 @@ with all output being flushed to the screen.
 - Count some numbers with bash
 
 #+name: bash_counter
-#+begin_src bash :shebang #!/bin/bash
+#+begin_src sh :shebang #!/bin/bash
 echo '' > out.log
 for i in `seq 1 5`; do 
 echo "Writing! $i"

data/spec/converge_examples/linked_tasks/tasks.org

@@ -9,7 +9,7 @@ With ~:after first~, the ~second~ block becomes
 a prerequisite of the ~first~ block.
 
 #+name: second
-#+begin_src bash :after first
+#+begin_src sh :after first
 for i in `seq 5 10`; do 
   echo $i >> out.log
 done
@@ -35,7 +35,7 @@ The same with ~:before all~, this would be executed
 at the beginning.
 
 #+name: prologue
-#+begin_src bash :before first :results output
+#+begin_src sh :before first :results output
 echo "init" > out.log
 #+end_src
 

data/spec/converge_examples/runlist_example/setup.org

@@ -5,7 +5,7 @@
 In this example, we will have scripts being chained one after another.
 
 #+name: first
-#+begin_src bash :shebang #!/bin/bash
+#+begin_src sh :shebang #!/bin/bash
 sleep 5
 echo "first" > out.log
 #+end_src

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: org-converge
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Waldemar Quevedo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt