org-converge 0.0.7 → 0.0.8

data/README.org

@@ -2,45 +2,64 @@
 #+STARTUP:	showeverything
 
 * Org Converge
+
+[[https://secure.travis-ci.org/wallyqs/org-converge.png?branch=master]]
+
 ** Description
 
-  This attempts to be an experiment of using Org mode syntax to
-  describe, configure and setting up something, borrowing some ideas
-  of what is possible to do with tools like =chef-solo=, =puppet=,
-  =ansible=, etc...
+This attempts to be an experiment of using Org mode syntax to
+create documentable reproducible runs, borrowing some ideas
+of what is possible to do with tools like =chef-solo=,
+=rake=, =foreman=, etc...
+
+** Installing
+
+: gem install org-converge
 
 ** Motivation
 
-  The Org babel syntax has proven to be flexible enough to produce
-  /reproducible research/ papers. Then, I believe that configuring and setting up
-  a server for example is something that could be also be done using
-  the same syntax, given that /converging/ the configuration is something
-  that one ought to be able to reproduce.
+The Org babel syntax has proven to be flexible enough to writing
+/reproducible research/ papers. Then, I believe that configuring and setting up
+a server for example is something that could be also be done using
+the same syntax, given that /converging/ the configuration is something
+that one ought to be able to reproduce.
 
 ** Usage
 
-   To run the blocks in parallel:
+To run the blocks in parallel...
 
 #+begin_src sh
-org-converge path/to/setup-file.org
+org-converge path/to/setup-file.org --runmode=parallel
 #+end_src
 
-   Or sequentially:
+or sequentially...
 
 #+begin_src sh
 org-converge path/to/setup-file.org --runmode=sequential
 #+end_src
 
+By including ~:after~ or ~:before~ arguments to a block,
+it is possible to make the blocks depend on one another.
+
+#+begin_src sh
+org-converge path/to/setup-file.org --runmode=chained
+#+end_src
+
+*** Other commands available
+
+: org-run        # alias for org-converge
+: org-tangle     # just tangles the contents without running the blocks
+
 ** Quick example
 
-   The following is an example of running 3 processes
-   in parallel by defining them as code blocks from 
-   an Org mode file:
+The following is an example of running 3 processes
+in parallel by defining them as code blocks from 
+an Org mode file:
 
 #+begin_src sh
   ,#+TITLE: Running Org babel processes in parallel
    
-  * Print with different languages
+  ,* Print with different languages
    　
   ,#+name: hello_from_bash
   ,#+begin_src sh :shebang #!/bin/bash
@@ -64,96 +83,82 @@ org-converge path/to/setup-file.org --runmode=sequential
   ,#+end_src   
 #+end_src
 
-  We store this in a file named =hello.org= and then run it as follows:
+We store this in a file named =hello.org= and then run it as follows:
 
 #+begin_src sh
 org-converge hello.org
 #+end_src
 
-  This would produce an output similar to the following:
+This would produce an output similar to the following:
 
 #+begin_src sh
-I, [2014-04-17T23:48:44.663545 #1710]  INFO -- : Tangling 0 files...
-I, [2014-04-17T23:48:44.663698 #1710]  INFO -- : Tangling succeeded!
-I, [2014-04-17T23:48:44.664829 #1710]  INFO -- : Running code blocks now! (4 runnable blocks found in total)
-I, [2014-04-17T23:48:44.762899 #1710]  INFO -- : hello_from_bash       (1711) -- started with pid 1711
-I, [2014-04-17T23:48:44.808717 #1710]  INFO -- : hello_from_ruby       (1712) -- started with pid 1712
-I, [2014-04-17T23:48:44.837878 #1710]  INFO -- : hello_from_python     (1713) -- started with pid 1713
-I, [2014-04-17T23:48:44.878336 #1710]  INFO -- :                       (1714) -- started with pid 1714
-I, [2014-04-17T23:48:44.879284 #1710]  INFO -- : hello_from_bash       (1711) -- hello world from bash
-I, [2014-04-17T23:48:44.882778 #1710]  INFO -- : hello_from_ruby       (1712) -- hello world from ruby
-I, [2014-04-17T23:48:44.883637 #1710]  INFO -- : hello_from_python     (1713) -- hello world from python
-I, [2014-04-17T23:48:45.778681 #1710]  INFO -- : hello_from_bash       (1711) -- hello world from bash
-I, [2014-04-17T23:48:45.792321 #1710]  INFO -- : hello_from_ruby       (1712) -- hello world from ruby
-I, [2014-04-17T23:48:45.882020 #1710]  INFO -- : hello_from_python     (1713) -- hello world from python
-I, [2014-04-17T23:48:46.787106 #1710]  INFO -- : hello_from_bash       (1711) -- hello world from bash
-I, [2014-04-17T23:48:46.793347 #1710]  INFO -- : hello_from_ruby       (1712) -- hello world from ruby
-I, [2014-04-17T23:48:46.883511 #1710]  INFO -- : hello_from_python     (1713) -- hello world from python
-I, [2014-04-17T23:48:47.794846 #1710]  INFO -- : hello_from_ruby       (1712) -- hello world from ruby
-I, [2014-04-17T23:48:47.796387 #1710]  INFO -- : hello_from_bash       (1711) -- hello world from bash
-I, [2014-04-17T23:48:47.884196 #1710]  INFO -- : hello_from_python     (1713) -- hello world from python
+[2014-05-04T19:23:40 +0900] Tangling 0 files...
+[2014-05-04T19:23:40 +0900] Tangling succeeded!
+[2014-05-04T19:23:40 +0900] Tangling 3 scripts within directory: /Users/mariko/repos/org-converge/run...
+[2014-05-04T19:23:40 +0900] Running code blocks now! (3 runnable blocks found in total)
+[2014-05-04T19:23:40 +0900] hello_from_bash       (4664) -- started with pid 4664
+[2014-05-04T19:23:40 +0900] hello_from_ruby       (4665) -- started with pid 4665
+[2014-05-04T19:23:40 +0900] hello_from_python     (4666) -- started with pid 4666
+[2014-05-04T19:23:40 +0900] hello_from_bash       (4664) -- hello world from bash
+[2014-05-04T19:23:41 +0900] hello_from_ruby       (4665) -- hello world from ruby
+[2014-05-04T19:23:41 +0900] hello_from_python     (4666) -- hello world from python
+[2014-05-04T19:23:42 +0900] hello_from_ruby       (4665) -- hello world from ruby
 #+end_src
 
 ** How it works
 
-  Org Converge uses an liberally extended version of Org Babel
-  features in order to give support for converging the configuration
-  of a server.
+Org Converge uses an liberally extended version of Org Babel
+features in order to give support for converging the configuration
+of a server.
+
+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.
+
+#+begin_src sh
+,#+begin_src yaml :tangle /etc/component.yml
+multitenant: false
+status_port: 10004
+,#+end_src
+#+end_src
+
+And then configure it by running it as follows, (considering we have
+the correct permissions for tangling at =/etc/component.yml=): 
 
-  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.
+#+begin_src sh
+sudo org-converge server.org
+#+end_src
 
-  #+begin_src sh
-    ,#+begin_src yaml :tangle /etc/component.yml
-    multitenant: false
-    status_port: 10004
-    ,#+end_src
-  #+end_src
+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:
 
-  And then configure it by running it as follows, (considering we have
-  the correct permissions for tangling at =/etc/component.yml=): 
+#+begin_src sh
+,* Configuring the component
 
-  #+begin_src sh
-  sudo org-converge server.org
-  #+end_src
+,#+begin_src yaml :tangle /etc/component.yml
+multitenant: false
+status_port: 10004
+,#+end_src  
 
-  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:
+,* Installing the dependencies
 
-  #+begin_src sh
-  ,* Configuring the component
+Need the following so that ~bundle install~ can compile 
+the native extensions correctly.
 
-  ,#+begin_src yaml :tangle /etc/component.yml
-  multitenant: false
-  status_port: 10004
-  ,#+end_src  
-　
-  ,* Installing the dependencies
+,#+begin_src sh
+apt-get install build-essentials -y
+,#+end_src
 　
-  Need the following so that ~bundle install~ can compile 
-  the native extensions correctly.
+Then the following should work:
 　
-  ,#+begin_src sh
-  apt-get install build-essentials -y
-  ,#+end_src
-　
-  Then the following should work:
-　
-  ,#+begin_src sh
-  cd project_path
-  bundle install
-  ,#+end_src
-  #+end_src
-
-  As long as the repo has been already checked out in the directory, 
-  the previous example will succeed. 
-
-  More practical examples can be found [[https://github.com/wallyqs/org-converge/tree/master/examples][here]], more will be added as
-  long as dogfooding from this goes well.
+,#+begin_src sh
+cd project_path
+bundle install
+,#+end_src
+#+end_src
 
 ** Contributing
 
-  The project is in very early development at this moment, but if you
-  feel that it is interesting enough, please create a ticket so start
-  the discussion.
+The project is in very early development at this moment, but if you
+feel that it is interesting enough, please create a ticket to start
+the discussion.

data/TODO

@@ -5,7 +5,7 @@
 * [0/7] > 0.0.9 version
 
 - [ ] Macros can be loaded and applied to the configuration
-- [ ] Actually support converging and idempotency
+- [ ] Actually support converging and idempotency (~--runmode=idempotent~)
   + Do not do an operation unless it is required
   + Abort in case there was a failure in executing the script.
   + This would work by using the ~:cache true~ to a block header argument
@@ -16,9 +16,9 @@
 - [ ] Use :eval for evaling blocks (off by default)
 - [ ] Can use :dir for running a process relative to that directory
 
-* [0/1] 0.0.8 version
+* [1/1] 0.0.8 version
 
-- [ ] ~org-spec~ exploration
+- [X] ~org-spec~ exploration!
 
 * [2/2] 0.0.7 version
 

data/bin/org-spec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# -*- mode: ruby -*-
+require 'docopt'
+require 'org-converge'
+
+doc = <<OPTIONS
+
+org-spec: Validate whether code blocks match to the contents of the #+RESULTS block
+
+Usage:
+  org-spec <org_file> [--showfiles] [--log=<logfile>] [--root-dir=<root_dir>] [--name=<block_name>]
+
+Options:
+
+  -h --help               Show this screen.
+
+OPTIONS
+
+begin
+  require "pp"
+  cmd = Docopt::docopt(doc)
+rescue Docopt::Exit => e
+  puts e.message
+end
+
+exit 1 unless cmd
+
+o = OrgConverge::Command.new(cmd.merge({ '--runmode' => 'spec' }))
+o.execute!

data/lib/org-converge/babel_output_buffer.rb

@@ -23,9 +23,9 @@ module Orgmode
       # ~@scripts~ are tangled in order and ran
       # : @scripts = [text, text, ...]
       @scripts = Hash.new {|h,k| h[k] = {
-          :lines  => '',
-          :header => {},
-          :lang   => ''
+          :lines   => '',
+          :header  => {},
+          :lang    => ''
         }
       }
       @scripts_counter = 0
@@ -77,10 +77,13 @@ module Orgmode
       end
 
       case
+      when (line.start_of_results_code_block?)
+        @accumulate_results_block = true
       when (line.assigned_paragraph_type == :code and @current_tangle)
         # Need to keep track of the current tangle to buffer its lines
         @tangle[@current_tangle][:lines] << line.output_text << "\n"
-      when (line.assigned_paragraph_type == :code)
+      when (line.assigned_paragraph_type == :code  or \
+            line.paragraph_type == :inline_example)
         # When a tangle is not going on, it means that the lines would go
         # into a runnable script
         @buffer << line.output_text << "\n"
@@ -88,7 +91,12 @@ module Orgmode
                                      line.assigned_paragraph_type == :code))
         # Fix indentation and remove fix commas from Org mode before flushing
         strip_code_block!
-        @scripts[@scripts_counter][:lines] << @buffer
+        if @accumulate_results_block
+          @scripts[@scripts_counter - 1][:results] = @buffer
+          @accumulate_results_block = false
+        else
+          @scripts[@scripts_counter][:lines] << @buffer
+        end
         @buffer = ''
         @scripts_counter += 1
       end

data/lib/org-converge/command.rb

@@ -6,14 +6,21 @@ module OrgConverge
     attr_reader :engine
 
     def initialize(options)
-      @options = options
-      @dotorg  = options['<org_file>']
-      @root_dir = options['--root-dir']
-      @run_dir  = if @root_dir
-                    File.expand_path(File.join(@root_dir, 'run'))
-                  else
-                    File.expand_path('run')
-                  end
+      @options   = options
+      @dotorg    = options['<org_file>']
+      @root_dir  = options['--root-dir']
+      @run_dir   = if @root_dir
+                     File.expand_path(File.join(@root_dir, 'run'))
+                   else
+                     File.expand_path('run')
+                   end
+      # The results dir will have a timestamp to avoid having to refresh all the time
+      results_dirname = "results_#{Time.now.strftime("%Y%m%d%H%M%S")}"
+      @results_dir = if @root_dir
+                       File.expand_path(File.join(@root_dir, results_dirname))
+                     else
+                       File.expand_path(results_dirname)
+                     end
       @ob    = Orgmode::Parser.new(File.read(dotorg)).babelize
       @babel = nil
       @logger  = Logger.new(options['--log'] || STDOUT)
@@ -40,14 +47,15 @@ module OrgConverge
 
     def converge!
       tangle!
+      runmode = @options['--runmode'] || ob.in_buffer_settings['RUNMODE']
       case
-      when @options['--runmode']
-        dispatch_runmode(@options['--runmode'])
       when @options['--name']
-        run_matching_blocks!
+        if runmode == 'sequentially'
+          run_matching_blocks_sequentially!
+        else
+          run_matching_blocks!
+        end
       else
-        # Try to find one in the buffer
-        runmode = ob.in_buffer_settings['RUNMODE']
         dispatch_runmode(runmode)
       end
     end
@@ -60,6 +68,8 @@ module OrgConverge
         run_blocks_sequentially!
       when 'chained', 'chain', 'tasks'
         run_blocks_chain!
+      when 'spec'
+        run_against_blocks_results!
       else # parallel by default
         run_blocks_in_parallel!
       end
@@ -177,8 +187,135 @@ module OrgConverge
       logger.info "Run has completed successfully.".fg 'green'
     end
 
-    def with_running_engine
-      engine = OrgConverge::Engine.new(:logger => @logger, :babel => @babel)
+    def run_matching_blocks_sequentially!
+      babel.tangle_runnable_blocks!(@run_dir)
+
+      runlist_stack = []
+      scripts = babel.ob.scripts.select {|k, h| h[:header][:name] =~ Regexp.new(@options['--name']) }
+      scripts.each do |key, script|
+        runlist_stack << [key, script]
+      end
+
+      while not runlist_stack.empty?
+        key, script = runlist_stack.shift
+
+        # Decision: Only run blocks which have a name
+        next unless script[:header][:name]
+
+        display_name = script[:header][:name]
+        with_running_engine do |engine|
+          file = File.expand_path("#{@run_dir}/#{key}")
+          cmd = "#{script[:lang]} #{file}"
+          engine.register display_name, cmd, { :cwd => @root_dir, :logger => logger }
+        end
+      end
+      logger.info "Run has completed successfully.".fg 'green'
+    end
+
+    def run_against_blocks_results!
+      require 'diff/lcs'
+      require 'diff/lcs/hunk'
+
+      succeeded = []
+      failed    = []
+
+      logger.info "Runmode: spec"
+      runlist_stack = []
+      scripts = if @options['--name']
+                  babel.ob.scripts.select {|k, h| h[:header][:name] =~ Regexp.new(@options['--name']) }
+                else
+                  babel.ob.scripts
+                end
+      scripts.each { |key, script| runlist_stack << [key, script] }
+
+      babel.tangle_runnable_blocks!(@run_dir)
+      FileUtils.mkdir_p(@results_dir)
+
+      while not runlist_stack.empty?
+        key, script = runlist_stack.shift
+
+        # Decision: Only run blocks which have a name
+        next unless script[:header][:name]
+
+        display_name = script[:header][:name]
+        script_file  = File.expand_path("#{@run_dir}/#{key}")
+        results_file = File.expand_path("#{@results_dir}/#{key}")
+        cmd           = "#{script[:lang]} #{script_file}"
+
+        with_running_engine(:runmode => 'spec', :results_dir => @results_dir) \
+        do |engine|
+          engine.register display_name, cmd, { 
+            :cwd     => @root_dir, 
+            :logger  => logger,
+            :results => results_file
+          }
+        end
+
+        if scripts[:results]
+          print "Checking results from '#{display_name.fg 'yellow'}' code block:\t"
+          expected_lines = script[:results].split("\n").map! {|e| e.chomp }
+          actual_lines   = File.open(results_file).read.split("\n").map! {|e| e.chomp }
+
+          output_diff = diff(expected_lines, actual_lines)
+          if output_diff.empty?
+            puts "OK".fg 'green'
+            succeeded << display_name
+          else
+            puts "DIFF".fg 'red'
+            puts output_diff.fg 'red'
+            failed << display_name
+          end
+        end
+      end
+
+      if failed.count > 0
+        puts ''
+        puts 'Failed code blocks:'.fg 'red'
+        failed.each do |name|
+          puts "  - #{name.fg 'yellow'}"
+        end
+        puts ''
+      end
+
+      puts "#{succeeded.count + failed.count} examples, #{failed.count} failures".fg 'green'
+      exit 1 if failed.count > 0
+    end
+
+    def diff(expected_lines, actual_lines)
+      output = ""
+      file_length_difference = 0
+
+      diffs = Diff::LCS.diff(expected_lines, actual_lines)
+      hunks = diffs.map do |piece|
+        Diff::LCS::Hunk.new(
+                            expected_lines, actual_lines, piece, 3, 0
+                            ).tap do |h|
+          file_length_difference = h.file_length_difference 
+        end
+      end
+
+      hunks.each_cons(2) do |prev_hunk, current_hunk|
+        begin
+          if current_hunk.overlaps?(prev_hunk)
+            current_hunk.merge(prev_hunk)
+          else
+            output << prev_hunk.diff(:unified).to_s
+          end
+        rescue => e
+        end
+      end
+
+      if hunks.last
+        output << hunks.last.diff(:unified).to_s
+      end
+
+      output
+    end
+
+    def with_running_engine(opts={})
+      default_options = { :logger => @logger, :babel => @babel }
+      options = default_options.merge!(opts)
+      engine = OrgConverge::Engine.new(options)
       yield engine
       engine.start
     end

data/lib/org-converge/engine.rb

@@ -16,8 +16,9 @@ module OrgConverge
 
     def initialize(options={})
       super(options)
-      @logger = options[:logger] || Logger.new(STDOUT)
-      @babel  = options[:babel]
+      @logger  = options[:logger] || Logger.new(STDOUT)
+      @babel   = options[:babel]
+      @runmode = options[:runmode]
     end
 
     # We allow other processes to exit with 0 status
@@ -37,11 +38,16 @@ module OrgConverge
       @processes.each do |process|
         reader, writer = create_pipe
         begin
+          # In case of spec mode, we need to redirect the output to a results file instead
+          writer = File.open(process.options[:results], 'a') if @runmode == 'spec'
           pid = process.run(:output => writer)
           @names[process] = "#{@names[process]}.#{pid}"
-          writer.puts "started with pid #{pid}"
+
+          # NOTE: In spec mode we need to be more strict on what is flushed by the engine
+          # because we will be comparing the output
+          writer.puts "started with pid #{pid}" unless @runmode == 'spec'
         rescue Errno::ENOENT
-          writer.puts "unknown command: #{process.command}"
+          writer.puts "unknown command: #{process.command}" unless @runmode == 'spec'
         end
         @running[pid] = [process]
         @readers[pid] = reader
@@ -63,8 +69,9 @@ module OrgConverge
         output  = "#{pad_process_name(ps)}(#{pid})".fg get_color_for_pid(pid.to_i)
         output += " -- "
         output += message
-        # FIXME: When the process has stopped already,
-        # the name of the process does not appear
+
+        # FIXME: When the process has stopped already, the name of the process does not appear
+        #        (which means that this approach is wrong from the beginning probably)
         logger.info output
       end
     rescue Errno::EPIPE
@@ -86,7 +93,21 @@ module OrgConverge
     def get_color_for_pid(pid)
       RAINBOW[pid % 7]
     end
+
+    def watch_for_termination
+      pid, status = Process.wait2
+      output_with_mutex name_for(pid), termination_message_for(status) unless @runmode == 'spec'
+      @running.delete(pid)
+      yield if block_given?
+      pid
+    rescue Errno::ECHILD
+    end
   end
 
-  class CodeBlockProcess < Foreman::Process; end
+  # Need to expose the options to make the process be aware
+  # of the possible running mode (specially spec mode)
+  # and where to put the results output
+  class CodeBlockProcess < Foreman::Process
+    attr_reader :options
+  end
 end

data/lib/org-converge/version.rb

@@ -1,3 +1,3 @@
 module OrgConverge
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/org-converge.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = OrgConverge::VERSION
   gem.add_runtime_dependency('docopt',   '~> 0.5.0')
-  gem.add_runtime_dependency('org-ruby', '~> 0.9.5')
+  gem.add_runtime_dependency('org-ruby', '~> 0.9.6')
   gem.add_runtime_dependency('foreman',  '~> 0.63.0')
   gem.add_runtime_dependency('tco',      '~> 0.1.0')
   gem.add_runtime_dependency('rake',     '~> 10.3')

data/spec/converge_examples/expected_results/spec.org

@@ -0,0 +1,62 @@
+# -*- mode: org; mode: auto-fill; -*-
+#+TITLE:   Expected results example
+#+runmode: spec
+
+Given a literate description of the run along with the expected
+results, we can try checking whether the contents from the code block
+are evaling into what is being documented in the results block.
+
+#+name: hello
+#+begin_src sh :results output code :exports both
+for i in `seq 20`; do 
+echo "hello"
+done
+#+end_src
+
+#+RESULTS: hello
+#+BEGIN_SRC sh
+hello
+hello
+hello
+hello
+hello
+hello
+hello
+hello
+hello
+hello
+hello
+hello
+hello
+hello
+hello
+hello
+hello
+hello
+hello
+hello
+#+END_SRC
+
+Something else.
+
+#+name: hola
+#+begin_src ruby :results output code :exports both
+10.times do 
+  puts "hola"
+end
+#+end_src
+
+#+RESULTS: hola
+#+BEGIN_SRC ruby
+hola
+hola
+hola
+hola
+hola
+hola
+hola
+hola
+hola
+hola
+#+END_SRC
+

data/spec/converge_examples/expected_results/spec2.org

@@ -0,0 +1,62 @@
+# -*- mode: org; mode: auto-fill; -*-
+#+TITLE:   Expected results example
+
+#+name: hello_test
+#+begin_src ruby :results output
+10.times do 
+  puts "hola"
+end
+#+end_src
+
+#+RESULTS: hello_test
+#+begin_example
+hola
+hola
+hola
+hola
+hola
+hola
+hola
+hola
+hola
+hola
+#+end_example
+
+This one would fail near christmas, outside of Japan,
+when the site is down, or there is a change in the rss.xml being provided.
+
+#+name: christmas_check
+#+begin_src sh :results output
+curl https://isitchristmas.com/rss.xml 2> /dev/null | grep title
+# curl isitchristmastyet.com 2> /dev/null
+#+end_src
+
+#+RESULTS: christmas_check
+#+begin_example
+    <title>Is It Christmas?</title>
+          <title>いいえ</title>
+          <title>いいえ</title>
+          <title>いいえ</title>
+          <title>いいえ</title>
+          <title>いいえ</title>
+          <title>いいえ</title>
+          <title>いいえ</title>
+          <title>いいえ</title>
+          <title>いいえ</title>
+          <title>いいえ</title>
+#+end_example
+
+#+RESULTS: fetch_google
+#+begin_example
+    <title>Is It Christmas?</title>
+          <title>いいえ</title>
+          <title>いいえ</title>
+          <title>いいえ</title>
+          <title>いいえ</title>
+          <title>いいえ</title>
+          <title>いいえ</title>
+          <title>いいえ</title>
+          <title>いいえ</title>
+          <title>いいえ</title>
+          <title>いいえ</title>
+#+end_example

data/spec/converge_spec.rb

@@ -105,4 +105,30 @@ describe OrgConverge::Command do
     expected_contents = "init\n0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11"
     File.read(File.join(example_dir, 'out.log')).should == expected_contents
   end
+
+  it "should run 'expected_results' with src blocks" do
+    example_dir = File.join(EXAMPLES_DIR, 'expected_results')
+    setup_file = File.join(example_dir, 'spec.org')
+
+    o = OrgConverge::Command.new({ 
+                                   '<org_file>' => setup_file,
+                                   '--root-dir' => example_dir,
+                                   '--runmode'  => 'spec'
+                                 })
+    success = o.execute!
+    success.should == true
+  end
+
+  it "should run 'expected_results' with example blocks" do
+    example_dir = File.join(EXAMPLES_DIR, 'expected_results')
+    setup_file = File.join(example_dir, 'spec2.org')
+
+    o = OrgConverge::Command.new({ 
+                                   '<org_file>' => setup_file,
+                                   '--root-dir' => example_dir,
+                                   '--runmode'  => 'spec'
+                                 })
+    success = o.execute!
+    success.should == true
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: org-converge
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
-  requirement: &70254668243000 !ruby/object:Gem::Requirement
+  requirement: &70238558687960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70254668243000
+  version_requirements: *70238558687960
 - !ruby/object:Gem::Dependency
   name: org-ruby
-  requirement: &70254668242520 !ruby/object:Gem::Requirement
+  requirement: &70238558687480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.6
   type: :runtime
   prerelease: false
-  version_requirements: *70254668242520
+  version_requirements: *70238558687480
 - !ruby/object:Gem::Dependency
   name: foreman
-  requirement: &70254664800460 !ruby/object:Gem::Requirement
+  requirement: &70238558687020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.63.0
   type: :runtime
   prerelease: false
-  version_requirements: *70254664800460
+  version_requirements: *70238558687020
 - !ruby/object:Gem::Dependency
   name: tco
-  requirement: &70254664799380 !ruby/object:Gem::Requirement
+  requirement: &70238558686560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70254664799380
+  version_requirements: *70238558686560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70254664798160 !ruby/object:Gem::Requirement
+  requirement: &70238558686100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,13 +65,14 @@ dependencies:
         version: '10.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70254664798160
+  version_requirements: *70238558686100
 description: A light configuration management tool for Org mode
 email:
 - waldemar.quevedo@gmail.com
 executables:
 - org-converge
 - org-run
+- org-spec
 - org-tangle
 extensions: []
 extra_rdoc_files: []
@@ -85,6 +86,7 @@ files:
 - TODO
 - bin/org-converge
 - bin/org-run
+- bin/org-spec
 - bin/org-tangle
 - examples/apt-get-install/setup.org
 - examples/fluentd/setup.org
@@ -101,6 +103,8 @@ files:
 - spec/converge_examples/basic_tangle/conf.yml.expected
 - spec/converge_examples/basic_tangle/setup.org
 - spec/converge_examples/commented_block/run.org
+- spec/converge_examples/expected_results/spec.org
+- spec/converge_examples/expected_results/spec2.org
 - spec/converge_examples/linked_tasks/tasks.org
 - spec/converge_examples/runlist_example/setup.org
 - spec/converge_examples/specified_block/run.org
@@ -136,6 +140,8 @@ test_files:
 - spec/converge_examples/basic_tangle/conf.yml.expected
 - spec/converge_examples/basic_tangle/setup.org
 - spec/converge_examples/commented_block/run.org
+- spec/converge_examples/expected_results/spec.org
+- spec/converge_examples/expected_results/spec2.org
 - spec/converge_examples/linked_tasks/tasks.org
 - spec/converge_examples/runlist_example/setup.org
 - spec/converge_examples/specified_block/run.org