org-converge 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f820b2bd05b18d9597ca859f80704b1375b8e78b
-  data.tar.gz: 150113c16bad5a6aa993e2dd6ab20aad39e78620
+  metadata.gz: 6cf889f8ef7be8359861d16b9c6ce2a686de0044
+  data.tar.gz: 6cda1842ca4d7862c7f8365c307c3e529e64e206
 SHA512:
-  metadata.gz: f9d49510cbafe950e8e846ef3bc4113c5cacc647ed26e0c2dff5f1d8183b79ebe1eef613a79cb7906230d276a91db15e9d6d5b5a50803b49b5a727106800d9b2
-  data.tar.gz: df152bb016b5438a2fc8cd919fc4b7cbb9647c9f5791b0ff060caa0dce9728103df833db07825ea143b16ecc2b9fd01be400dca825c719c7229fe9177db16bbf
+  metadata.gz: c7148d17f782828501fe134b62eef994acec46de820d4de785ca9365831d9f28156e21cdf4e24c30b7bf148f6957b7a834dcce82cca1f6a3263708174f940397
+  data.tar.gz: 322e52f96e1283746958de21cd84e4db78e069cd2eb9bfd8bbf727516f9ee0bbaeed0107af04497ec9dae103a33d6041a39df41cfe8c11614f754e38bf88bb01

data/README.org

@@ -47,13 +47,13 @@
 
 #+begin_src sh
   ,#+TITLE: Sample parallel run
-  
+  　
   ,#+name: infinite-worker-in-ruby
   ,#+begin_src ruby
   $stdout.sync = true
   loop { puts "working!"; sleep 1; }
   ,#+end_src
-  
+  　
   ,#+name: infinite-worker-in-python
   ,#+begin_src python :procs 2
   import sys
@@ -92,22 +92,22 @@
 #+begin_src sh
   ,#+TITLE:   Sample sequential run
   ,#+runmode: sequential
-  
+  　
   ,#+name: first
   ,#+begin_src sh
   echo "first"
   ,#+end_src
-  
+  　
   ,#+name: second
   ,#+begin_src sh
   echo "second"
   ,#+end_src
-  
+  　
   ,#+name: third
   ,#+begin_src sh
   echo "third"
   ,#+end_src
-  
+  　
   ,#+name: fourth
   ,#+begin_src sh
   echo "fourth"
@@ -149,9 +149,9 @@
     config files on a server by writing the following on a ~server.org~ file...
 
 #+begin_src sh
-
+　
 Configuration for a component that shoul be run in multitenant mode:
-
+　
 ,#+begin_src yaml :tangle /etc/component.yml
 multitenant: false
 status_port: 10004
@@ -161,6 +161,10 @@ status_port: 10004
     Then run:
 
    : sudo org-tangle server.org
+   
+   *Note:* The above tangle command is a reimplementation of the tangling functionality from Org mode using Ruby.
+   If you are interested in tangling from the command line without losing functionality and have available a local Emacs Org mode install,
+   the following project can be useful: <https://github.com/ngirard/org-noweb>
 
 *** Idempotent runs
 
@@ -171,20 +175,20 @@ status_port: 10004
 
 #+begin_src sh
   ,** Installing the dependencies
-  
+  　
   Need the following so that ~bundle install~ can compile 
   the native extensions correctly.
-  　
+  　　
   ,#+name: build-essential-installed
   ,#+begin_src sh
   dpkg -l | grep build-essential
   ,#+end_src
-  　 
+  　 　
   ,#+name: build_essentials
   ,#+begin_src sh :unless build-essential-installed
   apt-get install build-essential -y
   ,#+end_src
-
+　　
   ,#+name: bundle_install
   ,#+begin_src sh
   cd project_path
@@ -197,11 +201,11 @@ status_port: 10004
 
 #+begin_src sh
   ,#+TITLE: Another setup
-  
+  　
   Include the code blocks from the server into this:
- 　
+ 　　
   ,#+include: "server.org"
-  
+  　
   ,#+name: install_org_mode
   ,#+begin_src sh
   apt-get install org-mode -y
@@ -229,19 +233,19 @@ it would be run sequentially with idempotency checks applied:
   ,#+TITLE:           Linked tasks example
   ,#+runmode:         tasks
   ,#+final_task:      final
-  
+  　
   ,#+name: second
   ,#+begin_src sh :after first
   for i in `seq 5 10`; do 
     echo $i >> out.log
   done
   ,#+end_src
-  
+  　
   ,#+name: first
   ,#+begin_src ruby
   5.times { |n| File.open("out.log", "a") {|f| f.puts n } }
   ,#+end_src
-  
+  　
   ,#+name: final
   ,#+begin_src python :after second :results output
   print "Wrapping up with Python in the end"
@@ -249,14 +253,14 @@ it would be run sequentially with idempotency checks applied:
   f.write('11')
   f.close()
   ,#+end_src
-  
+  　
   ,#+name: prologue
   ,#+begin_src sh :before first :results output
   echo "init" > out.log
   ,#+end_src
 #+end_src
 
-    : org-spec chained-example.org --runmode=chained
+    : org-run chained-example.org --runmode=chained
 
     Instead of using =--runmode= options, it is also possible to just declare in buffer
     that the Org file should be run chained mode.
@@ -288,8 +292,9 @@ it would be run sequentially with idempotency checks applied:
     This is done by using =:dir= in the code block header argument.
 
 #+begin_src sh
-  ,#+sshidentifyfile:	vagrant/keys/vagrant
+  ,#+sshidentityfile:	vagrant/keys/vagrant
   ,#+name: remote-bash-code-block
+  　
   ,#+begin_src sh :results output :dir /vagrant@127.0.0.1#2222:/tmp
   random_number=$RANDOM
   for i in `seq 1 10`; do echo "[$random_number] Running script is $0 being run from `pwd`"; done
@@ -306,14 +311,14 @@ it would be run sequentially with idempotency checks applied:
 
 #+begin_src sh
   ,#+TITLE:   Expected results example
-  　
+  　　
   ,#+name: hello
   ,#+begin_src ruby :results output
   10.times do 
     puts "hola"
   end
   ,#+end_src
-  　
+  　　
   ,#+RESULTS: hello
   ,#+begin_example
   hola

data/TODO

@@ -35,6 +35,12 @@ Some of these need further work on the Org Ruby parser.
 - [ ] =:cache true=
   Also part of the idempotency checks.
 - [ ] =:env= and =#+envfile:=
+- [ ] Create pools for running processes
+
+* [2/2] 0.0.17 
+
+- [X] Typos
+- [X] Override the =:dir= for remote processes
 
 * [1/1] 0.0.16
 

data/bin/org-converge

@@ -8,7 +8,7 @@ doc = <<OPTIONS
 org-converge: Run with idempotency checks.
 
 Usage:
-  org-converge <org_file> [--showfiles] [--log=<logfile>] [--root-dir=<root_dir>]
+  org-converge <org_file> [--showfiles] [--log=<logfile>] [--root-dir=<root_dir>] [--dir=<dir>]
 
 Options:
 

data/bin/org-run

@@ -8,7 +8,7 @@ doc = <<OPTIONS
 org-run: Run code blocks in parallel by default.
 
 Usage:
-  org-run <org_file> [--showfiles] [--log=<logfile>] [--root-dir=<root_dir>] [--runmode=<runmode>] [--name=<block_name>]
+  org-run <org_file> [--showfiles] [--log=<logfile>] [--root-dir=<root_dir>] [--runmode=<runmode>] [--name=<block_name>] [--dir=<dir>]
 
 Options:
 

data/lib/org-converge/command.rb

@@ -11,6 +11,7 @@ module OrgConverge
       @options   = options
       @dotorg    = options['<org_file>']
       @root_dir  = options['--root-dir']
+      @dir       = options['--dir']
       @run_dir   = if @root_dir
                      File.expand_path(File.join(@root_dir, 'run'))
                    else
@@ -368,6 +369,7 @@ module OrgConverge
         end
       end
 
+      script[:header][:dir] = @dir if @dir
       if script[:header][:procs]
         procs = script[:header][:procs].to_i
         1.upto(procs) do |i|

data/lib/org-converge/engine.rb

@@ -222,7 +222,7 @@ module OrgConverge
           ssh_options = { }
           ssh_options[:port]       = block_modifiers[:ssh][:port]
           ssh_options[:password]   = block_modifiers[:ssh][:password]   if block_modifiers[:ssh][:password]
-          ssh_options[:keys] = @babel.ob.in_buffer_settings['SSHIDENTIFYFILE'] if @babel.ob.in_buffer_settings['SSHIDENTIFYFILE']
+          ssh_options[:keys] = @babel.ob.in_buffer_settings['SSHIDENTITYFILE'] if @babel.ob.in_buffer_settings['SSHIDENTITYFILE']
           begin
             # SCP the script to run remotely and the binary used to run it
             binary, script = command.split(' ')

data/lib/org-converge/version.rb

@@ -1,3 +1,3 @@
 module OrgConverge
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/spec/converge_examples/remote_dir/remote-dir.org

@@ -1,5 +1,5 @@
 #+TITLE:		Remote runs
-#+sshidentifyfile:	vagrant/keys/vagrant
+#+sshidentityfile:	vagrant/keys/vagrant
 #+sshpassword:          vagrant
 #+startup:              showeverything
 

data/spec/converge_spec.rb

@@ -174,6 +174,21 @@ describe OrgConverge::Command do
     result.should == "within subdir\n"
   end
 
+  it "should be able to override chdir the process directory" do
+    example_dir = File.join(EXAMPLES_DIR, 'chdir')
+    setup_file = File.join(example_dir, 'override-dir.org')
+
+    o = OrgConverge::Command.new({ 
+                                   '<org_file>' => setup_file,
+                                   '--root-dir' => example_dir,
+                                   '--dir'      => "subdir"
+                                 })
+    success = o.execute!
+    success.should == true
+    result = File.open("#{example_dir}/subdir/out.log").read
+    result.should == "within subdir\n"
+  end
+
   it "should support idempotency checks via :if and :unless conditional clauses" do
     example_dir = File.join(EXAMPLES_DIR, 'idempotency')
     setup_file = File.join(example_dir, 'conditions.org')

data/vagrant.org

@@ -52,7 +52,7 @@ end
 
 #+name: vagrant-running
 #+begin_src sh
-vagrant status
+vagrant status | grep poweron
 #+end_src
 
 #+name: start_vagrant
@@ -80,9 +80,10 @@ fi
 #+begin_src sh :dir /vagrant@localhost#2222:/ :if running-in-ubuntu
 sudo apt-get update
 sudo apt-get install build-essentials emacs24-nox org-mode -y
+sudo apt-get install docker.io -y
 #+end_src
 
-**** Vagrantfile :: Docker provider
+**** COMMENT Vagrantfile :: Docker provider
 
 #+begin_src ruby :tangle docker/Vagrantfile :mkdirp true
 Vagrant.configure("2") do |config|
@@ -95,7 +96,7 @@ end
 #+begin_src conf :tangle docker/Dockerfile
 FROM ubuntu
 RUN  apt-get -y update
-RUN  apt-get -y install emacs24-nox org-mode
+RUN  apt-get -y install emacs24-nox
 #+end_src
 
 #+name: vagrant-docker-provider

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: org-converge
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Waldemar Quevedo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt