org-converge 0.0.3 → 0.0.4

data/README.md

@@ -24,6 +24,8 @@ that one ought to be able to reproduce.
 
 # Example usage
 
+Inspecting the files that would be tangled:
+
 	$ org-converge spec/converge_examples/basic_tangle/setup.org --showfiles 
 	
 	---------- conf.yml --------------
@@ -35,6 +37,8 @@ that one ought to be able to reproduce.
      host: somewhere-example.local
 	 password: 111111111
 	 
+Executing the tangle:
+	 
 	$ org-converge spec/converge_examples/basic_tangle/setup.org --tangle
 	
 	I, [2014-03-24T00:21:08.073506 #660]  INFO -- : Tangling 1 files...
@@ -42,6 +46,51 @@ that one ought to be able to reproduce.
     I, [2014-03-24T00:21:08.075562 #660]  INFO -- : END(conf.yml): done.
     I, [2014-03-24T00:21:08.075638 #660]  INFO -- : Tangling succeeded!
 
+Run the code blocks in sequence:
+
+    $ org-converge spec/converge_examples/runlist_example/setup.org --runmode=sequential
+	I, [2014-04-02T01:18:17.336255 #65462]  INFO -- : Tangling 0 files...
+	I, [2014-04-02T01:18:17.336376 #65462]  INFO -- : Tangling succeeded!
+	I, [2014-04-02T01:18:17.336698 #65462]  INFO -- : Tangling 2 scripts within directory: /Users/mariko/repos/org-converge/run...
+	I, [2014-04-02T01:18:17.340638 #65462]  INFO -- : sh(65466) -- started with pid 65466
+	I, [2014-04-02T01:18:22.365128 #65462]  INFO -- : sh(65466) -- exited with code 0
+	I, [2014-04-02T01:18:22.398983 #65462]  INFO -- : ruby(65469) -- started with pid 65469
+	I, [2014-04-02T01:18:23.013195 #65462]  INFO -- : ruby(65469) -- exited with code 0
+	I, [2014-04-02T01:18:23.013354 #65462]  INFO -- : Run has completed successfully.
+
+Running the code blocks in parallel mode is also possible:
+
+    $ org-converge spec/converge_examples/basic_run_example/setup.org --runmode=parallel
+	
+	I, [2014-04-02T01:16:27.660259 #65126]  INFO -- : Tangling 0 files...
+	I, [2014-04-02T01:16:27.660390 #65126]  INFO -- : Tangling succeeded!
+	I, [2014-04-02T01:16:27.661640 #65126]  INFO -- : Running code blocks now! (3 runnable blocks found in total)
+	I, [2014-04-02T01:16:27.732659 #65126]  INFO -- : sh(65157)     -- started with pid 65157
+	I, [2014-04-02T01:16:27.732819 #65126]  INFO -- : ruby(65158)   -- started with pid 65158
+	I, [2014-04-02T01:16:27.732915 #65126]  INFO -- : python(65160) -- started with pid 65160
+	I, [2014-04-02T01:16:27.733565 #65126]  INFO -- : sh(65157)     -- Writing! 1
+	I, [2014-04-02T01:16:27.771819 #65126]  INFO -- : sh(65157)     -- Writing! 2
+	I, [2014-04-02T01:16:27.914407 #65126]  INFO -- : python(65160) -- 0
+	I, [2014-04-02T01:16:27.914674 #65126]  INFO -- : python(65160) -- 1
+	I, [2014-04-02T01:16:27.914887 #65126]  INFO -- : python(65160) -- 2
+	I, [2014-04-02T01:16:27.921333 #65126]  INFO -- : python(65160) -- exited with code 0
+	I, [2014-04-02T01:16:33.226998 #65126]  INFO -- : ruby(65158)   -- And now writing! 0
+	I, [2014-04-02T01:16:33.227257 #65126]  INFO -- : ruby(65158)   -- And now writing! 1
+	I, [2014-04-02T01:16:33.227458 #65126]  INFO -- : ruby(65158)   -- And now writing! 2
+	I, [2014-04-02T01:16:33.227673 #65126]  INFO -- : ruby(65158)   -- And now writing! 3
+	I, [2014-04-02T01:16:33.248160 #65126]  INFO -- : ruby(65158)   -- And now writing! 4
+	I, [2014-04-02T01:16:33.248378 #65126]  INFO -- : ruby(65158)   -- And now writing! 5
+	I, [2014-04-02T01:16:33.248552 #65126]  INFO -- : ruby(65158)   -- And now writing! 6
+	I, [2014-04-02T01:16:33.301512 #65126]  INFO -- : ruby(65158)   -- And now writing! 7
+	I, [2014-04-02T01:16:33.301877 #65126]  INFO -- : ruby(65158)   -- And now writing! 8
+	I, [2014-04-02T01:16:33.302186 #65126]  INFO -- : ruby(65158)   -- And now writing! 9
+	I, [2014-04-02T01:16:33.363135 #65126]  INFO -- : ruby(65158)   -- exited with code 0
+	I, [2014-04-02T01:16:36.736210 #65126]  INFO -- : sh(65157)     -- Writing! 3
+	I, [2014-04-02T01:16:41.747375 #65126]  INFO -- : sh(65157)     -- Writing! 4
+	I, [2014-04-02T01:16:47.754810 #65126]  INFO -- : sh(65157)     -- Writing! 5
+	I, [2014-04-02T01:16:50.764513 #65126]  INFO -- : sh(65157)     -- exited with code 0
+	I, [2014-04-02T01:16:50.764636 #65126]  INFO -- : Run has completed successfully.
+
 # How it works
 
 Org Converge uses an liberally extended version of Org Babel
@@ -52,9 +101,6 @@ For example, using Org Babel and macros we can easily spread config
 files on a server by writing the following on a `server.org` file.
 
 ```org
-    #+MACRO: multitenancy_enabled true
-    #+MACRO: status_port true
-    
     #+begin_src yaml :tangle /etc/component.yml
     multitenant: false
     status_port: 10004
@@ -68,24 +114,11 @@ the correct permissions):
   $ org-converge server.org
 ```
 
-This leverages on the syntax already provided by Org Babel, but one
-difference here is that if we run it once again without changes...
-
-```sh
-  $ org-converge server.org
-```
-
-...it would finish soon since the configuration has already converged.
-
 Next, let's say that we no only one want to set the configured templates,
 but that we also want to install some packages. In that case, we
 should be able to do the following:
 
 ```org
-    #+macro: multitenancy_enabled true
-    #+macro: status_port  true
-    #+macro: project_path path/to/project
-
     * Configuring the component
 
     #+begin_src yaml :tangle /etc/component.yml
@@ -98,30 +131,24 @@ should be able to do the following:
     Need the following so that ~bundle install~ can compile 
     the native extensions correctly.
 
-    #+begin_src sh
+    #+begin_src sh :shebang #!/bin/bash
     apt-get install build-essentials -y
     #+end_src
 
     Then the following should work:
 
-    #+begin_src sh
+    #+begin_src sh :shebang #!/bin/bash
     cd {{{project_path}}}
     bundle install
     #+end_src
 ```
 
 As long as the repo has been already checked out in the directory,
-the previous example will succeed.
-
-```sh
-  org-converge server.org
-```
-
-If that is not the case, then org-converge will fail
-and pickup from that last step.
+the previous example will succeed. Note that we are also setting 
+the `:shebang` on the scripts so that the script is executable.
 
-More practical examples can be found in the examples directory, more will be added as
-long as dogfooding from this goes well.
+More practical examples can be found in the examples directory. 
+Many more will be added as long as dogfooding from this goes well.
 
 # Contributing
 

data/lib/org-converge/babel_output_buffer.rb

@@ -46,12 +46,15 @@ module Orgmode
           # Need to keep track of the options from a block before running it
           @scripts[@scripts_counter][:header] = { 
             :shebang => line.block_header_arguments[':shebang'],
-            :mkdirp  => line.block_header_arguments[':mkdirp']
+            :mkdirp  => line.block_header_arguments[':mkdirp'],
+            :name    => line.properties['block_name']
           }
           @scripts[@scripts_counter][: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
+          # pass
         end
       end
 
@@ -64,7 +67,7 @@ module Orgmode
         # into a runnable script
         @buffer << line.output_text << "\n"
       when (!@buffer.empty? and not (line.begin_block? or line.assigned_paragraph_type == :code))
-        # Fix indentation and remove pre fix commas from Org mode before flushing
+        # Fix indentation and remove fix commas from Org mode before flushing
         strip_code_block!
         @scripts[@scripts_counter][:lines] << @buffer
         @buffer = ''

data/lib/org-converge/command.rb

@@ -69,7 +69,8 @@ module OrgConverge
         with_running_engine do |engine|
           file = File.expand_path("#{@run_dir}/#{key}")
           cmd = "#{script[:lang]} #{file}"
-          engine.register script[:lang], cmd, { :cwd => @root_dir, :logger => logger }
+          display_name = script[:header][:name] || script[:lang]
+          engine.register display_name, cmd, { :cwd => @root_dir, :logger => logger }
         end
       end
       logger.info "Run has completed successfully.".green
@@ -83,7 +84,8 @@ module OrgConverge
       babel.ob.scripts.each do |key, script|
         file = File.expand_path("#{@run_dir}/#{key}")
         cmd = "#{script[:lang]} #{file}"
-        @engine.register script[:lang], cmd, { :cwd => @root_dir, :logger => logger }
+        display_name = script[:header][:name] || script[:lang]
+        @engine.register display_name, cmd, { :cwd => @root_dir, :logger => logger }
       end
       logger.info "Running code blocks now! (#{babel.ob.scripts.count} runnable blocks found in total)"
       @engine.start

data/lib/org-converge/engine.rb

@@ -4,6 +4,7 @@
 #
 require 'foreman/engine'
 require 'foreman/process'
+require 'tco'
 
 module OrgConverge
   class Engine < Foreman::Engine
@@ -11,6 +12,8 @@ module OrgConverge
     attr_reader :logger
     attr_reader :babel
 
+    RAINBOW = ["#622e90", "#2d3091", "#00aaea", "#02a552", "#fdea22", "#eb443b", "#f37f5a"]
+
     def initialize(options={})
       super(options)
       @logger = options[:logger] || Logger.new(STDOUT)
@@ -35,7 +38,7 @@ module OrgConverge
         reader, writer = create_pipe
         begin
           pid = process.run(:output => writer)
-          @names[process] = "#{@names[process]}(#{pid})"
+          @names[process] = "#{@names[process]}.#{pid}"
           writer.puts "started with pid #{pid}"
         rescue Errno::ENOENT
           writer.puts "unknown command: #{process.command}"
@@ -55,10 +58,9 @@ module OrgConverge
 
     def output(name, data)
       data.to_s.lines.map(&:chomp).each do |message|
-
         # FIXME: In case the process has finished before its lines where flushed
-        ps = name.empty? ? '<defunct>' : name.split('.').first
-        output  = "#{pad_process_name(ps)}".yellow
+        ps, pid = name.empty? ? '<defunct>' : name.split('.')
+        output  = "#{pad_process_name(ps)}(#{pid})".fg get_color_for_pid(pid.to_i)
         output += " -- "
         output += message
         # FIXME: When the process has stopped already,
@@ -80,6 +82,10 @@ module OrgConverge
     def pad_process_name(name)
       name.ljust(name_padding, " ")
     end
+
+    def get_color_for_pid(pid)
+      RAINBOW[pid % 7]
+    end
   end
 
   class CodeBlockProcess < Foreman::Process; end

data/lib/org-converge/version.rb

@@ -1,3 +1,3 @@
 module OrgConverge
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/org-converge.gemspec

@@ -17,4 +17,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('docopt', '0.5.0')
   gem.add_runtime_dependency('org-ruby', '~> 0.9.2')
   gem.add_runtime_dependency('foreman', '~> 0.63.0')
+  gem.add_runtime_dependency('tco', '~> 0.1.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: org-converge
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
-  requirement: &70113563924580 !ruby/object:Gem::Requirement
+  requirement: &70205749443760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70113563924580
+  version_requirements: *70205749443760
 - !ruby/object:Gem::Dependency
   name: org-ruby
-  requirement: &70113563923840 !ruby/object:Gem::Requirement
+  requirement: &70205749424220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70113563923840
+  version_requirements: *70205749424220
 - !ruby/object:Gem::Dependency
   name: foreman
-  requirement: &70113563921200 !ruby/object:Gem::Requirement
+  requirement: &70205749407080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,18 @@ dependencies:
         version: 0.63.0
   type: :runtime
   prerelease: false
-  version_requirements: *70113563921200
+  version_requirements: *70205749407080
+- !ruby/object:Gem::Dependency
+  name: tco
+  requirement: &70205749404660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70205749404660
 description: A light configuration management tool for Org mode
 email:
 - waldemar.quevedo@gmail.com