org-converge 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8f7e90bad105cff350dbb911fe70a553646caa6
-  data.tar.gz: da367c09faae2f51ad7b0efd34c57f5a27ab8057
+  metadata.gz: 0d79849925c29871f3955a60256beec94327117a
+  data.tar.gz: c15b7b0962388cb85bc8ac2344b7ff21326b37f7
 SHA512:
-  metadata.gz: 2b099f71b36b2504a9ae922ea1956d2a23eb224478c332fc230a747079105db9214b604d397ab43f0fa8dfd8d29b2349384a00ca4dfcf7f9e2fd72809e0885b8
-  data.tar.gz: 8768bddc3b3273d54164c7325e2f1f5e22b1364ed91ceaecf31f6edd1ee426274500ebd45eec6ed8329e1a048a4041de85f9614a9e443086d5fe83a52f5ef466
+  metadata.gz: 951731210970f8ea7b3274c39309545cdab786b8743e8b6757e703e6cc2cf0f8e399d51846aef7f39e303b3e72d231b438dad853e84411661f3be47b0cffcf85
+  data.tar.gz: 555a85dd9f830ef9303670f527f7c560408314be273e4d58bc14fd6e2fca11d57c31e8eda652c1075e0390c7b238e297e94ddfe6662cee28ce836427c14e270f

data/TODO

@@ -2,23 +2,23 @@
 #+TODO:    TODO | DONE CANCELED 
 #+startup: showeverything
 
-* [0/16] 0.1.0 version
+* [0/15] 1.0.0 version
+
+Some of these need further work on the Org Ruby parser.
 
 - [ ] Macros can be loaded and applied to the configuration
-- [ ] 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
 - [ ] Support for ~#+SETUPFILE~
+  To load the macros
+- [ ] Support converging and idempotency (~--runmode=idempotent~)
+  + Do not do an operation unless it is required
+  + Abort in case there was a failure in executing one of the scripts.
 - [ ] Heuristics for determining which binary to use for running the script
 - [ ] Display how the run would look like without making changes
   : org-converge setupfile.org --dry-run
-- [ ] Use =:eval= for evaling blocks (off by default)
 - [ ] Bugfix for when results blocks have only inline examples or images
-- [ ] Bugfix for when the result from a ~org-spec~ run has non-zero exit status
-- [ ] Bugfixes for spec run
-- [ ] Distributed run helpers for the header arguments
-  Like remote =:dir= for example.
+- [ ] Bugfix for when the result from a ~org-spec~ run has non-zero exit status 
+- [ ] =:eval=
+  For evaling blocks (off by default)
 - [ ] =:onerror=
   aborteverything, restart, runhandler
 - [ ] =:asserts=
@@ -29,9 +29,16 @@
 - [ ] =:awaits:=
   Wait for other processes to finish before starting.
 - [ ] =:file=
-  For storing the output from the evaluation (already done in spec mode)a
-- [ ] Can use =:dir= for running a process remotely via ssh
-  This needs the credentials to be readily available
+  For storing the output from the evaluation (already done in spec
+  mode)
+- [ ] =:cache true=
+  Also part of the idempotency checks.
+- [ ] =:env= and =#+envfile:=
+
+* [1/1] 0.0.15
+
+- [X] Can use =:dir= for running a process remotely via ssh.
+  This needs the remote credentials to be available.
 
 * [2/2] 0.0.14
 
@@ -121,8 +128,8 @@ Need some basic functionality of what Org babel offers first.
 - [X] ~--tangle~ flag
 - [X] Support a root dir for when not running relative to the directory
 
-* [6/21] Ideas
-** TODO Chaining resources with ~#+NAME:~ directives and ~:notify~ argument
+* [9/20] Ideas
+** TODO Chaining resources with =#+name:= directives and =:notify= argument
 
 One idea is to be able to notify resources by naming the code blocks.
 
@@ -143,26 +150,18 @@ sudo /etc/register-to-balancer
 - Support for ~:before all~ and ~:after all~ added
 ** TODO Add namespace dynamically to the tasks using an in buffer setting
 
-When including files there can be some potential scoping issues.
+There can be some potential scoping issues when using =#+include:=
 
-** TODO Inject macros within the environment variables from a runnable process
 ** TODO Clarify which ones of the header arguments to implement
 
 http://orgmode.org/manual/Specific-header-arguments.html#Specific-header-arguments
-
-** TODO Use sshkit for running remote processes
-** TODO By default, it should use current dir for tangling
-** TODO Converging: Only do an operation when it didn't finish
-
-Hence the name of the project
-
 ** TODO For now we keep the indentation of the code blocks
 
 The indentatin of the ~#+begin_src~ should always 
 be at the beginning of the file, not at the indentation
 level from when the file was written in Org mode.
 
-** TODO We should have a whitelist of languages that can be executed and ignore everything
+** TODO We should have a whitelist of languages that can be executed and ignore everything else
 
 Under which heuristics or configuration should we decide which will be the 
 binary that should be used to execute the block? Specify with shebang?
@@ -183,9 +182,14 @@ It should be possible to tangle the files this way:
 
 It seems that there is support for a ~#+SETUPFILE~
 
-** TODO Something more flexible than macros:
+** TODO Something more flexible than macros for templating
 
-One example of syntax that we could use instead of macros:
+One example of syntax that we could use instead of macros.
+One idea is to use the =:session= argument and different drivers
+for languages that are commonly used for the configuration.
+This would inject the settings into a =@macros= hash from where
+the values can be picked up to be applied at runtime, sort 
+of like the overrride attributes feature from Chef.
 
 #+begin_src yaml :session
 fluentd:
@@ -193,13 +197,34 @@ fluentd:
   path: here.log
 #+end_src
 
-But need to 
+Or also json could be used:
 
-** TODO Choosing a templating language: default for now is mustache
+#+begin_src js :session
+{
+  "fluentd": {
+    "port": 4224,
+    "path": "here.log"
+  }
+}
+#+end_src
+
+Or even just plain Ruby?
+
+#+begin_src ruby :session
+session = {
+  "fluentd" => {
+    "port" => 4224,
+    "path" => "here.log"
+  }
+}
+#+end_src
+
+** TODO Choosing a templating language
 
 We could implement the macro systems, but it seems that it may not be
 strong enough for providing with all the cases we may run into.
-** TODO Support caching?
+
+** TODO Support =:cache=?
 
 #+begin_src emacs-lisp :cache yes :exports results
   (random)
@@ -208,11 +233,15 @@ strong enough for providing with all the cases we may run into.
 #+RESULTS[db54597aed193d861d01bf92110e10f28f8f40d4]:
 : 842438499349743708
 
-** TODO Support :eval ?
+** TODO Support =:eval=?
 
 #+begin_src sh :eval (print "Really doing this...")
   echo "Going ahead with operation X!"
 #+end_src
+** DONE By default, it should use current dir for tangling
+** DONE Converging: Only do an operation when it didn't finish
+
+Hence the name of the project
 
 ** DONE ~#+NAME:~ could be used in the logger for identifying the process
 ** DONE Managing dependencies: could be handled with ~#+include~ directives
@@ -246,6 +275,8 @@ would create the necessary directories behind the scenes.
   ,mkdir -p etc/fluentd/config
   ,#+end_src
 #+end_src
+
+** CANCELED Use sshkit for running remote processes
 ** CANCELED How to set the permissions from the directory from the file that is being tangled when it does not exists?
 
 By default, this would be 0644, but we also need to specify the

data/bin/org-converge

@@ -5,10 +5,10 @@ require 'org-converge'
 
 doc = <<OPTIONS
 
-org-converge: A light configuration management tool for Org mode
+org-converge: Run with idempotency checks.
 
 Usage:
-  org-converge <org_file> [--showfiles] [--log=<logfile>] [--root-dir=<root_dir>] [--runmode=<runmode>] [--name=<block_name>]
+  org-converge <org_file> [--showfiles] [--log=<logfile>] [--root-dir=<root_dir>]
 
 Options:
 

data/bin/org-run

@@ -1,5 +1,29 @@
 #!/usr/bin/env ruby
 # -*- mode: ruby -*-
+require 'docopt'
+require 'org-converge'
 
-# alias for org-converge
-load File.expand_path('../org-converge', __FILE__)
+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>]
+
+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)
+o.execute!

data/lib/org-converge.rb

@@ -1,6 +1,7 @@
 require 'org-ruby'
 require 'org-converge/babel_output_buffer'
 require 'org-converge/babel'
+require 'org-converge/helpers'
 require 'org-converge/command'
 require 'org-converge/engine'
 require 'org-converge/version'

data/lib/org-converge/command.rb

@@ -1,5 +1,6 @@
 module OrgConverge
   class Command
+    include Helpers 
     attr_reader :dotorg
     attr_reader :logger
     attr_reader :ob
@@ -321,7 +322,7 @@ module OrgConverge
     end
 
     def with_running_engine(opts={})
-      default_options = { :logger => @logger, :babel => @babel }
+      default_options = { :logger => @logger, :babel => babel }
       options = default_options.merge!(opts)
       engine = OrgConverge::Engine.new(options)
       yield engine
@@ -377,13 +378,5 @@ module OrgConverge
         engine.register display_name, cmd, { :cwd => @root_dir, :logger => logger, :header => script[:header] }
       end
     end
-
-    def determine_lang_bin(script)
-      if script[:header][:shebang]
-        script[:header][:shebang].gsub('#!', '')
-      else
-        script[:lang]
-      end
-    end
   end
 end

data/lib/org-converge/engine.rb

@@ -6,6 +6,8 @@ require 'foreman/engine'
 require 'foreman/process'
 require 'tco'
 require 'fileutils'
+require 'net/ssh'
+require 'net/scp'
 
 module OrgConverge
   class Engine < Foreman::Engine
@@ -85,6 +87,7 @@ module OrgConverge
     def register(name, command, options={})
       options[:env] ||= env
       options[:cwd] ||= File.dirname(command.split(" ").first)
+      options[:babel] ||= @babel
 
       process = OrgConverge::CodeBlockProcess.new(command, options)
       @names[process] = name
@@ -131,6 +134,7 @@ module OrgConverge
       yield if block_given?
       pid
     rescue Errno::ECHILD
+      yield if block_given?
     end
 
     def termination_message_for(status)
@@ -167,12 +171,15 @@ module OrgConverge
   # of the possible running mode (specially spec mode)
   # and where to put the results output
   class CodeBlockProcess < Foreman::Process
+    include OrgConverge::Helpers
     attr_reader :options
 
     def run(options={})
       env    = @options[:env].merge(options[:env] || {})
+      logger = @options[:logger]
       output = options[:output] || $stdout
       runner = "#{Foreman.runner}".shellescape
+      @babel = @options[:babel]
 
       # whitelist the modifiers which manipulate how to the block is started
       block_modifiers = { }
@@ -180,7 +187,12 @@ module OrgConverge
         block_modifiers[:waitfor] = options[:header][:waitsfor]  || options[:header][:waitfor] || options[:header][:sleep]
         block_modifiers[:timeout] = options[:header][:timeoutin] || options[:header][:timeout] || options[:header][:timeoutafter]
         if options[:header][:dir]
-          block_modifiers[:cwd] = File.expand_path(File.join(self.options[:cwd], options[:header][:dir]))
+          ssh_params = determine_ssh_params(options[:header][:dir])
+          if ssh_params[:host]
+            block_modifiers[:ssh] = ssh_params
+          else
+            block_modifiers[:cwd] = File.expand_path(File.join(self.options[:cwd], options[:header][:dir]))
+          end
         end
       end
 
@@ -204,15 +216,67 @@ module OrgConverge
         pid  = Process.spawn env, wrapped_command, opts
       end
 
+      ssh_process = nil
+      if block_modifiers[:ssh]
+        ssh_process = proc do
+          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']
+          begin
+            # SCP the script to run remotely and the binary used to run it
+            binary, script = command.split(' ')
+            remote_file = if not block_modifiers[:ssh][:remote_dir].empty?
+                            File.join(block_modifiers[:ssh][:remote_dir], "org-run-#{File.basename(script)}")
+                          else
+                            "org-run-#{File.basename(script)}"
+                          end
+            scp_options = ssh_options
+            scp_options[:keys] = [ssh_options[:keys]] if ssh_options[:keys]
+
+            # TODO: Detect and upload the file only once
+            Net::SCP.upload!(block_modifiers[:ssh][:host],
+                             block_modifiers[:ssh][:user],
+                             script,
+                             remote_file,
+                             :ssh => scp_options)
+            Net::SSH.start(block_modifiers[:ssh][:host], 
+                           block_modifiers[:ssh][:user], ssh_options) do |ssh|
+              channel = ssh.open_channel do |chan|
+                chan.exec "#{binary} #{remote_file}" do |ch, success|
+                  raise "could not execute command" unless success
+
+                  # "on_data" is called when the process writes something to stdout
+                  # "on_extended_data" is called when the process writes something to stderr
+                  chan.on_data          { |c, data| output.puts data       }
+                  chan.on_extended_data { |c, type, data| output.puts data }
+                  chan.on_close         { output.puts "exited from #{block_modifiers[:ssh][:host]}"}
+                end
+                chan.wait
+              end
+              ssh.loop
+            end
+          rescue Net::SCP::Error
+            output.puts "Error when transporting file: #{script}"
+          rescue => e
+            puts "Error during ssh session: #{e}"
+          end
+        end
+      end
+
       # In case we modify the run block, we run it in a Thread
       # otherwise we continue treating it as a forked process.
-      if block_modifiers and (block_modifiers[:waitfor] || block_modifiers[:timeout] || block_modifiers[:dir])
+      if block_modifiers and (block_modifiers[:waitfor] || block_modifiers[:timeout] || block_modifiers[:dir] || block_modifiers[:ssh])
         waitfor = block_modifiers[:waitfor].to_i
         timeout = block_modifiers[:timeout].to_i
 
         thread = Thread.new do
           sleep waitfor if waitfor > 0
-          pid = process.call
+          if ssh_process
+            ssh_process.call
+          else
+            pid = process.call
+          end
           if timeout > 0
             sleep timeout
             # FIXME: Kill children properly

data/lib/org-converge/helpers.rb

@@ -0,0 +1,24 @@
+module OrgConverge
+  module Helpers
+    def determine_lang_bin(script)
+      if script[:header][:shebang]
+        script[:header][:shebang].gsub('#!', '')
+      else
+        script[:lang]
+      end
+    end
+
+    def determine_ssh_params(dir)
+      ssh = { }
+
+      if dir =~ /\/(([^ @:]+)@)?([^ #:]+)?#?(\d+)?:(.*)?/
+        ssh[:user] = $2
+        ssh[:host] = $3
+        ssh[:port] = ($4 || 22).to_i
+        ssh[:remote_dir] = ($5 || '')
+      end
+
+      ssh
+    end
+  end
+end

data/lib/org-converge/version.rb

@@ -1,3 +1,3 @@
 module OrgConverge
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/org-converge.gemspec

@@ -14,10 +14,13 @@ Gem::Specification.new do |gem|
   gem.name          = "org-converge"
   gem.require_paths = ["lib"]
   gem.version       = OrgConverge::VERSION
+  gem.license       = 'MIT'
   gem.add_runtime_dependency('docopt',   '~> 0.5')
   gem.add_runtime_dependency('org-ruby', '~> 0.9')
   gem.add_runtime_dependency('foreman',  '~> 0.63')
   gem.add_runtime_dependency('tco',      '~> 0.1')
   gem.add_runtime_dependency('rake',     '~> 10.3')
-  gem.add_runtime_dependency('diff-lcs', '~> 1.2')  
+  gem.add_runtime_dependency('diff-lcs', '~> 1.2')
+  gem.add_runtime_dependency('net-ssh', '~> 2.8')
+  gem.add_runtime_dependency('net-scp', '~> 1.1')
 end

data/spec/converge_examples/block_modifiers/run.org

@@ -21,6 +21,8 @@ This one on the other hand starts as soon as possible:
 echo "whoosh" > out.log
 #+end_src
 
+** COMMENT Fails sometimes
+
 #+name: timeout-in-3-seconds
 #+begin_src sh :timeout 5
 while true; do

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

@@ -0,0 +1,76 @@
+#+TITLE:		Remote runs
+#+sshidentifyfile:	vagrant/keys/vagrant
+#+sshpassword:          vagrant
+#+startup:              showeverything
+
+*Note*: This one needs a vagrant VM available for testing...
+
+A block can be specified to be run remotely as well.
+In order to do this, it is needed to specify in the =:dir= block header argument
+the location of the remote node to connect to, as well as user name to use.
+
+*** Running locally
+
+#+name: 50-times
+#+begin_src ruby
+$stdout.sync = true
+50.times { puts "hello"; sleep 0.2 }
+#+end_src
+
+#+name: hello-world-block
+#+begin_src sh
+for i in `seq 1 30`; do
+echo "$i: hello world"
+sleep 0.5
+done
+#+end_src
+
+*** Running remotely
+
+#+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
+#+end_src
+
+#+name: remote-ruby-code-block
+#+begin_src ruby :results output :dir /vagrant@127.0.0.1#2222:/tmp :shebang #!/usr/bin/ruby
+$stdout.sync= true
+random_number = rand(10)
+10.times do
+  puts "[#{random_number}] Running script is #{$0} being run from #{File.dirname(__FILE__)}"
+end
+#+end_src
+
+#+name: remote-hello-from-default-path
+#+begin_src sh :results output :dir /vagrant@127.0.0.1#2222:
+random_number=$RANDOM
+for i in `seq 1 10`; do echo "[$random_number] Running script is $0 being run from `pwd`"; done
+#+end_src
+
+*** DONE Improvement: Need to be able to set a default identity file for doing ssh.
+
+#+sshidentityfile: vagrant/keys/vagrant
+
+*** DONE Should the remote runs and local runs coexists? : yes
+
+By specifying a remote dir:
+
+- The defined script will be scp to that remote dir
+- then executed using the binary in the path
+
+*** Ideas
+
+It would be useful to be able to define the nodes like:
+
+#+hosts: vagrant /vagrant@127.0.0.1#2222:
+#+hosts: node-1  /vagrant@127.0.0.1#2222:
+
+So that we could call it like:
+
+#+begin_src sh :host vagrant
+echo "test" > test
+#+end_src
+
+It would be even better if this list of hosts could be discovered
+by subscribing to a message bus.

data/spec/helpers_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe OrgConverge::Helpers do
+  include OrgConverge::Helpers
+
+  tests = []
+  tests << { 
+    :dir => '/vagrant@127.0.0.1#2222:/home/vagrant/',
+    :expected_user => "vagrant",
+    :expected_host => "127.0.0.1",
+    :expected_port => 2222,
+    :expected_remote_dir => "/home/vagrant/"
+  }
+  tests << { 
+    :dir => '/vagrant@127.0.0.1:/home/vagrant/',
+    :expected_user => "vagrant",
+    :expected_host => "127.0.0.1",
+    :expected_port => 22,
+    :expected_remote_dir => '/home/vagrant/'
+  }
+  tests << { 
+    :dir => '/vagrant@127.0.0.1:',
+    :expected_user => "vagrant",
+    :expected_host => "127.0.0.1",
+    :expected_port => 22,
+    :expected_remote_dir => ''
+  }
+  tests << { 
+    :dir => '/127.0.0.1:',
+    :expected_user => nil,
+    :expected_host => "127.0.0.1",
+    :expected_port => 22,
+    :expected_remote_dir => ''
+  }
+  tests << { 
+    :dir => '/var/lib/org/',
+    :expected_user => nil,
+    :expected_host => nil,
+    :expected_port => nil,
+    :expected_remote_dir => nil
+  }
+  tests << { 
+    :dir => 'org/',
+    :expected_user => nil,
+    :expected_host => nil,
+    :expected_port => nil,
+    :expected_remote_dir => nil
+  }
+  tests.each do |t|
+    it "should parse ':dir #{t[:dir]}'" do
+      ssh = determine_ssh_params(t[:dir])
+      ssh[:user].should == t[:expected_user]
+      ssh[:host].should == t[:expected_host]
+      ssh[:port].should == t[:expected_port]
+      ssh[:remote_dir].should == t[:expected_remote_dir]
+    end
+  end
+end

data/vagrant.org

@@ -77,7 +77,7 @@ fi
 #+end_src
 
 #+name: apt-get-install
-#+begin_src sh :dir vagrant@localhost:2222/ :if running-in-ubuntu
+#+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
 #+end_src

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: org-converge
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Waldemar Quevedo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -94,6 +94,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: A light configuration management tool for Org mode
 email:
 - waldemar.quevedo@gmail.com
@@ -125,6 +153,7 @@ files:
 - lib/org-converge/babel_output_buffer.rb
 - lib/org-converge/command.rb
 - lib/org-converge/engine.rb
+- lib/org-converge/helpers.rb
 - lib/org-converge/version.rb
 - org-converge.gemspec
 - spec/converge_examples/basic_run_example/setup.org
@@ -138,14 +167,17 @@ files:
 - spec/converge_examples/idempotency/conditions.org
 - spec/converge_examples/linked_tasks/tasks.org
 - spec/converge_examples/multi_proc/run.org
+- spec/converge_examples/remote_dir/remote-dir.org
 - spec/converge_examples/runlist_example/setup.org
 - spec/converge_examples/shebang/run.org
 - spec/converge_examples/specified_block/run.org
 - spec/converge_spec.rb
+- spec/helpers_spec.rb
 - spec/spec_helper.rb
 - vagrant.org
 homepage: https://github.com/wallyqs/org-converge
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -180,8 +212,10 @@ test_files:
 - spec/converge_examples/idempotency/conditions.org
 - spec/converge_examples/linked_tasks/tasks.org
 - spec/converge_examples/multi_proc/run.org
+- spec/converge_examples/remote_dir/remote-dir.org
 - spec/converge_examples/runlist_example/setup.org
 - spec/converge_examples/shebang/run.org
 - spec/converge_examples/specified_block/run.org
 - spec/converge_spec.rb
+- spec/helpers_spec.rb
 - spec/spec_helper.rb